From 3d07b8c9c19783c2fd4973d3d12aa856acb0ace3 Mon Sep 17 00:00:00 2001
From: Youseffo13 <110458691+Youseffo13@users.noreply.github.com>
Date: Fri, 20 Mar 2026 14:27:46 +0100
Subject: [PATCH] Fixed mux tab having same id as locale tab (#2031)

* Feat: fix mux tab having same id as locale tab

* Feat: updated some icon

* Update KeybindsModal.qml
---
 quickshell/Modals/KeybindsModal.qml            | 7 +++++--
 quickshell/Modals/Settings/SettingsContent.qml | 2 +-
 quickshell/Modals/Settings/SettingsSidebar.qml | 6 +++---
 quickshell/Modules/Settings/MuxTab.qml         | 3 +--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/quickshell/Modals/KeybindsModal.qml b/quickshell/Modals/KeybindsModal.qml
index 573e2f82..e1d6765e 100644
--- a/quickshell/Modals/KeybindsModal.qml
+++ b/quickshell/Modals/KeybindsModal.qml
@@ -81,7 +81,7 @@ DankModal {
 
                     StyledText {
                         Layout.alignment: Qt.AlignLeft
-                        text: KeybindsService.cheatsheet.title || "Keybinds"
+                        text: KeybindsService.cheatsheet.title || i18n("Keybinds")
                         font.pixelSize: Theme.fontSizeLarge
                         font.weight: Font.Bold
                         color: Theme.primary
@@ -309,10 +309,12 @@ DankModal {
                                                                         id: keyText
                                                                         anchors.centerIn: parent
                                                                         color: Theme.secondary
-                                                                        text: modelData.key || ""
+                                                                        text: (modelData.key || "").replace(/\+/g, " + ")
                                                                         font.pixelSize: Theme.fontSizeSmall
                                                                         font.weight: Font.Medium
                                                                         isMonospace: true
+                                                                        elide: Text.ElideRight
+                                                                        width: Math.min(implicitWidth, 148)
                                                                     }
                                                                 }
 
@@ -325,6 +327,7 @@ DankModal {
                                                                     font.pixelSize: Theme.fontSizeSmall
                                                                     opacity: 0.9
                                                                     elide: Text.ElideRight
+                                                                    wrapMode: Text.NoWrap
                                                                 }
                                                             }
                                                         }
diff --git a/quickshell/Modals/Settings/SettingsContent.qml b/quickshell/Modals/Settings/SettingsContent.qml
index dfff231b..34cd51ae 100644
--- a/quickshell/Modals/Settings/SettingsContent.qml
+++ b/quickshell/Modals/Settings/SettingsContent.qml
@@ -507,7 +507,7 @@ FocusScope {
         Loader {
             id: muxLoader
             anchors.fill: parent
-            active: root.currentIndex === 30
+            active: root.currentIndex === 32
             visible: active
             focus: active
 
diff --git a/quickshell/Modals/Settings/SettingsSidebar.qml b/quickshell/Modals/Settings/SettingsSidebar.qml
index 50ba2d81..092881c0 100644
--- a/quickshell/Modals/Settings/SettingsSidebar.qml
+++ b/quickshell/Modals/Settings/SettingsSidebar.qml
@@ -156,7 +156,7 @@ Rectangle {
                 {
                     "id": "running_apps",
                     "text": I18n.tr("Running Apps"),
-                    "icon": "apps",
+                    "icon": "app_registration",
                     "tabIndex": 19,
                     "hyprlandNiriOnly": true
                 },
@@ -237,7 +237,7 @@ Rectangle {
         {
             "id": "system",
             "text": I18n.tr("System"),
-            "icon": "computer",
+            "icon": "memory",
             "collapsedByDefault": true,
             "children": [
                 {
@@ -270,7 +270,7 @@ Rectangle {
                     "id": "multiplexers",
                     "text": I18n.tr("Multiplexers"),
                     "icon": "terminal",
-                    "tabIndex": 30
+                    "tabIndex": 32
                 },
                 {
                     "id": "window_rules",
diff --git a/quickshell/Modules/Settings/MuxTab.qml b/quickshell/Modules/Settings/MuxTab.qml
index 07fc0bcc..a82cdbef 100644
--- a/quickshell/Modules/Settings/MuxTab.qml
+++ b/quickshell/Modules/Settings/MuxTab.qml
@@ -12,7 +12,7 @@ Item {
         "zellij"
     ]
 
-DankFlickable {
+    DankFlickable {
         anchors.fill: parent
         clip: true
         contentHeight: mainColumn.height + Theme.spacingXL
@@ -79,7 +79,6 @@ DankFlickable {
                         onTextEdited: SettingsData.set("muxCustomCommand", text)
                     }
                 }
-
             }
 
             SettingsCard {