merge start/pause, gui removal and installer fixes into main

Author: adambonneruk

.screenshot/context-menu.png

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Adam Bonner
+Copyright (c) 2023 Adam Bonner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

.screenshot/in-the-tray.png

@@ -12,16 +12,16 @@ prevent the system from entering sleep or turning off the display
 ## Background and Information
 This simple windows app keeps a machine/workstation from going idle. Oriignally this application pressed the Scroll Lock button twice every second to keep windows "awake". The recent version now uses a native windows call "```ES_DISPLAY_REQUIRED```" to keep the display on instead.
 
-I built this tool to solve a problem, learn about ```tkinter```, ```pyautogui``` and python ```threading```. Displaying a basic GUI while a second thread takes care of the automation. You can still see that code in as recent as the [v0.4.0](https://github.com/adambonneruk/awake/tree/v0.4.0) tag.
+I built this tool to solve a problem, learn about ```tkinter```, ```pyautogui``` and python ```threading```. Displaying a basic GUI while a second thread takes care of the automation. Whilst the latest version is much more efficient/compact, you can still see that code in as recent as the [v0.4.0](https://github.com/adambonneruk/awake/tree/v0.4.0) tag.
 
 ## Usage
-The App starts in the system tray (with the [Z] icon).
+The App starts in the system tray (with the _Z_ icon).
 
-![Running in the Windows 10 System Tray](.screenshot/in-the-tray.png)
+![Running in the system tray](.screenshot/in-the-tray.png)
 
-A right-click context menu allowing you to "```Show```" the main GUI  (below) or "```Quit```" and close the application. The GUI close cross again minimises to the system tray.
+A right-click context menu allows you to "```Start/Pause```" the program (pausing will allow windows to sleep again, this is represented by ⏸ icon) or "```Quit```" and close the application.
 
-![Running awake.pyw on Windows 10](.screenshot/stay-awake-dont-sleep.png)
+![Start/Pause and Quit Menu while Paused](.screenshot/context-menu.png)
 
 ## Development
 
@@ -39,14 +39,18 @@ py -m pip install -r .\requirements.txt --trusted-host pypi.python.org --trusted
 
 ### Compile
 ```ps
-# run manually
+# compile manually
 pyinstaller "src/awake.spec" --noconfirm
 
-# run automatically
+package with nsis manually
+makensis installer/awake.nsi
+
+# run both automatically
 py "tools/make.py"
 ```
 
 ## Further Reading
 ### Useful Links
 - https://stackoverflow.com/questions/58273482/can-pyautogui-be-used-to-prevent-windows-screen-lock
 - https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setthreadexecutionstate
+- [change icon dynamically in pystray](https://github.com/moses-palmer/pystray/issues/68)

.screenshot/stay-awake-dont-sleep.png

@@ -7,7 +7,7 @@
 
 ; defines
 !define $PRODUCT_NAME "Awake"
-!define $APPVERSION "v0.5.1"
+!define $APPVERSION "v0.5.2"
 !define $PRODUCT_PUBLISHER "adambonneruk"
 !define $ICON_PATH "..\src\assets\awake.ico"
 !define $REG_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\Awake"
@@ -19,13 +19,12 @@ Unicode True
 
 ; settings
 Name "${$PRODUCT_NAME} ${$APPVERSION}"
-OutFile "Awake Installer (${$APPVERSION}).exe"
+OutFile "Awake Installer (${$APPVERSION}) x64.exe"
 BrandingText "${$PRODUCT_PUBLISHER}"
 
 ; gui configuration
 !define MUI_ICON ${$ICON_PATH}
 !define MUI_UNICON ${$ICON_PATH}
-!define MUI_ABORTWARNING ; "are you sure you want to quit?" prompt
 !define MUI_WELCOMEFINISHPAGE_BITMAP "assets\wizard.bmp"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP ".\assets\header.bmp"
@@ -48,24 +47,17 @@ Section "Base Files" SecBaseFiles
 	SetOutPath $INSTDIR
 	DetailPrint "Cleaning install directory"
 	RMDIR /r $INSTDIR\*.* ; clean the installation directory
-
-	; copy files given x86 or x86-64 operating system
-	${If} ${RunningX64}
-		DetailPrint "64-Bit Mode"
-		File /r ..\dist\awake\*.*
-	${else}
-		DetailPrint "32-Bit Mode"
-		File /r ..\dist\awake\*.*
-	${EndIf}
+	File /r ..\dist\awake\*.* ; copy files given x86-64 operating system
 
 	; add uninstaller entry to the add/remove programs control panel
+	SetRegView 64 ; set registry view given x86-64 operating system
 	WriteRegStr HKLM "${$REG_PATH}" "DisplayName" "${$PRODUCT_NAME}"
 	WriteRegStr HKLM "${$REG_PATH}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
 	WriteRegStr HKLM "${$REG_PATH}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
 	WriteRegStr HKLM "${$REG_PATH}" "DisplayIcon" "$\"$INSTDIR\assets\awake.ico$\""
 	WriteRegStr HKLM "${$REG_PATH}" "DisplayVersion" "${$APPVERSION}"
 	WriteRegStr HKLM "${$REG_PATH}" "Publisher" "${$PRODUCT_PUBLISHER}" ; Not show in Windows 10
-	WriteRegDWORD HKLM "${$REG_PATH}" "EstimatedSize" 26986 ; Calculated size based on v0.5.0
+	WriteRegDWORD HKLM "${$REG_PATH}" "EstimatedSize" 19558 ; Calculated size based on v0.5.2, in KiB
 	WriteRegDWORD HKLM "${$REG_PATH}" "NoModify" 1
 	WriteRegDWORD HKLM "${$REG_PATH}" "NoRepair" 1
 
@@ -92,14 +84,8 @@ SectionEnd
 
 Function .onInit
 
-	; set install folder given x86 or x86-64 operating system
-	${If} ${RunningX64}
-		StrCpy $INSTDIR "$PROGRAMFILES64\Awake"
-		SetRegView 64
-	${else}
-		StrCpy $INSTDIR "$PROGRAMFILES\Awake"
-		SetRegView 32
-	${EndIf}
+	; set install folder given x86-64 operating system
+	StrCpy $INSTDIR "$PROGRAMFILES64\Awake"
 
 FunctionEnd
 
@@ -124,13 +110,7 @@ Section "Uninstall"
 	Delete "$SMPROGRAMS\Awake\*.lnk"
 	RMDir "$SMPROGRAMS\Awake"
 
-	; set registry view given x86 or x86-64 operating system
-	${If} ${RunningX64}
-		SetRegView 64
-	${else}
-		SetRegView 32
-	${EndIf}
-
+	SetRegView 64 ; set registry view given x86-64 operating system
 	DeleteRegKey HKLM "${$REG_PATH}" ; delete windows add/remove programs key
 
 SectionEnd