1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-03 20:32:07 -04:00

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
This commit is contained in:
Youseffo13
2026-03-20 14:27:46 +01:00
committed by GitHub
parent dae74a40c0
commit 3d07b8c9c1
4 changed files with 10 additions and 8 deletions

View File

@@ -81,7 +81,7 @@ DankModal {
StyledText { StyledText {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: KeybindsService.cheatsheet.title || "Keybinds" text: KeybindsService.cheatsheet.title || i18n("Keybinds")
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold font.weight: Font.Bold
color: Theme.primary color: Theme.primary
@@ -309,10 +309,12 @@ DankModal {
id: keyText id: keyText
anchors.centerIn: parent anchors.centerIn: parent
color: Theme.secondary color: Theme.secondary
text: modelData.key || "" text: (modelData.key || "").replace(/\+/g, " + ")
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
isMonospace: true isMonospace: true
elide: Text.ElideRight
width: Math.min(implicitWidth, 148)
} }
} }
@@ -325,6 +327,7 @@ DankModal {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
opacity: 0.9 opacity: 0.9
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap
} }
} }
} }

View File

@@ -507,7 +507,7 @@ FocusScope {
Loader { Loader {
id: muxLoader id: muxLoader
anchors.fill: parent anchors.fill: parent
active: root.currentIndex === 30 active: root.currentIndex === 32
visible: active visible: active
focus: active focus: active

View File

@@ -156,7 +156,7 @@ Rectangle {
{ {
"id": "running_apps", "id": "running_apps",
"text": I18n.tr("Running Apps"), "text": I18n.tr("Running Apps"),
"icon": "apps", "icon": "app_registration",
"tabIndex": 19, "tabIndex": 19,
"hyprlandNiriOnly": true "hyprlandNiriOnly": true
}, },
@@ -237,7 +237,7 @@ Rectangle {
{ {
"id": "system", "id": "system",
"text": I18n.tr("System"), "text": I18n.tr("System"),
"icon": "computer", "icon": "memory",
"collapsedByDefault": true, "collapsedByDefault": true,
"children": [ "children": [
{ {
@@ -270,7 +270,7 @@ Rectangle {
"id": "multiplexers", "id": "multiplexers",
"text": I18n.tr("Multiplexers"), "text": I18n.tr("Multiplexers"),
"icon": "terminal", "icon": "terminal",
"tabIndex": 30 "tabIndex": 32
}, },
{ {
"id": "window_rules", "id": "window_rules",

View File

@@ -12,7 +12,7 @@ Item {
"zellij" "zellij"
] ]
DankFlickable { DankFlickable {
anchors.fill: parent anchors.fill: parent
clip: true clip: true
contentHeight: mainColumn.height + Theme.spacingXL contentHeight: mainColumn.height + Theme.spacingXL
@@ -79,7 +79,6 @@ DankFlickable {
onTextEdited: SettingsData.set("muxCustomCommand", text) onTextEdited: SettingsData.set("muxCustomCommand", text)
} }
} }
} }
SettingsCard { SettingsCard {