nix: escape version string (#1353)

quickshell/CODENAME

@@ -1 +1 @@
-Spicy Miso
+Saffron Bloom

quickshell/DMSShell.qml

@@ -442,15 +442,17 @@ Item {
             PopoutService.settingsModalLoader = settingsModalLoader;
         }
 
+        onActiveChanged: {
+            if (active && item) {
+                PopoutService.settingsModal = item;
+                PopoutService._onSettingsModalLoaded();
+            }
+        }
+
         SettingsModal {
             id: settingsModal
             property bool wasShown: false
 
-            Component.onCompleted: {
-                PopoutService.settingsModal = settingsModal;
-                PopoutService._onSettingsModalLoaded();
-            }
-
             onVisibleChanged: {
                 if (visible) {
                     wasShown = true;

quickshell/DMSShellIPC.qml

@@ -797,9 +797,11 @@ Item {
             const modal = PopoutService.settingsModal;
             if (modal) {
                 if (type === "wallpaper") {
-                    modal.openWallpaperBrowser(false);
+                    modal.wallpaperBrowser.allowStacking = false;
+                    modal.wallpaperBrowser.open();
                 } else if (type === "profile") {
-                    modal.openProfileBrowser(false);
+                    modal.profileBrowser.allowStacking = false;
+                    modal.profileBrowser.open();
                 }
             } else {
                 PopoutService.openSettings();

quickshell/Modals/Changelog/ChangelogModal.qml

@@ -128,7 +128,7 @@ FloatingWindow {
                     iconName: "open_in_new"
                     backgroundColor: Theme.surfaceContainerHighest
                     textColor: Theme.surfaceText
-                    onClicked: Qt.openUrlExternally("https://danklinux.com/blog/v1-2-release")
+                    onClicked: Qt.openUrlExternally("https://danklinux.com/blog/v1.2-release")
                 }
 
                 DankButton {

quickshell/Modals/Settings/ProfileSection.qml

@@ -74,7 +74,9 @@ Rectangle {
                                 if (root.parentModal) {
                                     root.parentModal.allowFocusOverride = true;
                                     root.parentModal.shouldHaveFocus = false;
-                                    root.parentModal.openProfileBrowser();
+                                    if (root.parentModal.profileBrowser) {
+                                        root.parentModal.profileBrowser.open();
+                                    }
                                 }
                             }
                         }

quickshell/Modals/Settings/SettingsModal.qml

@@ -8,26 +8,8 @@ import qs.Widgets
 FloatingWindow {
     id: settingsModal
 
-    property var profileBrowser: profileBrowserLoader.item
-    property var wallpaperBrowser: wallpaperBrowserLoader.item
-
-    function openProfileBrowser(allowStacking) {
-        profileBrowserLoader.active = true;
-        if (!profileBrowserLoader.item)
-            return;
-        if (allowStacking !== undefined)
-            profileBrowserLoader.item.allowStacking = allowStacking;
-        profileBrowserLoader.item.open();
-    }
-
-    function openWallpaperBrowser(allowStacking) {
-        wallpaperBrowserLoader.active = true;
-        if (!wallpaperBrowserLoader.item)
-            return;
-        if (allowStacking !== undefined)
-            wallpaperBrowserLoader.item.allowStacking = allowStacking;
-        wallpaperBrowserLoader.item.open();
-    }
+    property alias profileBrowser: profileBrowser
+    property alias wallpaperBrowser: wallpaperBrowser
     property alias sidebar: sidebar
     property int currentTabIndex: 0
     property bool shouldHaveFocus: visible
@@ -114,51 +96,41 @@ FloatingWindow {
         }
     }
 
-    LazyLoader {
-        id: profileBrowserLoader
-        active: false
+    FileBrowserModal {
+        id: profileBrowser
 
-        FileBrowserModal {
-            id: profileBrowserItem
-
-            allowStacking: true
-            parentModal: settingsModal
-            browserTitle: I18n.tr("Select Profile Image", "profile image file browser title")
-            browserIcon: "person"
-            browserType: "profile"
-            showHiddenFiles: true
-            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-            onFileSelected: path => {
-                PortalService.setProfileImage(path);
-                close();
-            }
-            onDialogClosed: () => {
-                allowStacking = true;
-            }
+        allowStacking: true
+        parentModal: settingsModal
+        browserTitle: I18n.tr("Select Profile Image", "profile image file browser title")
+        browserIcon: "person"
+        browserType: "profile"
+        showHiddenFiles: true
+        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+        onFileSelected: path => {
+            PortalService.setProfileImage(path);
+            close();
+        }
+        onDialogClosed: () => {
+            allowStacking = true;
         }
     }
 
-    LazyLoader {
-        id: wallpaperBrowserLoader
-        active: false
+    FileBrowserModal {
+        id: wallpaperBrowser
 
-        FileBrowserModal {
-            id: wallpaperBrowserItem
-
-            allowStacking: true
-            parentModal: settingsModal
-            browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
-            browserIcon: "wallpaper"
-            browserType: "wallpaper"
-            showHiddenFiles: true
-            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-            onFileSelected: path => {
-                SessionData.setWallpaper(path);
-                close();
-            }
-            onDialogClosed: () => {
-                allowStacking = true;
-            }
+        allowStacking: true
+        parentModal: settingsModal
+        browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
+        browserIcon: "wallpaper"
+        browserType: "wallpaper"
+        showHiddenFiles: true
+        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+        onFileSelected: path => {
+            SessionData.setWallpaper(path);
+            close();
+        }
+        onDialogClosed: () => {
+            allowStacking = true;
         }
     }
 

quickshell/Modules/Settings/DesktopWidgetsTab.qml

@@ -22,38 +22,18 @@ Item {
     readonly property var allInstances: SettingsData.desktopWidgetInstances || []
     readonly property var allGroups: SettingsData.desktopWidgetGroups || []
 
-    function showWidgetBrowser() {
-        widgetBrowserLoader.active = true;
-        if (widgetBrowserLoader.item)
-            widgetBrowserLoader.item.show();
-    }
-
-    function showDesktopPluginBrowser() {
-        desktopPluginBrowserLoader.active = true;
-        if (desktopPluginBrowserLoader.item)
-            desktopPluginBrowserLoader.item.show();
-    }
-
-    LazyLoader {
-        id: widgetBrowserLoader
-        active: false
-
-        DesktopWidgetBrowser {
-            parentModal: root.parentModal
-            onWidgetAdded: widgetType => {
-                ToastService.showInfo(I18n.tr("Widget added"));
-            }
+    DesktopWidgetBrowser {
+        id: widgetBrowser
+        parentModal: root.parentModal
+        onWidgetAdded: widgetType => {
+            ToastService.showInfo(I18n.tr("Widget added"));
         }
     }
 
-    LazyLoader {
-        id: desktopPluginBrowserLoader
-        active: false
-
-        PluginBrowser {
-            parentModal: root.parentModal
-            typeFilter: "desktop-widget"
-        }
+    PluginBrowser {
+        id: desktopPluginBrowser
+        parentModal: root.parentModal
+        typeFilter: "desktop-widget"
     }
 
     DankFlickable {
@@ -94,13 +74,13 @@ Item {
                         DankButton {
                             text: I18n.tr("Add Widget")
                             iconName: "add"
-                            onClicked: root.showWidgetBrowser()
+                            onClicked: widgetBrowser.show()
                         }
 
                         DankButton {
                             text: I18n.tr("Browse Plugins")
                             iconName: "store"
-                            onClicked: root.showDesktopPluginBrowser()
+                            onClicked: desktopPluginBrowser.show()
                         }
                     }
                 }

quickshell/Modules/Settings/PluginsTab.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import Quickshell
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -210,7 +209,7 @@ FocusScope {
                             iconName: "store"
                             enabled: DMSService.dmsAvailable
                             onClicked: {
-                                showPluginBrowser();
+                                pluginBrowser.show();
                             }
                         }
 
@@ -383,11 +382,9 @@ FocusScope {
     Connections {
         target: DMSService
         function onPluginsListReceived(plugins) {
-            if (!pluginBrowserLoader.item)
-                return;
-            pluginBrowserLoader.item.isLoading = false;
-            pluginBrowserLoader.item.allPlugins = plugins;
-            pluginBrowserLoader.item.updateFilteredPlugins();
+            pluginBrowser.isLoading = false;
+            pluginBrowser.allPlugins = plugins;
+            pluginBrowser.updateFilteredPlugins();
         }
         function onInstalledPluginsReceived(plugins) {
             var pluginMap = {};
@@ -413,36 +410,22 @@ FocusScope {
     }
 
     Component.onCompleted: {
+        pluginBrowser.parentModal = pluginsTab.parentModal;
         if (DMSService.dmsAvailable && DMSService.apiVersion >= 8)
             DMSService.listInstalled();
         if (PopoutService.pendingPluginInstall)
-            Qt.callLater(showPluginBrowser);
+            Qt.callLater(() => pluginBrowser.show());
     }
 
     Connections {
         target: PopoutService
         function onPendingPluginInstallChanged() {
             if (PopoutService.pendingPluginInstall)
-                showPluginBrowser();
+                pluginBrowser.show();
         }
     }
 
-    LazyLoader {
-        id: pluginBrowserLoader
-        active: false
-
-        PluginBrowser {
-            id: pluginBrowserItem
-
-            Component.onCompleted: {
-                pluginBrowserItem.parentModal = pluginsTab.parentModal;
-            }
-        }
-    }
-
-    function showPluginBrowser() {
-        pluginBrowserLoader.active = true;
-        if (pluginBrowserLoader.item)
-            pluginBrowserLoader.item.show();
+    PluginBrowser {
+        id: pluginBrowser
     }
 }

quickshell/Modules/Settings/ThemeColorsTab.qml

@@ -131,7 +131,7 @@ Item {
         if (DMSService.dmsAvailable)
             DMSService.listInstalledThemes();
         if (PopoutService.pendingThemeInstall)
-            Qt.callLater(() => showThemeBrowser());
+            Qt.callLater(() => themeBrowser.show());
         templateCheckProcess.running = true;
         if (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl)
             checkCursorIncludeStatus();
@@ -169,7 +169,7 @@ Item {
         target: PopoutService
         function onPendingThemeInstallChanged() {
             if (PopoutService.pendingThemeInstall)
-                showThemeBrowser();
+                themeBrowser.show();
         }
     }
 
@@ -939,7 +939,7 @@ Item {
                             text: I18n.tr("Browse Themes", "browse themes button")
                             iconName: "store"
                             anchors.horizontalCenter: parent.horizontalCenter
-                            onClicked: showThemeBrowser()
+                            onClicked: themeBrowser.show()
                         }
                     }
                 }
@@ -2041,18 +2041,7 @@ Item {
         }
     }
 
-    LazyLoader {
-        id: themeBrowserLoader
-        active: false
-
-        ThemeBrowser {
-            id: themeBrowserItem
-        }
-    }
-
-    function showThemeBrowser() {
-        themeBrowserLoader.active = true;
-        if (themeBrowserLoader.item)
-            themeBrowserLoader.item.show();
+    ThemeBrowser {
+        id: themeBrowser
     }
 }

quickshell/Modules/Settings/WallpaperTab.qml

@@ -139,7 +139,7 @@ Item {
                                     MouseArea {
                                         anchors.fill: parent
                                         cursorShape: Qt.PointingHandCursor
-                                        onClicked: root.openMainWallpaperBrowser()
+                                        onClicked: mainWallpaperBrowser.open()
                                     }
                                 }
 
@@ -476,7 +476,7 @@ Item {
                                             MouseArea {
                                                 anchors.fill: parent
                                                 cursorShape: Qt.PointingHandCursor
-                                                onClicked: root.openLightWallpaperBrowser()
+                                                onClicked: lightWallpaperBrowser.open()
                                             }
                                         }
 
@@ -660,7 +660,7 @@ Item {
                                             MouseArea {
                                                 anchors.fill: parent
                                                 cursorShape: Qt.PointingHandCursor
-                                                onClicked: root.openDarkWallpaperBrowser()
+                                                onClicked: darkWallpaperBrowser.open()
                                             }
                                         }
 
@@ -1242,83 +1242,53 @@ Item {
         }
     }
 
-    function openMainWallpaperBrowser() {
-        mainWallpaperBrowserLoader.active = true;
-        if (mainWallpaperBrowserLoader.item)
-            mainWallpaperBrowserLoader.item.open();
-    }
-
-    function openLightWallpaperBrowser() {
-        lightWallpaperBrowserLoader.active = true;
-        if (lightWallpaperBrowserLoader.item)
-            lightWallpaperBrowserLoader.item.open();
-    }
-
-    function openDarkWallpaperBrowser() {
-        darkWallpaperBrowserLoader.active = true;
-        if (darkWallpaperBrowserLoader.item)
-            darkWallpaperBrowserLoader.item.open();
-    }
-
-    LazyLoader {
-        id: mainWallpaperBrowserLoader
-        active: false
-
-        FileBrowserModal {
-            parentModal: root.parentModal
-            browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
-            browserIcon: "wallpaper"
-            browserType: "wallpaper"
-            showHiddenFiles: true
-            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-            onFileSelected: path => {
-                if (SessionData.perMonitorWallpaper) {
-                    SessionData.setMonitorWallpaper(selectedMonitorName, path);
-                } else {
-                    SessionData.setWallpaper(path);
-                }
-                close();
+    FileBrowserModal {
+        id: mainWallpaperBrowser
+        parentModal: root.parentModal
+        browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
+        browserIcon: "wallpaper"
+        browserType: "wallpaper"
+        showHiddenFiles: true
+        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+        onFileSelected: path => {
+            if (SessionData.perMonitorWallpaper) {
+                SessionData.setMonitorWallpaper(selectedMonitorName, path);
+            } else {
+                SessionData.setWallpaper(path);
             }
+            close();
         }
     }
 
-    LazyLoader {
-        id: lightWallpaperBrowserLoader
-        active: false
-
-        FileBrowserModal {
-            parentModal: root.parentModal
-            browserTitle: I18n.tr("Select Wallpaper", "light mode wallpaper file browser title")
-            browserIcon: "light_mode"
-            browserType: "wallpaper"
-            showHiddenFiles: true
-            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-            onFileSelected: path => {
-                SessionData.wallpaperPathLight = path;
-                SessionData.syncWallpaperForCurrentMode();
-                SessionData.saveSettings();
-                close();
-            }
+    FileBrowserModal {
+        id: lightWallpaperBrowser
+        parentModal: root.parentModal
+        browserTitle: I18n.tr("Select Wallpaper", "light mode wallpaper file browser title")
+        browserIcon: "light_mode"
+        browserType: "wallpaper"
+        showHiddenFiles: true
+        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+        onFileSelected: path => {
+            SessionData.wallpaperPathLight = path;
+            SessionData.syncWallpaperForCurrentMode();
+            SessionData.saveSettings();
+            close();
         }
     }
 
-    LazyLoader {
-        id: darkWallpaperBrowserLoader
-        active: false
-
-        FileBrowserModal {
-            parentModal: root.parentModal
-            browserTitle: I18n.tr("Select Wallpaper", "dark mode wallpaper file browser title")
-            browserIcon: "dark_mode"
-            browserType: "wallpaper"
-            showHiddenFiles: true
-            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-            onFileSelected: path => {
-                SessionData.wallpaperPathDark = path;
-                SessionData.syncWallpaperForCurrentMode();
-                SessionData.saveSettings();
-                close();
-            }
+    FileBrowserModal {
+        id: darkWallpaperBrowser
+        parentModal: root.parentModal
+        browserTitle: I18n.tr("Select Wallpaper", "dark mode wallpaper file browser title")
+        browserIcon: "dark_mode"
+        browserType: "wallpaper"
+        showHiddenFiles: true
+        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+        onFileSelected: path => {
+            SessionData.wallpaperPathDark = path;
+            SessionData.syncWallpaperForCurrentMode();
+            SessionData.saveSettings();
+            close();
         }
     }
 }

quickshell/Modules/Settings/WidgetsTab.qml

@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import Quickshell
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -917,28 +916,14 @@ Item {
         });
     }
 
-    LazyLoader {
-        id: widgetSelectionPopupLoader
-        active: false
-
-        WidgetSelectionPopup {
-            id: widgetSelectionPopupItem
-            parentModal: widgetsTab.parentModal
-            onWidgetSelected: (widgetId, targetSection) => {
-                widgetsTab.addWidgetToSection(widgetId, targetSection);
-            }
+    WidgetSelectionPopup {
+        id: widgetSelectionPopup
+        parentModal: widgetsTab.parentModal
+        onWidgetSelected: (widgetId, targetSection) => {
+            widgetsTab.addWidgetToSection(widgetId, targetSection);
         }
     }
 
-    function showWidgetSelectionPopup(sectionId) {
-        widgetSelectionPopupLoader.active = true;
-        if (!widgetSelectionPopupLoader.item)
-            return;
-        widgetSelectionPopupLoader.item.targetSection = sectionId;
-        widgetSelectionPopupLoader.item.allWidgets = widgetsTab.getWidgetsForPopup();
-        widgetSelectionPopupLoader.item.show();
-    }
-
     DankFlickable {
         anchors.fill: parent
         clip: true
@@ -1128,7 +1113,9 @@ Item {
                             widgetsTab.handleItemOrderChanged(sectionId, newOrder);
                         }
                         onAddWidget: sectionId => {
-                            showWidgetSelectionPopup(sectionId);
+                            widgetSelectionPopup.targetSection = sectionId;
+                            widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
+                            widgetSelectionPopup.show();
                         }
                         onRemoveWidget: (sectionId, index) => {
                             widgetsTab.removeWidgetFromSection(sectionId, index);
@@ -1183,7 +1170,9 @@ Item {
                             widgetsTab.handleItemOrderChanged(sectionId, newOrder);
                         }
                         onAddWidget: sectionId => {
-                            showWidgetSelectionPopup(sectionId);
+                            widgetSelectionPopup.targetSection = sectionId;
+                            widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
+                            widgetSelectionPopup.show();
                         }
                         onRemoveWidget: (sectionId, index) => {
                             widgetsTab.removeWidgetFromSection(sectionId, index);
@@ -1238,7 +1227,9 @@ Item {
                             widgetsTab.handleItemOrderChanged(sectionId, newOrder);
                         }
                         onAddWidget: sectionId => {
-                            showWidgetSelectionPopup(sectionId);
+                            widgetSelectionPopup.targetSection = sectionId;
+                            widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
+                            widgetSelectionPopup.show();
                         }
                         onRemoveWidget: (sectionId, index) => {
                             widgetsTab.removeWidgetFromSection(sectionId, index);

quickshell/Services/ChangelogService.qml

@@ -11,7 +11,7 @@ Singleton {
     id: root
 
     readonly property string currentVersion: "1.2"
-    readonly property bool changelogEnabled: true
+    readonly property bool changelogEnabled: false
 
     readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell"
     readonly property string changelogMarkerPath: configDir + "/.changelog-" + currentVersion

quickshell/VERSION

@@ -1 +1 @@
-v1.2.1
+v1.4-unstable