Fixed all qmlfmt warnings/errors

Bin/run-qmlfmt.sh

@@ -4,5 +4,4 @@
 # Can be installed from AUR "qmlfmt-git"
 # Requires qt6-5compat
 
-#find . -name "*.qml" -exec sh -c 'echo "Formatting $0..."; qmlfmt -e -b 120 -t 2 -i 2 -w "$0"' {} \;
 find . -name "*.qml" -print -exec qmlfmt -e -b 120 -t 2 -i 2 -w {} \;

Modules/Background/WallpaperPicker.qml

@@ -0,0 +1,8 @@
+pragma Singleton
+
+import Quickshell
+import qs.Services
+
+Item {
+  id: root
+}

Modules/DemoPanel/DemoPanel.qml

@@ -6,10 +6,10 @@ import Quickshell.Wayland
 import qs.Services
 import qs.Widgets
 
+
 /*
   An experiment/demo panel to tweaks widgets
 */
-
 NLoader {
   id: root
 
@@ -32,7 +32,9 @@ NLoader {
         anchors.centerIn: parent
 
         // Prevent closing when clicking in the panel bg
-        MouseArea { anchors.fill: parent }
+        MouseArea {
+          anchors.fill: parent
+        }
 
         ColumnLayout {
           anchors.fill: parent
@@ -42,50 +44,80 @@ NLoader {
           // NIconButton
           ColumnLayout {
             spacing: 16 * scaling
-            NText { text: "NIconButton"; color: Colors.accentSecondary }
+            NText {
+              text: "NIconButton"
+              color: Colors.accentSecondary
+            }
 
             NIconButton {
               id: myIconButton
               icon: "refresh"
-              onEntered: function() { myTooltip.show() }
-              onExited: function() { myTooltip.hide() }
+              onEntered: function () {
+                myTooltip.show()
+              }
+              onExited: function () {
+                myTooltip.hide()
+              }
+            }
+            NTooltip {
+              id: myTooltip
+              target: myIconButton
+              positionAbove: false
+              text: "Hello world"
             }
-            NTooltip { id: myTooltip; target: myIconButton; positionAbove: false; text: "Hello world"; }
 
-            NDivider { Layout.fillWidth: true }
+            NDivider {
+              Layout.fillWidth: true
+            }
           }
 
           // NToggle
           ColumnLayout {
             spacing: Style.marginLarge * scaling
             uniformCellSizes: true
-            NText { text: "NToggle + NTooltip"; color: Colors.accentSecondary }
+            NText {
+              text: "NToggle + NTooltip"
+              color: Colors.accentSecondary
+            }
 
             NToggle {
               label: "Label"
               description: "Description"
-              onToggled: function(value: bool) { console.log("NToggle: " + value) }
+              onToggled: function (value) {
+                console.log("NToggle: " + value)
+              }
             }
 
-
-            NDivider { Layout.fillWidth: true }
+            NDivider {
+              Layout.fillWidth: true
+            }
           }
 
           // NSlider
           ColumnLayout {
             spacing: 16 * scaling
-            NText { text: "Scaling"; color: Colors.accentSecondary }
+            NText {
+              text: "Scaling"
+              color: Colors.accentSecondary
+            }
             RowLayout {
               spacing: Style.marginSmall * scaling
-              NText { text: `${Math.round(Scaling.overrideScale * 100)}%`; Layout.alignment: Qt.AlignVCenter }
+              NText {
+                text: `${Math.round(Scaling.overrideScale * 100)}%`
+                Layout.alignment: Qt.AlignVCenter
+              }
               NSlider {
                 id: scaleSlider
                 from: 0.6
                 to: 1.8
                 stepSize: 0.01
                 value: Scaling.overrideScale
-                onMoved: function() { Scaling.overrideScale = value }
-                onPressedChanged: function() { Scaling.overrideEnabled = true }
+                onMoved: function () {
+                  Scaling.overrideScale = value
+                }
+                onPressedChanged: function () {
+                  Scaling.overrideEnabled = true
+                }
               }
               NIconButton {
                 icon: "restart_alt"
@@ -96,7 +128,9 @@ NLoader {
                 }
               }
             }
-            NDivider { Layout.fillWidth: true }
+            NDivider {
+              Layout.fillWidth: true
+            }
           }
         }
       }

Services/Location.qml

@@ -1,2 +1,10 @@
+pragma Singleton
+
+import Quickshell
+import qs.Services
+
 // Weather logic and caching
 // Calendar Hollidays logic and caching
+Singleton {
+  id: root
+}

Services/MediaPlayer.qml

@@ -1,25 +1,20 @@
-// pragma Singleton
+pragma Singleton
 
-// import QtQuick
-// import Quickshell
-// import Quickshell.Services.Mpris
-// import qs.Services
+import Quickshell
+import Quickshell.Services.Mpris
+import qs.Services
 
-// Singleton {
-//   id: manager
+Singleton {
+  id: root
 
   // property var currentPlayer: null
   // property real currentPosition: 0
   // property int selectedPlayerIndex: 0
   // property bool isPlaying: currentPlayer ? currentPlayer.isPlaying : false
-//   property string trackTitle: currentPlayer ? (currentPlayer.trackTitle
-//                                                || "Unknown Track") : ""
-//   property string trackArtist: currentPlayer ? (currentPlayer.trackArtist
-//                                                 || "Unknown Artist") : ""
-//   property string trackAlbum: currentPlayer ? (currentPlayer.trackAlbum
-//                                                || "Unknown Album") : ""
-//   property string trackArtUrl: currentPlayer ? (currentPlayer.trackArtUrl
-//                                                 || "") : ""
+  // property string trackTitle: currentPlayer ? (currentPlayer.trackTitle || "Unknown Track") : ""
+  // property string trackArtist: currentPlayer ? (currentPlayer.trackArtist || "Unknown Artist") : ""
+  // property string trackAlbum: currentPlayer ? (currentPlayer.trackAlbum || "Unknown Album") : ""
+  // property string trackArtUrl: currentPlayer ? (currentPlayer.trackArtUrl || "") : ""
   // property real trackLength: currentPlayer ? currentPlayer.length : 0
   // property bool canPlay: currentPlayer ? currentPlayer.canPlay : false
   // property bool canPause: currentPlayer ? currentPlayer.canPause : false
@@ -129,13 +124,11 @@
   // Timer {
   //   id: positionTimer
   //   interval: 1000
-//     running: currentPlayer && currentPlayer.isPlaying
-//              && currentPlayer.length > 0
+  //   running: currentPlayer && currentPlayer.isPlaying && currentPlayer.length > 0
   //            && currentPlayer.playbackState === MprisPlaybackState.Playing
   //   repeat: true
   //   onTriggered: {
-//       if (currentPlayer && currentPlayer.isPlaying
-//           && currentPlayer.playbackState === MprisPlaybackState.Playing) {
+  //     if (currentPlayer && currentPlayer.isPlaying && currentPlayer.playbackState === MprisPlaybackState.Playing) {
   //       currentPosition = currentPlayer.position
   //     } else {
   //       running = false
@@ -145,8 +138,7 @@
 
   // // Reset position when switching to inactive player
   // onCurrentPlayerChanged: {
-//     if (!currentPlayer || !currentPlayer.isPlaying
-//         || currentPlayer.playbackState !== MprisPlaybackState.Playing) {
+  //   if (!currentPlayer || !currentPlayer.isPlaying || currentPlayer.playbackState !== MprisPlaybackState.Playing) {
   //     currentPosition = 0
   //   }
   // }
@@ -166,4 +158,4 @@
 
   // // Expose cava values
   // property alias cavaValues: cava.values
-// }
+}

Widgets/NToggle.qml

@@ -11,7 +11,7 @@ RowLayout {
   property string description: ""
   property bool value: false
   property bool hovering: false
-  property var onToggled: function (value: bool) {}
+  property var onToggled: function (value) {}
 
   Layout.fillWidth: true
 
@@ -70,8 +70,8 @@ RowLayout {
       onEntered: hovering = true
       onExited: hovering = false
       onClicked: {
-        value = !value;
-        root.onToggled(value);
+        value = !value
+        root.onToggled(value)
       }
     }
   }