Skip to content

Commit cd4be8a

Browse files
author
matrix1001
committed
small fix
1 parent 3dbd2eb commit cd4be8a

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ personal.ahk
33
Includer.ahk
44
test.ahk
55
.vscode/
6+
Thumbs.db

Thumbs.db

-6 KB
Binary file not shown.

capslock++.ahk

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ Menu, MsgLevel, add, Normal, SetMsgLevel
2828
Menu, MsgLevel, add, WarnOnly, SetMsgLevel
2929
Menu, MsgLevel, add, Disable, SetMsgLevel
3030

31+
Menu, Tray, add
3132
Menu, Tray, add, Message Level, :MsgLevel
3233

33-
3434
Menu, defaultmenu, Standard
35+
Menu, Tray, add
3536
Menu, Tray, add, AutoHotkey, :defaultmenu
3637

37-
SetTimer, IconGetStatus, 1000
38+
SetTimer, TrayMenuRefresh, 1000
3839

3940
#Include lib/Settings.ahk
4041

@@ -61,45 +62,55 @@ IfMsgBox, Yes
6162
}
6263
return
6364
SetMsgLevel:
64-
Menu, MsgLevel, UnCheck, Disable
65-
Menu, MsgLevel, UnCheck, WarnOnly
66-
Menu, MsgLevel, UnCheck, Normal
67-
Menu, MsgLevel, UnCheck, Debug
6865
if StrEq(A_ThisMenuItem, "Disable")
6966
{
7067
HyperSettings.Notify.MsgLevel := 3
71-
Menu, MsgLevel, Check, Disable
7268
}
7369
if StrEq(A_ThisMenuItem, "WarnOnly")
7470
{
7571
HyperSettings.Notify.MsgLevel := 2
76-
Menu, MsgLevel, Check, WarnOnly
7772
}
7873
if StrEq(A_ThisMenuItem, "Normal")
7974
{
8075
HyperSettings.Notify.MsgLevel := 1
81-
Menu, MsgLevel, Check, Normal
8276
}
8377
if StrEq(A_ThisMenuItem, "Debug")
8478
{
8579
HyperSettings.Notify.MsgLevel := 0
86-
Menu, MsgLevel, Check, Debug
8780
}
8881
return
8982

90-
IconGetStatus()
83+
TrayMenuRefresh()
9184
{
85+
; tray tip
9286
stat := GetStatus()
9387
if (A_IsSuspended = 1)
94-
content := "Capslock++ Suspended`n"
88+
content := "Capslock++`nSuspended`n"
89+
else if (HyperSettings.RunTime.ScriptChagne + HyperSettings.RunTime.SettingChagne = 0)
90+
content := "Capslock++`nRunning`n"
9591
else
96-
content := "Capslock++ Running`n"
92+
content := "Capslock++`nRunning (Reload needed)`n"
93+
9794
for key, val in stat
9895
{
9996
content .= Format("{:-20}: {:-}`n", key, val)
10097
}
10198
content := SubStr(content, 1, -1)
10299
Menu, Tray, Tip, %content%
100+
101+
; message level
102+
Menu, MsgLevel, UnCheck, Disable
103+
Menu, MsgLevel, UnCheck, WarnOnly
104+
Menu, MsgLevel, UnCheck, Normal
105+
Menu, MsgLevel, UnCheck, Debug
106+
if (HyperSettings.Notify.MsgLevel = 0)
107+
Menu, MsgLevel, Check, Debug
108+
if (HyperSettings.Notify.MsgLevel = 1)
109+
Menu, MsgLevel, Check, Normal
110+
if (HyperSettings.Notify.MsgLevel = 2)
111+
Menu, MsgLevel, Check, WarnOnly
112+
if (HyperSettings.Notify.MsgLevel = 3)
113+
Menu, MsgLevel, Check, Disable
103114
}
104115
GetStatus()
105116
{

img/Thumbs.db

-35 KB
Binary file not shown.

lib/basicfunc.ahk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ SendWordReplace(CurrentWord,NewWord,CorrectCase = False)
190190
;send the word
191191
; is here a bug? may stuck the capslock
192192
Send, % "{BS " . StrLen(CurrentWord) . "}" ;clear the typed word
193+
Sleep, 100
193194
SendRaw, %NewWord%
194195
}
195196

0 commit comments

Comments
 (0)