From aeb1955947dfe64a0731ff91d652435f3f479e2e Mon Sep 17 00:00:00 2001 From: Madjid Taha Date: Thu, 30 Oct 2025 22:12:25 +0100 Subject: [PATCH] end-4 feedback --- .../modules/cheatsheet/CheatsheetKeybinds.qml | 6 +- .../quickshell/ii/modules/common/Config.qml | 5 +- .../ii/modules/settings/AdvancedConfig.qml | 158 ----------------- .../ii/modules/settings/InterfaceConfig.qml | 159 ++++++++++++++++++ 4 files changed, 165 insertions(+), 163 deletions(-) diff --git a/dots/.config/quickshell/ii/modules/cheatsheet/CheatsheetKeybinds.qml b/dots/.config/quickshell/ii/modules/cheatsheet/CheatsheetKeybinds.qml index 57a16ec0b..80208df5e 100644 --- a/dots/.config/quickshell/ii/modules/cheatsheet/CheatsheetKeybinds.qml +++ b/dots/.config/quickshell/ii/modules/cheatsheet/CheatsheetKeybinds.qml @@ -169,7 +169,7 @@ Item { delegate: KeyboardKey { required property var modelData key: keySubstitutions[modelData] || modelData - pixelSize: Config.options.appearance.keybinds.pixelSize.key + pixelSize: Config.options.appearance.keybinds.fontSize.key } } StyledText { @@ -181,7 +181,7 @@ Item { id: keybindKey visible: !Config.options.appearance.keybinds.useMacLikeShortcut && !keyBlacklist.includes(modelData.key) key: keySubstitutions[modelData.key] || modelData.key - pixelSize: Config.options.appearance.keybinds.pixelSize.key + pixelSize: Config.options.appearance.keybinds.fontSize.key color: Appearance.colors.colOnLayer0 } } @@ -197,7 +197,7 @@ Item { StyledText { id: commentText anchors.centerIn: parent - font.pixelSize: Config.options.appearance.keybinds.pixelSize.comment || Appearance.font.pixelSize.smaller + font.pixelSize: Config.options.appearance.keybinds.fontSize.comment || Appearance.font.pixelSize.smaller text: modelData.comment } } diff --git a/dots/.config/quickshell/ii/modules/common/Config.qml b/dots/.config/quickshell/ii/modules/common/Config.qml index 38e47dd6b..6ae8d25f8 100644 --- a/dots/.config/quickshell/ii/modules/common/Config.qml +++ b/dots/.config/quickshell/ii/modules/common/Config.qml @@ -133,9 +133,10 @@ Singleton { property bool useMacLikeShortcut: false property bool useMouseSymbol: false property bool useFnSymbol: false - property JsonObject pixelSize: JsonObject { + property JsonObject fontSize: JsonObject { property int key: Appearance.font.pixelSize.smaller - property int comment: Appearance.font.pixelSize.smaller } + property int comment: Appearance.font.pixelSize.smaller + } } } diff --git a/dots/.config/quickshell/ii/modules/settings/AdvancedConfig.qml b/dots/.config/quickshell/ii/modules/settings/AdvancedConfig.qml index 4c9218edc..7d51dbe12 100644 --- a/dots/.config/quickshell/ii/modules/settings/AdvancedConfig.qml +++ b/dots/.config/quickshell/ii/modules/settings/AdvancedConfig.qml @@ -92,162 +92,4 @@ ContentPage { - ContentSection { - icon: "keyboard" - title: Translation.tr("Keybinds Cheatsheet") - - ContentSubsection { - title: Translation.tr("Super Key Symbol") - ConfigSelectionArray { - currentValue: Config.options.appearance.keybinds.superKey - onSelected: newValue => { - Config.options.appearance.keybinds.superKey = newValue; - } - // Use a nerdfont to see the icons - // 0: 󰖳 | 1: 󰌽 | 2: 󰘳 | 3:  | 4: 󰨡 - // 5:  | 6:  | 7: 󰣇 | 8:  | 9:  - // 10:  | 11:  | 12:  | 13:  | 14: 󱄛 - // 15: 󰀲 | 16: 󰟍 | 17:  | - options: [ - { - displayName: "󰖳", - value: 0 - }, - { - displayName: "", - value: 3 - }, - { - displayName: "󰨡", - value: 4 - }, - { - displayName: "", - value: 5 - }, - { - displayName: "󰣇", - value: 7 - }, - { - displayName: "", - value: 12 - }, - { - displayName: "", - value: 13 - }, - { - displayName: "", - value: 11 - }, - { - displayName: "", - value: 10 - }, - { - displayName: "", - value: 8 - }, - { - displayName: "󱄛", - value: 14 - }, - { - displayName: "", - value: 9 - }, - { - displayName: "", - value: 6 - }, - { - displayName: "󰘳", - value: 2 - }, - { - displayName: "󰀲", - value: 15 - }, - { - displayName: "󰟍", - value: 16 - }, - { - displayName: "", - value: 17 - }, - - ] - } - } - - ConfigSwitch { - buttonIcon: "󰘵" - text: Translation.tr("Use macOS-like symbols for mods keys") - checked: Config.options.appearance.keybinds.useMacSymbol - onCheckedChanged: { - Config.options.appearance.keybinds.useMacSymbol = checked; - } - StyledToolTip { - text: Translation.tr("macOS-style symbols, e.g. 󰘴 for Ctrl, 󰘵 for Alt, 󰘶 for Shift, etc") - } - } - - ConfigSwitch { - buttonIcon: "󱊶" - text: Translation.tr("Use symbols for function keys") - checked: Config.options.appearance.keybinds.useFnSymbol - onCheckedChanged: { - Config.options.appearance.keybinds.useFnSymbol = checked; - } - StyledToolTip { - text: Translation.tr("Show functions keys as symbols, e.g. 󱊫 for F1, 󱊶 for F12") - } - } - ConfigSwitch { - buttonIcon: "󰍽" - text: Translation.tr("Use symbols for mouse") - checked: Config.options.appearance.keybinds.useMouseSymbol - onCheckedChanged: { - Config.options.appearance.keybinds.useMouseSymbol = checked; - } - StyledToolTip { - text: Translation.tr("Replace 󱕐 for \"Scroll ↓\", 󱕑 \"Scroll ↑\", L󰍽 \"LMB\", R󰍽 \"RMB\", 󱕒 \"Scroll ↑/↓\" and ⇞/⇟ for \"Page_↑/↓\"") - } - } - ConfigSwitch { - buttonIcon: "" - text: Translation.tr("Use macOS shortcut layout") - checked: Config.options.appearance.keybinds.useMacLikeShortcut - onCheckedChanged: { - Config.options.appearance.keybinds.useMacLikeShortcut = checked; - } - StyledToolTip { - text: Translation.tr("Display modifiers and keys in a single keycap (e.g., \"Ctrl A\" instead of \"Ctrl + A\" or \"󰘴 A\" instead of \"󰘴 + A\")") - } - - } - - ConfigSpinBox { - text: Translation.tr("Keybind font size") - value: Config.options.appearance.keybinds.pixelSize.key - from: Appearance.font.pixelSize.smallest - to: Appearance.font.pixelSize.large - stepSize: 1 - onValueChanged: { - Config.options.appearance.keybinds.pixelSize.key = value; - } - } - ConfigSpinBox { - text: Translation.tr("Description font size") - value: Config.options.appearance.keybinds.pixelSize.comment - from: Appearance.font.pixelSize.smallest - to: Appearance.font.pixelSize.large - stepSize: 1 - onValueChanged: { - Config.options.appearance.keybinds.pixelSize.comment = value; - } - } - } } diff --git a/dots/.config/quickshell/ii/modules/settings/InterfaceConfig.qml b/dots/.config/quickshell/ii/modules/settings/InterfaceConfig.qml index 13a909cbb..79b01bf95 100644 --- a/dots/.config/quickshell/ii/modules/settings/InterfaceConfig.qml +++ b/dots/.config/quickshell/ii/modules/settings/InterfaceConfig.qml @@ -1012,4 +1012,163 @@ ContentPage { } } } + + ContentSection { + icon: "keyboard" + title: Translation.tr("Cheatsheet") + + ContentSubsection { + title: Translation.tr("Super Key Symbol") + ConfigSelectionArray { + currentValue: Config.options.appearance.keybinds.superKey + onSelected: newValue => { + Config.options.appearance.keybinds.superKey = newValue; + } + // Use a nerdfont to see the icons + // 0: 󰖳 | 1: 󰌽 | 2: 󰘳 | 3:  | 4: 󰨡 + // 5:  | 6:  | 7: 󰣇 | 8:  | 9:  + // 10:  | 11:  | 12:  | 13:  | 14: 󱄛 + // 15: 󰀲 | 16: 󰟍 | 17:  | + options: [ + { + displayName: "󰖳", + value: 0 + }, + { + displayName: "", + value: 3 + }, + { + displayName: "󰨡", + value: 4 + }, + { + displayName: "", + value: 5 + }, + { + displayName: "󰣇", + value: 7 + }, + { + displayName: "", + value: 12 + }, + { + displayName: "", + value: 13 + }, + { + displayName: "", + value: 11 + }, + { + displayName: "", + value: 10 + }, + { + displayName: "", + value: 8 + }, + { + displayName: "󱄛", + value: 14 + }, + { + displayName: "", + value: 9 + }, + { + displayName: "", + value: 6 + }, + { + displayName: "󰘳", + value: 2 + }, + { + displayName: "󰀲", + value: 15 + }, + { + displayName: "󰟍", + value: 16 + }, + { + displayName: "", + value: 17 + }, + + ] + } + } + + ConfigSwitch { + buttonIcon: "󰘵" + text: Translation.tr("Use macOS-like symbols for mods keys") + checked: Config.options.appearance.keybinds.useMacSymbol + onCheckedChanged: { + Config.options.appearance.keybinds.useMacSymbol = checked; + } + StyledToolTip { + text: Translation.tr("macOS-style symbols, e.g. 󰘴 for Ctrl, 󰘵 for Alt, 󰘶 for Shift, etc") + } + } + + ConfigSwitch { + buttonIcon: "󱊶" + text: Translation.tr("Use symbols for function keys") + checked: Config.options.appearance.keybinds.useFnSymbol + onCheckedChanged: { + Config.options.appearance.keybinds.useFnSymbol = checked; + } + StyledToolTip { + text: Translation.tr("Show functions keys as symbols, e.g. 󱊫 for F1, 󱊶 for F12") + } + } + ConfigSwitch { + buttonIcon: "󰍽" + text: Translation.tr("Use symbols for mouse") + checked: Config.options.appearance.keybinds.useMouseSymbol + onCheckedChanged: { + Config.options.appearance.keybinds.useMouseSymbol = checked; + } + StyledToolTip { + text: Translation.tr("Replace 󱕐 for \"Scroll ↓\", 󱕑 \"Scroll ↑\", L󰍽 \"LMB\", R󰍽 \"RMB\", 󱕒 \"Scroll ↑/↓\" and ⇞/⇟ for \"Page_↑/↓\"") + } + } + ConfigSwitch { + buttonIcon: "" + text: Translation.tr("Use macOS shortcut layout") + checked: Config.options.appearance.keybinds.useMacLikeShortcut + onCheckedChanged: { + Config.options.appearance.keybinds.useMacLikeShortcut = checked; + } + StyledToolTip { + text: Translation.tr("Display modifiers and keys in a single keycap (e.g., \"Ctrl A\" instead of \"Ctrl + A\" or \"󰘴 A\" instead of \"󰘴 + A\")") + } + + } + + ConfigSpinBox { + text: Translation.tr("Keybind font size") + value: Config.options.appearance.keybinds.fontSize.key + from: Appearance.font.pixelSize.smallest + to: Appearance.font.pixelSize.large + stepSize: 1 + onValueChanged: { + Config.options.appearance.keybinds.fontSize.key = value; + } + } + ConfigSpinBox { + text: Translation.tr("Description font size") + value: Config.options.appearance.keybinds.fontSize.comment + from: Appearance.font.pixelSize.smallest + to: Appearance.font.pixelSize.large + stepSize: 1 + onValueChanged: { + Config.options.appearance.keybinds.fontSize.comment = value; + } + } + } }