Add files via upload

Author: AleksElixir

modules/BatteryMonitor.qml

@@ -1,15 +1,17 @@
-import QtQuick
+import qs.config
+import Caelestia
 import Quickshell
 import Quickshell.Services.UPower
-import Caelestia
-import qs.config
+import QtQuick
 
 Scope {
     id: root
 
     readonly property list<var> warnLevels: [...Config.general.battery.warnLevels].sort((a, b) => b.level - a.level)
 
     Connections {
+        target: UPower
+
         function onOnBatteryChanged(): void {
             if (UPower.onBattery) {
                 if (Config.utilities.toasts.chargingChanged)
@@ -21,11 +23,11 @@ Scope {
                     level.warned = false;
             }
         }
-
-        target: UPower
     }
 
     Connections {
+        target: UPower.displayDevice
+
         function onPercentageChanged(): void {
             if (!UPower.onBattery)
                 return;
@@ -43,8 +45,6 @@ Scope {
                 hibernateTimer.start();
             }
         }
-
-        target: UPower.displayDevice
     }
 
     Timer {

modules/IdleMonitors.qml

@@ -1,11 +1,11 @@
 pragma ComponentBehavior: Bound
 
 import "lock"
+import qs.config
+import qs.services
+import Caelestia.Internal
 import Quickshell
 import Quickshell.Wayland
-import Caelestia.Internal
-import qs.services
-import qs.config
 
 Scope {
     id: root

modules/Shortcuts.qml

@@ -1,27 +1,23 @@
-import Quickshell
-import Quickshell.Io
-import Caelestia
 import qs.components.misc
-import qs.services
 import qs.modules.controlcenter
+import qs.services
+import Caelestia
+import Quickshell
+import Quickshell.Io
 
 Scope {
     id: root
 
     property bool launcherInterrupted
     readonly property bool hasFullscreen: Hypr.focusedWorkspace?.toplevels.values.some(t => t.lastIpcObject.fullscreen === 2) ?? false
 
-    // qmllint disable unresolved-type
     CustomShortcut {
-        // qmllint enable unresolved-type
         name: "controlCenter"
         description: "Open control center"
         onPressed: WindowFactory.create()
     }
 
-    // qmllint disable unresolved-type
     CustomShortcut {
-        // qmllint enable unresolved-type
         name: "showall"
         description: "Toggle launcher, dashboard and osd"
         onPressed: {
@@ -32,9 +28,7 @@ Scope {
         }
     }
 
-    // qmllint disable unresolved-type
     CustomShortcut {
-        // qmllint enable unresolved-type
         name: "dashboard"
         description: "Toggle dashboard"
         onPressed: {
@@ -45,9 +39,7 @@ Scope {
         }
     }
 
-    // qmllint disable unresolved-type
     CustomShortcut {
-        // qmllint enable unresolved-type
         name: "session"
         description: "Toggle session menu"
         onPressed: {
@@ -58,9 +50,7 @@ Scope {
         }
     }
 
-    // qmllint disable unresolved-type
     CustomShortcut {
-        // qmllint enable unresolved-type
         name: "launcher"
         description: "Toggle launcher"
         onPressed: root.launcherInterrupted = false
@@ -73,17 +63,14 @@ Scope {
         }
     }
 
-    // qmllint disable unresolved-type
     CustomShortcut {
-        // qmllint enable unresolved-type
         name: "launcherInterrupt"
         description: "Interrupt launcher keybind"
         onPressed: root.launcherInterrupted = true
     }
 
-    // qmllint disable unresolved-type
+
     CustomShortcut {
-        // qmllint enable unresolved-type
         name: "sidebar"
         description: "Toggle sidebar"
         onPressed: {
@@ -94,9 +81,7 @@ Scope {
         }
     }
 
-    // qmllint disable unresolved-type
     CustomShortcut {
-        // qmllint enable unresolved-type
         name: "utilities"
         description: "Toggle utilities"
         onPressed: {
@@ -108,6 +93,8 @@ Scope {
     }
 
     IpcHandler {
+        target: "drawers"
+
         function toggle(drawer: string): void {
             if (list().split("\n").includes(drawer)) {
                 if (root.hasFullscreen && ["launcher", "session", "dashboard"].includes(drawer))
@@ -123,19 +110,19 @@ Scope {
             const visibilities = Visibilities.getForActive();
             return Object.keys(visibilities).filter(k => typeof visibilities[k] === "boolean").join("\n");
         }
-
-        target: "drawers"
     }
 
     IpcHandler {
+        target: "controlCenter"
+
         function open(): void {
             WindowFactory.create();
         }
-
-        target: "controlCenter"
     }
 
     IpcHandler {
+        target: "toaster"
+
         function info(title: string, message: string, icon: string): void {
             Toaster.toast(title, message, icon, Toast.Info);
         }
@@ -151,7 +138,5 @@ Scope {
         function error(title: string, message: string, icon: string): void {
             Toaster.toast(title, message, icon, Toast.Error);
         }
-
-        target: "toaster"
     }
 }

modules/dashboard/Background.qml

@@ -1,8 +1,8 @@
-import QtQuick
-import QtQuick.Shapes
 import qs.components
 import qs.services
 import qs.config
+import QtQuick
+import QtQuick.Shapes
 
 ShapePath {
     id: root

modules/dashboard/Content.qml

@@ -1,27 +1,18 @@
 pragma ComponentBehavior: Bound
 
-import QtQuick
-import QtQuick.Layouts
-import Quickshell
-import Quickshell.Widgets
 import qs.components
 import qs.components.filedialog
 import qs.config
+import Quickshell
+import Quickshell.Widgets
+import QtQuick
+import QtQuick.Layouts
 
 Item {
     id: root
 
-    required property DrawerVisibilities visibilities
-    readonly property bool needsKeyboard: {
-        const count = repeater.count;
-        for (let i = 0; i < count; i++) {
-            const item = repeater.itemAt(i) as Loader;
-            if (item?.sourceComponent === mediaComponent && (item?.item as MediaWrapper)?.needsKeyboard)
-                return true;
-        }
-        return false;
-    }
-    required property DashboardState state
+    required property PersistentProperties visibilities
+    required property PersistentProperties state
     required property FileDialog facePicker
 
     readonly property var dashboardTabs: {
@@ -90,24 +81,21 @@ Item {
             id: view
 
             readonly property int currentIndex: root.state.currentTab
-            readonly property Item currentItem: {
-                repeater.count; // Trigger update on count change
-                return repeater.itemAt(currentIndex);
-            }
+            readonly property Item currentItem: row.children[currentIndex]
 
             anchors.fill: parent
 
             flickableDirection: Flickable.HorizontalFlick
 
-            implicitWidth: currentItem?.implicitWidth ?? 0
-            implicitHeight: currentItem?.implicitHeight ?? 0
+            implicitWidth: currentItem.implicitWidth
+            implicitHeight: currentItem.implicitHeight
 
-            contentX: currentItem?.x ?? 0
+            contentX: currentItem.x
             contentWidth: row.implicitWidth
             contentHeight: row.implicitHeight
 
             onContentXChanged: {
-                if (!moving || !currentItem)
+                if (!moving)
                     return;
 
                 const x = contentX - currentItem.x;
@@ -118,24 +106,19 @@ Item {
             }
 
             onDragEnded: {
-                if (!currentItem)
-                    return;
-
                 const x = contentX - currentItem.x;
                 if (x > currentItem.implicitWidth / 10)
                     root.state.currentTab = Math.min(root.state.currentTab + 1, tabs.count - 1);
                 else if (x < -currentItem.implicitWidth / 10)
                     root.state.currentTab = Math.max(root.state.currentTab - 1, 0);
                 else
-                    contentX = Qt.binding(() => currentItem?.x ?? 0);
+                    contentX = Qt.binding(() => currentItem.x);
             }
 
             RowLayout {
                 id: row
 
                 Repeater {
-                    id: repeater
-
                     model: ScriptModel {
                         values: root.dashboardTabs
                     }
@@ -163,7 +146,6 @@ Item {
 
             Component {
                 id: dashComponent
-
                 Dash {
                     visibilities: root.visibilities
                     state: root.state
@@ -173,22 +155,19 @@ Item {
 
             Component {
                 id: mediaComponent
-
-                MediaWrapper {
+                Media {
                     visibilities: root.visibilities
                 }
             }
 
             Component {
                 id: performanceComponent
-
                 Performance {}
             }
 
             Component {
                 id: weatherComponent
-
-                WeatherTab {}
+                Weather {}
             }
 
             Behavior on contentX {

modules/dashboard/Dash.qml

@@ -1,15 +1,16 @@
-import "dash"
-import QtQuick.Layouts
 import qs.components
 import qs.components.filedialog
 import qs.services
 import qs.config
+import "dash"
+import Quickshell
+import QtQuick.Layouts
 
 GridLayout {
     id: root
 
-    required property DrawerVisibilities visibilities
-    required property DashboardState state
+    required property PersistentProperties visibilities
+    required property PersistentProperties state
     required property FileDialog facePicker
 
     rowSpacing: Appearance.spacing.normal
@@ -40,7 +41,7 @@ GridLayout {
 
         radius: Appearance.rounding.large * 1.5
 
-        SmallWeather {}
+        Weather {}
     }
 
     Rect {