diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 44e01b4b..0dba983f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -109,7 +109,7 @@ jobs: export QMAKE=/home/runner/work/${{env.EXECUTABLE}}/Qt/${{env.QT_VERSION_LINUX}}/gcc_64/bin/qmake export PATH=/home/runner/work/${{env.EXECUTABLE}}/Qt/${{env.QT_VERSION_LINUX}}/gcc_64/libexec:$PATH - ./linuxdeploy-x86_64.AppImage --appdir AppDir -e ${{env.UNIXNAME}} -i ../../app/deploy/linux/${{env.UNIXNAME}}.png -d ../../app/deploy/linux/${{env.UNIXNAME}}.desktop --plugin qt --output appimage + ./linuxdeploy-x86_64.AppImage --appdir AppDir -e ${{env.UNIXNAME}} -i ../../app/deploy/linux/${{env.UNIXNAME}}.svg -d ../../app/deploy/linux/${{env.UNIXNAME}}.desktop --plugin qt --output appimage rm linuxdeploy-x86_64.AppImage rm linuxdeploy-plugin-qt-x86_64.AppImage diff --git a/app/deploy/linux/serial-studio.png b/app/deploy/linux/serial-studio.png deleted file mode 100644 index 8eea1a77..00000000 Binary files a/app/deploy/linux/serial-studio.png and /dev/null differ diff --git a/app/deploy/linux/serial-studio.svg b/app/deploy/linux/serial-studio.svg new file mode 100644 index 00000000..4642a780 --- /dev/null +++ b/app/deploy/linux/serial-studio.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/deploy/windows/banner.bmp b/app/deploy/windows/banner.bmp index 8a4eadab..1f67b750 100644 Binary files a/app/deploy/windows/banner.bmp and b/app/deploy/windows/banner.bmp differ diff --git a/app/deploy/windows/dialog.bmp b/app/deploy/windows/dialog.bmp index 30cdb340..f64b77df 100644 Binary files a/app/deploy/windows/dialog.bmp and b/app/deploy/windows/dialog.bmp differ diff --git a/app/deploy/windows/icon.ico b/app/deploy/windows/icon.ico index f8023949..30ed3c6a 100644 Binary files a/app/deploy/windows/icon.ico and b/app/deploy/windows/icon.ico differ diff --git a/app/rcc/images/appimage_icon.png b/app/rcc/images/appimage_icon.png new file mode 100644 index 00000000..77c2f537 Binary files /dev/null and b/app/rcc/images/appimage_icon.png differ diff --git a/app/rcc/rcc.qrc b/app/rcc/rcc.qrc index 1ab37664..330c6e7a 100644 --- a/app/rcc/rcc.qrc +++ b/app/rcc/rcc.qrc @@ -225,6 +225,7 @@ images/donate-qr.svg images/drag-and-drop.svg images/hammer.svg + images/appimage_icon.png images/icon-small@1x.png images/icon-small@2x.png images/icon@1x.png diff --git a/app/src/main.cpp b/app/src/main.cpp index d09e4968..3751edee 100644 --- a/app/src/main.cpp +++ b/app/src/main.cpp @@ -87,7 +87,8 @@ int main(int argc, char **argv) // Linux specific initialization code #ifdef Q_OS_LINUX - setupAppImageIcon(APP_EXECUTABLE, QStringLiteral(":/rcc/images/icon@2x.png")); + setupAppImageIcon(APP_EXECUTABLE, + QStringLiteral(":/rcc/images/appimage_icon.png")); #endif // Avoid 200% scaling on 150% scaling... diff --git a/doc/icon.svg b/doc/icon.svg index 1f9503b2..4642a780 100644 --- a/doc/icon.svg +++ b/doc/icon.svg @@ -28,17 +28,9 @@ - - - - - - - - - - + + @@ -50,4 +42,4 @@ - + \ No newline at end of file