From a57cc7c1d2f6dc5dd2642b6d9d9dab2ca8f43da2 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Sun, 17 Nov 2024 17:23:44 +0100
Subject: [PATCH] chore: misc

---
 src/MainBar.qml                         | 10 +--------
 src/shell.qml                           | 16 +++++++--------
 src/widgets/mpris/MprisSmall.qml        |  8 +++++---
 src/widgets/notifcenter/Notifcenter.qml | 27 -------------------------
 src/widgets/workspaces/WorkspaceIPC.qml |  1 -
 5 files changed, 14 insertions(+), 48 deletions(-)
 delete mode 100644 src/widgets/notifcenter/Notifcenter.qml

diff --git a/src/MainBar.qml b/src/MainBar.qml
index 1f9dc58..4eb11fb 100644
--- a/src/MainBar.qml
+++ b/src/MainBar.qml
@@ -2,13 +2,11 @@ import "widgets/systray"
 import "widgets/workspaces"
 import "widgets/battery"
 import "widgets/network"
-import "widgets/notifcenter"
 import "widgets/caffeine"
 import "windows/notificationtoast"
-import "windows/workspace-view"
 import "base"
 import "provider"
-import Quickshell // for ShellRoot and PanelWindow
+import Quickshell
 import QtQuick
 import QtQuick.Layouts
 
@@ -33,8 +31,6 @@ PanelWindow {
         win: lbar
     }
 
-    WorkspaceView {}
-
     Rectangle {
         color: "transparent"
         anchors.margins: 5
@@ -57,12 +53,8 @@ PanelWindow {
 
             Battery {}
 
-            //Privacy {}
-
             Network {}
 
-            Notifcenter {}
-
             Caffeine {}
 
             Item {
diff --git a/src/shell.qml b/src/shell.qml
index 2d95577..996b9df 100644
--- a/src/shell.qml
+++ b/src/shell.qml
@@ -13,17 +13,17 @@ ShellRoot {
         }
     }
 
-    Component.onCompleted: {
-        Quickshell.reloadCompleted.connect(() => loader.active = false);
-        Quickshell.reloadFailed.connect(e => {
-            loader.active = true;
-            loader.message = e;
-        });
-    }
-
     LazyLoader {
         id: loader
 
+        Component.onCompleted: {
+            Quickshell.reloadCompleted.connect(() => loader.active = false);
+            Quickshell.reloadFailed.connect(e => {
+                loader.active = true;
+                loader.message = e;
+            });
+        }
+
         property string message: ""
 
         PanelWindow {
diff --git a/src/widgets/mpris/MprisSmall.qml b/src/widgets/mpris/MprisSmall.qml
index 6a6d255..8d4fa38 100644
--- a/src/widgets/mpris/MprisSmall.qml
+++ b/src/widgets/mpris/MprisSmall.qml
@@ -26,17 +26,19 @@ BRectangle {
         orientation: Qt.Horizontal
         snapMode: ListView.SnapOneItem
         spacing: 10
-        delegate: Item {
+        delegate: BRectangle {
             id: card
             required property var modelData
             property MprisPlayer player: modelData
+
             width: mprisSmall.width
             height: mprisSmall.height
+            radius: 15
 
             BlurredImage {
                 source: card.player?.trackArtUrl ?? ""
                 anchors.fill: parent
-                radius: 15
+                radius: parent.radius
             }
 
             RowLayout {
@@ -104,7 +106,7 @@ BRectangle {
                             size: 20
                         }
                         BIconButton {
-                            source: Quickshell.iconPath(card.player.playbackState === MprisPlaybackState.Playing ? "media-playback-pause" : "media-playback-start")
+                            source: Quickshell.iconPath(card.player?.playbackState === MprisPlaybackState.Playing ? "media-playback-pause" : "media-playback-start")
                             onClicked: card.player?.togglePlaying()
                             size: 20
                         }
diff --git a/src/widgets/notifcenter/Notifcenter.qml b/src/widgets/notifcenter/Notifcenter.qml
deleted file mode 100644
index 3e988f2..0000000
--- a/src/widgets/notifcenter/Notifcenter.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import "../../base"
-import Quickshell
-import Quickshell.Widgets
-import Quickshell.Io
-import QtQuick
-
-BRectangle {
-    MouseArea {
-        anchors.fill: parent
-
-        IconImage {
-            anchors.fill: parent
-            anchors.margins: 2
-            source: Quickshell.iconPath("notification-active")
-        }
-
-        onClicked: () => {
-            gui.running = true;
-        }
-
-        Process {
-            id: gui
-            running: false
-            command: ["swaync-client", "-t"]
-        }
-    }
-}
diff --git a/src/widgets/workspaces/WorkspaceIPC.qml b/src/widgets/workspaces/WorkspaceIPC.qml
index 58d0674..e797917 100644
--- a/src/widgets/workspaces/WorkspaceIPC.qml
+++ b/src/widgets/workspaces/WorkspaceIPC.qml
@@ -1,6 +1,5 @@
 import QtQuick
 import Quickshell
-import Quickshell.Io
 import Quickshell.Hyprland
 import Quickshell.I3