diff --git a/Makefile b/Makefile index 16295cbf5f..49d4f7a93e 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,7 @@ BUILD_SYSTEM_DIR := vendor/nimbus-build-system run-linux \ run-macos \ run-windows \ + set-status-macos-dev-icon \ status-go \ update @@ -442,9 +443,20 @@ clean: | clean-common run: rcc $(RUN_TARGET) +STATUS_MACOS_DEV_ICON ?= tmp/macos/status-dev-icon.rsrc NIM_STATUS_CLIENT_DEV ?= t STATUS_PORT ?= 30306 +$(STATUS_MACOS_DEV_ICON): + mkdir -p tmp/macos + cp status-dev-icon.icns tmp/macos/ + sips -i tmp/macos/status-dev-icon.icns + DeRez -only icns tmp/macos/status-dev-icon.icns > tmp/macos/status-dev-icon.rsrc + +set-status-macos-dev-icon: + Rez -append tmp/macos/status-dev-icon.rsrc -o bin/nim_status_client + SetFile -a C bin/nim_status_client + run-linux: echo -e "\e[92mRunning:\e[39m bin/nim_status_client" NIM_STATUS_CLIENT_DEV="$(NIM_STATUS_CLIENT_DEV)" \ @@ -452,7 +464,7 @@ run-linux: STATUS_PORT="$(STATUS_PORT)" \ ./bin/nim_status_client -run-macos: +run-macos: $(STATUS_MACOS_DEV_ICON) set-status-macos-dev-icon echo -e "\e[92mRunning:\e[39m bin/nim_status_client" NIM_STATUS_CLIENT_DEV="$(NIM_STATUS_CLIENT_DEV)" \ STATUS_PORT="$(STATUS_PORT)" \ diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim index 55142be940..0060167f11 100644 --- a/src/nim_status_client.nim +++ b/src/nim_status_client.nim @@ -44,17 +44,15 @@ proc mainProc() = let statusAppIcon = if defined(macosx): - if getEnv("NIM_STATUS_CLIENT_DEV").string == "": - "/../Resources/status-icon.icns" - else: - "/../status-dev-icon.icns" + "" # not used in macOS elif defined(windows) and getEnv("NIM_STATUS_CLIENT_DEV").string == "": "/../resources/status.svg" elif getEnv("NIM_STATUS_CLIENT_DEV").string != "": "/../status-dev.svg" else: "/../status.svg" - app.icon(app.applicationDirPath & statusAppIcon) + if not defined(macosx): + app.icon(app.applicationDirPath & statusAppIcon) var i18nPath = "" if (getEnv("NIM_STATUS_CLIENT_DEV").string != ""): diff --git a/status-dev-icon.icns b/status-dev-icon.icns index 716b21f7de..e6bfe1d66e 100644 Binary files a/status-dev-icon.icns and b/status-dev-icon.icns differ diff --git a/status-icon.icns b/status-icon.icns index b19c7d0cb2..9f8d0eb741 100644 Binary files a/status-icon.icns and b/status-icon.icns differ diff --git a/status-macos-dev.svg b/status-macos-dev.svg new file mode 100644 index 0000000000..a12fc61573 --- /dev/null +++ b/status-macos-dev.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/status-macos.svg b/status-macos.svg new file mode 100644 index 0000000000..3fe8fbfa1a --- /dev/null +++ b/status-macos.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +