Skip to content

Commit

Permalink
chore: update icons to use the new multicoloured Status logo
Browse files Browse the repository at this point in the history
Fixes #14531
  • Loading branch information
jrainville committed May 7, 2024
1 parent 1cbc944 commit 7f0d7fd
Show file tree
Hide file tree
Showing 39 changed files with 90 additions and 777 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,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
Expand Down Expand Up @@ -740,7 +740,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
Expand Down
2 changes: 1 addition & 1 deletion app/qml/Status/Application/System/StatusTrayIcon.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion ci/cpp/Jenkinsfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/nim_status_client.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified status-dev.icns
Binary file not shown.
Binary file added status-dev.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions status-dev.svg

This file was deleted.

117 changes: 35 additions & 82 deletions status-macos-dev.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified status-macos.ico
Binary file not shown.

0 comments on commit 7f0d7fd

Please sign in to comment.