diff --git a/appimage/AppImageBuilder-aarch64.yml b/appimage/AppImageBuilder-aarch64.yml index e4cfb723e..b372f4eb9 100644 --- a/appimage/AppImageBuilder-aarch64.yml +++ b/appimage/AppImageBuilder-aarch64.yml @@ -8,6 +8,7 @@ script: - mv ./usr ./AppDir/usr # 32x32 icon - for i in {32,64,128}; do mkdir -p ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/; cp ../res/$i\x$i.png ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/rustdesk.png; done + - mkdir -p ./AppDir/usr/share/icons/hicolor/scalable/apps/; cp ../res/scalable.svg ./AppDir/usr/share/icons/hicolor/scalable/apps/rustdesk.svg # desktop file # - sed -i "s/Icon=\/usr\/share\/rustdesk\/files\/rustdesk.png/Icon=rustdesk/g" ./AppDir/usr/share/applications/rustdesk.desktop - rm -rf ./AppDir/usr/share/applications diff --git a/appimage/AppImageBuilder-x86_64.yml b/appimage/AppImageBuilder-x86_64.yml index 1a443dc34..9a4054b62 100644 --- a/appimage/AppImageBuilder-x86_64.yml +++ b/appimage/AppImageBuilder-x86_64.yml @@ -8,6 +8,7 @@ script: - mv ./usr ./AppDir/usr # 32x32 icon - for i in {32,64,128}; do mkdir -p ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/; cp ../res/$i\x$i.png ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/rustdesk.png; done + - mkdir -p ./AppDir/usr/share/icons/hicolor/scalable/apps/; cp ../res/scalable.svg ./AppDir/usr/share/icons/hicolor/scalable/apps/rustdesk.svg # desktop file # - sed -i "s/Icon=\/usr\/share\/rustdesk\/files\/rustdesk.png/Icon=rustdesk/g" ./AppDir/usr/share/applications/rustdesk.desktop - rm -rf ./AppDir/usr/share/applications diff --git a/build.py b/build.py index bc72c1e6c..98d8aa30f 100755 --- a/build.py +++ b/build.py @@ -320,6 +320,8 @@ def build_flutter_deb(version, features): 'cp ../res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( 'cp ../res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') + system2( + 'cp ../res/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg') system2( 'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( @@ -360,6 +362,8 @@ def build_deb_from_folder(version, binary_folder): 'cp ../res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( 'cp ../res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') + system2( + 'cp ../res/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg') system2( 'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( @@ -585,6 +589,8 @@ def main(): 'cp res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( 'cp res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') + system2( + 'cp res/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg') system2( 'cp res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( diff --git a/flatpak/rustdesk.json b/flatpak/rustdesk.json index ff7701d27..4a8334fc9 100644 --- a/flatpak/rustdesk.json +++ b/flatpak/rustdesk.json @@ -4,7 +4,7 @@ "runtime-version": "21.08", "sdk": "org.freedesktop.Sdk", "command": "rustdesk", - "icon": "share/rustdesk/files/rustdesk.png", + "icon": "share/icons/hicolor/scalable/apps/rustdesk.svg", "modules": [ "shared-modules/libappindicator/libappindicator-gtk3-12.10.json", "xdotool.json", @@ -19,6 +19,7 @@ "mv /app/share/applications/rustdesk.desktop /app/share/applications/com.rustdesk.RustDesk.desktop", "sed -i '/^Icon=/ c\\Icon=com.rustdesk.RustDesk' /app/share/applications/com.rustdesk.RustDesk.desktop", "sed -i '/^Icon=/ c\\Icon=com.rustdesk.RustDesk' /app/share/applications/rustdesk-link.desktop", + "mv /app/share/icons/hicolor/scalable/apps/rustdesk.svg /app/share/icons/hicolor/scalable/apps/com.rustdesk.RustDesk.svg", "for size in 16 24 32 48 64 128 256 512; do\n rsvg-convert -w $size -h $size -f png -o $size.png logo.svg\n install -Dm644 $size.png /app/share/icons/hicolor/${size}x${size}/apps/com.rustdesk.RustDesk.png\n done" ], "cleanup": ["/include", "/lib/pkgconfig", "/share/gtk-doc"], diff --git a/res/PKGBUILD b/res/PKGBUILD index 6a9ca4094..4d3911b3b 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -31,4 +31,5 @@ package() { install -Dm 644 $HBB/res/rustdesk.desktop -t "${pkgdir}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk-link.desktop -t "${pkgdir}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/128x128@2x.png "${pkgdir}/usr/share/icons/hicolor/256x256/apps/rustdesk.png" + install -Dm 644 $HBB/res/scalable.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg" } diff --git a/res/rpm-flutter-suse.spec b/res/rpm-flutter-suse.spec index 1beb7234f..08080424c 100644 --- a/res/rpm-flutter-suse.spec +++ b/res/rpm-flutter-suse.spec @@ -25,11 +25,13 @@ install -Dm 644 $HBB/res/rustdesk.service -t "%{buildroot}/usr/share/rustdesk/fi install -Dm 644 $HBB/res/rustdesk.desktop -t "%{buildroot}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk-link.desktop -t "%{buildroot}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/128x128@2x.png "%{buildroot}/usr/share/icons/hicolor/256x256/apps/rustdesk.png" +install -Dm 644 $HBB/res/scalable.svg "%{buildroot}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg" %files /usr/lib/rustdesk/* /usr/share/rustdesk/files/rustdesk.service /usr/share/icons/hicolor/256x256/apps/rustdesk.png +/usr/share/icons/hicolor/scalable/apps/rustdesk.svg /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop diff --git a/res/rpm-flutter.spec b/res/rpm-flutter.spec index 778e161c7..5b4899bff 100644 --- a/res/rpm-flutter.spec +++ b/res/rpm-flutter.spec @@ -25,11 +25,13 @@ install -Dm 644 $HBB/res/rustdesk.service -t "%{buildroot}/usr/share/rustdesk/fi install -Dm 644 $HBB/res/rustdesk.desktop -t "%{buildroot}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk-link.desktop -t "%{buildroot}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/128x128@2x.png "%{buildroot}/usr/share/icons/hicolor/256x256/apps/rustdesk.png" +install -Dm 644 $HBB/res/scalable.svg "%{buildroot}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg" %files /usr/lib/rustdesk/* /usr/share/rustdesk/files/rustdesk.service /usr/share/icons/hicolor/256x256/apps/rustdesk.png +/usr/share/icons/hicolor/scalable/apps/rustdesk.svg /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop diff --git a/res/rpm-suse.spec b/res/rpm-suse.spec index ea1b0f231..6d190da32 100644 --- a/res/rpm-suse.spec +++ b/res/rpm-suse.spec @@ -24,6 +24,7 @@ install -m 755 $HBB/target/release/rustdesk %{buildroot}/usr/bin/rustdesk install $HBB/libsciter-gtk.so %{buildroot}/usr/lib/rustdesk/libsciter-gtk.so install $HBB/res/rustdesk.service %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/128x128@2x.png %{buildroot}/usr/share/icons/hicolor/256x256/apps/rustdesk.png +install $HBB/res/scalable.svg %{buildroot}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg install $HBB/res/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ @@ -32,6 +33,7 @@ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ /usr/lib/rustdesk/libsciter-gtk.so /usr/share/rustdesk/files/rustdesk.service /usr/share/icons/hicolor/256x256/apps/rustdesk.png +/usr/share/icons/hicolor/scalable/apps/rustdesk.svg /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop diff --git a/res/rpm.spec b/res/rpm.spec index e9f9849da..ff28a621b 100644 --- a/res/rpm.spec +++ b/res/rpm.spec @@ -24,6 +24,7 @@ install -m 755 $HBB/target/release/rustdesk %{buildroot}/usr/bin/rustdesk install $HBB/libsciter-gtk.so %{buildroot}/usr/lib/rustdesk/libsciter-gtk.so install $HBB/res/rustdesk.service %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/128x128@2x.png %{buildroot}/usr/share/icons/hicolor/256x256/apps/rustdesk.png +install $HBB/res/scalable.svg %{buildroot}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg install $HBB/res/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ @@ -32,6 +33,7 @@ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ /usr/lib/rustdesk/libsciter-gtk.so /usr/share/rustdesk/files/rustdesk.service /usr/share/icons/hicolor/256x256/apps/rustdesk.png +/usr/share/icons/hicolor/scalable/apps/rustdesk.svg /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop /usr/share/rustdesk/files/__pycache__/* diff --git a/res/scalable.svg b/res/scalable.svg new file mode 100644 index 000000000..50cab67a3 --- /dev/null +++ b/res/scalable.svg @@ -0,0 +1,88 @@ + +