add ui for changing increment mode

Author: benmusson

TagCompanion.ahk

@@ -89,12 +89,12 @@ context.HotstringManager.Load(context.SettingsManager.settings['hotstrings']['fi
 
 ; Increment number in selection.
 ^Up:: {
-	ClipboardIncrement("First", context.SettingsManager.settings['increment']['up'])
+	ClipboardIncrement(context.SettingsManager.settings['increment']['mode'], context.SettingsManager.settings['increment']['up'])
 }
 
 ; Decrement number in selection.
 ^Down:: {
-	ClipboardIncrement("First", context.SettingsManager.settings['increment']['down'])
+	ClipboardIncrement(context.SettingsManager.settings['increment']['mode'], context.SettingsManager.settings['increment']['down'])
 }
 
 #SuspendExempt false

lib/Clipboard.ahk

@@ -26,7 +26,10 @@ ClipboardIncrement(IncrementMode, offset) {
     SendInput newText
 
     ; Reselect the current region
-    SendInput("^+{Left}")
+    Loop (StrLen(newText)) {
+        SendInput("+{Up}")
+    }
+    ; SendInput("^+{Left}")
     if i > 1 {
         Loop (i - 1) {
             SendInput("^+{Up}")

lib/MenuManager.ahk

@@ -15,6 +15,11 @@ class MenuManager {
         this.FileMenu.Add("Exit", (*) => ExitApp())
         this.FileMenu.SetIcon("&Open Hotstrings...`tCtrl+O","shell32.dll", 4)
         this.FileMenu.SetIcon("&Save Hotstrings`tCtrl+S","shell32.dll", 259)
+
+        this.SettingsMenu := Menu()
+        this.SettingsMenu.Add("Increment First", (*) => context.SettingsManager.SetIncrementMode("first"))
+        this.SettingsMenu.Add("Increment Last", (*) => context.SettingsManager.SetIncrementMode("last"))
+        this.FileMenu.Add()
 
         this.HelpMenu := Menu()
         this.HelpMenu.Add("&Help`tF1", this.MenuHandler)
@@ -23,8 +28,10 @@ class MenuManager {
         this.HelpMenu.SetIcon("&Help`tF1","shell32.dll", 24)
         this.MenuBar := MenuBar()
         this.MenuBar.Add("&File", this.FileMenu)
+        this.MenuBar.Add("Settings", this.SettingsMenu)
         this.MenuBar.Add("Help", this.HelpMenu)
         this.context.GuiMain.MenuBar := this.MenuBar
+        this.UpdateState()
     }
 
 
@@ -33,6 +40,18 @@ class MenuManager {
         SetTimer () => ToolTip(), -3000
     }
 
+    UpdateState() {
+        settings := this.context.SettingsManager.settings
+        if (settings["increment"]["mode"] == "last") {
+            this.SettingsMenu.Uncheck("Increment First")
+            this.SettingsMenu.Check("Increment Last")
+        } else {
+            this.SettingsMenu.Check("Increment First")
+            this.SettingsMenu.Uncheck("Increment Last")
+        }
+
+    }
+
     ControlDelayMenuHandler(ItemName, ItemPos, MenuInstance) {
         Switch ItemName {
             case "Send It (Fastest)": 

lib/SettingsManager.ahk

@@ -107,4 +107,10 @@ class SettingsManager {
 	HotstringsSetEnabled(Value) {
 		this.settings['hotstrings']['enabled'] := Value
 	}
+
+	SetIncrementMode(Value) {
+		this.settings['increment']['mode'] := Value
+		this.context.MenuManager.UpdateState()
+		this.Autosave()
+	}
 }

lib/Strings.ahk

@@ -19,16 +19,16 @@ StringUnescapeCC(String)
 /**
  * Find and increment a number inside a string
  * @param {String} String input string
- * @param {'First'|'Last'} IncrementMode
+ * @param {'first'|'last'} IncrementMode
  * @param {Integer} Offset value to add
  * @returns {String} output string
  */
 StringIncrement(String, IncrementMode, Offset){
     regex := ""
     Switch IncrementMode {
-        case "First":
+        case "first":
             regex := "(\d+)"
-        case "Last":
+        case "last":
             regex := "(\d+)(?!.*\d+)"
     }