Skip to content

Commit 7104389

Browse files
committed
feat: update wording and use more information messages
1 parent 20a77d0 commit 7104389

7 files changed

+42
-34
lines changed

package/contents/config/config.qml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ ConfigModel {
1010
}
1111

1212
ConfigCategory {
13-
name: i18n("Presets autoloading")
13+
name: i18n("Presets auto-loading")
1414
icon: "system-run-symbolic"
1515
source: "configPresetAutoload.qml"
1616
}
1717

1818
ConfigCategory {
1919
name: i18n("Appearance")
2020
icon: "desktop-symbolic"
21-
source: "configGlobal.qml"
21+
source: "configAppearance.qml"
2222
}
2323

2424
ConfigCategory {
@@ -28,7 +28,7 @@ ConfigModel {
2828
}
2929

3030
ConfigCategory {
31-
name: i18n("Unified background")
31+
name: i18n("Unified widget backgrounds")
3232
icon: "lines-connector-symbolic"
3333
source: "configUnifiedBackground.qml"
3434
}
@@ -40,9 +40,9 @@ ConfigModel {
4040
}
4141

4242
ConfigCategory {
43-
name: i18n("User Overrides")
44-
icon: "user-properties-symbolic"
45-
source: "configUserWidgetOverrides.qml"
43+
name: i18n("Global Overrides")
44+
icon: "globe-symbolic"
45+
source: "configGlobalWidgetOverrides.qml"
4646
}
4747

4848
ConfigCategory {

package/contents/ui/configGlobal.qml renamed to package/contents/ui/configAppearance.qml

+6
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ KCM.SimpleKCM {
6363

6464
ColumnLayout {
6565
enabled: cfg_isEnabled
66+
Kirigami.InlineMessage {
67+
Layout.fillWidth: true
68+
text: i18n("Not getting the expeted result? Make sure you're editing the correct element.")
69+
visible: true
70+
type: Kirigami.MessageType.Information
71+
}
6672
Kirigami.FormLayout {
6773
id: parentLayout
6874
Layout.fillWidth: true

package/contents/ui/configForeground.qml

+6-7
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ KCM.SimpleKCM {
118118

119119
ColumnLayout {
120120
enabled: cfg_isEnabled
121+
Kirigami.InlineMessage {
122+
Layout.fillWidth: true
123+
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.")
124+
visible: true
125+
type: Kirigami.MessageType.Information
126+
}
121127
Components.SettingImportExport {
122128
onExportConfirmed: {
123129
runCommand.run(crateConfigDirCmd)
@@ -146,13 +152,6 @@ KCM.SimpleKCM {
146152
}
147153
Kirigami.FormLayout {
148154

149-
Label {
150-
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.")
151-
opacity: 0.7
152-
Layout.maximumWidth: widgetCards.width
153-
wrapMode: Text.Wrap
154-
}
155-
156155
ColumnLayout {
157156
id: widgetCards
158157
Repeater {

package/contents/ui/configUserWidgetOverrides.qml renamed to package/contents/ui/configGlobalWidgetOverrides.qml

+7-8
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ KCM.SimpleKCM {
125125

126126
ColumnLayout {
127127
enabled: cfg_isEnabled
128+
Kirigami.InlineMessage {
129+
Layout.fillWidth: true
130+
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.")
131+
visible: true
132+
type: Kirigami.MessageType.Information
133+
}
128134
Components.SettingImportExport {
129135
onExportConfirmed: {
130136
runCommand.run(crateConfigDirCmd)
@@ -140,13 +146,6 @@ KCM.SimpleKCM {
140146
Kirigami.FormData.label: i18n("Configuration overrides")
141147
}
142148

143-
Label {
144-
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.")
145-
opacity: 0.7
146-
Layout.maximumWidth: presetCards.width
147-
wrapMode: Text.Wrap
148-
}
149-
150149
ColumnLayout {
151150
id: presetCards
152151
Layout.minimumWidth: 500
@@ -261,7 +260,7 @@ KCM.SimpleKCM {
261260
}
262261

263262
Label {
264-
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.")
263+
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.")
265264
opacity: 0.7
266265
Layout.maximumWidth: presetCards.width
267266
wrapMode: Text.Wrap

package/contents/ui/configPresetWidgetOverrides.qml

+7-8
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@ KCM.SimpleKCM {
9898

9999
ColumnLayout {
100100
enabled: cfg_isEnabled
101+
Kirigami.InlineMessage {
102+
Layout.fillWidth: true
103+
text: i18n("Create configuration overrides and apply them to one or multiple widgets. These overrides are linked and saved to the current preset.")
104+
visible: true
105+
type: Kirigami.MessageType.Information
106+
}
101107

102108
Kirigami.FormLayout {
103109

@@ -106,13 +112,6 @@ KCM.SimpleKCM {
106112
Kirigami.FormData.label: i18n("Configuration overrides")
107113
}
108114

109-
Label {
110-
text: i18n("Create configuration overrides and apply them to one or multiple widgets. These overrides are linked to in the current preset.")
111-
opacity: 0.7
112-
Layout.maximumWidth: presetCards.width
113-
wrapMode: Text.Wrap
114-
}
115-
116115
ColumnLayout {
117116
id: presetCards
118117
Layout.minimumWidth: 500
@@ -214,7 +213,7 @@ KCM.SimpleKCM {
214213
}
215214

216215
Label {
217-
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.")
216+
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.")
218217
opacity: 0.7
219218
Layout.maximumWidth: presetCards.width
220219
wrapMode: Text.Wrap

package/contents/ui/configPresets.qml

+6
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,12 @@ KCM.SimpleKCM {
192192
}
193193

194194
ColumnLayout {
195+
Kirigami.InlineMessage {
196+
Layout.fillWidth: true
197+
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!")
198+
visible: true
199+
type: Kirigami.MessageType.Information
200+
}
195201
Kirigami.FormLayout {
196202
enabled: cfg_isEnabled
197203
RowLayout {

package/contents/ui/configUnifiedBackground.qml

+4-5
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,11 @@ KCM.SimpleKCM {
9494
ColumnLayout {
9595
enabled: cfg_isEnabled
9696
Kirigami.FormLayout {
97-
98-
Label {
97+
Kirigami.InlineMessage {
98+
Layout.fillWidth: true
9999
text: i18n("Select start and end of unified background areas, widgets between <b>Start</b> and <b>End</b> must be left Disabled.")
100-
opacity: 0.7
101-
Layout.maximumWidth: widgetCards.width
102-
wrapMode: Text.Wrap
100+
visible: true
101+
type: Kirigami.MessageType.Information
103102
}
104103

105104
ColumnLayout {

0 commit comments

Comments
 (0)