feat: reword some settings and update icons

luisbocanegra · luisbocanegra · commit d5b4057e5573 · 2024-11-01T00:52:34.000-06:00
diff --git a/package/contents/ui/components/FormWidgetSettings.qml b/package/contents/ui/components/FormWidgetSettings.qml
@@ -16,6 +16,7 @@ ColumnLayout {
     property bool handleString: false
     // key to extract config from
     property string keyName
+    property string keyFriendlyName
     // internal config objects to be sent, both string and json
     property string configString: "{}"
     property var config: handleString ? JSON.parse(configString) : undefined
@@ -68,7 +69,7 @@ ColumnLayout {
             RowLayout {
                 // Layout.alignment: Qt.AlignRight
                 Label {
-                    text: i18n("Enable:")
+                    text: i18n("Enable") + " " + keyFriendlyName + " " + i18n("customization") + ":"
                 }
                 CheckBox {
                     id: isEnabled
@@ -80,8 +81,7 @@ ColumnLayout {
                 }
             }
             RowLayout {
-                property bool isPanel: keyName === "panel"
-                visible: isPanel
+                visible: keyName === "panel"
                 Label {
                     text: i18n("Native panel background:")
                 }
@@ -93,8 +93,14 @@ ColumnLayout {
                         updateConfig()
                     }
                 }
+                Kirigami.ContextualHelpButton {
+                    toolTipText: i18n("Disable to make panel fully transparent, removes contrast and blur effects.")
+                }
+            }
+            RowLayout {
+                visible: keyName === "panel"
                 Label {
-                    text: i18n("Opacity:")
+                    text: i18n("Panel Opacity:")
                 }
                 SpinBoxDecimal {
                     Layout.preferredWidth: backgroundRoot.Kirigami.Units.gridUnit * 5
@@ -108,7 +114,7 @@ ColumnLayout {
                     enabled: nativePanelBackgroundCheckbox.checked
                 }
                 Kirigami.ContextualHelpButton {
-                    toolTipText: i18n("Disabling the native Panel background also removes the contrast and blur.\n\nSet Opacity to 0 to keep just the mask required by Blur custom background.")
+                    toolTipText: i18n("Set Opacity to 0 to keep just the mask required by Blur custom background.")
                 }
             }
             RowLayout {
@@ -138,7 +144,7 @@ ColumnLayout {
             Kirigami.InlineMessage {
                 id: warningResources
                 Layout.fillWidth: true
-                text: i18n("Draw a custom blur mask behind the custom background(s).\nRequires the C++ plugin to work, check the repository README on GitHub for details.\nNative panel background must be enabled with opacity of 0 for this to work as intended.")
+                text: i18n("Draw a custom blur mask behind the custom background(s).<br>Requires the C++ plugin to work, check the repository README on GitHub for details.<br><strong>Native panel background must be enabled with opacity of 0 for this to work as intended.</strong>")
                 visible: showBlurMessage
                 actions: [
                     Kirigami.Action {
@@ -166,25 +172,25 @@ ColumnLayout {
         }
         actions: [
             Kirigami.Action {
-                icon.name: "globe"
+                icon.name: "color-picker"
                 text: "Color"
                 checked: currentTab === 0
                 onTriggered: currentTab = 0
             },
             Kirigami.Action {
-                icon.name: "globe"
+                icon.name: "rectangle-shape-symbolic"
                 text: "Shape"
                 checked: currentTab === 1
                 onTriggered: currentTab = 1
             },
             Kirigami.Action {
-                icon.name: "globe"
+                icon.name: "bordertool-symbolic"
                 text: "Border"
                 checked: currentTab === 2
                 onTriggered: currentTab = 2
             },
             Kirigami.Action {
-                icon.name: "globe"
+                icon.name: "kstars_horizon-symbolic"
                 text: "Shadow"
                 checked: currentTab === 3
                 onTriggered: currentTab = 3
diff --git a/package/contents/ui/components/WidgetCardCheck.qml b/package/contents/ui/components/WidgetCardCheck.qml
@@ -52,36 +52,33 @@ Kirigami.AbstractCard {
         }
         Button {
             id: maskCheckbox
-            text: i18n("M")
+            text: i18n("Mask")
             checkable: true
             checked: widget.method.mask ?? false
             icon.name: checked ? "checkmark-symbolic" : "dialog-close-symbolic"
             onCheckedChanged: {
                 updateWidget(maskCheckbox.checked, effectCheckbox.checked, reloadCheckbox.checked)
             }
-            Layout.preferredWidth: 50
         }
         Button {
             id: effectCheckbox
-            text: i18n("E")
+            text: i18n("Effect")
             checkable: true
             checked: widget.method.multiEffect ?? false
             icon.name: checked ? "checkmark-symbolic" : "dialog-close-symbolic"
             onCheckedChanged: {
                 updateWidget(maskCheckbox.checked, effectCheckbox.checked, reloadCheckbox.checked)
             }
-            Layout.preferredWidth: 50
         }
         Button {
             id: reloadCheckbox
-            text: i18n("R")
+            text: i18n("Refresh")
             checkable: true
             checked: widget.reload ?? false
             icon.name: checked ? "checkmark-symbolic" : "dialog-close-symbolic"
             onCheckedChanged: {
                 updateWidget(maskCheckbox.checked, effectCheckbox.checked, reloadCheckbox.checked)
             }
-            Layout.preferredWidth: 50
         }
     }
 }
diff --git a/package/contents/ui/configForeground.qml b/package/contents/ui/configForeground.qml
@@ -147,7 +147,7 @@ KCM.SimpleKCM {
     Kirigami.FormLayout {
 
         Label {
-            text: i18n("<strong>[M]ask</strong>: Force Icon colorization (symbolic icons).<br><strong>[E]ffect</strong>: Force Text/Icons colorization using post-processing effect (any icon).<br><strong>[R]efresh</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.")
+            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
diff --git a/package/contents/ui/configGlobal.qml b/package/contents/ui/configGlobal.qml
@@ -95,6 +95,7 @@ KCM.SimpleKCM {
                 item.currentTab = root.currentTab
                 item.handleString = true
                 item.keyName = targetComponent.currentValue
+                item.keyFriendlyName = targetComponent.currentText
                 item.followVisbility = root.followVisbility[targetComponent.currentValue]
                 item.tabChanged.connect((currentTab) => {
                     root.currentTab = currentTab
diff --git a/package/contents/ui/configPresetWidgetOverrides.qml b/package/contents/ui/configPresetWidgetOverrides.qml
@@ -194,6 +194,8 @@ KCM.SimpleKCM {
                         root.updateConfig()
                     })
                     item.currentTab = root.currentTab
+                    item.keyName = "widgets"
+                    item.keyFriendlyName = "Widgets"
                     item.tabChanged.connect((currentTab) => {
                         root.currentTab = currentTab
                     })
diff --git a/package/contents/ui/configPresets.qml b/package/contents/ui/configPresets.qml
@@ -269,6 +269,7 @@ KCM.SimpleKCM {
 
                                 Button {
                                     id: loadBtn
+                                    icon.name: "dialog-ok-apply-symbolic"
                                     text: i18n("Load")
                                     Layout.preferredHeight: saveBtn.height
                                     onClicked: {
diff --git a/package/contents/ui/configUnifiedBackground.qml b/package/contents/ui/configUnifiedBackground.qml
@@ -96,7 +96,7 @@ KCM.SimpleKCM {
     Kirigami.FormLayout {
 
         Label {
-            text: i18n("Select start and end of unified background areas, widgets between start and must be left Disabled.")
+            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
diff --git a/package/contents/ui/configUserWidgetOverrides.qml b/package/contents/ui/configUserWidgetOverrides.qml
@@ -241,6 +241,8 @@ KCM.SimpleKCM {
                         root.updateConfig()
                     })
                     item.currentTab = root.currentTab
+                    item.keyName = "widgets"
+                    item.keyFriendlyName = "Widgets"
                     item.tabChanged.connect((currentTab) => {
                         root.currentTab = currentTab
                     })

Original file line number	Diff line number	Diff line change
`@@ -52,36 +52,33 @@ Kirigami.AbstractCard {`
`52`	`52`	`}`
`53`	`53`	`Button {`
`54`	`54`	`id: maskCheckbox`
`55`		`- text: i18n("M")`
	`55`	`+ text: i18n("Mask")`
`56`	`56`	`checkable: true`
`57`	`57`	`checked: widget.method.mask ?? false`
`58`	`58`	`icon.name: checked ? "checkmark-symbolic" : "dialog-close-symbolic"`
`59`	`59`	`onCheckedChanged: {`
`60`	`60`	`updateWidget(maskCheckbox.checked, effectCheckbox.checked, reloadCheckbox.checked)`
`61`	`61`	`}`
`62`		`- Layout.preferredWidth: 50`
`63`	`62`	`}`
`64`	`63`	`Button {`
`65`	`64`	`id: effectCheckbox`
`66`		`- text: i18n("E")`
	`65`	`+ text: i18n("Effect")`
`67`	`66`	`checkable: true`
`68`	`67`	`checked: widget.method.multiEffect ?? false`
`69`	`68`	`icon.name: checked ? "checkmark-symbolic" : "dialog-close-symbolic"`
`70`	`69`	`onCheckedChanged: {`
`71`	`70`	`updateWidget(maskCheckbox.checked, effectCheckbox.checked, reloadCheckbox.checked)`
`72`	`71`	`}`
`73`		`- Layout.preferredWidth: 50`
`74`	`72`	`}`
`75`	`73`	`Button {`
`76`	`74`	`id: reloadCheckbox`
`77`		`- text: i18n("R")`
	`75`	`+ text: i18n("Refresh")`
`78`	`76`	`checkable: true`
`79`	`77`	`checked: widget.reload ?? false`
`80`	`78`	`icon.name: checked ? "checkmark-symbolic" : "dialog-close-symbolic"`
`81`	`79`	`onCheckedChanged: {`
`82`	`80`	`updateWidget(maskCheckbox.checked, effectCheckbox.checked, reloadCheckbox.checked)`
`83`	`81`	`}`
`84`		`- Layout.preferredWidth: 50`
`85`	`82`	`}`
`86`	`83`	`}`
`87`	`84`	`}`