diff --git a/Makefile b/Makefile index 14aedf7c3a..f1efe0f2a7 100644 --- a/Makefile +++ b/Makefile @@ -607,8 +607,8 @@ $(STATUS_CLIENT_APPIMAGE): nim_status_client $(APPIMAGE_TOOL) nim-status.desktop # General Files cp bin/nim_status_client tmp/linux/dist/usr/bin cp nim-status.desktop tmp/linux/dist/. - cp status.svg tmp/linux/dist/status.svg - cp status.svg tmp/linux/dist/usr/. + cp status.png tmp/linux/dist/status.png + cp status.png tmp/linux/dist/usr/. cp -R resources.rcc tmp/linux/dist/usr/. cp -R $(FLEETS_FILE) tmp/linux/dist/usr/. mkdir -p tmp/linux/dist/usr/i18n @@ -739,7 +739,7 @@ $(STATUS_CLIENT_EXE): nim_status_client nim_windows_launcher $(NIM_WINDOWS_PREBU rm -rf pkg/*.exe tmp/windows/dist mkdir -p $(OUTPUT)/bin $(OUTPUT)/resources $(OUTPUT)/vendor $(OUTPUT)/resources/i18n $(OUTPUT)/bin/StatusQ cat windows-install.txt | unix2dos > $(OUTPUT)/INSTALL.txt - cp status.ico status.svg resources.rcc $(FLEETS_FILE) $(OUTPUT)/resources/ + cp status.ico status.png resources.rcc $(FLEETS_FILE) $(OUTPUT)/resources/ cp bin/i18n/* $(OUTPUT)/resources/i18n cp cacert.pem $(OUTPUT)/bin/cacert.pem cp bin/StatusQ/* $(OUTPUT)/bin/StatusQ diff --git a/app/qml/Status/Application/System/StatusTrayIcon.qml b/app/qml/Status/Application/System/StatusTrayIcon.qml index 4e7d55f4bd..70764b9f59 100644 --- a/app/qml/Status/Application/System/StatusTrayIcon.qml +++ b/app/qml/Status/Application/System/StatusTrayIcon.qml @@ -17,7 +17,7 @@ SystemTrayIcon { visible: true icon.source: { if (production) - return Qt.platform.os === "osx" ? Resources.svg("status-logo-icon") : Resources.png("status-logo") + return Qt.platform.os === "osx" ? Resources.png("status-logo-icon") : Resources.png("status-logo") else return Resources.svg("status-logo-dark") } diff --git a/ci/cpp/Jenkinsfile.linux b/ci/cpp/Jenkinsfile.linux index c9eb9b6abf..b2e66fca03 100644 --- a/ci/cpp/Jenkinsfile.linux +++ b/ci/cpp/Jenkinsfile.linux @@ -71,7 +71,7 @@ pipeline { stage('Package') { steps { - sh "linuxdeploy --plugin qt --executable=${env.WORKSPACE}/build/status-desktop --appdir ${env.WORKSPACE}/build/AppDir --desktop-file=${env.WORKSPACE}/status.desktop --icon-file=${env.WORKSPACE}/status.svg --custom-apprun=${env.WORKSPACE}/AppRun-cpp" + sh "linuxdeploy --plugin qt --executable=${env.WORKSPACE}/build/status-desktop --appdir ${env.WORKSPACE}/build/AppDir --desktop-file=${env.WORKSPACE}/status.desktop --icon-file=${env.WORKSPACE}/status.png --custom-apprun=${env.WORKSPACE}/AppRun-cpp" sh "cmake --install ${env.WORKSPACE}/build --prefix=${env.WORKSPACE}/build/install" sh "cp ${env.WORKSPACE}/build/install/lib/* ${env.WORKSPACE}/build/AppDir/usr/lib/" // TODO enable after deploying appimage plugin in the corresponding docker diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim index 7f2ba61c1c..2f17361096 100644 --- a/src/nim_status_client.nim +++ b/src/nim_status_client.nim @@ -36,14 +36,14 @@ proc determineStatusAppIconPath(): string = if main_constants.IS_MACOS: return "" # not used in macOS elif defined(windows): - return "/../resources/status.svg" + return "/../resources/status.png" else: - return "/../status.svg" + return "/../status.png" else: if main_constants.IS_MACOS: return "" # not used in macOS else: - return "/../status-dev.svg" + return "/../status-dev.png" proc prepareLogging() = # Outputs logs in the node tab diff --git a/status-dev.icns b/status-dev.icns index e6bfe1d66e..cf37b50468 100644 Binary files a/status-dev.icns and b/status-dev.icns differ diff --git a/status-dev.png b/status-dev.png new file mode 100644 index 0000000000..5bb01d3c93 Binary files /dev/null and b/status-dev.png differ diff --git a/status-dev.svg b/status-dev.svg deleted file mode 100644 index 5d19b08d55..0000000000 --- a/status-dev.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/status-macos-dev.svg b/status-macos-dev.svg index a12fc61573..47e84c9d3f 100644 --- a/status-macos-dev.svg +++ b/status-macos-dev.svg @@ -1,94 +1,47 @@ - - - + + + + + + + + - - + + + + + + + + + + - - - + - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + + + + + + diff --git a/status-macos.ico b/status-macos.ico index c17d5972f4..9a517eb976 100644 Binary files a/status-macos.ico and b/status-macos.ico differ diff --git a/status-macos.svg b/status-macos.svg index 3fe8fbfa1a..70e319e8a9 100644 --- a/status-macos.svg +++ b/status-macos.svg @@ -1,94 +1,47 @@ - - - + + + + + + + + - - + + + + + + + + + + - - - + - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + + + + + + diff --git a/status.icns b/status.icns index 9f8d0eb741..4f3960e7a9 100644 Binary files a/status.icns and b/status.icns differ diff --git a/status.ico b/status.ico index 1d08c730df..9a517eb976 100644 Binary files a/status.ico and b/status.ico differ diff --git a/status.png b/status.png new file mode 100644 index 0000000000..22b745fbcc Binary files /dev/null and b/status.png differ diff --git a/status.svg b/status.svg deleted file mode 100644 index a58455db05..0000000000 --- a/status.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ui/StatusQ/src/StatusQ/Platform/StatusMacNotification.qml b/ui/StatusQ/src/StatusQ/Platform/StatusMacNotification.qml index ce05dfa906..1dec46fb92 100644 --- a/ui/StatusQ/src/StatusQ/Platform/StatusMacNotification.qml +++ b/ui/StatusQ/src/StatusQ/Platform/StatusMacNotification.qml @@ -52,7 +52,7 @@ Rectangle { Component { id: statusIdenticon Image { - source: "../../assets/img/status-logo-icon.svg" + source: "../../assets/img/status-logo-icon.png" width: 40 height: 40 sourceSize.width: width * 2 @@ -60,11 +60,6 @@ Rectangle { cache: true fillMode: Image.PreserveAspectFit } - /* SVGImage { */ - /* source: Style.svg("status-logo-icon") */ - /* width: 40 */ - /* height: 40 */ - /* } */ } StatusBaseText { diff --git a/ui/StatusQ/src/assets.qrc b/ui/StatusQ/src/assets.qrc index 20a97a67a7..2d87c2fd52 100644 --- a/ui/StatusQ/src/assets.qrc +++ b/ui/StatusQ/src/assets.qrc @@ -127,7 +127,7 @@ assets/img/icons/windows_titlebar/close.svg assets/img/icons/windows_titlebar/maximize.svg assets/img/icons/windows_titlebar/minimise.svg - assets/img/icons/windows_titlebar/status.svg + assets/img/icons/windows_titlebar/status.png assets/img/icons/activity.svg assets/img/icons/add-circle.svg assets/img/icons/add-contact.svg @@ -292,7 +292,7 @@ assets/img/icons/speech.svg assets/img/icons/star-icon-outline.svg assets/img/icons/star-icon.svg - assets/img/icons/status-logo-icon.svg + assets/img/icons/status-logo-icon.png assets/img/icons/status-update.svg assets/img/icons/status.svg assets/img/icons/stickers.svg @@ -324,7 +324,7 @@ assets/img/icons/wallet.svg assets/img/icons/warning.svg assets/img/icons/youtube.svg - assets/img/status-logo-icon.svg + assets/img/status-logo-icon.png assets/twemoji/26x26/1f004.png assets/twemoji/26x26/1f0cf.png assets/twemoji/26x26/1f170.png diff --git a/ui/StatusQ/src/assets/img/icons/status-logo-icon.png b/ui/StatusQ/src/assets/img/icons/status-logo-icon.png new file mode 100644 index 0000000000..e8a59b00ac Binary files /dev/null and b/ui/StatusQ/src/assets/img/icons/status-logo-icon.png differ diff --git a/ui/StatusQ/src/assets/img/icons/status-logo-icon.svg b/ui/StatusQ/src/assets/img/icons/status-logo-icon.svg deleted file mode 100644 index 10142c21eb..0000000000 --- a/ui/StatusQ/src/assets/img/icons/status-logo-icon.svg +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui/StatusQ/src/assets/img/icons/windows_titlebar/status.png b/ui/StatusQ/src/assets/img/icons/windows_titlebar/status.png new file mode 100644 index 0000000000..cc1a500569 Binary files /dev/null and b/ui/StatusQ/src/assets/img/icons/windows_titlebar/status.png differ diff --git a/ui/StatusQ/src/assets/img/icons/windows_titlebar/status.svg b/ui/StatusQ/src/assets/img/icons/windows_titlebar/status.svg deleted file mode 100644 index 1268f2cf71..0000000000 --- a/ui/StatusQ/src/assets/img/icons/windows_titlebar/status.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/StatusQ/src/assets/img/status-logo-icon.png b/ui/StatusQ/src/assets/img/status-logo-icon.png new file mode 100644 index 0000000000..e8a59b00ac Binary files /dev/null and b/ui/StatusQ/src/assets/img/status-logo-icon.png differ diff --git a/ui/StatusQ/src/assets/img/status-logo-icon.svg b/ui/StatusQ/src/assets/img/status-logo-icon.svg deleted file mode 100644 index 10142c21eb..0000000000 --- a/ui/StatusQ/src/assets/img/status-logo-icon.svg +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui/app/AppLayouts/Profile/views/AboutView.qml b/ui/app/AppLayouts/Profile/views/AboutView.qml index cbb49e8866..074aa663fe 100644 --- a/ui/app/AppLayouts/Profile/views/AboutView.qml +++ b/ui/app/AppLayouts/Profile/views/AboutView.qml @@ -57,7 +57,7 @@ SettingsContentBase { id: statusIcon width: 80 height: 80 - icon: root.store.isProduction ? Style.svg("status-logo-circle") : Style.svg("status-logo-dev-circle") + icon: root.store.isProduction ? Style.png("status-logo-circle") : Style.png("status-logo-dev-circle") anchors.horizontalCenter: parent.horizontalCenter } diff --git a/ui/app/mainui/SplashScreen.qml b/ui/app/mainui/SplashScreen.qml index 380e14885f..f477f01126 100644 --- a/ui/app/mainui/SplashScreen.qml +++ b/ui/app/mainui/SplashScreen.qml @@ -14,7 +14,7 @@ Item { Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: 128 Layout.preferredHeight: 128 - source: Style.svg("status-logo-circle") + source: Style.png("status-logo") } StatusBaseText { id: loadingText diff --git a/ui/imports/assets/CMakeLists.txt b/ui/imports/assets/CMakeLists.txt index edb07d1111..d78aac42c1 100644 --- a/ui/imports/assets/CMakeLists.txt +++ b/ui/imports/assets/CMakeLists.txt @@ -18,7 +18,7 @@ qt6_add_qml_module(${PROJECT_NAME} STATIC # TODO: temporary until we make qt_target_qml_sources work RESOURCES - icons/status-logo-icon.svg + icons/status-logo-icon.png icons/status-logo-dark.svg icons/status-logo-circle.svg diff --git a/ui/imports/assets/icons/status-logo-circle.svg b/ui/imports/assets/icons/status-logo-circle.svg deleted file mode 100644 index a541382d19..0000000000 --- a/ui/imports/assets/icons/status-logo-circle.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui/imports/assets/icons/status-logo-dev-circle.svg b/ui/imports/assets/icons/status-logo-dev-circle.svg deleted file mode 100644 index 153899e3cd..0000000000 --- a/ui/imports/assets/icons/status-logo-dev-circle.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui/imports/assets/icons/status-logo-dev-round-rect.svg b/ui/imports/assets/icons/status-logo-dev-round-rect.svg deleted file mode 100644 index b125417fe1..0000000000 --- a/ui/imports/assets/icons/status-logo-dev-round-rect.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui/imports/assets/icons/status-logo-icon.svg b/ui/imports/assets/icons/status-logo-icon.svg deleted file mode 100644 index 10142c21eb..0000000000 --- a/ui/imports/assets/icons/status-logo-icon.svg +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui/imports/assets/icons/status-logo-round-rect.svg b/ui/imports/assets/icons/status-logo-round-rect.svg deleted file mode 100644 index 6fff4edb4a..0000000000 --- a/ui/imports/assets/icons/status-logo-round-rect.svg +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui/imports/assets/png/status-logo-circle.png b/ui/imports/assets/png/status-logo-circle.png new file mode 100644 index 0000000000..c03f201a15 Binary files /dev/null and b/ui/imports/assets/png/status-logo-circle.png differ diff --git a/ui/imports/assets/png/status-logo-dev-circle.png b/ui/imports/assets/png/status-logo-dev-circle.png new file mode 100644 index 0000000000..5bb01d3c93 Binary files /dev/null and b/ui/imports/assets/png/status-logo-dev-circle.png differ diff --git a/ui/imports/assets/png/status-logo-dev-round-rect.png b/ui/imports/assets/png/status-logo-dev-round-rect.png new file mode 100644 index 0000000000..f2bfb7be7c Binary files /dev/null and b/ui/imports/assets/png/status-logo-dev-round-rect.png differ diff --git a/ui/imports/assets/png/status-logo-icon.png b/ui/imports/assets/png/status-logo-icon.png new file mode 100644 index 0000000000..e8a59b00ac Binary files /dev/null and b/ui/imports/assets/png/status-logo-icon.png differ diff --git a/ui/imports/assets/png/status-logo-round-rect.png b/ui/imports/assets/png/status-logo-round-rect.png new file mode 100644 index 0000000000..e8a59b00ac Binary files /dev/null and b/ui/imports/assets/png/status-logo-round-rect.png differ diff --git a/ui/imports/assets/png/status-logo.png b/ui/imports/assets/png/status-logo.png index a68fd41610..0a93f898d6 100644 Binary files a/ui/imports/assets/png/status-logo.png and b/ui/imports/assets/png/status-logo.png differ diff --git a/ui/imports/assets/png/status.png b/ui/imports/assets/png/status.png index b16f29061d..e8a59b00ac 100644 Binary files a/ui/imports/assets/png/status.png and b/ui/imports/assets/png/status.png differ diff --git a/ui/imports/shared/status/StatusNotification.qml b/ui/imports/shared/status/StatusNotification.qml index 493f027b8a..3c149b686e 100644 --- a/ui/imports/shared/status/StatusNotification.qml +++ b/ui/imports/shared/status/StatusNotification.qml @@ -52,7 +52,7 @@ Rectangle { Component { id: statusIdenticon SVGImage { - source: Style.svg("status-logo-icon") + source: Style.png("status-logo-icon") width: 40 height: 40 } diff --git a/ui/main.qml b/ui/main.qml index 32837003d7..0ca8794b73 100644 --- a/ui/main.qml +++ b/ui/main.qml @@ -315,14 +315,14 @@ StatusWindow { icon.source: { if (production) { if (Qt.platform.os == Constants.mac) - return "imports/assets/icons/status-logo-round-rect.svg" + return "imports/assets/png/status-logo-round-rect.png" else - return "imports/assets/icons/status-logo-circle.svg" + return "imports/assets/png/status-logo-circle.png" } else { if (Qt.platform.os == Constants.mac) - return "imports/assets/icons/status-logo-dev-round-rect.svg" + return "imports/assets/png/status-logo-dev-round-rect.png" else - return "imports/assets/icons/status-logo-dev-circle.svg" + return "imports/assets/png/status-logo-dev-circle.png" } }