Merge remote-tracking branch 'origin/main' into addon-i18n

.config/quickshell/modules/sidebarRight/BottomWidgetGroup.qml

@@ -130,15 +130,17 @@ Rectangle {
             Layout.topMargin: 10
             width: tabBar.width
             // Navigation rail buttons
-            ColumnLayout {
+            NavigationRailTabArray {
+                id: tabBar
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.left: parent.left
                 anchors.leftMargin: 5
-                id: tabBar
-                spacing: 15
+                currentIndex: root.selectedTab
+                expanded: false
                 Repeater {
                     model: root.tabs
-                    NavRailButton {
+                    NavigationRailButton {
+                        showToggledHighlight: false
                         toggled: root.selectedTab == index
                         buttonText: modelData.name
                         buttonIcon: modelData.icon

.config/quickshell/modules/sidebarRight/SidebarRight.qml

@@ -3,6 +3,7 @@ import "root:/services"
 import "root:/modules/common"
 import "root:/modules/common/widgets"
 import "root:/modules/common/functions/string_utils.js" as StringUtils
+import "root:/modules/common/functions/file_utils.js" as FileUtils
 import "./quickToggles/"
 import "root:/services/"
 import QtQuick
@@ -17,8 +18,10 @@ import Quickshell.Wayland
 import Quickshell.Hyprland
 
 Scope {
+    id: root
     property int sidebarWidth: Appearance.sizes.sidebarWidth
     property int sidebarPadding: 15
+    property string settingsQmlPath: FileUtils.trimFileProtocol(`${Directories.config}/quickshell/settings.qml`)
 
     PanelWindow {
         id: sidebarRoot
@@ -144,11 +147,11 @@ Scope {
                                     toggled: false
                                     buttonIcon: "settings"
                                     onClicked: {
-                                        Hyprland.dispatch(`exec ${ConfigOptions.apps.settings}`)
-                                        Hyprland.dispatch(`global quickshell:sidebarRightClose`)
+                                        Hyprland.dispatch("global quickshell:sidebarRightClose")
+                                        Quickshell.execDetached(["qs", "-p", root.settingsQmlPath])
                                     }
                                     StyledToolTip {
-                                        content: Translation.tr("Plasma Settings")
+                                        content: Translation.tr("Settings")
                                     }
                                 }
                                 QuickToggleButton {

.config/quickshell/modules/sidebarRight/quickToggles/BluetoothToggle.qml

@@ -15,8 +15,8 @@ QuickToggleButton {
         toggleBluetooth.running = true
     }
     altAction: () => {
-        Hyprland.dispatch(`exec ${ConfigOptions.apps.bluetooth}`)
-            Hyprland.dispatch("global quickshell:sidebarRightClose")
+        Quickshell.execDetached(["bash", "-c", `${ConfigOptions.apps.bluetooth}`])
+        Hyprland.dispatch("global quickshell:sidebarRightClose")
     }
     Process {
         id: toggleBluetooth

.config/quickshell/modules/sidebarRight/quickToggles/GameMode.qml

@@ -7,20 +7,27 @@ import Quickshell.Io
 import Quickshell.Hyprland
 
 QuickToggleButton {
-    property bool enabled: false
+    id: root
     buttonIcon: "gamepad"
-    toggled: enabled
+    toggled: toggled
 
     onClicked: {
-        enabled = !enabled
-        if (enabled) {
-            // gameModeOn.running = true
-            Hyprland.dispatch(`exec hyprctl --batch "keyword animations:enabled 0; keyword decoration:shadow:enabled 0; keyword decoration:blur:enabled 0; keyword general:gaps_in 0; keyword general:gaps_out 0; keyword general:border_size 1; keyword decoration:rounding 0; keyword general:allow_tearing 1"`)
+        root.toggled = !root.toggled
+        if (root.toggled) {
+            Quickshell.execDetached(["bash", "-c", `hyprctl --batch "keyword animations:enabled 0; keyword decoration:shadow:enabled 0; keyword decoration:blur:enabled 0; keyword general:gaps_in 0; keyword general:gaps_out 0; keyword general:border_size 1; keyword decoration:rounding 0; keyword general:allow_tearing 1"`])
         } else {
-            Hyprland.dispatch("exec hyprctl reload")
+            Quickshell.execDetached(["hyprctl", "reload"])
+        }
+    }
+    Process {
+        id: fetchActiveState
+        running: true
+        command: ["bash", "-c", `test "$(hyprctl getoption animations:enabled -j | jq ".int")" -ne 0`]
+        onExited: (exitCode, exitStatus) => {
+            console.log("Game mode toggle exited with code:", exitCode, "and status:", exitStatus)
+            root.toggled = exitCode !== 0 // Inverted because enabled = nonzero exit
         }
     }
-    
     StyledToolTip {
         content: Translation.tr("Game mode")
     }

.config/quickshell/modules/sidebarRight/quickToggles/NetworkToggle.qml

@@ -16,7 +16,7 @@ QuickToggleButton {
         toggleNetwork.running = true
     }
     altAction: () => {
-        Hyprland.dispatch(`exec ${Network.ethernet ? ConfigOptions.apps.networkEthernet : ConfigOptions.apps.network}`)
+        Quickshell.execDetached(["bash", "-c", `${Network.ethernet ? ConfigOptions.apps.networkEthernet : ConfigOptions.apps.network}`])
         Hyprland.dispatch("global quickshell:sidebarRightClose")
     }
     Process {

.config/quickshell/modules/sidebarRight/todo/TodoWidget.qml

@@ -154,31 +154,18 @@ Item {
     // + FAB
     StyledRectangularShadow {
         target: fabButton
-        radius: Appearance.rounding.normal
+        radius: fabButton.buttonRadius
+        blur: 0.6 * Appearance.sizes.elevationMargin
     }
-    Button { 
+    FloatingActionButton {
         id: fabButton
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         anchors.rightMargin: root.fabMargins
         anchors.bottomMargin: root.fabMargins
-        width: root.fabSize
-        height: root.fabSize
-        PointingHandInteraction {}
 
         onClicked: root.showAddDialog = true
 
-        background: Rectangle {
-            id: fabBackground
-            anchors.fill: parent
-            radius: Appearance.rounding.normal
-            color: (fabButton.down) ? Appearance.colors.colPrimaryContainerActive : (fabButton.hovered ? Appearance.colors.colPrimaryContainerHover : Appearance.colors.colPrimaryContainer)
-
-            Behavior on color {
-                animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-            }
-        }
-
         contentItem: MaterialSymbol {
             text: "add"
             horizontalAlignment: Text.AlignHCenter