change appid + fix icon location

cosmic-clipboard-manager.spec

@@ -53,8 +53,8 @@ just rootdir=%{buildroot} prefix=%{_prefix} install
 %license LICENSE.dependencies
 %license cargo-vendor.txt
 %{_bindir}/cosmic-clipboard-manager
-%{_datadir}/applications/com.wiiznokes.CosmicClipboardManager.desktop
-%{_datadir}/com.wiiznokes.CosmicClipboardManager/icons/assignment24.svg
+%{_datadir}/applications/io.github.wiiznokes.cosmic-clipboard-manager.desktop
+%{_datadir}/share/icons/hicolor/scalable/apps/io.github.wiiznokes.cosmic-clipboard-manager.svg
 
 %changelog
 %autochangelog

justfile

@@ -1,5 +1,5 @@
 name := 'cosmic-clipboard-manager'
-export APPID := 'com.wiiznokes.CosmicClipboardManager'
+export APPID := 'io.github.wiiznokes.cosmic-clipboard-manager'
 
 rootdir := ''
 prefix := '/usr'
@@ -11,24 +11,18 @@ export INSTALL_DIR := base-dir / 'share'
 bin-src := 'target' / 'release' / name
 bin-dst := base-dir / 'bin' / name
 
-desktop := APPID + '.desktop'
-desktop-src := 'res' / desktop
-desktop-dst := clean(rootdir / prefix) / 'share' / 'applications' / desktop
+desktop-src := 'res' / 'desktop_entry.desktop'
+desktop-dst := clean(rootdir / prefix) / 'share' / 'applications' / APPID + '.desktop'
 
-metainfo := APPID + '.metainfo.xml'
-metainfo-src := 'res' / metainfo
-metainfo-dst := clean(rootdir / prefix) / 'share' / 'metainfo' / metainfo
+metainfo-src := 'res' / 'metainfo.xml'
+metainfo-dst := clean(rootdir / prefix) / 'share' / 'metainfo' / APPID + '.metainfo.xml'
 
 res-src := 'res'
-res-dst := clean(rootdir / prefix) / 'share' / APPID
+res-dst := clean(rootdir / prefix) / 'share'
 
 # Default recipe which runs `just build-release`
 default: build-release
 
-clean:
-  cargo clean
-
-
 
 # Compiles with debug profile
 build-debug *args:
@@ -41,13 +35,18 @@ build-release *args:
 install:
   install -Dm0755 {{bin-src}} {{bin-dst}}
   install -Dm0644 {{desktop-src}} {{desktop-dst}}
-  install -Dm0644 {{res-src}}/icons/assignment24.svg {{res-dst}}/icons/assignment24.svg
+  install -Dm0644 {{res-src}}/app_icon.svg {{res-dst}}/icons/hicolor/scalable/apps/{{APPID}}.svg
 
 # Uninstalls installed files
 uninstall:
   rm {{bin-dst}}
   rm {{desktop-dst}}
-  rm -r {{res-dst}}
+  rm {{res-dst}}/icons/hicolor/scalable/apps/{{APPID}}.svg
+
+
+clean:
+  cargo clean
+
 
 pull: fmt prettier fix
 

res/desktop_entry.desktop

@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Clipboard Manager
+Comment=A wayland clipboard manager
+Keywords=Cosmic;Iced;history;
+
+# translators: do not translate this part
+Icon=io.github.wiiznokes.cosmic-clipboard-manager
+Categories=Cosmic;Iced;
+Type=Application
+Exec=cosmic-clipboard-manager
+Terminal=false
+StartupNotify=true
+NoDisplay=true
+X-CosmicApplet=true
+X-CosmicHoverPopup=true

src/app.rs

@@ -29,9 +29,9 @@ use std::sync::atomic::{self, AtomicBool};
 // todo: converge this 4 strings
 pub static QUALIFIER: &str = "com";
 pub static ORG: &str = "wiiznokes";
-pub static APP: &str = "CosmicClipboardManager";
+pub static APP: &str = "cosmic-clipboard-manager";
 
-pub const APP_ID: &str = "com.wiiznokes.CosmicClipboardManager";
+pub const APP_ID: &str = "com.wiiznokes.cosmic-clipboard-manager";
 
 pub struct Window {
     core: Core,
@@ -304,7 +304,7 @@ impl cosmic::Application for Window {
         let icon = self
             .core
             .applet
-            .icon_button("/usr/share/com.wiiznokes.CosmicClipboardManager/icons/assignment24.svg")
+            .icon_button("io.github.wiiznokes.cosmic-clipboard-manager")
             .on_press(AppMessage::TogglePopup);
 
         MouseArea::new(icon)