diff --git a/Makefile b/Makefile index f8c64cbe..b166680f 100644 --- a/Makefile +++ b/Makefile @@ -74,10 +74,11 @@ install-icon: @echo "Icon installed" install-desktop: - @echo "Installing desktop entry..." + @echo "Installing desktop entries..." @install -D -m 644 $(ASSETS_DIR)/dms-open.desktop $(APPLICATIONS_DIR)/dms-open.desktop + @install -D -m 644 $(ASSETS_DIR)/com.danklinux.dms.desktop $(APPLICATIONS_DIR)/com.danklinux.dms.desktop @update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true - @echo "Desktop entry installed" + @echo "Desktop entries installed" install: install-bin install-shell install-completions install-systemd install-icon install-desktop @echo "" @@ -116,10 +117,11 @@ uninstall-icon: @echo "Icon removed" uninstall-desktop: - @echo "Removing desktop entry..." + @echo "Removing desktop entries..." @rm -f $(APPLICATIONS_DIR)/dms-open.desktop + @rm -f $(APPLICATIONS_DIR)/com.danklinux.dms.desktop @update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true - @echo "Desktop entry removed" + @echo "Desktop entries removed" uninstall: uninstall-systemd uninstall-desktop uninstall-icon uninstall-completions uninstall-shell uninstall-bin @echo "" diff --git a/assets/com.danklinux.dms.desktop b/assets/com.danklinux.dms.desktop new file mode 100644 index 00000000..8e8e270e --- /dev/null +++ b/assets/com.danklinux.dms.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Name=DankMaterialShell +GenericName=Desktop Shell +Comment=Material 3 inspired shell for Wayland compositors +Exec=dms run +Icon=danklogo +Terminal=false +NoDisplay=true +StartupNotify=false +Categories=Utility; diff --git a/distro/debian/dms-git/debian/rules b/distro/debian/dms-git/debian/rules index 7163ee0e..8b5a16fc 100755 --- a/distro/debian/dms-git/debian/rules +++ b/distro/debian/dms-git/debian/rules @@ -73,6 +73,7 @@ override_dh_auto_install: cp -r quickshell/* debian/dms-git/usr/share/quickshell/dms/; \ install -Dm644 assets/systemd/dms.service debian/dms-git/usr/lib/systemd/user/dms.service; \ install -Dm644 assets/dms-open.desktop debian/dms-git/usr/share/applications/dms-open.desktop; \ + install -Dm644 assets/com.danklinux.dms.desktop debian/dms-git/usr/share/applications/com.danklinux.dms.desktop; \ install -Dm644 assets/danklogo.svg debian/dms-git/usr/share/icons/hicolor/scalable/apps/danklogo.svg; \ else \ echo "ERROR: quickshell directory not found!" && \ diff --git a/distro/debian/dms/debian/rules b/distro/debian/dms/debian/rules index cebd1197..b1a1b5cb 100755 --- a/distro/debian/dms/debian/rules +++ b/distro/debian/dms/debian/rules @@ -66,6 +66,7 @@ override_dh_auto_install: cp -r DankMaterialShell-$(UPSTREAM_VERSION)/quickshell/* debian/dms/usr/share/quickshell/dms/; \ install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/systemd/dms.service debian/dms/usr/lib/systemd/user/dms.service; \ install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/dms-open.desktop debian/dms/usr/share/applications/dms-open.desktop; \ + install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/com.danklinux.dms.desktop debian/dms/usr/share/applications/com.danklinux.dms.desktop; \ install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/danklogo.svg debian/dms/usr/share/icons/hicolor/scalable/apps/danklogo.svg; \ else \ echo "ERROR: DankMaterialShell-$(UPSTREAM_VERSION) directory not found!" && \ diff --git a/distro/fedora/dms-git.spec b/distro/fedora/dms-git.spec index 9ad24551..a5d9d43e 100644 --- a/distro/fedora/dms-git.spec +++ b/distro/fedora/dms-git.spec @@ -121,6 +121,7 @@ core/bin/${DMS_BINARY} completion fish > %{buildroot}%{_datadir}/fish/vendor_com install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop +install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg # Install shell files to shared data location @@ -144,6 +145,7 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service %{_datadir}/applications/dms-open.desktop +%{_datadir}/applications/com.danklinux.dms.desktop %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg %files -n dms-cli diff --git a/distro/fedora/dms.spec b/distro/fedora/dms.spec index 08d54db3..20d547f8 100644 --- a/distro/fedora/dms.spec +++ b/distro/fedora/dms.spec @@ -89,6 +89,7 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service install -Dm644 %{_builddir}/dms-qml/assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop +install -Dm644 %{_builddir}/dms-qml/assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop install -Dm644 %{_builddir}/dms-qml/assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg install -dm755 %{buildroot}%{_datadir}/quickshell/dms @@ -111,6 +112,7 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service %{_datadir}/applications/dms-open.desktop +%{_datadir}/applications/com.danklinux.dms.desktop %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg %files -n dms-cli diff --git a/distro/opensuse/dms-git.spec b/distro/opensuse/dms-git.spec index 53340cb9..afadf39a 100644 --- a/distro/opensuse/dms-git.spec +++ b/distro/opensuse/dms-git.spec @@ -116,6 +116,7 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop +install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg install -dm755 %{buildroot}%{_datadir}/quickshell/dms @@ -151,6 +152,7 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service %{_datadir}/applications/dms-open.desktop +%{_datadir}/applications/com.danklinux.dms.desktop %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps diff --git a/distro/opensuse/dms.spec b/distro/opensuse/dms.spec index 1be30720..e4dfd088 100644 --- a/distro/opensuse/dms.spec +++ b/distro/opensuse/dms.spec @@ -65,6 +65,7 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop +install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg install -dm755 %{buildroot}%{_datadir}/quickshell/dms @@ -98,6 +99,7 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service %{_datadir}/applications/dms-open.desktop +%{_datadir}/applications/com.danklinux.dms.desktop %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps diff --git a/distro/ubuntu/dms-git/debian/rules b/distro/ubuntu/dms-git/debian/rules index 23246450..b2713e5e 100755 --- a/distro/ubuntu/dms-git/debian/rules +++ b/distro/ubuntu/dms-git/debian/rules @@ -73,6 +73,8 @@ override_dh_auto_install: # Install desktop file and icon install -Dm644 dms-git-repo/assets/dms-open.desktop \ debian/dms-git/usr/share/applications/dms-open.desktop + install -Dm644 dms-git-repo/assets/com.danklinux.dms.desktop \ + debian/dms-git/usr/share/applications/com.danklinux.dms.desktop install -Dm644 dms-git-repo/assets/danklogo.svg \ debian/dms-git/usr/share/icons/hicolor/scalable/apps/danklogo.svg diff --git a/distro/ubuntu/dms/debian/rules b/distro/ubuntu/dms/debian/rules index 1b68be55..6558e230 100755 --- a/distro/ubuntu/dms/debian/rules +++ b/distro/ubuntu/dms/debian/rules @@ -54,6 +54,8 @@ override_dh_auto_install: # Install desktop file and icon install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dms-open.desktop \ debian/dms/usr/share/applications/dms-open.desktop + install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/com.danklinux.dms.desktop \ + debian/dms/usr/share/applications/com.danklinux.dms.desktop install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/danklogo.svg \ debian/dms/usr/share/icons/hicolor/scalable/apps/danklogo.svg diff --git a/distro/void/srcpkgs/dms/template b/distro/void/srcpkgs/dms/template index 131ac2e1..08bd8b27 100644 --- a/distro/void/srcpkgs/dms/template +++ b/distro/void/srcpkgs/dms/template @@ -32,6 +32,7 @@ post_install() { # Desktop entry + icon vinstall "${wrksrc}/assets/dms-open.desktop" 644 usr/share/applications + vinstall "${wrksrc}/assets/com.danklinux.dms.desktop" 644 usr/share/applications vinstall "${wrksrc}/assets/danklogo.svg" 644 usr/share/icons/hicolor/scalable/apps # Shell completions (generated by the built binary; skip when cross-building) diff --git a/flake.nix b/flake.nix index 92fbde66..c4207e3e 100644 --- a/flake.nix +++ b/flake.nix @@ -131,6 +131,8 @@ # Install desktop file and icon install -D ${rootSrc}/assets/dms-open.desktop \ $out/share/applications/dms-open.desktop + install -D ${rootSrc}/assets/com.danklinux.dms.desktop \ + $out/share/applications/com.danklinux.dms.desktop install -D ${rootSrc}/core/assets/danklogo.svg \ $out/share/hicolor/scalable/apps/danklogo.svg diff --git a/quickshell/Common/Paths.qml b/quickshell/Common/Paths.qml index 2d6e23fe..b38f6192 100644 --- a/quickshell/Common/Paths.qml +++ b/quickshell/Common/Paths.qml @@ -113,8 +113,7 @@ Singleton { } function getAppIcon(appId: string, desktopEntry: var): string { - // ! TODO - after QS 0.3, we can install our icon properly - if (appId === "org.quickshell" || appId === "com.danklinux.dms") { + if (appId === "org.quickshell") { return Qt.resolvedUrl("../assets/danklogo.svg"); }