Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-03 20:32:07 -04:00
Code Packages Releases Activity

qs: set app ID to com.danklinux.dms

Browse Source
This commit is contained in:
bbedward
2026-03-20 10:03:33 -04:00
parent 1caf8942b7
commit 1a9449da1b
11 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.MD
View File

@@ -1,5 +1,13 @@
This file is more of a quick reference so I know what to account for before next releases. This file is more of a quick reference so I know what to account for before next releases.
# 1.5.0
- Overhauled shadows
- App ID changed to com.danklinux.dms - breaking for window rules
- Greeter stuff
- Terminal mux
- Locale overrides
- new neovim theming
# 1.4.0 # 1.4.0
- Overhauled system monitor, graphs, styling - Overhauled system monitor, graphs, styling

1
core/internal/config/embedded/niri.kdl
View File

@@ -252,6 +252,7 @@ window-rule {
// Open dms windows as floating by default // Open dms windows as floating by default
window-rule { window-rule {
match app-id=r#"org.quickshell$"# match app-id=r#"org.quickshell$"#
match app-id=r#"com.danklinux.dms$"#
open-floating true open-floating true
} }
debug { debug {

11
quickshell/Common/Paths.qml
View File

@@ -72,7 +72,8 @@ Singleton {
} }
function resolveIconPath(iconName: string): string { function resolveIconPath(iconName: string): string {
if (!iconName) return ""; if (!iconName)
return "";
const moddedId = moddedAppId(iconName); const moddedId = moddedAppId(iconName);
if (moddedId !== iconName) { if (moddedId !== iconName) {
if (moddedId.startsWith("~") || moddedId.startsWith("/")) if (moddedId.startsWith("~") || moddedId.startsWith("/"))
@@ -85,7 +86,8 @@ Singleton {
} }
function resolveIconUrl(iconName: string): string { function resolveIconUrl(iconName: string): string {
if (!iconName) return ""; if (!iconName)
return "";
const moddedId = moddedAppId(iconName); const moddedId = moddedAppId(iconName);
if (moddedId !== iconName) { if (moddedId !== iconName) {
if (moddedId.startsWith("~") || moddedId.startsWith("/")) if (moddedId.startsWith("~") || moddedId.startsWith("/"))
@@ -98,7 +100,8 @@ Singleton {
} }
function getAppIcon(appId: string, desktopEntry: var): string { function getAppIcon(appId: string, desktopEntry: var): string {
if (appId === "org.quickshell") { // ! TODO - after QS 0.3, we can install our icon properly
if (appId === "org.quickshell" || appId === "com.danklinux.dms") {
return Qt.resolvedUrl("../assets/danklogo.svg"); return Qt.resolvedUrl("../assets/danklogo.svg");
} }
@@ -118,7 +121,7 @@ Singleton {
} }
function getAppName(appId: string, desktopEntry: var): string { function getAppName(appId: string, desktopEntry: var): string {
if (appId === "org.quickshell") { if (appId === "org.quickshell" || appId === "com.danklinux.dms") {
return "dms"; return "dms";
} }

4
quickshell/Modules/DankBar/Widgets/AppsDock.qml
View File

@@ -248,7 +248,7 @@ BasePill {
let appId = Paths.moddedAppId(rawAppId); let appId = Paths.moddedAppId(rawAppId);
let coreAppData = null; let coreAppData = null;
if (rawAppId === "org.quickshell") { if (rawAppId === "org.quickshell" || rawAppId === "com.danklinux.dms") {
coreAppData = getCoreAppDataByTitle(toplevel.title); coreAppData = getCoreAppDataByTitle(toplevel.title);
if (coreAppData) { if (coreAppData) {
appId = coreAppData.builtInPluginId; appId = coreAppData.builtInPluginId;
@@ -697,7 +697,7 @@ BasePill {
mipmap: true mipmap: true
asynchronous: true asynchronous: true
visible: status === Image.Ready && !coreIcon.visible visible: status === Image.Ready && !coreIcon.visible
layer.enabled: appItem.appId === "org.quickshell" layer.enabled: appItem.appId === "org.quickshell" || appItem.appId === "com.danklinux.dms"
layer.smooth: true layer.smooth: true
layer.mipmap: true layer.mipmap: true
layer.effect: MultiEffect { layer.effect: MultiEffect {

2
quickshell/Modules/DankBar/Widgets/AppsDockContextMenu.qml
View File

@@ -16,7 +16,7 @@ PanelWindow {
property int margin: 10 property int margin: 10
property bool hidePin: false property bool hidePin: false
property var desktopEntry: null property var desktopEntry: null
property bool isDmsWindow: appData?.appId === "org.quickshell" property bool isDmsWindow: appData?.appId === "org.quickshell" || appData?.appId === "com.danklinux.dms"
property bool isVertical: false property bool isVertical: false
property string edge: "top" property string edge: "top"

2
quickshell/Modules/DankBar/Widgets/FocusedApp.qml
View File

@@ -145,7 +145,7 @@ BasePill {
smooth: true smooth: true
mipmap: true mipmap: true
asynchronous: true asynchronous: true
layer.enabled: activeWindow && activeWindow.appId === "org.quickshell" layer.enabled: activeWindow && (activeWindow.appId === "org.quickshell" || activeWindow.appId === "com.danklinux.dms")
layer.smooth: true layer.smooth: true
layer.mipmap: true layer.mipmap: true
layer.effect: MultiEffect { layer.effect: MultiEffect {

2
quickshell/Modules/DankBar/Widgets/RunningApps.qml
View File

@@ -296,7 +296,7 @@ BasePill {
mipmap: true mipmap: true
asynchronous: true asynchronous: true
visible: status === Image.Ready visible: status === Image.Ready
layer.enabled: appId === "org.quickshell" layer.enabled: appId === "org.quickshell" || appId === "com.danklinux.dms"
layer.smooth: true layer.smooth: true
layer.mipmap: true layer.mipmap: true
layer.effect: MultiEffect { layer.effect: MultiEffect {

10
quickshell/Modules/Dock/DockAppButton.qml
View File

@@ -344,7 +344,7 @@ Item {
groupedToplevel.activate(); groupedToplevel.activate();
} }
} else if (contextMenu) { } else if (contextMenu) {
const shouldHidePin = appData.appId === "org.quickshell"; const shouldHidePin = appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms";
contextMenu.showForButton(root, appData, root.height + 25, shouldHidePin, cachedDesktopEntry, parentDockScreen, dockApps); contextMenu.showForButton(root, appData, root.height + 25, shouldHidePin, cachedDesktopEntry, parentDockScreen, dockApps);
} }
break; break;
@@ -391,7 +391,7 @@ Item {
break; break;
case "grouped": case "grouped":
if (contextMenu) { if (contextMenu) {
const shouldHidePin = appData.appId === "org.quickshell"; const shouldHidePin = appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms";
contextMenu.showForButton(root, appData, root.height, shouldHidePin, cachedDesktopEntry, parentDockScreen, dockApps); contextMenu.showForButton(root, appData, root.height, shouldHidePin, cachedDesktopEntry, parentDockScreen, dockApps);
} }
break; break;
@@ -414,7 +414,7 @@ Item {
} else if (mouse.button === Qt.RightButton) { } else if (mouse.button === Qt.RightButton) {
if (!contextMenu) if (!contextMenu)
return; return;
const shouldHidePin = appData.appId === "org.quickshell"; const shouldHidePin = appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms";
contextMenu.showForButton(root, appData, root.height, shouldHidePin, cachedDesktopEntry, parentDockScreen, dockApps); contextMenu.showForButton(root, appData, root.height, shouldHidePin, cachedDesktopEntry, parentDockScreen, dockApps);
} }
} }
@@ -471,7 +471,7 @@ Item {
id: iconImg id: iconImg
anchors.centerIn: parent anchors.centerIn: parent
implicitSize: appData && appData.appId === "org.quickshell" ? actualIconSize * 0.85 : actualIconSize implicitSize: appData && (appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms") ? actualIconSize * 0.85 : actualIconSize
source: { source: {
if (!appData || appData.appId === "__SEPARATOR__") { if (!appData || appData.appId === "__SEPARATOR__") {
return ""; return "";
@@ -485,7 +485,7 @@ Item {
smooth: true smooth: true
asynchronous: true asynchronous: true
visible: status === Image.Ready && !coreIcon.visible visible: status === Image.Ready && !coreIcon.visible
layer.enabled: appData && appData.appId === "org.quickshell" layer.enabled: appData && (appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms")
layer.smooth: true layer.smooth: true
layer.mipmap: true layer.mipmap: true
layer.effect: MultiEffect { layer.effect: MultiEffect {

4
quickshell/Modules/Dock/DockApps.qml
View File

@@ -161,7 +161,7 @@ Item {
let appId = Paths.moddedAppId(rawAppId); let appId = Paths.moddedAppId(rawAppId);
let coreAppData = null; let coreAppData = null;
if (rawAppId === "org.quickshell") { if (rawAppId === "org.quickshell" || rawAppId === "com.danklinux.dms") {
coreAppData = getCoreAppDataByTitle(toplevel.title); coreAppData = getCoreAppDataByTitle(toplevel.title);
if (coreAppData) if (coreAppData)
appId = coreAppData.builtInPluginId; appId = coreAppData.builtInPluginId;
@@ -241,7 +241,7 @@ Item {
let coreAppData = null; let coreAppData = null;
let isCoreApp = false; let isCoreApp = false;
if (rawAppId === "org.quickshell") { if (rawAppId === "org.quickshell" || rawAppId === "com.danklinux.dms") {
coreAppData = getCoreAppDataByTitle(toplevel.title); coreAppData = getCoreAppDataByTitle(toplevel.title);
if (coreAppData) if (coreAppData)
isCoreApp = true; isCoreApp = true;

2
quickshell/Modules/Dock/DockContextMenu.qml
View File

@@ -17,7 +17,7 @@ PanelWindow {
property int margin: 10 property int margin: 10
property bool hidePin: false property bool hidePin: false
property var desktopEntry: null property var desktopEntry: null
property bool isDmsWindow: appData?.appId === "org.quickshell" property bool isDmsWindow: appData?.appId === "org.quickshell" || appData?.appId === "com.danklinux.dms"
property var dockApps: null property var dockApps: null
function showForButton(button, data, dockHeight, hidePinOption, entry, dockScreen, parentDockApps) { function showForButton(button, data, dockHeight, hidePinOption, entry, dockScreen, parentDockApps) {

1
quickshell/shell.qml
View File

@@ -5,6 +5,7 @@
//@ pragma Env QT_WAYLAND_DISABLE_WINDOWDECORATION=1 //@ pragma Env QT_WAYLAND_DISABLE_WINDOWDECORATION=1
//@ pragma Env QT_QUICK_CONTROLS_STYLE=Material //@ pragma Env QT_QUICK_CONTROLS_STYLE=Material
//@ pragma UseQApplication //@ pragma UseQApplication
//@ pragma AppId com.danklinux.dms
import QtQuick import QtQuick
import Quickshell import Quickshell