diff --git a/README.md b/README.md index c5e5e47..b3e74de 100644 --- 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 -``` \ No newline at end of file +``` + +# Credits + +- Icons from [Icons8](https://icons8.com/icons/fluency) +- Converted to ICO using [Convertio](https://convertio.co/png-ico/) \ No newline at end of file diff --git a/build.ps1.bat b/build.ps1.bat index 8611183..0b8513a 100644 --- 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" \ No newline at end of file diff --git a/icons/ScreenSketch.ico b/icons/ScreenSketch.ico deleted file mode 100644 index 7d87eba..0000000 Binary files a/icons/ScreenSketch.ico and /dev/null differ diff --git a/icons/add-fingerprint.ico b/icons/add-fingerprint.ico new file mode 100644 index 0000000..157b460 Binary files /dev/null and b/icons/add-fingerprint.ico differ diff --git a/icons/bluetooth.ico b/icons/bluetooth.ico new file mode 100644 index 0000000..fd6d450 Binary files /dev/null and b/icons/bluetooth.ico differ diff --git a/icons/code-fork.ico b/icons/code-fork.ico new file mode 100644 index 0000000..07ce1fb Binary files /dev/null and b/icons/code-fork.ico differ diff --git a/icons/face-id.ico b/icons/face-id.ico new file mode 100644 index 0000000..5dfc238 Binary files /dev/null and b/icons/face-id.ico differ diff --git a/icons/shortcut.ico b/icons/shortcut.ico new file mode 100644 index 0000000..f505a82 Binary files /dev/null and b/icons/shortcut.ico differ diff --git a/icons/software-installer.ico b/icons/software-installer.ico new file mode 100644 index 0000000..04c53c7 Binary files /dev/null and b/icons/software-installer.ico differ diff --git a/icons/whiteboard.ico b/icons/whiteboard.ico new file mode 100644 index 0000000..236065c Binary files /dev/null and b/icons/whiteboard.ico differ diff --git a/icons/windows-snipping-tool.ico b/icons/windows-snipping-tool.ico new file mode 100644 index 0000000..4a8c8c5 Binary files /dev/null and b/icons/windows-snipping-tool.ico differ diff --git a/source/core.ahk b/source/core.ahk index 5212919..a3250d0 100644 --- a/source/core.ahk +++ b/source/core.ahk @@ -1,2 +1,2 @@ KEEWEB_BIN := "C:\Program Files\KeeWeb\KeeWeb.exe" -NO_ICON := "*" \ No newline at end of file +DEFAULT_ICON := "icons\shortcut.ico" \ No newline at end of file diff --git a/source/packageResources.ahk b/source/packageResources.ahk index fa05c1f..f83cc7d 100644 --- 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") \ No newline at end of file diff --git a/source/trayLayout.ahk b/source/trayLayout.ahk index 00bd36b..012d7e6 100644 --- 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 index 49ebfa7..59556e5 100644 --- 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