power: disable profile osd by default, ensure dbus activation doesnt

happen
2025-12-05 21:15:38 -05:00 · 2025-11-23 18:17:04 -05:00
parent 23538c0323
commit 43bea80cad
11 changed files with 207 additions and 204 deletions
--- a/quickshell/Common/CacheData.qml
+++ b/quickshell/Common/CacheData.qml
@@ -1,5 +1,4 @@
 pragma Singleton
-
 pragma ComponentBehavior: Bound

 import QtCore
@@ -23,79 +22,79 @@ Singleton {
    property string profileLastPath: ""

    property var fileBrowserSettings: ({
-        "wallpaper": {
-            "lastPath": "",
-            "viewMode": "grid",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "profile": {
-            "lastPath": "",
-            "viewMode": "grid",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "notepad_save": {
-            "lastPath": "",
-            "viewMode": "list",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "notepad_load": {
-            "lastPath": "",
-            "viewMode": "list",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "generic": {
-            "lastPath": "",
-            "viewMode": "list",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "default": {
-            "lastPath": "",
-            "viewMode": "list",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        }
-    })
+            "wallpaper": {
+                "lastPath": "",
+                "viewMode": "grid",
+                "sortBy": "name",
+                "sortAscending": true,
+                "iconSizeIndex": 1,
+                "showSidebar": true
+            },
+            "profile": {
+                "lastPath": "",
+                "viewMode": "grid",
+                "sortBy": "name",
+                "sortAscending": true,
+                "iconSizeIndex": 1,
+                "showSidebar": true
+            },
+            "notepad_save": {
+                "lastPath": "",
+                "viewMode": "list",
+                "sortBy": "name",
+                "sortAscending": true,
+                "iconSizeIndex": 1,
+                "showSidebar": true
+            },
+            "notepad_load": {
+                "lastPath": "",
+                "viewMode": "list",
+                "sortBy": "name",
+                "sortAscending": true,
+                "iconSizeIndex": 1,
+                "showSidebar": true
+            },
+            "generic": {
+                "lastPath": "",
+                "viewMode": "list",
+                "sortBy": "name",
+                "sortAscending": true,
+                "iconSizeIndex": 1,
+                "showSidebar": true
+            },
+            "default": {
+                "lastPath": "",
+                "viewMode": "list",
+                "sortBy": "name",
+                "sortAscending": true,
+                "iconSizeIndex": 1,
+                "showSidebar": true
+            }
+        })

    Component.onCompleted: {
        if (!isGreeterMode) {
-            loadCache()
+            loadCache();
        }
    }

    function loadCache() {
-        _loading = true
-        parseCache(cacheFile.text())
-        _loading = false
+        _loading = true;
+        parseCache(cacheFile.text());
+        _loading = false;
    }

    function parseCache(content) {
-        _loading = true
+        _loading = true;
        try {
            if (content && content.trim()) {
-                const cache = JSON.parse(content)
+                const cache = JSON.parse(content);

-                wallpaperLastPath = cache.wallpaperLastPath !== undefined ? cache.wallpaperLastPath : ""
-                profileLastPath = cache.profileLastPath !== undefined ? cache.profileLastPath : ""
+                wallpaperLastPath = cache.wallpaperLastPath !== undefined ? cache.wallpaperLastPath : "";
+                profileLastPath = cache.profileLastPath !== undefined ? cache.profileLastPath : "";

                if (cache.fileBrowserSettings !== undefined) {
-                    fileBrowserSettings = cache.fileBrowserSettings
+                    fileBrowserSettings = cache.fileBrowserSettings;
                } else if (cache.fileBrowserViewMode !== undefined) {
                    fileBrowserSettings = {
                        "wallpaper": {
@@ -122,65 +121,60 @@ Singleton {
                            "iconSizeIndex": 1,
                            "showSidebar": true
                        }
-                    }
+                    };
                }

                if (cache.configVersion === undefined) {
-                    migrateFromUndefinedToV1(cache)
-                    cleanupUnusedKeys()
-                    saveCache()
+                    migrateFromUndefinedToV1(cache);
+                    cleanupUnusedKeys();
+                    saveCache();
                }
            }
        } catch (e) {
-            console.warn("CacheData: Failed to parse cache:", e.message)
+            console.warn("CacheData: Failed to parse cache:", e.message);
        } finally {
-            _loading = false
+            _loading = false;
        }
    }

    function saveCache() {
        if (_loading)
-            return
+            return;
        cacheFile.setText(JSON.stringify({
-                                             "wallpaperLastPath": wallpaperLastPath,
-                                             "profileLastPath": profileLastPath,
-                                             "fileBrowserSettings": fileBrowserSettings,
-                                             "configVersion": cacheConfigVersion
-                                         }, null, 2))
+            "wallpaperLastPath": wallpaperLastPath,
+            "profileLastPath": profileLastPath,
+            "fileBrowserSettings": fileBrowserSettings,
+            "configVersion": cacheConfigVersion
+        }, null, 2));
    }

    function migrateFromUndefinedToV1(cache) {
-        console.info("CacheData: Migrating configuration from undefined to version 1")
+        console.info("CacheData: Migrating configuration from undefined to version 1");
    }

    function cleanupUnusedKeys() {
-        const validKeys = [
-            "wallpaperLastPath",
-            "profileLastPath",
-            "fileBrowserSettings",
-            "configVersion"
-        ]
+        const validKeys = ["wallpaperLastPath", "profileLastPath", "fileBrowserSettings", "configVersion"];

        try {
-            const content = cacheFile.text()
-            if (!content || !content.trim()) return
-
-            const cache = JSON.parse(content)
-            let needsSave = false
+            const content = cacheFile.text();
+            if (!content || !content.trim())
+                return;
+            const cache = JSON.parse(content);
+            let needsSave = false;

            for (const key in cache) {
                if (!validKeys.includes(key)) {
-                    console.log("CacheData: Removing unused key:", key)
-                    delete cache[key]
-                    needsSave = true
+                    console.log("CacheData: Removing unused key:", key);
+                    delete cache[key];
+                    needsSave = true;
                }
            }

            if (needsSave) {
-                cacheFile.setText(JSON.stringify(cache, null, 2))
+                cacheFile.setText(JSON.stringify(cache, null, 2));
            }
        } catch (e) {
-            console.warn("CacheData: Failed to cleanup unused keys:", e.message)
+            console.warn("CacheData: Failed to cleanup unused keys:", e.message);
        }
    }

@@ -194,12 +188,12 @@ Singleton {
        watchChanges: !isGreeterMode
        onLoaded: {
            if (!isGreeterMode) {
-                parseCache(cacheFile.text())
+                parseCache(cacheFile.text());
            }
        }
        onLoadFailed: error => {
            if (!isGreeterMode) {
-                console.info("CacheData: No cache file found, starting fresh")
+                console.info("CacheData: No cache file found, starting fresh");
            }
        }
    }
--- a/quickshell/Common/CacheUtils.qml
+++ b/quickshell/Common/CacheUtils.qml
@@ -1,28 +1,24 @@
-import Quickshell
 pragma Singleton
+pragma ComponentBehavior: Bound
+import Quickshell

 Singleton {
    id: root

    // Clear all image cache
    function clearImageCache() {
-        Quickshell.execDetached(["rm", "-rf", Paths.stringify(
-                                     Paths.imagecache)])
-        Paths.mkdir(Paths.imagecache)
+        Quickshell.execDetached(["rm", "-rf", Paths.stringify(Paths.imagecache)]);
+        Paths.mkdir(Paths.imagecache);
    }

    // Clear cache older than specified minutes
    function clearOldCache(ageInMinutes) {
-        Quickshell.execDetached(
-                    ["find", Paths.stringify(
-                         Paths.imagecache), "-name", "*.png", "-mmin", `+${ageInMinutes}`, "-delete"])
+        Quickshell.execDetached(["find", Paths.stringify(Paths.imagecache), "-name", "*.png", "-mmin", `+${ageInMinutes}`, "-delete"]);
    }

    // Clear cache for specific size
    function clearCacheForSize(size) {
-        Quickshell.execDetached(
-                    ["find", Paths.stringify(
-                         Paths.imagecache), "-name", `*@${size}x${size}.png`, "-delete"])
+        Quickshell.execDetached(["find", Paths.stringify(Paths.imagecache), "-name", `*@${size}x${size}.png`, "-delete"]);
    }

    // Get cache size in MB
@@ -30,8 +26,7 @@ Singleton {
        var process = Qt.createQmlObject(`
                                         import Quickshell.Io
                                         Process {
-                                         command: ["du", "-sm", "${Paths.stringify(
-                                             Paths.imagecache)}"]
+                                         command: ["du", "-sm", "${Paths.stringify(Paths.imagecache)}"]
                                         running: true
                                         stdout: StdioCollector {
                                         onStreamFinished: {
@@ -40,6 +35,6 @@ Singleton {
                                         }
                                         }
                                         }
-                                         `, root)
+                                         `, root);
    }
 }
--- a/quickshell/Common/I18n.qml
+++ b/quickshell/Common/I18n.qml
@@ -1,27 +1,26 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
 import QtQuick
 import Qt.labs.folderlistmodel
 import Quickshell
 import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound

 Singleton {
    id: root

    readonly property string _rawLocale: Qt.locale().name
    readonly property string _lang: _rawLocale.split(/[_-]/)[0]
-    readonly property var    _candidates: {
+    readonly property var _candidates: {
        const fullUnderscore = _rawLocale;
-        const fullHyphen     = _rawLocale.replace("_", "-");
+        const fullHyphen = _rawLocale.replace("_", "-");
        return [fullUnderscore, fullHyphen, _lang].filter(c => c && c !== "en");
    }

-
    readonly property url translationsFolder: Qt.resolvedUrl("../translations/poexports")

    property string currentLocale: "en"
-    property var    translations: ({})
-    property bool   translationsLoaded: false
+    property var translations: ({})
+    property bool translationsLoaded: false

    property url _selectedPath: ""

@@ -32,7 +31,8 @@ Singleton {
        showDirs: false
        showDotAndDotDot: false

-        onStatusChanged: if (status === FolderListModel.Ready) root._pickTranslation()
+        onStatusChanged: if (status === FolderListModel.Ready)
+            root._pickTranslation()
    }

    FileView {
@@ -41,73 +41,75 @@ Singleton {

        onLoaded: {
            try {
-                root.translations = JSON.parse(text())
-                root.translationsLoaded = true
-                console.info(`I18n: Loaded translations for '${root.currentLocale}' ` +
-                            `(${Object.keys(root.translations).length} contexts)`)
+                root.translations = JSON.parse(text());
+                root.translationsLoaded = true;
+                console.info(`I18n: Loaded translations for '${root.currentLocale}' ` + `(${Object.keys(root.translations).length} contexts)`);
            } catch (e) {
-                console.warn(`I18n: Error parsing '${root.currentLocale}':`, e,
-                             "- falling back to English")
-                root._fallbackToEnglish()
+                console.warn(`I18n: Error parsing '${root.currentLocale}':`, e, "- falling back to English");
+                root._fallbackToEnglish();
            }
        }

-        onLoadFailed: (error) => {
-            console.warn(`I18n: Failed to load '${root.currentLocale}' (${error}), ` +
-                         "falling back to English")
-            root._fallbackToEnglish()
+        onLoadFailed: error => {
+            console.warn(`I18n: Failed to load '${root.currentLocale}' (${error}), ` + "falling back to English");
+            root._fallbackToEnglish();
        }
    }

    function _pickTranslation() {
-        const present = new Set()
+        const present = new Set();
        for (let i = 0; i < dir.count; i++) {
-            const name = dir.get(i, "fileName") // e.g. "zh_CN.json"
+            const name = dir.get(i, "fileName"); // e.g. "zh_CN.json"
            if (name && name.endsWith(".json")) {
-                present.add(name.slice(0, -5))
+                present.add(name.slice(0, -5));
            }
        }

        for (let i = 0; i < _candidates.length; i++) {
-            const cand = _candidates[i]
+            const cand = _candidates[i];
            if (present.has(cand)) {
-                _useLocale(cand, dir.folder + "/" + cand + ".json")
-                return
+                _useLocale(cand, dir.folder + "/" + cand + ".json");
+                return;
            }
        }

-        _fallbackToEnglish()
+        _fallbackToEnglish();
    }

    function _useLocale(localeTag, fileUrl) {
-        currentLocale = localeTag
-        _selectedPath = fileUrl
-        translationsLoaded = false
-        translations = ({})
-        console.info(`I18n: Using locale '${localeTag}' from ${fileUrl}`)
+        currentLocale = localeTag;
+        _selectedPath = fileUrl;
+        translationsLoaded = false;
+        translations = ({});
+        console.info(`I18n: Using locale '${localeTag}' from ${fileUrl}`);
    }

    function _fallbackToEnglish() {
-        currentLocale = "en"
-        _selectedPath = ""
-        translationsLoaded = false
-        translations = ({})
-        console.warn("I18n: Falling back to built-in English strings")
+        currentLocale = "en";
+        _selectedPath = "";
+        translationsLoaded = false;
+        translations = ({});
+        console.warn("I18n: Falling back to built-in English strings");
    }

    function tr(term, context) {
-        if (!translationsLoaded || !translations) return term
-        const ctx = context || term
-        if (translations[ctx] && translations[ctx][term]) return translations[ctx][term]
+        if (!translationsLoaded || !translations)
+            return term;
+        const ctx = context || term;
+        if (translations[ctx] && translations[ctx][term])
+            return translations[ctx][term];
        for (const c in translations) {
-            if (translations[c] && translations[c][term]) return translations[c][term]
+            if (translations[c] && translations[c][term])
+                return translations[c][term];
        }
-        return term
+        return term;
    }

    function trContext(context, term) {
-        if (!translationsLoaded || !translations) return term
-        if (translations[context] && translations[context][term]) return translations[context][term]
-        return term
+        if (!translationsLoaded || !translations)
+            return term;
+        if (translations[context] && translations[context][term])
+            return translations[context][term];
+        return term;
    }
 }
--- a/quickshell/Common/ModalManager.qml
+++ b/quickshell/Common/ModalManager.qml
@@ -1,4 +1,5 @@
 pragma Singleton
+pragma ComponentBehavior: Bound

 import Quickshell
 import QtQuick
@@ -10,11 +11,11 @@ Singleton {

    function openModal(modal) {
        if (!modal.allowStacking) {
-            closeAllModalsExcept(modal)
+            closeAllModalsExcept(modal);
        }
        if (!modal.keepPopoutsOpen) {
-            PopoutManager.closeAllPopouts()
+            PopoutManager.closeAllPopouts();
        }
-        TrayMenuManager.closeAllMenus()
+        TrayMenuManager.closeAllMenus();
    }
 }
--- a/quickshell/Common/OSDManager.qml
+++ b/quickshell/Common/OSDManager.qml
@@ -1,4 +1,5 @@
 pragma Singleton
+pragma ComponentBehavior: Bound

 import Quickshell
 import QtQuick
@@ -10,15 +11,14 @@ Singleton {

    function showOSD(osd) {
        if (!osd || !osd.screen)
-            return
-
-        const screenName = osd.screen.name
-        const currentOSD = currentOSDsByScreen[screenName]
+            return;
+        const screenName = osd.screen.name;
+        const currentOSD = currentOSDsByScreen[screenName];

        if (currentOSD && currentOSD !== osd) {
-            currentOSD.hide()
+            currentOSD.hide();
        }

-        currentOSDsByScreen[screenName] = osd
+        currentOSDsByScreen[screenName] = osd;
    }
 }
--- a/quickshell/Common/Paths.qml
+++ b/quickshell/Common/Paths.qml
@@ -1,4 +1,5 @@
 pragma Singleton
+pragma ComponentBehavior: Bound

 import Quickshell
 import QtCore
--- a/quickshell/Common/settings/SettingsSpec.js
+++ b/quickshell/Common/settings/SettingsSpec.js
@@ -194,7 +194,7 @@ var SPEC = {
    osdIdleInhibitorEnabled: { def: true },
    osdMicMuteEnabled: { def: true },
    osdCapsLockEnabled: { def: true },
-    osdPowerProfileEnabled: { def: true },
+    osdPowerProfileEnabled: { def: false },

    powerActionConfirm: { def: true },
    powerMenuActions: { def: ["reboot", "logout", "poweroff", "lock", "suspend", "restart"] },
--- a/quickshell/DMSShell.qml
+++ b/quickshell/DMSShell.qml
@@ -556,24 +556,17 @@ Item {
        }
    }

-    LazyLoader {
-        id: powerProfileOSDLoader
-        active: false
-
-        Variants {
-            model: SettingsData.getFilteredScreens("osd")
-
-            delegate: PowerProfileOSD {
-                modelData: item
-            }
-        }
+    Loader {
+        id: powerProfileWatcherLoader
+        active: SettingsData.osdPowerProfileEnabled
+        source: "Services/PowerProfileWatcher.qml"
    }

-    Connections {
-        target: BatteryService
+    Variants {
+        model: SettingsData.osdPowerProfileEnabled ? SettingsData.getFilteredScreens("osd") : []

-        function onPowerProfileChanged() {
-            powerProfileOSDLoader.active = true
+        delegate: PowerProfileOSD {
+            modelData: item
        }
    }

--- a/quickshell/Modules/OSD/PowerProfileOSD.qml
+++ b/quickshell/Modules/OSD/PowerProfileOSD.qml
@@ -7,30 +7,36 @@ import qs.Widgets
 DankOSD {
    id: root

+    property int currentProfile: 0
+    property string profileIcon: "settings"
+
    osdWidth: Theme.iconSize + Theme.spacingS * 2
    osdHeight: Theme.iconSize + Theme.spacingS * 2
    autoHideInterval: 2000
    enableMouseInteraction: false

    Connections {
-        target: BatteryService
+        target: PowerProfileWatcher

-        function onPowerProfileChanged() {
+        function onProfileChanged(profile) {
            if (SettingsData.osdPowerProfileEnabled) {
-                root.show()
+                root.currentProfile = profile;
+                root.profileIcon = Theme.getPowerProfileIcon(profile);
+                root.show();
            }
        }
    }

    Component.onCompleted: {
-        if (SettingsData.osdPowerProfileEnabled) {
-            root.show()
+        if (SettingsData.osdPowerProfileEnabled && typeof PowerProfileWatcher !== "undefined") {
+            root.currentProfile = PowerProfileWatcher.currentProfile;
+            root.profileIcon = Theme.getPowerProfileIcon(PowerProfileWatcher.currentProfile);
        }
    }

    content: DankIcon {
        anchors.centerIn: parent
-        name: typeof PowerProfiles !== "undefined" ? Theme.getPowerProfileIcon(PowerProfiles.profile) : "settings"
+        name: root.profileIcon
        size: Theme.iconSize
        color: Theme.primary
    }
--- a/quickshell/Services/BatteryService.qml
+++ b/quickshell/Services/BatteryService.qml
@@ -11,10 +11,6 @@ Singleton {

    property bool suppressSound: true
    property bool previousPluggedState: false
-    property int currentPowerProfile: -1
-    property int previousPowerProfile: -1
-
-    signal powerProfileChanged

    Timer {
        id: startupTimer
@@ -24,27 +20,6 @@ Singleton {
        onTriggered: root.suppressSound = false
    }

-    Connections {
-        target: typeof PowerProfiles !== "undefined" ? PowerProfiles : null
-
-        function onProfileChanged() {
-            if (typeof PowerProfiles !== "undefined") {
-                root.previousPowerProfile = root.currentPowerProfile;
-                root.currentPowerProfile = PowerProfiles.profile;
-                if (root.previousPowerProfile !== -1) {
-                    root.powerProfileChanged();
-                }
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        if (typeof PowerProfiles !== "undefined") {
-            root.currentPowerProfile = PowerProfiles.profile;
-            root.previousPowerProfile = PowerProfiles.profile;
-        }
-    }
-
    readonly property string preferredBatteryOverride: Quickshell.env("DMS_PREFERRED_BATTERY")

    // List of laptop batteries
@@ -160,7 +135,7 @@ Singleton {
        return isCharging ? "Charging" : (isPluggedIn ? "Plugged In" : "Discharging");
    }

-    readonly property bool suggestPowerSaver: batteryAvailable && isLowBattery && UPower.onBattery && (typeof PowerProfiles !== "undefined" && PowerProfiles.profile !== PowerProfile.PowerSaver)
+    readonly property bool suggestPowerSaver: false

    readonly property var bluetoothDevices: {
        const btDevices = [];
--- a/quickshell/Services/PowerProfileWatcher.qml
+++ b/quickshell/Services/PowerProfileWatcher.qml
@@ -0,0 +1,36 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Services.UPower
+
+Singleton {
+    id: root
+
+    property int currentProfile: -1
+    property int previousProfile: -1
+
+    signal profileChanged(int profile)
+
+    Connections {
+        target: typeof PowerProfiles !== "undefined" ? PowerProfiles : null
+
+        function onProfileChanged() {
+            if (typeof PowerProfiles !== "undefined") {
+                root.previousProfile = root.currentProfile;
+                root.currentProfile = PowerProfiles.profile;
+                if (root.previousProfile !== -1) {
+                    root.profileChanged(root.currentProfile);
+                }
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        if (typeof PowerProfiles !== "undefined") {
+            root.currentProfile = PowerProfiles.profile;
+            root.previousProfile = PowerProfiles.profile;
+        }
+    }
+}