feat: update wording and use more information messages

luisbocanegra · Nov 3, 2024 · 7104389 · 7104389
1 parent 20a77d0
commit 7104389
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 34 deletions.
diff --git a/package/contents/config/config.qml b/package/contents/config/config.qml
@@ -10,15 +10,15 @@ ConfigModel {
     }
 
     ConfigCategory {
-        name: i18n("Presets autoloading")
+        name: i18n("Presets auto-loading")
         icon: "system-run-symbolic"
         source: "configPresetAutoload.qml"
     }
 
     ConfigCategory {
         name: i18n("Appearance")
         icon: "desktop-symbolic"
-        source: "configGlobal.qml"
+        source: "configAppearance.qml"
     }
 
     ConfigCategory {
@@ -28,7 +28,7 @@ ConfigModel {
     }
 
     ConfigCategory {
-        name: i18n("Unified background")
+        name: i18n("Unified widget backgrounds")
         icon: "lines-connector-symbolic"
         source: "configUnifiedBackground.qml"
     }
@@ -40,9 +40,9 @@ ConfigModel {
     }
 
     ConfigCategory {
-        name: i18n("User Overrides")
-        icon: "user-properties-symbolic"
-        source: "configUserWidgetOverrides.qml"
+        name: i18n("Global Overrides")
+        icon: "globe-symbolic"
+        source: "configGlobalWidgetOverrides.qml"
     }
 
     ConfigCategory {

diff --git a/package/contents/ui/configGlobal.qml → package/contents/ui/configAppearance.qml b/package/contents/ui/configGlobal.qml → package/contents/ui/configAppearance.qml
@@ -63,6 +63,12 @@ KCM.SimpleKCM {
 
     ColumnLayout {
         enabled: cfg_isEnabled
+        Kirigami.InlineMessage {
+            Layout.fillWidth: true
+            text: i18n("Not getting the expeted result? Make sure you're editing the correct element.")
+            visible: true
+            type: Kirigami.MessageType.Information
+        }
         Kirigami.FormLayout {
             id: parentLayout
             Layout.fillWidth: true

diff --git a/package/contents/ui/configForeground.qml b/package/contents/ui/configForeground.qml
@@ -118,6 +118,12 @@ KCM.SimpleKCM {
 
     ColumnLayout {
         enabled: cfg_isEnabled
+        Kirigami.InlineMessage {
+            Layout.fillWidth: true
+            text: i18n("Force text and icon colors for specified widgets.<br><strong>Mask</strong>: Force Icon colorization (symbolic icons).<br><strong>Color Effect</strong>: Force Text/Icons colorization using post-processing effect (any icon).<br><strong>Refresh</strong>: Re-apply colorization at a fixed interval, for widgets that recreate or recolor content themselves<br>To restore the <strong>Mask<strong> and <strong>Color Effect</strong> disable and restart Plasma or logout.")
+            visible: true
+            type: Kirigami.MessageType.Information
+        }
         Components.SettingImportExport {
             onExportConfirmed: {
                 runCommand.run(crateConfigDirCmd)
@@ -146,13 +152,6 @@ KCM.SimpleKCM {
         }
     Kirigami.FormLayout {
 
-        Label {
-            text: i18n("<strong>Mask</strong>: Force Icon colorization (symbolic icons).<br><strong>Color Effect</strong>: Force Text/Icons colorization using post-processing effect (any icon).<br><strong>Refresh</strong>: Re-apply colorization at a fixed interval, for widgets that recreate or recolor content themselves<br>To restore the <strong>Mask<strong> and <strong>Color Effect</strong> disable and restart Plasma or logout.")
-            opacity: 0.7
-            Layout.maximumWidth: widgetCards.width
-            wrapMode: Text.Wrap
-        }
-
         ColumnLayout {
             id: widgetCards
             Repeater {

diff --git a/...contents/ui/configUserWidgetOverrides.qml → ...ntents/ui/configGlobalWidgetOverrides.qml b/...contents/ui/configUserWidgetOverrides.qml → ...ntents/ui/configGlobalWidgetOverrides.qml
@@ -125,6 +125,12 @@ KCM.SimpleKCM {
 
     ColumnLayout {
         enabled: cfg_isEnabled
+        Kirigami.InlineMessage {
+            Layout.fillWidth: true
+            text: i18n("Create configuration overrides and apply them to one or multiple widgets. These overrides are independent and will be applied on top of the Preset settings.")
+            visible: true
+            type: Kirigami.MessageType.Information
+        }
         Components.SettingImportExport {
             onExportConfirmed: {
                 runCommand.run(crateConfigDirCmd)
@@ -140,13 +146,6 @@ KCM.SimpleKCM {
             Kirigami.FormData.label: i18n("Configuration overrides")
         }
 
-        Label {
-            text: i18n("Create configuration overrides and apply them to one or multiple widgets. These overrides are independent and will be applied on top of the Global/Preset settings.")
-            opacity: 0.7
-            Layout.maximumWidth: presetCards.width
-            wrapMode: Text.Wrap
-        }
-
         ColumnLayout {
             id: presetCards
             Layout.minimumWidth: 500
@@ -261,7 +260,7 @@ KCM.SimpleKCM {
         }
 
         Label {
-            text: i18n("Overrides are applied from top to bottom, if two or more overrides share the same option, the one last occurence replaces the value of the previous one.")
+            text: i18n("Overrides are applied from top to bottom, if two or more configuration overrides share the same option, the last occurence replaces the value of the previous one.")
             opacity: 0.7
             Layout.maximumWidth: presetCards.width
             wrapMode: Text.Wrap

diff --git a/package/contents/ui/configPresetWidgetOverrides.qml b/package/contents/ui/configPresetWidgetOverrides.qml
@@ -98,6 +98,12 @@ KCM.SimpleKCM {
 
     ColumnLayout {
         enabled: cfg_isEnabled
+        Kirigami.InlineMessage {
+            Layout.fillWidth: true
+            text: i18n("Create configuration overrides and apply them to one or multiple widgets. These overrides are linked and saved to the current preset.")
+            visible: true
+            type: Kirigami.MessageType.Information
+        }
 
     Kirigami.FormLayout {
 
@@ -106,13 +112,6 @@ KCM.SimpleKCM {
             Kirigami.FormData.label: i18n("Configuration overrides")
         }
 
-        Label {
-            text: i18n("Create configuration overrides and apply them to one or multiple widgets. These overrides are linked to in the current preset.")
-            opacity: 0.7
-            Layout.maximumWidth: presetCards.width
-            wrapMode: Text.Wrap
-        }
-
         ColumnLayout {
             id: presetCards
             Layout.minimumWidth: 500
@@ -214,7 +213,7 @@ KCM.SimpleKCM {
         }
 
         Label {
-            text: i18n("Overrides are applied from top to bottom, if two or more overrides share the same option, the last occurence replaces the value of the previous one.")
+            text: i18n("Overrides are applied from top to bottom, if two or more configuration overrides share the same option, the last occurence replaces the value of the previous one.")
             opacity: 0.7
             Layout.maximumWidth: presetCards.width
             wrapMode: Text.Wrap

diff --git a/package/contents/ui/configPresets.qml b/package/contents/ui/configPresets.qml
@@ -192,6 +192,12 @@ KCM.SimpleKCM {
     }
 
     ColumnLayout {
+        Kirigami.InlineMessage {
+            Layout.fillWidth: true
+            text: i18n("Changes to the current preset aren't synced to disk automatically. You should come back to this tab and update it manually before switching to a different preset, otherwise unsaved preset settings will be lost when presets change!")
+            visible: true
+            type: Kirigami.MessageType.Information
+        }
         Kirigami.FormLayout {
             enabled: cfg_isEnabled
             RowLayout {

diff --git a/package/contents/ui/configUnifiedBackground.qml b/package/contents/ui/configUnifiedBackground.qml
@@ -94,12 +94,11 @@ KCM.SimpleKCM {
     ColumnLayout {
         enabled: cfg_isEnabled
     Kirigami.FormLayout {
-
-        Label {
+        Kirigami.InlineMessage {
+            Layout.fillWidth: true
             text: i18n("Select start and end of unified background areas, widgets between <b>Start</b> and <b>End</b> must be left Disabled.")
-            opacity: 0.7
-            Layout.maximumWidth: widgetCards.width
-            wrapMode: Text.Wrap
+            visible: true
+            type: Kirigami.MessageType.Information
         }
 
         ColumnLayout {