Merge branch 'main' of https://github.com/end-4/dots-hyprland into sticky-merge-main

dots/.config/quickshell/ii/modules/common/Config.qml

@@ -76,6 +76,12 @@ Singleton {
 
         JsonAdapter {
             id: configOptionsJsonAdapter
+
+            property list<string> enabledPanels: [
+                "iiBar", "iiBackground", "iiCheatsheet", "iiDock", "iiLock", "iiMediaControls", "iiNotificationPopup", "iiOnScreenDisplay", "iiOnScreenKeyboard", "iiOverlay", "iiOverview", "iiPolkit", "iiRegionSelector", "iiReloadPopup", "iiScreenCorners", "iiSessionScreen", "iiSidebarLeft", "iiSidebarRight", "iiVerticalBar", "iiWallpaperSelector"
+            ]
+            property string panelFamily: "ii" // "ii", "w"
+
             property JsonObject policies: JsonObject {
                 property int ai: 1 // 0: No | 1: Yes | 2: Local
                 property int weeb: 1 // 0: No | 1: Open | 2: Closet
@@ -148,6 +154,7 @@ Singleton {
                 property JsonObject widgets: JsonObject {
                     property JsonObject clock: JsonObject {
                         property bool enable: true
+                        property bool showOnlyWhenLocked: false
                         property string placementStrategy: "leastBusy" // "free", "leastBusy", "mostBusy"
                         property real x: 100
                         property real y: 100
@@ -274,7 +281,7 @@ Singleton {
                 // 10:  | 11:  | 12:  | 13:  | 14: 󱄛
                 property string superKey: ""
                 property bool useMacSymbol: false
-                property bool splitButtons: true
+                property bool splitButtons: false
                 property bool useMouseSymbol: false
                 property bool useFnSymbol: false
                 property JsonObject fontSize: JsonObject {
@@ -380,7 +387,11 @@ Singleton {
             property JsonObject overlay: JsonObject {
                 property bool openingZoomAnimation: true
                 property bool darkenScreen: true
-                property real clickthroughOpacity: 0.7
+                property real clickthroughOpacity: 0.8
+                property JsonObject floatingImage: JsonObject {
+                    property string imageSource: "https://media.tenor.com/H5U5bJzj3oAAAAAi/kukuru.gif"
+                    property real scale: 0.5
+                }
             }
 
             property JsonObject overview: JsonObject {
@@ -511,6 +522,7 @@ Singleton {
                 // https://doc.qt.io/qt-6/qtime.html#toString
                 property string format: "hh:mm"
                 property string shortDateFormat: "dd/MM"
+                property string dateWithYearFormat: "dd/MM/yyyy"
                 property string dateFormat: "ddd, dd/MM"
                 property JsonObject pomodoro: JsonObject {
                     property int breakTime: 300
@@ -545,6 +557,13 @@ Singleton {
                     property list<string> linkKeywords: ["hentai", "porn", "sukebei", "hitomi.la", "rule34", "gelbooru", "fanbox", "dlsite"]
                 }
             }
+
+            property JsonObject waffles: JsonObject {
+                property JsonObject bar: JsonObject {
+                    property bool bottom: true
+                    property bool leftAlignApps: false
+                }
+            }
         }
     }
 }

dots/.config/quickshell/ii/modules/common/Directories.qml

@@ -24,6 +24,7 @@ Singleton {
     property string scriptPath: Quickshell.shellPath("scripts")
     property string favicons: FileUtils.trimFileProtocol(`${Directories.cache}/media/favicons`)
     property string coverArt: FileUtils.trimFileProtocol(`${Directories.cache}/media/coverart`)
+    property string tempImages: "/tmp/quickshell/media/images"
     property string booruPreviews: FileUtils.trimFileProtocol(`${Directories.cache}/media/boorus`)
     property string booruDownloads: FileUtils.trimFileProtocol(Directories.pictures  + "/homework")
     property string booruDownloadsNsfw: FileUtils.trimFileProtocol(Directories.pictures + "/homework/🌶️")
@@ -54,5 +55,6 @@ Singleton {
         Quickshell.execDetached(["bash", "-c", `rm -rf '${latexOutput}'; mkdir -p '${latexOutput}'`])
         Quickshell.execDetached(["bash", "-c", `rm -rf '${cliphistDecode}'; mkdir -p '${cliphistDecode}'`])
         Quickshell.execDetached(["mkdir", "-p", `${aiChats}`])
+        Quickshell.execDetached(["rm", "-rf", `${tempImages}`])
     }
 }

dots/.config/quickshell/ii/modules/common/Persistent.qml

@@ -89,6 +89,22 @@ Singleton {
                     property real width: 250
                     property real height: 100
                 }
+                property JsonObject floatingImage: JsonObject {
+                    property bool pinned: false
+                    property bool clickthrough: false
+                    property real x: 1650
+                    property real y: 390
+                    property real width: 0
+                    property real height: 0
+                }
+                property JsonObject fpsLimiter: JsonObject {
+                    property bool pinned: false
+                    property bool clickthrough: false
+                    property real x: 1570
+                    property real y: 615
+                    property real width: 280
+                    property real height: 80
+                }
                 property JsonObject recorder: JsonObject {
                     property bool pinned: false
                     property bool clickthrough: false
@@ -115,14 +131,6 @@ Singleton {
                     property real height: 600
                     property int tabIndex: 0
                 }
-                property JsonObject fpsLimiter: JsonObject {
-                    property bool pinned: false
-                    property bool clickthrough: false
-                    property real x: 1576
-                    property real y: 630
-                    property real width: 280
-                    property real height: 80
-                }
                 property JsonObject stickypad: JsonObject {
                     property bool pinned: true
                     property bool clickthrough: false

dots/.config/quickshell/ii/modules/common/utils/ImageDownloaderProcess.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.modules.common
+import qs.modules.common.functions
+
+Process {
+    id: root
+
+    signal done(string path, int width, int height);
+    required property string filePath;
+    required property string sourceUrl;
+    property string downloadUserAgent: Config.options?.networking.userAgent ?? ""
+    
+    function processFilePath() {
+        return StringUtils.shellSingleQuoteEscape(FileUtils.trimFileProtocol(filePath));
+    }
+
+    running: true
+    command: ["bash", "-c", 
+        `mkdir -p $(dirname '${processFilePath(filePath)}'); [ -f '${processFilePath(filePath)}' ] || curl -sSL '${sourceUrl}' -o '${processFilePath(filePath)}' && magick identify -format '%w %h' '${processFilePath(filePath)}'[0]`
+    ]
+    stdout: StdioCollector {
+        id: imageSizeOutputCollector
+        onStreamFinished: {
+            const output = imageSizeOutputCollector.text.trim();
+            const [width, height] = output.split(" ").map(Number);
+            root.done(root.filePath, width, height);
+        }
+    }
+}

dots/.config/quickshell/ii/modules/common/widgets/ConfigSwitch.qml

@@ -34,7 +34,6 @@ RippleButton {
         StyledSwitch {
             id: switchWidget
             down: root.down
-            scale: 0.6
             Layout.fillWidth: false
             checked: root.checked
             onClicked: root.clicked()

dots/.config/quickshell/ii/modules/common/widgets/PopupToolTip.qml

@@ -1,3 +1,4 @@
+pragma ComponentBehavior: Bound
 import qs.modules.common
 import qs.modules.common.widgets
 import QtQuick
@@ -13,15 +14,24 @@ Item {
     property real horizontalPadding: 10
     property real verticalPadding: 5
 
+    readonly property bool internalVisibleCondition: (extraVisibleCondition && (parent.hovered === undefined || parent?.hovered)) || alternativeVisibleCondition
     property var anchorEdges: Edges.Top
     property var anchorGravity: anchorEdges
 
-    readonly property bool internalVisibleCondition: (extraVisibleCondition && (parent.hovered === undefined || parent?.hovered)) || alternativeVisibleCondition
+    property Item contentItem: StyledToolTipContent {
+        id: contentItem
+        anchors.centerIn: parent
+        text: root.text
+        shown: false
+        Component.onCompleted: shown = true
+        horizontalPadding: root.horizontalPadding
+        verticalPadding: root.verticalPadding
+    }
 
     Loader {
         id: tooltipLoader
         anchors.fill: parent
-        active: internalVisibleCondition
+        active: root.internalVisibleCondition
         sourceComponent: PopupWindow {
             visible: true
             anchor {
@@ -35,18 +45,10 @@ Item {
             }
 
             color: "transparent"
-            implicitWidth: contentItem.implicitWidth + root.horizontalPadding * 2
-            implicitHeight: contentItem.implicitHeight + root.verticalPadding * 2
+            implicitWidth: root.contentItem.implicitWidth + root.horizontalPadding * 2
+            implicitHeight: root.contentItem.implicitHeight + root.verticalPadding * 2
 
-            StyledToolTipContent {
-                id: contentItem
-                anchors.centerIn: parent
-                text: root.text
-                shown: false
-                Component.onCompleted: shown = true
-                horizontalPadding: root.horizontalPadding
-                verticalPadding: root.verticalPadding
-            }
+            data: [root.contentItem]
         }
     }
 }

dots/.config/quickshell/ii/modules/common/widgets/StyledSwitch.qml

@@ -9,7 +9,7 @@ import Qt5Compat.GraphicalEffects
  */
 Switch {
     id: root
-    property real scale: 0.6 // Default in m3 spec is huge af
+    property real scale: 0.75 // Default in m3 spec is huge af
     implicitHeight: 32 * root.scale
     implicitWidth: 52 * root.scale
     property color activeColor: Appearance?.colors.colPrimary ?? "#685496"