Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-25 05:52:50 -05:00
Code Packages Releases Activity

config refacotr: separate settings.json, session.json, appusage.json

Browse Source
This commit is contained in:
bbedward
2025-08-06 11:47:24 -04:00
parent defc50eec6
commit 18aa557ef1
45 changed files with 639 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/Dock/Dock.qml
View File

@@ -17,8 +17,8 @@ PanelWindow {
property var modelData
property var contextMenu
property var windowsMenu
property bool autoHide: Prefs.dockAutoHide
property real backgroundTransparency: Prefs.dockTransparency
property bool autoHide: SettingsData.dockAutoHide
property real backgroundTransparency: SettingsData.dockTransparency
property bool contextMenuOpen: (contextMenu && contextMenu.visible && contextMenu.screen === modelData) || (windowsMenu && windowsMenu.visible && windowsMenu.screen === modelData)
@@ -32,14 +32,14 @@ PanelWindow {
property bool reveal: (!autoHide || dockMouseArea.containsMouse || dockApps.requestDockShow || contextMenuOpen) && !windowIsFullscreen
Connections {
target: Prefs
target: SettingsData
function onDockTransparencyChanged() {
dock.backgroundTransparency = Prefs.dockTransparency;
dock.backgroundTransparency = SettingsData.dockTransparency;
}
}
screen: modelData
visible: Prefs.showDock
visible: SettingsData.showDock
color: "transparent"
anchors {

6
Modules/Dock/DockAppButton.qml
View File

@@ -170,7 +170,7 @@ Item {
if (appData && appData.appId) {
var desktopEntry = DesktopEntries.byId(appData.appId)
if (desktopEntry) {
Prefs.addAppUsage({
AppUsageHistoryData.addAppUsage({
id: appData.appId,
name: desktopEntry.name || appData.appId,
icon: desktopEntry.icon || "",
@@ -190,7 +190,7 @@ Item {
if (appData && appData.appId) {
var desktopEntry = DesktopEntries.byId(appData.appId)
if (desktopEntry) {
Prefs.addAppUsage({
AppUsageHistoryData.addAppUsage({
id: appData.appId,
name: desktopEntry.name || appData.appId,
icon: desktopEntry.icon || "",
@@ -225,7 +225,7 @@ Item {
if (!appData || !appData.appId) return ""
var desktopEntry = DesktopEntries.byId(appData.appId)
if (desktopEntry && desktopEntry.icon) {
var iconPath = Quickshell.iconPath(desktopEntry.icon, Prefs.iconTheme === "System Default" ? "" : Prefs.iconTheme)
var iconPath = Quickshell.iconPath(desktopEntry.icon, SettingsData.iconTheme === "System Default" ? "" : SettingsData.iconTheme)
return iconPath
}
return ""

10
Modules/Dock/DockApps.qml
View File

@@ -19,13 +19,13 @@ Item {
function movePinnedApp(fromIndex, toIndex) {
if (fromIndex === toIndex) return
var currentPinned = [...Prefs.pinnedApps]
var currentPinned = [...SessionData.pinnedApps]
if (fromIndex < 0 || fromIndex >= currentPinned.length || toIndex < 0 || toIndex >= currentPinned.length) return
var movedApp = currentPinned.splice(fromIndex, 1)[0]
currentPinned.splice(toIndex, 0, movedApp)
Prefs.setPinnedApps(currentPinned)
SessionData.setPinnedApps(currentPinned)
}
Row {
@@ -46,7 +46,7 @@ Item {
var items = []
var runningApps = NiriService.getRunningAppIds()
var pinnedApps = [...Prefs.pinnedApps]
var pinnedApps = [...SessionData.pinnedApps]
var addedApps = new Set()
pinnedApps.forEach(appId => {
@@ -63,7 +63,7 @@ Item {
}
})
root.pinnedAppCount = pinnedApps.length
var appUsageRanking = Prefs.appUsageRanking || {}
var appUsageRanking = AppUsageHistoryData.appUsageRanking || {}
var allUnpinnedApps = []
for (var appId in appUsageRanking) {
@@ -151,7 +151,7 @@ Item {
}
Connections {
target: Prefs
target: SessionData
function onPinnedAppsChanged() { dockModel.updateModel() }
}
}

4
Modules/Dock/DockContextMenu.qml
View File

@@ -160,9 +160,9 @@ PanelWindow {
onClicked: {
if (!root.appData) return
if (root.appData.isPinned) {
Prefs.removePinnedApp(root.appData.appId)
SessionData.removePinnedApp(root.appData.appId)
} else {
Prefs.addPinnedApp(root.appData.appId)
SessionData.addPinnedApp(root.appData.appId)
}
root.close()
}