refactor: new installer & cleanup

- bump version to 1.0.4
- removed Microsoft Installer Project and replaced it with an Inno Setup script
- installer now contains "Run after installation" option

Author: austinnixholm

.gitignore

@@ -399,5 +399,9 @@ FodyWeavers.xsd
 # Notepad++ auto-generated backup files
 *.bak
 
+# Created setup files
+Installers/
+
 # Extra
 enc_temp_folder/
+

ThreeFingerDrag/Resource.h

@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by ThreeFingerDrag.rc
+// Used by Gestures.rc
 
 #define IDS_APP_TITLE			103
 

ThreeFingerDrag/ThreeFingerDrag.cpp

@@ -1,6 +1,6 @@
 #include "ThreeFingerDrag.h"
 
-using namespace ThreeFingerDrag;
+using namespace Gestures;
 using namespace WinToastLib;
 
 // Constants
@@ -26,7 +26,7 @@ NOTIFYICONDATA tray_icon_data;
 GestureProcessor gesture_processor;
 std::thread update_settings_thread;
 std::thread touch_activity_thread;
-BOOL run_loops = true;
+BOOL application_running = true;
 
 // Forward declarations
 
@@ -38,8 +38,7 @@ void CreateTrayMenu(HWND hWnd);
 void RemoveStartupRegistryKey();
 void AddStartupRegistryKey();
 void ReadPrecisionTouchPadInfo();
-void StartUpdateThread();
-void StartActivityThread();
+void StartPeriodicUpdateThreads();
 void HandleUncaughtExceptions();
 
 
@@ -78,10 +77,10 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	}
 
 	// Start threads
-	StartUpdateThread();
-	StartActivityThread();
+	StartPeriodicUpdateThreads();
 
-	if (IsInitialStartup()) {
+	// First time running application
+	if (Application::IsInitialStartup()) {
 		bool result = Popups::DisplayPrompt("Would you like run ThreeFingerDrag on startup of Windows?", "ThreeFingerDrag");
 		if (result)
 			AddStartupRegistryKey();
@@ -101,7 +100,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	Shell_NotifyIcon(NIM_DELETE, &tray_icon_data);
 
 	// Join threads
-	run_loops = false;
+	application_running = false;
 	update_settings_thread.join();
 	touch_activity_thread.join();
 
@@ -141,13 +140,14 @@ BOOL InitInstance(const HINSTANCE hInstance, int nCmdShow)
 		return FALSE;
 	}
 
+	// Initialize WinToast notifications
 
 	auto appName = L"ThreeFingerDrag";
 
 	WinToast::WinToastError error;
 	WinToast::instance()->setAppName(appName);
 
-	auto str = GetVersionString();
+	auto str = Application::GetVersionString();
 	const std::wstring w_version(str.begin(), str.end());
 	const auto aumi = WinToast::configureAUMI(L"Austin Nixholm", appName, L"Tool", L"Current");
 
@@ -175,6 +175,7 @@ BOOL InitInstance(const HINSTANCE hInstance, int nCmdShow)
 	}
 
 	// Initialize tray icon data
+
 	tray_icon_data.cbSize = sizeof(NOTIFYICONDATA);
 	tray_icon_data.hWnd = tool_window_handle;
 	tray_icon_data.uID = 1;
@@ -183,7 +184,7 @@ BOOL InitInstance(const HINSTANCE hInstance, int nCmdShow)
 	tray_icon_data.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_THREEFINGERDRAG));
 
 	std::string title = "Three Finger Drag ";
-	title.append(GetVersionString());
+	title.append(Application::GetVersionString());
 	const std::wstring w_title(title.begin(), title.end());
 	lstrcpy(tray_icon_data.szTip, w_title.c_str());
 
@@ -251,26 +252,22 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 /**
  * \brief Starts a thread that periodically updates setting info.
  */
-void StartUpdateThread()
+void StartPeriodicUpdateThreads()
 {
+	// Check for any updates to the user's precision touchpad settings every few seconds
 	update_settings_thread = std::thread([&]
 	{
-		while (run_loops)
+		while (application_running)
 		{
 			std::this_thread::sleep_for(UPDATE_SETTINGS_PERIOD_MS);
 			ReadPrecisionTouchPadInfo();
 		}
 	});
-}
 
