Skip to content

Commit

Permalink
refactor: rename Vimkey class to VimHotkey
Browse files Browse the repository at this point in the history 
feat: add SetConfDefault method for setting default configuration values
refactor: replace direct Conf access with GetConf for configuration retrieval
refactor: switch to using GetVal and GetDescription in VimSetting
fix: update Setup to use VimHotkey instead of removed Vimkey
refactor: update variable assignment in IsVimGroup method to use GetVal
fix: replace VimDefault2V with SetConfDefault in Reset method of VimSetting
  • Loading branch information
@rcmdnk
rcmdnk committed Sep 29, 2024
1 parent b6c5adf commit fddc975
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 62 deletions.
38 changes: 30 additions & 8 deletions lib/vim_ahk.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#Include %A_LineFile%\..\vim_check.ahk
#Include %A_LineFile%\..\vim_icon.ahk
#Include %A_LineFile%\..\vim_caret.ahk
#Include %A_LineFile%\..\vim_hotkey.ahk
#Include %A_LineFile%\..\vim_ini.ahk
#Include %A_LineFile%\..\vim_key.ahk
#Include %A_LineFile%\..\vim_menu.ahk
#Include %A_LineFile%\..\vim_move.ahk
#Include %A_LineFile%\..\vim_setting.ahk
Expand Down Expand Up @@ -38,8 +38,8 @@ class VimAhk{
this.Check := VimCheck(this)
this.Icon := VimIcon(this)
this.Caret := VimCaret(this)
this.VimHotkey := VimHotkey(this)
this.Ini := VimIni(this)
this.key := Vimkey(this)
this.VimMenu := VimMenu(this)
this.Move := VimMove(this)
this.Setting := VimSetting(this)
Expand Down Expand Up @@ -172,6 +172,12 @@ class VimAhk{
this.Conf[setting] := Map("default", default, "val", val, "description", description, "info", info)
}

SetConfDefault(){
for k, v in this.Conf {
v["val"] := v["default"]
}
}

SetExistValue(){
; Need some way to retrieve default values (v-label values are removed from vim_ahk for v2)
;for k, v in this.Conf {
Expand All @@ -183,22 +189,38 @@ class VimAhk{
;}
}

GetConf(Name, Key){
return this.Conf[Name][Key]
}

GetVal(Name){
return this.GetConf(Name, "val")
}

GetDefault(Name){
return this.GetConf(Name, "default")
}

GetDescription(name){
return this.GetConf(Name, "description")
}

SetGroup(){
this.GroupN++
this.GroupName := "VimGroup" this.GroupN
Loop Parse, this.Conf["VimGroup"]["val"], this.GroupDel {
Loop Parse, this.GetConf("VimGroup", "val"), this.GroupDel {
if(A_LoopField != ""){
GroupAdd(this.GroupName, A_LoopField)
}
}
}

Setup(){
SetTitleMatchMode(this.Conf["VimSetTitleMatchMode"]["val"])
SetTitleMatchMode(this.Conf["VimSetTitleMatchModeFS"]["val"])
SetTitleMatchMode(this.GetVal("VimSetTitleMatchMode"))
SetTitleMatchMode(this.GetVal("VimSetTitleMatchModeFS"))
this.State.SetStatusCheck()
this.SetGroup()
this.Key.Set()
this.VimHotkey.Set()
}

Initialize(){
Expand Down Expand Up @@ -246,9 +268,9 @@ class VimAhk{
IsVimGroup(){
if(not this.Enabled){
Return False
}else if(this.Conf["VimAppList"]["val"] == "Allow List"){
}else if(this.GetVal("VimAppList") == "Allow List"){
Return WinActive("ahk_group " . this.GroupName)
}else if(this.Conf["VimAppList"]["val"] == "Deny List"){
}else if(this.GetVal("VimAppList") == "Deny List"){
Return !WinActive("ahk_group " . this.GroupName)
}
Return True
Expand Down
2 changes: 1 addition & 1 deletion lib/vim_key.ahk → lib/vim_hotkey.ahk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Vimkey{
class VimHotkey{
__New(Vim){
this.Vim := Vim

Expand Down
84 changes: 31 additions & 53 deletions lib/vim_setting.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,51 +26,51 @@ class VimSetting Extends VimGui{
}else{
x := "10"
}
this.Hwnd.AddCheckbox(k " XM+" x " " y " v" k, this.GetDescription(k))
this.Hwnd.AddCheckbox(k " XM+" x " " y " v" k, this.Vim.GetDescription(k))
this.HwndAll.Push(this.Hwnd[k])
created := 1
this.Hwnd[k].Value := this.GetVal(k)
this.Hwnd[k].Value := this.Vim.GetVal(k)
}
this.Hwnd.AddText("XM+10 Y+15 vVimTwoLetterText", this.GetDescription("VimTwoLetter"))
this.Hwnd.AddEdit("XM+10 Y+5 R4 W100 Multi vVimTwoLetter", StrReplace(this.GetVal("VimTwoLetter"), this.Vim.GroupDel, "`n", 0, , -1))
this.Hwnd.AddText("XM+10 Y+15 vVimDisableUnusedText", this.GetDescription("VimDisableUnused"))
this.Hwnd.AddDDL("X+5 Y+-16 W30 vVimDisableUnused Choose" this.GetVal("VimDisableUnused"), [1, 2, 3])
this.Hwnd.AddText("XM+10 Y+15 vVimTwoLetterText", this.Vim.GetDescription("VimTwoLetter"))
this.Hwnd.AddEdit("XM+10 Y+5 R4 W100 Multi vVimTwoLetter", StrReplace(this.Vim.GetVal("VimTwoLetter"), this.Vim.GroupDel, "`n", 0, , -1))
this.Hwnd.AddText("XM+10 Y+15 vVimDisableUnusedText", this.Vim.GetDescription("VimDisableUnused"))
this.Hwnd.AddDDL("X+5 Y+-16 W30 vVimDisableUnused Choose" this.Vim.GetVal("VimDisableUnused"), [1, 2, 3])
this.HwndAll.Push(this.Hwnd["VimDisableUnused"])
this.Hwnd.AddText("XM+10 Y+15 vVimSetTitleMatchModeText", this.GetDescription("VimSetTitleMatchMode"))
if(this.GetVal("VimSetTitleMatchMode") == "RegEx"){
this.Hwnd.AddText("XM+10 Y+15 vVimSetTitleMatchModeText", this.Vim.GetDescription("VimSetTitleMatchMode"))
if(this.Vim.GetVal("VimSetTitleMatchMode") == "RegEx"){
matchmode := 4
}else{
matchmode := this.GetVal("VimSetTitleMatchMode")
matchmode := this.Vim.GetVal("VimSetTitleMatchMode")
}
this.Hwnd.AddDDL("X+5 Y+-16 W60 vVimSetTitleMatchMode Choose" matchmode, [1, 2, 3, "RegEx"])
this.HwndAll.Push(this.Hwnd["VimSetTitleMatchMode"])
if(this.GetVal("VimSetTitleMatchModeFS") == "Fast"){
if(this.Vim.GetVal("VimSetTitleMatchModeFS") == "Fast"){
matchmodefs := 1
}else{
matchmodefs := 2
}
this.Hwnd.AddDDL("X+5 Y+-20 W50 vVimSetTitleMatchModeFS Choose" matchmodefs, ["Fast", "Slow"])
this.HwndAll.Push(this.Hwnd["VimSetTitleMatchModeFS"])
this.Hwnd.AddText("XM+10 Y+10 vVimIconCheckIntervalText", this.GetDescription("VimIconCheckInterval"))
this.Hwnd.AddText("XM+10 Y+10 vVimIconCheckIntervalText", this.Vim.GetDescription("VimIconCheckInterval"))
this.Hwnd.AddEdit("X+5 Y+-16 W70 vVimIconCheckIntervalEdit")
this.HwndAll.Push(this.Hwnd["VimIconCheckIntervalEdit"])
this.Hwnd.AddUpDown("vVimIconCheckInterval Range0-1000000", this.GetVal("VimIconCheckInterval"))
this.Hwnd.AddUpDown("vVimIconCheckInterval Range0-1000000", this.Vim.GetVal("VimIconCheckInterval"))
this.HwndAll.Push(this.Hwnd["VimIconCheckInterval"])
this.Hwnd.AddText("XM+10 Y+10 vVimVerboseText", this.GetDescription("VimVerbose"))
this.Hwnd.AddDDL("X+5 Y+-16 W30 vVimVerbose Choose" this.GetVal("VimVerbose"), [1, 2, 3, 4])
this.Hwnd.AddText("XM+10 Y+10 vVimVerboseText", this.Vim.GetDescription("VimVerbose"))
this.Hwnd.AddDDL("X+5 Y+-16 W30 vVimVerbose Choose" this.Vim.GetVal("VimVerbose"), [1, 2, 3, 4])
this.HwndAll.Push(this.Hwnd["VimVerbose"])
this.Hwnd.AddText("XM+10 Y+10 vVimAppListText", this.GetDescription("VimAppList"))
if(this.GetVal("VimAppList") == "All"){
this.Hwnd.AddText("XM+10 Y+10 vVimAppListText", this.Vim.GetDescription("VimAppList"))
if(this.Vim.GetVal("VimAppList") == "All"){
matchapplist := 1
}else if(this.GetVal("VimAppList") == "Allow List"){
}else if(this.Vim.GetVal("VimAppList") == "Allow List"){
matchapplist := 2
}else{
matchapplist := 3
}
this.Hwnd.AddDDL("X+5 Y+-16 W100 vVimAppList Choose" matchapplist, ["All", "Allow List", "Deny List"])
this.HwndAll.Push(this.Hwnd["VimAppList"])
this.Hwnd.AddText("XM+10 Y+5 vVimGroupText", this.GetDescription("VimGroup"))
this.Hwnd.AddEdit("XM+10 Y+5 R10 W300 Multi vVimGroup", StrReplace(this.GetVal("VimGroup"), this.Vim.GroupDel, "`n", 0, , -1))
this.Hwnd.AddText("XM+10 Y+5 vVimGroupText", this.Vim.GetDescription("VimGroup"))
this.Hwnd.AddEdit("XM+10 Y+5 R10 W300 Multi vVimGroup", StrReplace(this.Vim.GetVal("VimGroup"), this.Vim.GroupDel, "`n", 0, , -1))
this.HwndAll.Push(this.Hwnd["VimGroup"])
this.Hwnd.AddText("XM+10 Y+10", "Check")
this.Hwnd.SetFont("Underline")
Expand All @@ -94,33 +94,33 @@ class VimSetting Extends VimGui{

UpdateGuiValue(){
for i, k in this.Vim.Checkboxes {
this.Hwnd[k].Value := this.GetVal(k)
this.Hwnd[k].Value := this.Vim.GetVal(k)
}
this.Hwnd["VimTwoLetter"].Value := StrReplace(this.GetVal("VimTwoLetter"), this.Vim.GroupDel, "`n", 0, , -1)
this.Hwnd["VimDisableUnused"].Value := this.GetVal("VimDisableUnused")
this.Hwnd["VimIconCheckInterval"].Value := this.GetVal("VimIconCheckInterval")
if(this.GetVal("VimSetTitleMatchMode") == "RegEx"){
this.Hwnd["VimTwoLetter"].Value := StrReplace(this.Vim.GetVal("VimTwoLetter"), this.Vim.GroupDel, "`n", 0, , -1)
this.Hwnd["VimDisableUnused"].Value := this.Vim.GetVal("VimDisableUnused")
this.Hwnd["VimIconCheckInterval"].Value := this.Vim.GetVal("VimIconCheckInterval")
if(this.Vim.GetVal("VimSetTitleMatchMode") == "RegEx"){
matchmode := 4
}else{
matchmode := this.GetVal("VimSetTitleMatchMode")
matchmode := this.Vim.GetVal("VimSetTitleMatchMode")
}
this.Hwnd["VimSetTitleMatchMode"].Value := matchmode
if(this.GetVal("VimSetTitleMatchModeFS") == "Fast"){
if(this.Vim.GetVal("VimSetTitleMatchModeFS") == "Fast"){
matchmodefs := 1
}else{
matchmodefs := 2
}
this.Hwnd["VimSetTitleMatchModeFS"].Value := matchmodefs
this.Hwnd["VimVerbose"].Value := this.GetVal("VimVerbose")
if(this.GetVal("VimAppList") == "All"){
this.Hwnd["VimVerbose"].Value := this.Vim.GetVal("VimVerbose")
if(this.Vim.GetVal("VimAppList") == "All"){
matchapplist := 1
}else if(this.GetVal("VimAppList") == "Allow List"){
}else if(this.Vim.GetVal("VimAppList") == "Allow List"){
matchapplist := 2
}else{
matchapplist := 3
}
this.Hwnd["VimAppList"].Value := matchapplist
this.Hwnd["VimGroup"].Value := StrReplace(this.GetVal("VimGroup"), this.Vim.GroupDel, "`n", 0, , -1)
this.Hwnd["VimGroup"].Value := StrReplace(this.Vim.GetVal("VimGroup"), this.Vim.GroupDel, "`n", 0, , -1)
}

VimV2Conf(){
Expand Down Expand Up @@ -165,28 +165,6 @@ class VimSetting Extends VimGui{
return result
}

VimDefault2V(){
for k, v in this.Vim.Conf {
v["val"] := v["default"]
}
}

GetConf(Name, Key){
return this.Vim.Conf[Name][Key]
}

GetVal(Name){
return this.GetConf(Name, "val")
}

GetDefault(Name){
return this.GetConf(Name, "default")
}

GetDescription(name){
return this.GetConf(Name, "description")
}

OK(Btn, Info){
this.Hwnd.Submit()
this.VimV2Conf()
Expand All @@ -200,7 +178,7 @@ class VimSetting Extends VimGui{
}

Reset(Btn, Info){
this.VimDefault2V()
this.Vim.SetConfDefault()
this.UpdateGuiValue()
}
}

0 comments on commit fddc975

Please sign in to comment.