Merge pull request #113 from rcmdnk/keyremap

Introduce tabs in settings window

Author: rcmdnk

README.md

@@ -199,13 +199,19 @@ or launch the setting window by `Ctrl-Alt-Shift-v`.
 
 ![traymenu](https://raw.githubusercontent.com/rcmdnk/vim_ahk/master/pictures/traymenu.jpg "traymenu")
 
-![settings](https://raw.githubusercontent.com/rcmdnk/vim_ahk/master/pictures/settings.jpg "settings")
+![settings_keys](https://raw.githubusercontent.com/rcmdnk/vim_ahk/master/pictures/settings_keys.png "settings_keys")
+![settings_applications](https://raw.githubusercontent.com/rcmdnk/vim_ahk/master/pictures/settings_applications.png "settings_applications")
+![settings_status](https://raw.githubusercontent.com/rcmdnk/vim_ahk/master/pictures/settings_status.png "settings_status")
+![settings_configuration](https://raw.githubusercontent.com/rcmdnk/vim_ahk/master/pictures/settings_configuration.png "settings_configuration")
 
-Here, you can add applications, change the mode change key,
-or change the verbose level.
+Here, you can add applications, change the mode change key, change the verbose level,
+or import/export the configuration file.
+
+If you import a configuration file, these settings will be enabled
+only if you push the `Apply` or `OK` button.
 
 If you push `Reset`, default settings will be shown in the window.
-These settings will be enabled only if you push the `OK` button.
+These settings will be enabled only if you push the `Apply` or `OK` button, too.
 
 These **default settings** are overwritten by
 your `VimXXX` options in your script described above.

lib/vim_ahk.ahk

@@ -138,9 +138,9 @@ class VimAhk{
       , "1: Nothing `n2: Minimum tooltip (mode information only)`n3: Tooltip (all information)`n4: Debug mode with a message box, which doesn't disappear automatically")
     this.AddToConf("VimAppList", "Allow List", "Allow List"
       , "Application list usage"
-      , "All: Enable on all application (the application list is ignored) `nAllow List: Use the application list as an allow list`nDeny List: Use the application list as a deny list")
+      , "All: Enable on all applications (the application list is ignored) `nAllow List: Use the application list as an allow list`nDeny List: Use the application list as a deny list")
     this.AddToConf("VimGroup", DefaultGroup, DefaultGroup
-      , "Application"
+      , "Application list"
       , "Set one application per line.`n`nIt can be any of Window Title, Class or Process.`nYou can check these values by Window Spy (in the right click menu of tray icon).")
 
     this.CheckBoxes := ["VimEscNormal", "VimSendEscNormal", "VimLongEscNormal", "VimCtrlBracketToEsc", "VimCtrlBracketNormal", "VimSendCtrlBracketNormal", "VimLongCtrlBracketNormal", "VimRestoreIME", "VimJJ", "VimChangeCaretWidth"]

lib/vim_check.ahk

@@ -3,7 +3,7 @@
     this.Vim := Vim
   }
 
-  CheckMenu(ItemName, ItemPos, MyMenu) {
+  CheckMenu(ItemName:="", ItemPos:="", MyMenu:="") {
     ; Additional message is necessary before checking current window.
     ; Otherwise process name cannot be retrieved...?
     MsgBox("Checking current window...", "Vim Ahk")

lib/vim_gui.ahk

@@ -31,7 +31,7 @@ class VimGui{
   UpdateGui(){
   }
 
-  ShowGui(ItemName, ItemPos, MyMenu){
+  ShowGui(ItemName:="", ItemPos:="", MyMenu:=""){
     if(this.Obj == 0){
       this.Obj := Gui("", this.Title)
       this.MakeGui()

lib/vim_ini.ahk

@@ -17,13 +17,13 @@
     this.IniDir := Dir
     this.Ini := Dir "\" Ini
     this.section := Section
+
+    this.OpenIniDirObj := ObjBindMethod(this, "OpenIniDir")
+    this.OpenIniObj := ObjBindMethod(this, "OpenIni")
   }
 
-  ReadIni(Conf:=""){
-    if (Conf == ""){
-        Conf := this.Vim.Conf
-    }
-    for k, v in Conf {
+  ReadIni(){
+    for k, v in this.Vim.Conf {
       Current := v["val"]
       if(Current != ""){
         val := IniRead(this.Ini, this.Section, k, Current)
@@ -68,4 +68,14 @@
       IniWrite(v["val"], this.Ini, this.Section, k)
     }
   }
+
+  OpenIniDir(Obj, Info){
+    this.Vim.VimToolTip.RemoveToolTip()
+    Run("explorer.exe " this.IniDir)
+  }
+
+  OpenIni(Obj, Info){
+    this.Vim.VimToolTip.RemoveToolTip()
+    Run("notepad.exe " this.Ini)
+  }
 }

lib/vim_move.ahk

@@ -27,11 +27,11 @@
       this.Zero()
       this.ShiftDown()
       this.Up()
-      this.vim.state.setmode("Vim_VisualLine")
+      this.Vim.state.setmode("Vim_VisualLine")
     }
 
     if(this.Vim.State.IsCurrentVimMode("Vim_VisualLineFirst")) and (Key == "j" or Key == "^d" or Key == "^f" or Key == "+g"){
-      this.vim.state.setmode("Vim_VisualLine")
+      this.Vim.state.setmode("Vim_VisualLine")
     }
 
     if(this.Vim.State.StrIsInCurrentVimMode("Vim_ydc")) and (Key == "k" or Key == "^u" or Key == "^b" or Key == "g"){

lib/vim_setting.ahk

@@ -7,6 +7,9 @@ class VimSetting Extends VimGui{
 
     this.ResetObj := ObjBindMethod(this, "Reset")
     this.CancelObj := ObjBindMethod(this, "Cancel")
+    this.ApplyObj := ObjBindMethod(this, "Apply")
+    this.ImportObj := ObjBindMethod(this, "ImportIni")
+    this.ExportObj := ObjBindMethod(this, "ExportIni")
   }
 
   AddConf(ControlType, Key, Options, Text:="", V:=False){
@@ -25,65 +28,91 @@ class VimSetting Extends VimGui{
   }
 
   MakeGui(){
-    this.Obj.Opt("-MinimizeBox -Resize")
-    created := 0
+    this.Obj.Opt("-Resize -MinimizeBox -MaximizeBox")
+    this.Tab := this.Obj.Add("Tab3", "X+0 Y+0 W480 H360", ["Keys", "Applications", "Status", "Configuration file"])
+
+    ; Tab 1: Keys
+    this.Tab.UseTab(1)
+    this.Obj.AddText("X+0 Y+0 Section", "")
     for i, k in this.Vim.Checkboxes {
-      if(created == 0){
-        y := "YM"
-        created := 1
-      }else{
-        y := "Y+10"
-      }
-      if(inStr(k, "Long") or inStr(k, "Send")) {
-        x := "30"
-      }else{
-        x := "10"
-      }
-      this.AddConf("Checkbox", k, "XM+" x " " y, this.Vim.GetDescription(k), True)
+      x := (inStr(k, "Long") or inStr(k, "Send")) ? "30" : "10"
+      this.AddConf("Checkbox", k, "XS+" x " Y+6", this.Vim.GetDescription(k), True)
       this.Obj[k].Value := this.Vim.GetVal(k)
     }
-    this.AddConf("Text", "VimTwoLetter", "XM+10 Y+15")
-    this.AddConf("Edit", "VimTwoLetter", "XM+10 Y+5 R4 W100 Multi", StrReplace(this.Vim.GetVal("VimTwoLetter"), this.Vim.GroupDel, "`n", 0, , -1), True)
-    this.AddConf("Text", "VimDisableUnused", "XM+10 Y+15")
-    this.AddConf("DDL", "VimDisableUnused", "X+5 Y+-16 W30 Choose" this.Vim.GetVal("VimDisableUnused"), [1, 2, 3], True)
-    this.AddConf("Text", "VimSetTitleMatchMode", "XM+10 Y+15")
+    this.AddConf("Text", "VimTwoLetter", "XS+10 Y+15")
+    this.AddConf("Edit", "VimTwoLetter", "XS+10 Y+5 R4 W100 Multi", StrReplace(this.Vim.GetVal("VimTwoLetter"), this.Vim.GroupDel, "`n", 0, , -1), True)
+    this.AddConf("Text", "VimDisableUnused", "XS+10 Y+15")
+    this.AddConf("DDL", "VimDisableUnused", "X+5 YP-4 W40 Choose" this.Vim.GetVal("VimDisableUnused"), [1, 2, 3], True)
+
+    ; Tab 2: Applications (Merged with Matching & Lists)
+    this.Tab.UseTab(2)
+    this.Obj.AddText("X+0 Y+0 Section", "")
+    ; (Disabled unused keys moved to Keys tab)
+    this.AddConf("Text", "VimSetTitleMatchMode", "XS+10 Y+10")
     if(this.Vim.GetVal("VimSetTitleMatchMode") == "RegEx"){
       matchmode := 4
     }else{
       matchmode := this.Vim.GetVal("VimSetTitleMatchMode")
     }
-    this.AddConf("DDL","VimSetTitleMatchMode",  "X+5 Y+-16 W60 Choose" matchmode, [1, 2, 3, "RegEx"], True)
+    this.AddConf("DDL","VimSetTitleMatchMode",  "X+5 YP-4 W60 Choose" matchmode, [1, 2, 3, "RegEx"], True)
     if(this.Vim.GetVal("VimSetTitleMatchModeFS") == "Fast"){
       matchmodefs := 1
     }else{
       matchmodefs := 2
     }
-    this.AddConf("DDL", "VimSetTitleMatchModeFS", "X+5 Y+-20 W50 Choose" matchmodefs, ["Fast", "Slow"], True)
-    this.AddConf("Text", "VimIconCheckInterval", "XM+10 Y+10")
-    this.AddConf("Edit", "VimIconCheckInterval", "X+5 Y+-16 W70")
-    this.AddConf("UpDown", "VimIconCheckInterval", "Range0-1000000", this.Vim.GetVal("VimIconCheckInterval"), True)
-    this.AddConf("Text", "VimVerbose", "XM+10 Y+10")
-    this.AddConf("DDL", "VimVerbose", "X+5 Y+-16 W30 Choose" this.Vim.GetVal("VimVerbose"), [1, 2, 3, 4], True)
-    this.AddConf("Text", "VimAppList", "XM+10 Y+10")
+    this.AddConf("DDL", "VimSetTitleMatchModeFS", "X+5 YP+0 W50 Choose" matchmodefs, ["Fast", "Slow"], True)
+
+    ; Applications specific
+    this.AddConf("Text", "VimAppList", "XS+10 Y+15")
     if(this.Vim.GetVal("VimAppList") == "All"){
       matchapplist := 1
     }else if(this.Vim.GetVal("VimAppList") == "Allow List"){
       matchapplist := 2
     }else{
       matchapplist := 3
     }
-    this.AddConf("DDL", "VimAppList", "X+5 Y+-16 W100 Choose" matchapplist, ["All", "Allow List", "Deny List"], True)
-    this.AddConf("Text", "VimGroup", "XM+10 Y+5")
-    this.AddConf("Edit", "VimGroup", "XM+10 Y+5 R10 W300 Multi", StrReplace(this.Vim.GetVal("VimGroup"), this.Vim.GroupDel, "`n", 0, , -1), True)
-    this.Obj.AddText("XM+10 Y+10", "Check")
+    this.AddConf("DDL", "VimAppList", "X+5 YP-4 W100 Choose" matchapplist, ["All", "Allow List", "Deny List"], True)
+    this.AddConf("Text", "VimGroup", "XS+10 Y+5")
+    this.AddConf("Edit", "VimGroup", "XS+10 Y+5 R10 W300 Multi", StrReplace(this.Vim.GetVal("VimGroup"), this.Vim.GroupDel, "`n", 0, , -1), True)
+
+    ; Tab 3: Status
+    this.Tab.UseTab(3)
+    this.Obj.AddText("X+0 Y+0 Section", "")
+    this.AddConf("Text", "VimIconCheckInterval", "XS+10 Y+10")
+    this.AddConf("Edit", "VimIconCheckInterval", "X+5 YP-4 W70")
+    this.AddConf("UpDown", "VimIconCheckInterval", "Range0-1000000", this.Vim.GetVal("VimIconCheckInterval"), True)
+    this.AddConf("Text", "VimVerbose", "XS+10 Y+10")
+    this.AddConf("DDL", "VimVerbose", "X+5 YP-4 W30 Choose" this.Vim.GetVal("VimVerbose"), [1, 2, 3, 4], True)
+
+    ; Tab 4: Configuration file
+    this.Tab.UseTab(4)
+    this.Obj.AddText("X+0 Y+0 Section", "")
+    SplitPath(this.Vim.Ini.Ini, &fileName, &iniDir)
+    this.Obj.AddText("XS+10 Y+10", "Current configuration directory:")
+    this.AddClick("Text", "XS+10 cBlue", iniDir, this.Vim.Ini.OpenIniDirObj)
+    this.Obj.AddText("XS+10 Y+10", "Current configuration file:")
+    this.AddClick("Text", "XS+10 cBlue", fileName, this.Vim.Ini.OpenIniObj)
+    this.AddClick("Button", "XS+10 Y+10 W120", "Import", this.ImportObj, "Load settings from an INI file")
+    this.AddClick("Button", "X+10 W120", "Export", this.ExportObj, "Save current settings to an INI file")
+
+    ; End tabs; add help and buttons below the tab
+    this.Tab.UseTab()
+
+    ; Add contents below the tab
+    this.Tab.GetPos(&tabX, &tabY, &tabW, &tabH)
+    underTab := tabY + tabH + 10
+
+    ;; Create help controls and measure
+    this.Obj.AddText("X15 Y" underTab, "Check")
     this.Obj.SetFont("Underline")
     this.AddClick("Text", "X+5 cBlue", "HELP", this.Vim.about.OpenHomepageObj, this.Vim.About.Homepage)
     this.Obj.SetFont("Norm")
     this.Obj.AddText("X+5", "for further information.")
 
-    this.AddClick("Button", "X10 W100 Y+10 Default", "OK", this.OKObj, "Reflect changes and exit")
+    this.AddClick("Button", "X15 W100 Y+10 Default", "OK", this.OKObj, "Apply changes and close")
+    this.AddClick("Button", "X+10 W100", "Apply", this.ApplyObj, "Apply changes without closing")
     this.AddClick("Button", "X+10 W100", "Reset", this.ResetObj, "Reset to the default values")
-    this.AddClick("Button", "X+10 W100", "Cancel", this.CancelObj, "Don't change and exit")
+    this.AddClick("Button", "X+10 W100", "Cancel", this.CancelObj, "Discard changes and close")
   }
 
   UpdateGui(){
@@ -167,10 +196,18 @@ class VimSetting Extends VimGui{
     this.Obj.Submit()
     this.VimV2Conf()
     this.Vim.Setup()
-    this.vim.Ini.WriteIni()
+    this.Vim.Ini.WriteIni()
     this.Hide(Obj)
   }
 
+  Apply(Obj, Info){
+    this.Obj.Submit(false)
+    this.VimV2Conf()
+    this.Vim.Setup()
+    this.Vim.Ini.WriteIni()
+    this.Vim.VimToolTip.RemoveToolTip()
+  }
+
   Cancel(Obj, Info){
     this.Hide(Obj)
   }
@@ -179,4 +216,72 @@ class VimSetting Extends VimGui{
     this.Vim.SetConfDefault()
     this.UpdateGuiValue()
   }
+
+  ImportIni(Obj, Info){
+    try {
+      path := FileSelect("", "", "Import INI (staged; Apply to confirm)", "INI (*.ini)")
+      if (path == "")
+        return
+      ; Read selected INI into a temporary conf map without touching runtime conf
+      tmpConf := Map()
+      for k, v in this.Vim.Conf {
+        tmpConf[k] := Map("default", v["default"], "val", v["val"], "description", v["description"], "info", v["info"])
+      }
+      SplitPath(path, &fileName, &dir)
+      tmpIni := VimIni(this.Vim, dir, fileName)
+      tmpIni.ReadIni()
+
+      ; Update GUI controls from tmpConf only
+      ; Checkboxes
+      for i, k in this.Vim.Checkboxes {
+        if this.Obj.HasProp(k) && tmpConf.Has(k)
+          this.Obj[k].Value := tmpConf[k]["val"]
+      }
+      ; Text/DDL fields with conversions
+      if this.Obj.HasProp("VimTwoLetter")
+        this.Obj["VimTwoLetter"].Value := StrReplace(tmpConf["VimTwoLetter"]["val"], this.Vim.GroupDel, "`n", 0, , -1)
+      if this.Obj.HasProp("VimDisableUnused")
+        this.Obj["VimDisableUnused"].Value := tmpConf["VimDisableUnused"]["val"]
+      if this.Obj.HasProp("VimIconCheckInterval")
+        this.Obj["VimIconCheckInterval"].Value := tmpConf["VimIconCheckInterval"]["val"]
+      ; Title match mode
+      if this.Obj.HasProp("VimSetTitleMatchMode") {
+        matchmode := tmpConf["VimSetTitleMatchMode"]["val"]
+        this.Obj["VimSetTitleMatchMode"].Value := (matchmode == "RegEx") ? 4 : matchmode
+      }
+      if this.Obj.HasProp("VimSetTitleMatchModeFS") {
+        matchmodefs := tmpConf["VimSetTitleMatchModeFS"]["val"]
+        this.Obj["VimSetTitleMatchModeFS"].Value := (matchmodefs == "Fast") ? 1 : 2
+      }
+      if this.Obj.HasProp("VimVerbose")
+        this.Obj["VimVerbose"].Value := tmpConf["VimVerbose"]["val"]
+      if this.Obj.HasProp("VimAppList") {
+        ap := tmpConf["VimAppList"]["val"]
+        this.Obj["VimAppList"].Value := (ap == "All") ? 1 : (ap == "Allow List") ? 2 : 3
+      }
+      if this.Obj.HasProp("VimGroup")
+        this.Obj["VimGroup"].Value := StrReplace(tmpConf["VimGroup"]["val"], this.Vim.GroupDel, "`n", 0, , -1)
+
+      ; Do not write to the main INI nor apply runtime yet — waits for Apply
+      MsgBox("Imported settings staged from:`n" path "`nClick Apply to apply them.", "Vim Ahk")
+    } catch as e {
+      MsgBox("Failed to import: " e.Message, "Vim Ahk", "Iconx")
+    }
+  }
+
+  ExportIni(Obj, Info){
+    try {
+      path := FileSelect("S", "", "Export INI", "INI (*.ini)")
+      if (path == "")
+        return
+      ; Ensure current settings are saved before export
+      this.Obj.Submit(false)
+      this.VimV2Conf()
+      this.Vim.Ini.WriteIni()
+      FileCopy(this.Vim.Ini.Ini, path, true)
+      MsgBox("Exported settings to: `n" path, "Vim Ahk")
+    } catch as e {
+      MsgBox("Failed to export: " e.Message, "Vim Ahk", "Iconx")
+    }
+  }
 }

lib/vim_state.ahk

@@ -43,7 +43,7 @@
     this.Vim.VimToolTip.SetRemoveToolTip(1000)
   }
 
-  FullStatus(ItemName, ItemPos, MyMenu){
+  FullStatus(ItemName:="", ItemPos:="", MyMenu:=""){
     this.CheckMode(4, , , , 1)
   }