-/**
- * \brief Starts a thread that periodically checks 
- */
-void StartActivityThread()
-{
+	// Check if the dragging action needs to be completed
 	touch_activity_thread = std::thread([&]
 	{
-		while (run_loops)
+		while (application_running)
 		{
 			std::this_thread::sleep_for(TOUCH_ACTIVITY_PERIOD_MS);
 			if (!gesture_processor.IsDragging())

ThreeFingerDrag/ThreeFingerDrag.h

@@ -12,39 +12,53 @@
 #include "popups.h"
 
 
-constexpr int VERSION_MAJOR = 1;
-constexpr int VERSION_MINOR = 0;
-constexpr int VERSION_PATCH = 3;
+namespace Application {
 
-constexpr char kVersionFileName[] = "version.txt";
+    constexpr int VERSION_MAJOR = 1;
+    constexpr int VERSION_MINOR = 0;
+    constexpr int VERSION_PATCH = 4;
 
-inline std::string GetVersionString() {
-	return std::to_string(VERSION_MAJOR) + "." + std::to_string(VERSION_MINOR) + "." + std::to_string(VERSION_PATCH);
-}
+    constexpr char VERSION_FILE_NAME[] = "version.txt";
+
+    std::string GetVersionString() {
+        return std::to_string(VERSION_MAJOR) + "." + std::to_string(VERSION_MINOR) + "." + std::to_string(VERSION_PATCH);
+    }
 
-inline bool IsInitialStartup() {
+    /**
+     * @brief Checks if a version.txt file exists in application data and updates it.
+     * @return True if no version file was found
+     */
+    bool IsInitialStartup() {
+        size_t len;
+        char* env_path;
+        const errno_t err = _dupenv_s(&env_path, &len, "LOCALAPPDATA");
 
-    size_t len;
-    char* env_path;
-    const errno_t err = _dupenv_s(&env_path, &len, "LOCALAPPDATA");
+        if (err == 0 && env_path != nullptr) {
+            std::string version_file_path_ = std::string(env_path);
+            version_file_path_ += "\\";
+            version_file_path_ += "ThreeFingerDrag";
 
-    if (err == 0 && env_path != nullptr) {
-        std::string log_file_path_ = std::string(env_path);
-        log_file_path_ += "\\";
-        log_file_path_ += "ThreeFingerDrag";
-        log_file_path_ += "\\";
-        log_file_path_ += kVersionFileName;
+            // Create the application data directory if necessary
+            if (!std::filesystem::exists(version_file_path_)) 
+                std::filesystem::create_directory(version_file_path_);
 
-        if (std::filesystem::exists(log_file_path_))
-            return false;
+            version_file_path_ += "\\";
+            version_file_path_ += VERSION_FILE_NAME;
 
-        std::ofstream versionFile(log_file_path_);
-        if (!versionFile)
-            return false;
+            // File contents do not need to update after initial creation
+            if (std::filesystem::exists(version_file_path_))
+                return false;
 
-        versionFile << GetVersionString();
-        versionFile.close();
+            // Create the file if it has not been created yet, and write the current version to it
+            std::ofstream versionFile(version_file_path_);
+            if (!versionFile)
+                return false;
+
+            versionFile << GetVersionString();
+            versionFile.close();
+        }
+
+        return true;
     }
+}
 
-    return true;
-}

ThreeFingerDrag/touch_gestures.cpp

@@ -18,7 +18,7 @@ namespace
 	constexpr auto USAGE_DIGITIZER_Y_COORDINATE = 0x31;
 }
 
-namespace ThreeFingerDrag
+namespace Gestures
 {
 	void GestureProcessor::ParseRawTouchData(const LPARAM lParam)
 	{

ThreeFingerDrag/touch_gestures.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <chrono>
 
-namespace ThreeFingerDrag
+namespace Gestures
 {
 	struct TouchPoint
 	{