use blue/yellow/orange OpenHantek icons also for MacOS

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
OpenHantek · Aug 29, 2023 · 385bdaa · 385bdaa
1 parent 6e00f96
commit 385bdaa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
@@ -112,7 +112,7 @@ jobs:
           macdeployqt OpenHantek.app -always-overwrite -verbose=1
           python ../../utils/macdeployqtfix/macdeployqtfix.py \
             --quiet OpenHantek.app/Contents/MacOS/OpenHantek $(brew --prefix qt5)
-          create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/openhantek.icns \
+          create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/OpenHantek.icns \
             --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 \
             --skip-jenkins --hide-extension "OpenHantek.app" --app-drop-link 600 185 \
             --eula ../../LICENSE OpenHantek.dmg OpenHantek.app

diff --git a/docs/build.md b/docs/build.md
@@ -166,7 +166,7 @@ After you've installed the requirements run the following commands inside the to
     python ../../utils/macdeployqtfix/macdeployqtfix.py OpenHantek.app/Contents/MacOS/OpenHantek $(brew --prefix qt5)
     #
     # finally create OpenHantek.dmg from OpenHantek.app
-    create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/openhantek.icns --window-pos 200 120 \
+    create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/OpenHantek.icns --window-pos 200 120 \
       --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 --skip-jenkins \
       --hide-extension "OpenHantek.app" --app-drop-link 600 185 --eula ../../LICENSE OpenHantek.dmg OpenHantek.app
     #

diff --git a/openhantek/CMakeLists.txt b/openhantek/CMakeLists.txt
@@ -55,8 +55,8 @@ if( APPLE AND BUILD_MACOSX_BUNDLE )
     set( MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION} )
     string(TIMESTAMP THISYEAR "%Y")
     set( MACOSX_BUNDLE_COPYRIGHT "(C) 2012-${THISYEAR} OpenHantek community" )
-    set( MACOSX_BUNDLE_ICON_FILE openhantek.icns )
-    set( ICONS ${CMAKE_CURRENT_SOURCE_DIR}/res/images/openhantek.icns )
+    set( MACOSX_BUNDLE_ICON_FILE OpenHantek.icns )
+    set( ICONS ${CMAKE_CURRENT_SOURCE_DIR}/res/images/OpenHantek.icns )
     set_source_files_properties( ${ICONS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" )
 endif()
 

diff --git a/openhantek/res/images/OpenHantek.icns b/openhantek/res/images/OpenHantek.icns