diff --git a/.config/quickshell/ii/modules/background/Background.qml b/.config/quickshell/ii/modules/background/Background.qml index 2c2d30ab6..d322120ba 100644 --- a/.config/quickshell/ii/modules/background/Background.qml +++ b/.config/quickshell/ii/modules/background/Background.qml @@ -178,6 +178,7 @@ Variants { StyledImage { id: wallpaper visible: opacity > 0 && !blurLoader.active + opacity: (status === Image.Ready && !bgRoot.wallpaperIsVideo) ? 1 : 0 cache: false smooth: false // Range = groups that workspaces span on diff --git a/.config/quickshell/ii/modules/common/widgets/ConfigSpinBox.qml b/.config/quickshell/ii/modules/common/widgets/ConfigSpinBox.qml index 33fb84057..de70529f5 100644 --- a/.config/quickshell/ii/modules/common/widgets/ConfigSpinBox.qml +++ b/.config/quickshell/ii/modules/common/widgets/ConfigSpinBox.qml @@ -19,12 +19,14 @@ RowLayout { spacing: 10 OptionalMaterialSymbol { icon: root.icon + opacity: root.enabled ? 1 : 0.4 } StyledText { id: labelWidget Layout.fillWidth: true text: root.text color: Appearance.colors.colOnSecondaryContainer + opacity: root.enabled ? 1 : 0.4 } } diff --git a/.config/quickshell/ii/modules/common/widgets/ConfigSwitch.qml b/.config/quickshell/ii/modules/common/widgets/ConfigSwitch.qml index 349ee5737..13c43c552 100644 --- a/.config/quickshell/ii/modules/common/widgets/ConfigSwitch.qml +++ b/.config/quickshell/ii/modules/common/widgets/ConfigSwitch.qml @@ -18,6 +18,7 @@ RippleButton { spacing: 10 OptionalMaterialSymbol { icon: root.buttonIcon + opacity: root.enabled ? 1 : 0.4 iconSize: Appearance.font.pixelSize.larger } StyledText { @@ -26,6 +27,7 @@ RippleButton { text: root.text font: root.font color: Appearance.colors.colOnSecondaryContainer + opacity: root.enabled ? 1 : 0.4 } StyledSwitch { id: switchWidget diff --git a/.config/quickshell/ii/modules/common/widgets/StyledSpinBox.qml b/.config/quickshell/ii/modules/common/widgets/StyledSpinBox.qml index c11f241a0..c26efaf73 100644 --- a/.config/quickshell/ii/modules/common/widgets/StyledSpinBox.qml +++ b/.config/quickshell/ii/modules/common/widgets/StyledSpinBox.qml @@ -14,6 +14,8 @@ SpinBox { property real innerButtonRadius: Appearance.rounding.unsharpen editable: true + opacity: root.enabled ? 1 : 0.4 + background: Rectangle { color: Appearance.colors.colLayer2 radius: root.radius diff --git a/.config/quickshell/ii/modules/overview/OverviewWidget.qml b/.config/quickshell/ii/modules/overview/OverviewWidget.qml index 0487c6025..0e850493a 100644 --- a/.config/quickshell/ii/modules/overview/OverviewWidget.qml +++ b/.config/quickshell/ii/modules/overview/OverviewWidget.qml @@ -188,7 +188,7 @@ Item { } } - z: atInitPosition ? (root.windowZ + windowData?.floating) : root.windowDraggingZ + z: Drag.active ? root.windowDraggingZ : (root.windowZ + windowData?.floating) Drag.hotSpot.x: targetWindowWidth / 2 Drag.hotSpot.y: targetWindowHeight / 2 MouseArea { diff --git a/.config/quickshell/ii/modules/settings/GeneralConfig.qml b/.config/quickshell/ii/modules/settings/GeneralConfig.qml index 5ba068f10..fd5fc154d 100644 --- a/.config/quickshell/ii/modules/settings/GeneralConfig.qml +++ b/.config/quickshell/ii/modules/settings/GeneralConfig.qml @@ -15,6 +15,7 @@ ContentPage { title: Translation.tr("Audio") ConfigSwitch { + buttonIcon: "hearing" text: Translation.tr("Earbang protection") checked: Config.options.audio.protection.enable onCheckedChanged: { @@ -25,8 +26,9 @@ ContentPage { } } ConfigRow { - // uniform: true + enabled: Config.options.audio.protection.enable ConfigSpinBox { + icon: "arrow_warm_up" text: Translation.tr("Max allowed increase") value: Config.options.audio.protection.maxAllowedIncrease from: 0 @@ -37,6 +39,7 @@ ContentPage { } } ConfigSpinBox { + icon: "vertical_align_top" text: Translation.tr("Volume limit") value: Config.options.audio.protection.maxAllowed from: 0 @@ -56,6 +59,7 @@ ContentPage { ConfigRow { uniform: true ConfigSpinBox { + icon: "warning" text: Translation.tr("Low warning") value: Config.options.battery.low from: 0 @@ -66,6 +70,7 @@ ContentPage { } } ConfigSpinBox { + icon: "dangerous" text: Translation.tr("Critical warning") value: Config.options.battery.critical from: 0 @@ -77,8 +82,10 @@ ContentPage { } } ConfigRow { - uniform: true + uniform: false + Layout.fillWidth: false ConfigSwitch { + buttonIcon: "pause" text: Translation.tr("Automatic suspend") checked: Config.options.battery.automaticSuspend onCheckedChanged: { @@ -89,7 +96,8 @@ ContentPage { } } ConfigSpinBox { - text: Translation.tr("Suspend at") + enabled: Config.options.battery.automaticSuspend + text: Translation.tr("at") value: Config.options.battery.suspend from: 0 to: 100 diff --git a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml index f03a90a99..3b56fcd67 100644 --- a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml +++ b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml @@ -120,6 +120,7 @@ ContentPage { title: Translation.tr("Wallpaper parallax") ConfigSwitch { + buttonIcon: "unfold_more_double" text: Translation.tr("Vertical") checked: Config.options.background.parallax.vertical onCheckedChanged: { @@ -130,6 +131,7 @@ ContentPage { ConfigRow { uniform: true ConfigSwitch { + buttonIcon: "counter_1" text: Translation.tr("Depends on workspace") checked: Config.options.background.parallax.enableWorkspace onCheckedChanged: { @@ -137,6 +139,7 @@ ContentPage { } } ConfigSwitch { + buttonIcon: "side_navigation" text: Translation.tr("Depends on sidebars") checked: Config.options.background.parallax.enableSidebar onCheckedChanged: { @@ -145,6 +148,7 @@ ContentPage { } } ConfigSpinBox { + icon: "loupe" text: Translation.tr("Preferred wallpaper zoom (%)") value: Config.options.background.parallax.workspaceZoom * 100 from: 100 @@ -159,7 +163,7 @@ ContentPage { ContentSection { icon: "point_scan" - title: Translation.tr("Crosshair") + title: Translation.tr("Crosshair overlay") MaterialTextArea { Layout.fillWidth: true @@ -172,6 +176,12 @@ ContentPage { } RowLayout { + StyledText { + Layout.leftMargin: 10 + color: Appearance.colors.colSubtext + font.pixelSize: Appearance.font.pixelSize.smallie + text: Translation.tr("Press Super+G to toggle appearance") + } Item { Layout.fillWidth: true } RippleButtonWithIcon { id: editorButton @@ -193,6 +203,7 @@ ContentPage { title: Translation.tr("Dock") ConfigSwitch { + buttonIcon: "check" text: Translation.tr("Enable") checked: Config.options.dock.enable onCheckedChanged: { @@ -203,6 +214,7 @@ ContentPage { ConfigRow { uniform: true ConfigSwitch { + buttonIcon: "highlight_mouse_cursor" text: Translation.tr("Hover to reveal") checked: Config.options.dock.hoverToReveal onCheckedChanged: { @@ -210,6 +222,7 @@ ContentPage { } } ConfigSwitch { + buttonIcon: "keep" text: Translation.tr("Pinned on startup") checked: Config.options.dock.pinnedOnStartup onCheckedChanged: { @@ -218,6 +231,7 @@ ContentPage { } } ConfigSwitch { + buttonIcon: "colors" text: Translation.tr("Tint app icons") checked: Config.options.dock.monochromeIcons onCheckedChanged: { @@ -231,6 +245,7 @@ ContentPage { title: Translation.tr("Lock screen") ConfigSwitch { + buttonIcon: "account_circle" text: Translation.tr('Launch on startup') checked: Config.options.lock.launchOnStartup onCheckedChanged: { @@ -239,28 +254,38 @@ ContentPage { } ContentSubsection { - title: Translation.tr("Blurred style") + title: Translation.tr("Security") ConfigSwitch { - text: Translation.tr('Enable blur') - checked: Config.options.lock.blur.enable + buttonIcon: "settings_power" + text: Translation.tr('Require password to power off/restart') + checked: Config.options.lock.security.requirePasswordToPower onCheckedChanged: { - Config.options.lock.blur.enable = checked; + Config.options.lock.security.requirePasswordToPower = checked; } - } - - ConfigSpinBox { - text: Translation.tr("Blur: Extra zoom (%)") - value: Config.options.lock.blur.extraZoom * 100 - from: 1 - to: 150 - stepSize: 2 - onValueChanged: { - Config.options.lock.blur.extraZoom = value / 100; + StyledToolTip { + text: Translation.tr("Remember that on most devices one can always hold the power button to force shutdown\nThis only makes it a tiny bit harder for accidents to happen") } } ConfigSwitch { + buttonIcon: "key_vertical" + text: Translation.tr('Also unlock keyring') + checked: Config.options.lock.security.unlockKeyring + onCheckedChanged: { + Config.options.lock.security.unlockKeyring = checked; + } + StyledToolTip { + text: Translation.tr("This is usually safe and needed for your browser and AI sidebar anyway\nMostly useful for those who use lock on startup instead of a display manager that does it (GDM, SDDM, etc.)") + } + } + } + + ContentSubsection { + title: Translation.tr("Style: general") + + ConfigSwitch { + buttonIcon: "center_focus_weak" text: Translation.tr('Center clock') checked: Config.options.lock.centerClock onCheckedChanged: { @@ -269,12 +294,37 @@ ContentPage { } ConfigSwitch { + buttonIcon: "info" text: Translation.tr('Show "Locked" text') checked: Config.options.lock.showLockedText onCheckedChanged: { Config.options.lock.showLockedText = checked; } } + } + ContentSubsection { + title: Translation.tr("Style: Blurred") + + ConfigSwitch { + buttonIcon: "blur_on" + text: Translation.tr('Enable blur') + checked: Config.options.lock.blur.enable + onCheckedChanged: { + Config.options.lock.blur.enable = checked; + } + } + + ConfigSpinBox { + icon: "loupe" + text: Translation.tr("Extra wallpaper zoom (%)") + value: Config.options.lock.blur.extraZoom * 100 + from: 1 + to: 150 + stepSize: 2 + onValueChanged: { + Config.options.lock.blur.extraZoom = value / 100; + } + } } @@ -285,6 +335,7 @@ ContentPage { title: Translation.tr("Notifications") ConfigSpinBox { + icon: "av_timer" text: Translation.tr("Timeout duration (if not defined by notification) (ms)") value: Config.options.notifications.timeout from: 1000 @@ -301,6 +352,7 @@ ContentPage { title: Translation.tr("Sidebars") ConfigSwitch { + buttonIcon: "memory" text: Translation.tr('Keep right sidebar loaded') checked: Config.options.sidebar.keepRightSidebarLoaded onCheckedChanged: { @@ -317,6 +369,7 @@ ContentPage { ConfigRow { uniform: true ConfigSwitch { + buttonIcon: "check" text: Translation.tr("Enable") checked: Config.options.sidebar.cornerOpen.enable onCheckedChanged: { @@ -324,6 +377,7 @@ ContentPage { } } ConfigSwitch { + buttonIcon: "highlight_mouse_cursor" text: Translation.tr("Hover to trigger") checked: Config.options.sidebar.cornerOpen.clickless onCheckedChanged: { @@ -338,6 +392,7 @@ ContentPage { ConfigRow { uniform: true ConfigSwitch { + buttonIcon: "vertical_align_bottom" text: Translation.tr("Place at bottom") checked: Config.options.sidebar.cornerOpen.bottom onCheckedChanged: { @@ -349,6 +404,7 @@ ContentPage { } } ConfigSwitch { + buttonIcon: "unfold_more_double" text: Translation.tr("Value scroll") checked: Config.options.sidebar.cornerOpen.valueScroll onCheckedChanged: { @@ -361,6 +417,7 @@ ContentPage { } } ConfigSwitch { + buttonIcon: "visibility" text: Translation.tr("Visualize region") checked: Config.options.sidebar.cornerOpen.visualize onCheckedChanged: { @@ -369,6 +426,7 @@ ContentPage { } ConfigRow { ConfigSpinBox { + icon: "arrow_range" text: Translation.tr("Region width") value: Config.options.sidebar.cornerOpen.cornerRegionWidth from: 1 @@ -379,6 +437,7 @@ ContentPage { } } ConfigSpinBox { + icon: "height" text: Translation.tr("Region height") value: Config.options.sidebar.cornerOpen.cornerRegionHeight from: 1 @@ -397,6 +456,7 @@ ContentPage { title: Translation.tr("On-screen display") ConfigSpinBox { + icon: "av_timer" text: Translation.tr("Timeout (ms)") value: Config.options.osd.timeout from: 100 @@ -413,6 +473,7 @@ ContentPage { title: Translation.tr("Overview") ConfigSwitch { + buttonIcon: "check" text: Translation.tr("Enable") checked: Config.options.overview.enable onCheckedChanged: { @@ -420,6 +481,7 @@ ContentPage { } } ConfigSpinBox { + icon: "loupe" text: Translation.tr("Scale (%)") value: Config.options.overview.scale * 100 from: 1 @@ -432,6 +494,7 @@ ContentPage { ConfigRow { uniform: true ConfigSpinBox { + icon: "splitscreen_bottom" text: Translation.tr("Rows") value: Config.options.overview.rows from: 1 @@ -442,6 +505,7 @@ ContentPage { } } ConfigSpinBox { + icon: "splitscreen_right" text: Translation.tr("Columns") value: Config.options.overview.columns from: 1 @@ -459,6 +523,7 @@ ContentPage { title: Translation.tr("Screenshot tool") ConfigSwitch { + buttonIcon: "nearby" text: Translation.tr('Show regions of potential interest') checked: Config.options.screenshotTool.showContentRegions onCheckedChanged: { diff --git a/.config/quickshell/ii/modules/settings/QuickConfig.qml b/.config/quickshell/ii/modules/settings/QuickConfig.qml index b14cb085a..66055a5d8 100644 --- a/.config/quickshell/ii/modules/settings/QuickConfig.qml +++ b/.config/quickshell/ii/modules/settings/QuickConfig.qml @@ -221,6 +221,7 @@ ContentPage { } ConfigSwitch { + buttonIcon: "ev_shadow" text: Translation.tr("Transparency") checked: Config.options.appearance.transparency.enable onCheckedChanged: { diff --git a/.config/quickshell/ii/modules/settings/ServicesConfig.qml b/.config/quickshell/ii/modules/settings/ServicesConfig.qml index dc7817cab..e6be25e2a 100644 --- a/.config/quickshell/ii/modules/settings/ServicesConfig.qml +++ b/.config/quickshell/ii/modules/settings/ServicesConfig.qml @@ -47,6 +47,7 @@ ContentPage { title: Translation.tr("Resources") ConfigSpinBox { + icon: "av_timer" text: Translation.tr("Polling interval (ms)") value: Config.options.resources.updateInterval from: 100