use the AvNav icons for windows

wellenvogel · May 17, 2024 · 92227d6 · 92227d6
1 parent e132865
commit 92227d6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/windows/service/Chart60.ico b/windows/service/Chart60.ico
diff --git a/windows/service/Chart60Inact.ico b/windows/service/Chart60Inact.ico
diff --git a/windows/service/avnavservice.ps1 b/windows/service/avnavservice.ps1
@@ -14,8 +14,8 @@ $serverError="$logDir\service-err.log"
 $defaultUpdateUrl="https://wellenvogel.de/software/avnav/downloads/release/latest/avnav-latest.zip"
 $regKey="HKCU:\Software\Wellenvogel\AvNav"
 
-$icon = Join-Path $PSScriptRoot 'Chart60.ico'
-$iconInact = Join-Path $PSScriptRoot 'Chart60Inact.ico'
+$icon = Join-Path $PSScriptRoot 'sailboat256x96.ico'
+$iconInact = Join-Path $PSScriptRoot 'sailboat256x96Inact.ico'
 
 #import dialogs
 . "$PSScriptRoot\Dialogs.ps1"

diff --git a/windows/service/install.nsi b/windows/service/install.nsi
@@ -6,11 +6,13 @@
 !endif
 !define PATH_OUT "../build"
 !system 'mkdir ${PATH_OUT}'
+!define ICON sailboat256x96.ico
+!define ICONINACT sailboat256x96Inact.ico
 OutFile "${PATH_OUT}/avnav-service-${VERSION}.exe"
 !macro InstFiles cmd prfx
     ${cmd} ${prfx}avnavservice.cmd
-    ${cmd} ${prfx}Chart60.ico  
-    ${cmd} ${prfx}Chart60Inact.ico  
+    ${cmd} ${prfx}${ICON}
+    ${cmd} ${prfx}${ICONINACT}
     ${cmd} ${prfx}Dialogs.ps1  
     ${cmd} ${prfx}downloadAndInstall.ps1  
     ${cmd} ${prfx}avnavservice.ps1
@@ -37,12 +39,12 @@ WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "avnavservice"
 WriteRegStr HKCU "${UNINST_KEY}" "UninstallString" \
     "$\"$INSTDIR\uninstaller.exe$\" /CurrentUser"
 WriteRegStr HKCU "${UNINST_KEY}" "DisplayIcon" \
-    "$INSTDIR\Chart60Inact.ico" 
+    "$INSTDIR\${ICON}" 
 WriteRegStr HKCU "${UNINST_KEY}" "QuietUninstallString" \
     "$\"$INSTDIR\uninstaller.exe$\" /CurrentUser /S"
-CreateShortCut "$SMPROGRAMS\avnavservice.lnk" $INSTDIR\avnavservice.cmd "" $INSTDIR\Chart60.ico 0
-CreateShortCut "$SMSTARTUP\avnavservice.lnk" $INSTDIR\avnavservice.cmd "" $INSTDIR\Chart60.ico 0
-CreateShortCut "$SMPROGRAMS\avnavuninstall.lnk" $INSTDIR\uninstaller.exe "" $INSTDIR\Chart60Inact.ico 0
+CreateShortCut "$SMPROGRAMS\avnavservice.lnk" $INSTDIR\avnavservice.cmd "" $INSTDIR\${ICON} 0
+CreateShortCut "$SMSTARTUP\avnavservice.lnk" $INSTDIR\avnavservice.cmd "" $INSTDIR\${ICON} 0
+CreateShortCut "$SMPROGRAMS\avnavuninstall.lnk" $INSTDIR\uninstaller.exe "" $INSTDIR\${ICONINACT} 0
 
 #-------
 # default section end

diff --git a/windows/service/sailboat256x96.ico b/windows/service/sailboat256x96.ico
diff --git a/windows/service/sailboat256x96Inact.ico b/windows/service/sailboat256x96Inact.ico