Skip to content

Commit

Permalink
small fix
Browse files Browse the repository at this point in the history
  • Loading branch information
matrix1001 committed Oct 18, 2018
1 parent 3dbd2eb commit cd4be8a
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ personal.ahk
Includer.ahk
test.ahk
.vscode/
Thumbs.db
Binary file removed Thumbs.db
Binary file not shown.
37 changes: 24 additions & 13 deletions capslock++.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ Menu, MsgLevel, add, Normal, SetMsgLevel
Menu, MsgLevel, add, WarnOnly, SetMsgLevel
Menu, MsgLevel, add, Disable, SetMsgLevel

Menu, Tray, add
Menu, Tray, add, Message Level, :MsgLevel


Menu, defaultmenu, Standard
Menu, Tray, add
Menu, Tray, add, AutoHotkey, :defaultmenu

SetTimer, IconGetStatus, 1000
SetTimer, TrayMenuRefresh, 1000

#Include lib/Settings.ahk

Expand All @@ -61,45 +62,55 @@ IfMsgBox, Yes
}
return
SetMsgLevel:
Menu, MsgLevel, UnCheck, Disable
Menu, MsgLevel, UnCheck, WarnOnly
Menu, MsgLevel, UnCheck, Normal
Menu, MsgLevel, UnCheck, Debug
if StrEq(A_ThisMenuItem, "Disable")
{
HyperSettings.Notify.MsgLevel := 3
Menu, MsgLevel, Check, Disable
}
if StrEq(A_ThisMenuItem, "WarnOnly")
{
HyperSettings.Notify.MsgLevel := 2
Menu, MsgLevel, Check, WarnOnly
}
if StrEq(A_ThisMenuItem, "Normal")
{
HyperSettings.Notify.MsgLevel := 1
Menu, MsgLevel, Check, Normal
}
if StrEq(A_ThisMenuItem, "Debug")
{
HyperSettings.Notify.MsgLevel := 0
Menu, MsgLevel, Check, Debug
}
return

IconGetStatus()
TrayMenuRefresh()
{
; tray tip
stat := GetStatus()
if (A_IsSuspended = 1)
content := "Capslock++ Suspended`n"
content := "Capslock++`nSuspended`n"
else if (HyperSettings.RunTime.ScriptChagne + HyperSettings.RunTime.SettingChagne = 0)
content := "Capslock++`nRunning`n"
else
content := "Capslock++ Running`n"
content := "Capslock++`nRunning (Reload needed)`n"

for key, val in stat
{
content .= Format("{:-20}: {:-}`n", key, val)
}
content := SubStr(content, 1, -1)
Menu, Tray, Tip, %content%

; message level
Menu, MsgLevel, UnCheck, Disable
Menu, MsgLevel, UnCheck, WarnOnly
Menu, MsgLevel, UnCheck, Normal
Menu, MsgLevel, UnCheck, Debug
if (HyperSettings.Notify.MsgLevel = 0)
Menu, MsgLevel, Check, Debug
if (HyperSettings.Notify.MsgLevel = 1)
Menu, MsgLevel, Check, Normal
if (HyperSettings.Notify.MsgLevel = 2)
Menu, MsgLevel, Check, WarnOnly
if (HyperSettings.Notify.MsgLevel = 3)
Menu, MsgLevel, Check, Disable
}
GetStatus()
{
Expand Down
Binary file removed img/Thumbs.db
Binary file not shown.
1 change: 1 addition & 0 deletions lib/basicfunc.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ SendWordReplace(CurrentWord,NewWord,CorrectCase = False)
;send the word
; is here a bug? may stuck the capslock
Send, % "{BS " . StrLen(CurrentWord) . "}" ;clear the typed word
Sleep, 100
SendRaw, %NewWord%
}

Expand Down

0 comments on commit cd4be8a

Please sign in to comment.