add custom icons

Yetenol · Oct 10, 2022 · 66d16d8 · 66d16d8
1 parent a52b827
commit 66d16d8
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ Table of Contents
   - [Application shortcuts](#application-shortcuts)
     - [Tray Shortcuts](#tray-shortcuts)
 - [Build instructions](#build-instructions)
+- [Credits](#credits)
 
 # Features
 ## Application shortcuts
@@ -44,4 +45,9 @@ Table of Contents
 $compiler = "$env:ProgramFiles\AutoHotkey 2\Compiler\Ahk2Exe.exe"
 $ahk2 = "$env:ProgramFiles\AutoHotkey 2\AutoHotkey64.exe"
 & $compiler /bin $ahk2 /in source/main.ahk /out bin\shortcutFox.exe
-```
+```
+
+# Credits
+
+- Icons from [Icons8](https://icons8.com/icons/fluency)
+- Converted to ICO using [Convertio](https://convertio.co/png-ico/)
diff --git a/build.ps1.bat b/build.ps1.bat
@@ -5,5 +5,5 @@ $compiler = "$env:ProgramFiles\AutoHotkey 2\Compiler\Ahk2Exe.exe"
 $ahk2 = "$env:ProgramFiles\AutoHotkey 2\AutoHotkey64.exe"
 
 # Get-Process shortcutFox -ErrorAction SilentlyContinue | Stop-Process
-& $compiler /bin $ahk2 /in source/main.ahk /out bin\shortcutFox.exe
+& $compiler /bin $ahk2 /in source/main.ahk /out bin\shortcutFox.exe /icon icons\shortcut.ico
 # Start-Process -FilePath "bin\shortcutFox.exe"
diff --git a/icons/ScreenSketch.ico b/icons/ScreenSketch.ico
diff --git a/icons/add-fingerprint.ico b/icons/add-fingerprint.ico
diff --git a/icons/bluetooth.ico b/icons/bluetooth.ico
diff --git a/icons/code-fork.ico b/icons/code-fork.ico
diff --git a/icons/face-id.ico b/icons/face-id.ico
diff --git a/icons/shortcut.ico b/icons/shortcut.ico
diff --git a/icons/software-installer.ico b/icons/software-installer.ico
diff --git a/icons/whiteboard.ico b/icons/whiteboard.ico
diff --git a/icons/windows-snipping-tool.ico b/icons/windows-snipping-tool.ico
diff --git a/source/core.ahk b/source/core.ahk
@@ -1,2 +1,2 @@
 KEEWEB_BIN := "C:\Program Files\KeeWeb\KeeWeb.exe"
-NO_ICON := "*"
+DEFAULT_ICON := "icons\shortcut.ico"
diff --git a/source/packageResources.ahk b/source/packageResources.ahk
@@ -7,7 +7,15 @@ loop parse resourceFolders, "," {
 }
 
 ; Install resource files
-FileInstall("..\icons\ScreenSketch.ico", "icons\ScreenSketch.ico")
+FileInstall("..\icons\add-fingerprint.ico", "icons\add-fingerprint.ico")
+FileInstall("..\icons\bluetooth.ico", "icons\bluetooth.ico")
+FileInstall("..\icons\code-fork.ico", "icons\code-fork.ico")
+FileInstall("..\icons\face-id.ico", "icons\face-id.ico")
+FileInstall("..\icons\shortcut.ico", "icons\shortcut.ico")
+FileInstall("..\icons\software-installer.ico", "icons\software-installer.ico")
+FileInstall("..\icons\whiteboard.ico", "icons\whiteboard.ico")
+FileInstall("..\icons\windows-snipping-tool.ico", "icons\windows-snipping-tool.ico")
+
 FileInstall("..\scripts\gitUpdateAll.ps1.bat", "scripts\gitUpdateAll.ps1.bat")
 FileInstall("..\scripts\wingetUpdateAll.ps1.bat", "scripts\wingetUpdateAll.ps1.bat")
 FileInstall("..\scripts\toggleRunAtStartup.ps1.bat", "scripts\toggleRunAtStartup.ps1.bat")
diff --git a/source/trayLayout.ahk b/source/trayLayout.ahk
@@ -67,21 +67,21 @@ TRAY_LAYOUT := {
                                 id: "SETUP_HELLO_FACE",
                                 text: "Setup Hello Face",
                                 run: "explorer ms-settings:signinoptions-launchfaceenrollment",
-                                icon: [A_WinDir "\System32\ddores.dll", 87],
+                                icon: "icons\face-id.ico",
                             },
                                 {
                                     id: "SETUP_HELLO_FINGERPRINT",
                                     text: "Setup Hello Fingerprint",
                                     run: "explorer ms-settings:signinoptions-launchfingerprintenrollment",
-                                    icon: [A_WinDir "\System32\sensorscpl.dll", 11],
+                                    icon: "icons\add-fingerprint.ico",
                                 },
                             ]
                     },
                         {
                             id: "BLUETOOTH",
                             text: "Bluetooth audio and file transfer",
-                            icon: [A_WinDir "\System32\netshell.dll", 104],
                             maxDisplay: 1,
+                            icon: "icons\bluetooth.ico",
                             content:
                                 [{
                                     id: "BLUETOOTH_FILE_TRANSFER",
@@ -98,13 +98,13 @@ TRAY_LAYOUT := {
                                         id: "WINGET_UPDATE",
                                         text: "Update all applications",
                                         run: "scripts\wingetUpdateAll.ps1.bat",
-                                        icon: [A_WinDir "\System32\shell32.dll", 239],
+                                        icon: "icons\software-installer.ico",
                                     },
                                         {
                                             id: "GIT_UPDATE",
                                             text: "Update all repositories",
                                             run: "scripts\gitUpdateAll.ps1.bat",
-                                            icon: [A_WinDir "\System32\shell32.dll", 239],
+                                            icon: "icons\code-fork.ico",
                                         },
                                     ]
                             },
@@ -116,13 +116,13 @@ TRAY_LAYOUT := {
                                             id: "CALIBRATE_DIGITIZER",
                                             text: "Calibrate pen",
                                             run: "tabcal",
-                                            icon: [A_WinDir "\System32\ddores.dll", 27],
+                                            icon: "icons\whiteboard.ico",
                                         },
                                             {
                                                 id: "TAKE_SCREENSHOT",
                                                 text: "Take Screenshot",
                                                 send: "#+s",
-                                                icon: "icons\ScreenSketch.ico",
+                                                icon: "icons\windows-snipping-tool.ico",
                                             },
                                         ]
                                 },

diff --git a/source/trayMenu.ahk b/source/trayMenu.ahk
@@ -1,7 +1,9 @@
-#Include trayLayout.ahk
 #Include core.ahk
+#Include trayLayout.ahk
 #Include io.ahk
 
+TraySetIcon(DEFAULT_ICON)
+
 class MenuManager {
     static ITEM_TYPES := {    ; all items need an ID and TEXT
         ACTION: 0,    ; Do DELAY interval, RUN file, SEND keystrokes, assumed by default
@@ -267,10 +269,10 @@ _readDefaultAction() {
 }
 
 _applyDefaultAction() {
-    global NO_ICON
+    global DEFAULT_ICON
     action := this._readDefaultAction()
     if not action {
-        TraySetIcon(NO_ICON)
+        TraySetIcon(DEFAULT_ICON)
         return
     }
     icon := action.icon