Merge pull request #1 from 3tmp/2.0.0_alpha

2.0.0 alpha

Author: 3tmp

.gitignore

@@ -1 +1,3 @@
-Config.ini
+Config.ini
+test*.ahk
+log.txt

Application.ahk

@@ -0,0 +1,117 @@
+class Application extends _Object
+{
+    static _applicationName := "Stronghold Hotkeys"
+         , _iniPath := "Config.ini"
+         , _logger := LoggerFactory.GetLogger(Application)
+
+    __New()
+    {
+        this._settingsModel := ""
+        this._settingsController := ""
+        this._settingsGui := ""
+        this._hotkeyHandler := ""
+        this._updateChecker := ""
+
+        this._errorLogger := ""
+        this._exitLogger := ""
+    }
+
+    Initialize()
+    {
+        ; Set up the logger
+        If (IsDebuggerAttatched())
+        {
+            LoggerFactory.SetMinLogLevel(_logLevel.Trace)
+            LoggerFactory.SetBufferSize(1)
+        }
+        Else
+        {
+            LoggerFactory.SetMinLogLevel(_logLevel.Warn)
+            LoggerFactory.SetBufferSize(1)
+        }
+        this._errorLogger := LoggerFactory.GetErrorLogger()
+        this._exitLogger := LoggerFactory.GetExitLogger()
+
+        Application._logger.Info("App is starting up...")
+        Application._logger.Info("Version: " Stronghold_Version())
+
+        If (IsDebuggerAttatched())
+        {
+            Application._logger.Info("App is running in dev mode.")
+        }
+
+        this._registerWindowGroups()
+
+        ; Create the settings model from the config file (if it exists), otherwise create a default one
+        If (FileExist(Application._iniPath))
+        {
+            Application._logger.Trace("Applying the saved settings.")
+            readConfig := FileRead(Application._iniPath)
+            this._settingsModel := SettingsModel.FromIniString(readConfig)
+        }
+        Else
+        {
+            Application._logger.Trace("No saved settings. Use the default settings.")
+            this._settingsModel := SettingsModel.Default()
+        }
+
+        this._settingsController := new SettingsController(this._settingsModel, Application._iniPath)
+
+        this._hotkeyHandler := new StrongholdHotkeyHandler(this._settingsController, this._settingsModel)
+        this._updateChecker := new UpdatesChecker(this._settingsController, this._settingsModel)
+
+        ; Set up the tray menu (has to be done before the gui to ensure the Stronghold icon in the window title bar)
+        TrayMenu.Instance.Init(this)
+
+        ; Only show the gui when no config file exists (usually the first load), or if the app is in dev mode
+        If (!FileExist(Application._iniPath) || IsDebuggerAttatched())
+        {
+            this._settingsController.SaveToFile()
+            this._getOrCreateSettingsGui().Show()
+        }
+
+        Application._logger.Info("App startup finished.")
+    }
+
+    ; Get a reference to a settings gui instance
+    SettingsGui[]
+    {
+        Get
+        {
+            Return this._getOrCreateSettingsGui()
+        }
+    }
+
+    ; The central application exit point
+    ExitApp()
+    {
+        Application._logger.Info("App is shutting down...")
+        ExitApp
+    }
+
+    ; Register the Stronghold window groups via the GroupAdd command
+    _registerWindowGroups()
+    {
+        static isRegistered := false
+        If (isRegistered)
+        {
+            Return
+        }
+
+        For each, group in EWindowGroups
+        {
+            GroupAdd(group, StrongholdManager.WindowTitles[group])
+        }
+        isRegistered := true
+    }
+
+    _getOrCreateSettingsGui()
+    {
+        If (this._settingsGui == "" || this._settingsGui.IsDestroyed)
+        {
+            title := Stronghold_Version().Format(GetLanguage().Title)
+            this._settingsGui := new SettingsGui(this._settingsController, this._settingsModel, title)
+        }
+        Return this._settingsGui
+    }
+}

Build/Compiler.ahk

@@ -7,18 +7,20 @@ global resultFileExe := "Stronghold.exe"
 global buildMinimal := true
 global resultFileExeMinimal := "Stronghold_minimal.exe"
 
+global mainFileName := "Main.ahk"
+global mainMinimalName := "Minimal_Autoclicker.ahk"
 global mainPath := GetFullPathName(A_ScriptDir "\..\")
 SetWorkingDir, % mainPath
 
-If (!FileExist("Stronghold.ahk"))
+If (!FileExist(mainFileName))
 {
     MsgBox,, Error, The Main file does not exist
     ExitApp
 }
 
 output := ""
 
-For each, line in FileToLineArray(FileRead("Stronghold.ahk"))
+For each, line in FileToLineArray(FileRead(mainFileName))
 {
     line := removeIndent ? Trim(line) : line
 
@@ -49,15 +51,15 @@ If (FileExist("Build\" resultFileExe))
 {
     FileDelete("Build\" resultFileExe)
 }
-CompileWithAhk2Exe("Stronghold.ahk", resultFileExe)
+CompileWithAhk2Exe("Build\" resultFileAhk, resultFileExe)
 
 If (buildMinimal)
 {
     If (FileExist("Build\" resultFileExeMinimal))
     {
         FileDelete("Build\" resultFileExeMinimal)
     }
-    CompileWithAhk2Exe("Minimal_Autoclicker.ahk", resultFileExeMinimal)
+    CompileWithAhk2Exe(mainMinimalName, resultFileExeMinimal)
 }
 
 Msgbox,, Finish, Compiling the files finished
@@ -114,10 +116,11 @@ FileToLineArray(file)
 }
 
 ; Retrieves the full path and file name of the specified file.
-GetFullPathName(fileName, longName := 0)
+GetFullPathName(fileName)
 {
-    ; 522 is 260 (MAX_PATH) plus null termination character and Unicode
-    size := (VarSetCapacity(lpFilePath, longName ? longName * 2 : 522) // 2) - 1
-    res := DllCall("Kernel32.dll\GetFullPathName", "Str", fileName, "UInt", size, "Str", lpFilePath, "Int", 0)
-    Return res ? lpFilePath : ""
+    static MAX_PATH := 260
+    ; +1 for the null terminating character
+    VarSetCapacity(lpFilePath, (MAX_PATH + 1) * 2)
+    res := DllCall("Kernel32.dll\GetFullPathName", "Str", fileName, "UInt", MAX_PATH, "Str", lpFilePath, "Int", 0)
+    Return lpFilePath
 }