Git commit 86ca74053d8ddda4e554dd3984c1bdc2409a0857 by Nate Graham. Committed on 18/02/2025 at 00:04. Pushed by ngraham into branch 'master'.
kcms/workspace: describe visual options comprehensibly Right now these settings are rather unclear, using vague language and omitting information about their scope. Let's re-word everything to make it clear to users what these settings actually do, and add context help buttons for more info if needed. M +3 -4 doc/kcontrol/workspaceoptions/index.docbook M +32 -15 kcms/workspaceoptions/ui/main.qml M +4 -3 kcms/workspaceoptions/workspaceoptions_plasmasettings.kcfg https://invent.kde.org/plasma/plasma-desktop/-/commit/86ca74053d8ddda4e554dd3984c1bdc2409a0857 diff --git a/doc/kcontrol/workspaceoptions/index.docbook b/doc/kcontrol/workspaceoptions/index.docbook index 95b61f2b40..600ca58ccd 100644 --- a/doc/kcontrol/workspaceoptions/index.docbook +++ b/doc/kcontrol/workspaceoptions/index.docbook @@ -32,7 +32,7 @@ <variablelist> <varlistentry> -<term><guilabel>Display informational tooltips on mouse hover</guilabel></term> +<term><guilabel>Allow Plasma to show panel and widget tooltips</guilabel></term> <listitem> <para>If this option is checked, tooltips are displayed hovering items in the &plasma; panel or on the desktop.</para> @@ -40,10 +40,9 @@ </varlistentry> <varlistentry> -<term><guilabel>Display visual feedback for status changes</guilabel></term> +<term><guilabel>Allow Plasma to show OSD popups for status changes</guilabel></term> <listitem> -<para>If you change ⪚ brightness and volume using the keyboard these status -changes are displayed in an OSD.</para> +<para>If this option is checked, all Plasma widgets are allowed to show on-screen display (OSD) popups for changes like volume and brightness level, or audio device switching.</para> </listitem> </varlistentry> diff --git a/kcms/workspaceoptions/ui/main.qml b/kcms/workspaceoptions/ui/main.qml index 03866b7235..d75bcdd320 100644 --- a/kcms/workspaceoptions/ui/main.qml +++ b/kcms/workspaceoptions/ui/main.qml @@ -41,26 +41,43 @@ KCM.SimpleKCM { Kirigami.FormLayout { // Visual behavior settings - QQC2.CheckBox { - Kirigami.FormData.label: i18n("Visual behavior:") - text: i18n("Display informational tooltips on mouse hover") - checked: kcm.plasmaSettings.delay > 0 - onCheckedChanged: kcm.plasmaSettings.delay = (checked ? 0.7 : -1) + RowLayout { + Kirigami.FormData.label: i18nc("Part of the sentence 'Allow Plasma to show panel and widget tooltips'", "Allow Plasma to show:") + Kirigami.FormData.buddyFor: tooltipDisablerCheckbox - KCM.SettingStateBinding { - configObject: kcm.plasmaSettings - settingName: "delay" + spacing: 0 + + QQC2.CheckBox { + id: tooltipDisablerCheckbox + text: i18nc("Part of the sentence 'Allow Plasma to show panel and widget tooltips'", "Panel and widget tooltips") + checked: kcm.plasmaSettings.delay > 0 + onCheckedChanged: kcm.plasmaSettings.delay = (checked ? 0.7 : -1) + + KCM.SettingStateBinding { + configObject: kcm.plasmaSettings + settingName: "delay" + } + } + Kirigami.ContextualHelpButton { + toolTipText: i18n("Allows all Plasma panel and desktop widgets to show descriptive tooltips when hovered with the pointer. This setting has no effect on the small tooltips displayed when hovering over individual buttons and other user interface elements.") } } - QQC2.CheckBox { - text: i18n("Display visual feedback for status changes") - checked: kcm.plasmaSettings.osdEnabled - onCheckedChanged: kcm.plasmaSettings.osdEnabled = checked + RowLayout { + spacing: 0 - KCM.SettingStateBinding { - configObject: kcm.plasmaSettings - settingName: "osdEnabled" + QQC2.CheckBox { + text: i18nc("Part of the sentence 'Allow Plasma to show OSD popups for status changes'", "OSD popups for status changes") + checked: kcm.plasmaSettings.osdEnabled + onCheckedChanged: kcm.plasmaSettings.osdEnabled = checked + + KCM.SettingStateBinding { + configObject: kcm.plasmaSettings + settingName: "osdEnabled" + } + } + Kirigami.ContextualHelpButton { + toolTipText: i18n("Allows all Plasma widgets to show on-screen display (OSD) popups for changes like volume and brightness level, or audio device switching.") } } diff --git a/kcms/workspaceoptions/workspaceoptions_plasmasettings.kcfg b/kcms/workspaceoptions/workspaceoptions_plasmasettings.kcfg index 16f9aa99a6..253d25e14a 100644 --- a/kcms/workspaceoptions/workspaceoptions_plasmasettings.kcfg +++ b/kcms/workspaceoptions/workspaceoptions_plasmasettings.kcfg @@ -6,14 +6,15 @@ <kcfgfile name="plasmarc" /> <group name="PlasmaToolTips"> <entry name="delay" key="Delay" type="Double"> - <label>Display informational tooltips on mouse hover</label> + <label>Display large panel and widget tooltips</label> + <tooltip>Allow Plasma widgets to display large panel and widget tooltips on hover</tooltip> <default>0.7</default> </entry> </group> <group name="OSD"> <entry name="osdEnabled" key="Enabled" type="Bool"> - <label>Display visual feedback for status changes</label> - <tooltip>Show an on-screen display to indicate status changes such as brightness or volume</tooltip> + <label>Display small popups for status changes</label> + <tooltip>Allow Plasma widgets to display small popups for status changes such as brightness or volume</tooltip> <default>true</default> </entry> <entry name="osdKbdLayoutChangedEnabled" key="kbdLayoutChangedEnabled" type="Bool">