#22: show warnings for only X11

antroids · Mar 22, 2024 · e666de0 · e666de0
1 parent f065e61
commit e666de0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/package/contents/ui/config/ConfigAppearance.qml b/package/contents/ui/config/ConfigAppearance.qml
@@ -57,20 +57,12 @@ KCM.SimpleKCM {
             Kirigami.FormData.label: i18n("Window Control Buttons")
         }
 
-        RowLayout {
-            Kirigami.FormData.label: i18n("Icons theme:")
-
-            ComboBox {
-                id: widgetButtonsIconsTheme
-
-                Layout.minimumWidth: Kirigami.Units.gridUnit * 15
-                model: [i18n("Plasma"), i18n("Breeze"), i18n("Aurorae")]
-            }
-
-            KCM.ContextualHelpButton {
-                toolTipText: i18n("<b>Plasma</b>: default icons from system <br/><b>Breeze</b>: implicit Breeze icons <br/><b>Aurorae</b>: installed theme can be used")
-            }
+        ComboBox {
+            id: widgetButtonsIconsTheme
 
+            Kirigami.FormData.label: i18n("Icons theme:")
+            Layout.minimumWidth: Kirigami.Units.gridUnit * 15
+            model: [i18n("Plasma: Global icon theme"), i18n("Breeze: Implicit Breeze icons"), i18n("Aurorae: Window decorations theme")]
         }
 
         RowLayout {

diff --git a/package/contents/ui/config/ConfigBehavior.qml b/package/contents/ui/config/ConfigBehavior.qml
@@ -63,7 +63,7 @@ KCM.SimpleKCM {
             anchors.right: parent.right
             text: i18n("Some functionality is unsupported or can work unstable in X11 sessions.")
             type: Kirigami.MessageType.Warning
-            visible: !Utils.isWayland()
+            visible: Utils.isX11()
         }
 
         RowLayout {
@@ -154,7 +154,7 @@ KCM.SimpleKCM {
             anchors.right: parent.right
             text: i18n("Window Move action is incompatible with Mouse Drag in X11 sessions.")
             type: Kirigami.MessageType.Error
-            visible: !Utils.isWayland() && leftButtonDragAction.currentValue == "Window Move"
+            visible: Utils.isX11() && leftButtonDragAction.currentValue == "Window Move"
         }
 
         KWinShortcutComboBox {
@@ -171,7 +171,7 @@ KCM.SimpleKCM {
             anchors.right: parent.right
             text: i18n("Window Move action is incompatible with Mouse Drag in X11 sessions.")
             type: Kirigami.MessageType.Error
-            visible: !Utils.isWayland() && middleButtonDragAction.currentValue == "Window Move"
+            visible: Utils.isX11() && middleButtonDragAction.currentValue == "Window Move"
         }
 
         KWinShortcutComboBox {

diff --git a/package/contents/ui/utils.js b/package/contents/ui/utils.js
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-function isWayland() {
-    const isWaylandPlugin = Qt.platform.pluginName == "wayland";
-    return isWaylandPlugin;
+function isX11() {
+    const isX11Plugin = Qt.platform.pluginName == "xcb";
+    return isX11Plugin;
 }
 
 function copyLayoutConstraint(from, to) {