Skip to content

Commit 73543fb

Browse files
DemerNkardazDemerNkardaz
committed
А
1 parent 9175887 commit 73543fb

File tree

3 files changed

+41
-46
lines changed

3 files changed

+41
-46
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ __dev/DSLKeyPad_App_Icons/.vs/
44
__dev/DSLKeyPad_App_Icons/x64/
55
src/bin/DSLKeyPad_App_Icons/.vs/
66
src/bin/DSLKeyPad_App_Icons/x64/
7+
src/bin/DSLKeyPad_App_Icons/DSLKeyPad.*/x64
78
testing/
89
src/DSLKeyPad.exe
910
*.tmp

‎src/DSLKeyPad.ahk‎

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ RawSource := RawRepo "DSLKeyPad.ahk"
8888
UpdateAvailable := False
8989

9090
ChangeLogRaw := Map(
91-
"ru", RawRepoInfo "cChangelog.ru.md",
92-
"en", RawRepoInfo "cChangelog.en.md"
91+
"ru", RawRepoInfo "changelog.ru.md",
92+
"en", RawRepoInfo "changelog.en.md"
9393
)
9494

9595
WorkingDir := A_ScriptDir
@@ -1645,34 +1645,27 @@ ToggleLetterScript(HideMessage := False, ScriptName := "Glagolitic Futhark") {
16451645
"Maths", "script_maths",
16461646
]
16471647

1648+
scriptModes := Map(
1649+
"Hellenic", [App.indexIcos["hellenic"]],
1650+
"Glagolitic Futhark", [App.indexIcos["norse"], App.indexIcos["glagolitic"]],
1651+
"Old Turkic Old Permic", [App.indexIcos["turkic"], App.indexIcos["permic"]],
1652+
"Old Hungarian", [App.indexIcos["hungarian"]],
1653+
"Gothic", [App.indexIcos["gothic"]],
1654+
"Old Italic", [App.indexIcos["old_italic"]],
1655+
"Phoenician", [App.indexIcos["phoenician"]],
1656+
"Ancient South Arabian", [App.indexIcos["south_arabian"]],
1657+
"Ancient North Arabian", [App.indexIcos["north_arabian"]],
1658+
"IPA", [App.indexIcos["ipa"]],
1659+
"Maths", [App.indexIcos["maths"]],
1660+
)
1661+
16481662
if !CurrentActive {
1649-
if ScriptName = "Glagolitic Futhark" {
1650-
TraySetIcon(App.internal["ico_dll"].file, CurrentLayout = CodeEn ? 2 : CurrentLayout = CodeRu ? 3 : 1)
1651-
} else if ScriptName = "Hellenic" {
1652-
TraySetIcon(App.internal["ico_dll"].file, CurrentLayout = CodeEn ? 2 : CurrentLayout = CodeRu ? 3 : 1)
1653-
} else if ScriptName = "Old Turkic Old Permic" {
1654-
TraySetIcon(App.internal["ico_dll"].file, CurrentLayout = CodeEn ? 4 : CurrentLayout = CodeRu ? 5 : 1)
1655-
} else if ScriptName = "Old Hungarian" {
1656-
TraySetIcon(App.internal["ico_dll"].file, (CurrentLayout = CodeEn || CurrentLayout = CodeRu) ? 6 : 1)
1657-
} else if ScriptName = "Gothic" {
1658-
TraySetIcon(App.internal["ico_dll"].file, (CurrentLayout = CodeEn || CurrentLayout = CodeRu) ? 7 : 1)
1659-
} else if ScriptName = "Old Italic" {
1660-
TraySetIcon(App.internal["ico_dll"].file, (CurrentLayout = CodeEn || CurrentLayout = CodeRu) ? 13 : 1)
1661-
} else if ScriptName = "Phoenician" {
1662-
TraySetIcon(App.internal["ico_dll"].file, (CurrentLayout = CodeEn || CurrentLayout = CodeRu) ? 14 : 1)
1663-
} else if ScriptName = "Ancient South Arabian" {
1664-
TraySetIcon(App.internal["ico_dll"].file, (CurrentLayout = CodeEn || CurrentLayout = CodeRu) ? 15 : 1)
1665-
} else if ScriptName = "Ancient North Arabian" {
1666-
TraySetIcon(App.internal["ico_dll"].file, (CurrentLayout = CodeEn || CurrentLayout = CodeRu) ? 16 : 1)
1667-
} else if ScriptName = "IPA" {
1668-
TraySetIcon(App.internal["ico_dll"].file, (CurrentLayout = CodeEn || CurrentLayout = CodeRu) ? 8 : 1)
1669-
} else if ScriptName = "Maths" {
1670-
TraySetIcon(App.internal["ico_dll"].file, (CurrentLayout = CodeEn || CurrentLayout = CodeRu) ? 10 : 1)
1671-
} else {
1672-
TraySetIcon(App.internal["ico_dll"].file, 1)
1663+
if scriptModes.Has(ScriptName) {
1664+
index := scriptModes[ScriptName].Length == 2 ? (CurrentLayout = Language.supported["en"].code ? 1 : 2) : 1
1665+
TraySetIcon(App.internal["ico_dll"].file, scriptModes[ScriptName][index])
16731666
}
16741667
} else {
1675-
TraySetIcon(App.internal["ico_dll"].file, 1)
1668+
TraySetIcon(App.internal["ico_dll"].file, App.indexIcos["app"])
16761669
}
16771670

16781671
if !HideMessage {
@@ -5779,18 +5772,18 @@ ManageTrayItems() {
57795772
ScriptsSubMenu.Add(Labels["ipa"], (*) => ToggleLetterScript(, "IPA"))
57805773
ScriptsSubMenu.Add(Labels["maths"], (*) => ToggleLetterScript(, "Maths"))
57815774

5782-
ScriptsSubMenu.SetIcon(Labels["vietNam"], App.internal["ico_dll"].file, 11)
5783-
ScriptsSubMenu.SetIcon(Labels["pinYin"], App.internal["ico_dll"].file, 12)
5784-
ScriptsSubMenu.SetIcon(Labels["glagolitic"], App.internal["ico_dll"].file, 2)
5785-
ScriptsSubMenu.SetIcon(Labels["turkic"], App.internal["ico_dll"].file, 4)
5786-
ScriptsSubMenu.SetIcon(Labels["hungarian"], App.internal["ico_dll"].file, 6)
5787-
ScriptsSubMenu.SetIcon(Labels["gothic"], App.internal["ico_dll"].file, 7)
5788-
ScriptsSubMenu.SetIcon(Labels["italic"], App.internal["ico_dll"].file, 13)
5789-
ScriptsSubMenu.SetIcon(Labels["phoenician"], App.internal["ico_dll"].file, 14)
5790-
ScriptsSubMenu.SetIcon(Labels["south_arabian"], App.internal["ico_dll"].file, 15)
5791-
ScriptsSubMenu.SetIcon(Labels["north_arabian"], App.internal["ico_dll"].file, 16)
5792-
ScriptsSubMenu.SetIcon(Labels["maths"], App.internal["ico_dll"].file, 10)
5793-
ScriptsSubMenu.SetIcon(Labels["ipa"], App.internal["ico_dll"].file, 8)
5775+
ScriptsSubMenu.SetIcon(Labels["vietNam"], App.internal["ico_dll"].file, App.indexIcos["viet"])
5776+
ScriptsSubMenu.SetIcon(Labels["pinYin"], App.internal["ico_dll"].file, App.indexIcos["pinyin"])
5777+
ScriptsSubMenu.SetIcon(Labels["glagolitic"], App.internal["ico_dll"].file, App.indexIcos["glagolitic"])
5778+
ScriptsSubMenu.SetIcon(Labels["turkic"], App.internal["ico_dll"].file, App.indexIcos["turkic"])
5779+
ScriptsSubMenu.SetIcon(Labels["hungarian"], App.internal["ico_dll"].file, App.indexIcos["hungarian"])
5780+
ScriptsSubMenu.SetIcon(Labels["gothic"], App.internal["ico_dll"].file, App.indexIcos["gothic"])
5781+
ScriptsSubMenu.SetIcon(Labels["italic"], App.internal["ico_dll"].file, App.indexIcos["italic"])
5782+
ScriptsSubMenu.SetIcon(Labels["phoenician"], App.internal["ico_dll"].file, App.indexIcos["phoenician"])
5783+
ScriptsSubMenu.SetIcon(Labels["south_arabian"], App.internal["ico_dll"].file, App.indexIcos["south_arabian"])
5784+
ScriptsSubMenu.SetIcon(Labels["north_arabian"], App.internal["ico_dll"].file, App.indexIcos["north_arabian"])
5785+
ScriptsSubMenu.SetIcon(Labels["maths"], App.internal["ico_dll"].file, App.indexIcos["math"])
5786+
ScriptsSubMenu.SetIcon(Labels["ipa"], App.internal["ico_dll"].file, App.indexIcos["ipa"])
57945787

57955788
ScriptsSubMenu.Disable(Labels["telexInput"])
57965789
ScriptsSubMenu.Disable(Labels["altInput"])
@@ -5853,17 +5846,17 @@ ManageTrayItems() {
58535846
App.tray.Add()
58545847
if KeyboardBinder.disabledByMonitor || KeyboardBinder.disabledByUser {
58555848
App.tray.Add(Labels["enable"], (*) => KeyboardBinder.MonitorToggler(KeyboardBinder.disabledByUser = !False ? True : False, "User", "Monitor"))
5856-
App.tray.SetIcon(Labels["enable"], App.internal["ico_dll"].file, 9)
5849+
App.tray.SetIcon(Labels["enable"], App.internal["ico_dll"].file, App.indexIcos["disabled"])
58575850
} else {
58585851

58595852
App.tray.Add(Labels["disable"], (*) => KeyboardBinder.MonitorToggler(KeyboardBinder.disabledByUser = !False ? True : False, "User", "Monitor"))
5860-
App.tray.SetIcon(Labels["disable"], App.internal["ico_dll"].file, 9)
5853+
App.tray.SetIcon(Labels["disable"], App.internal["ico_dll"].file, App.indexIcos["disabled"])
58615854
}
58625855
App.tray.Add()
58635856
App.tray.Add(Labels["exit"], ExitApplication)
58645857
App.tray.Add()
58655858

5866-
App.tray.SetIcon(CurrentApp, App.internal["ico_dll"].file, 1)
5859+
App.tray.SetIcon(CurrentApp, App.internal["ico_dll"].file, App.indexIcos["app"])
58675860
App.tray.SetIcon(Labels["search"], ImageRes, 169)
58685861
App.tray.SetIcon(Labels["unicode"], Shell32, 225)
58695862
App.tray.SetIcon(Labels["altcode"], Shell32, 313)

‎src/Lib/cls_app.ahk‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Class App {
77
static versionText := this.formatVersion(this.version)
88
static winTitle := this.title " " this.status " — " this.versionText
99
static tray := A_TrayMenu
10+
static indexIcos := Map()
1011

1112
static paths := {
1213
dir: A_ScriptDir,
@@ -33,15 +34,15 @@ Class App {
3334
"exe", { repo: this.git.files "DSLKeyPad.exe", file: this.paths.dir "\DSLKeyPad.exe" },
3435
)
3536

36-
this.icos := Map(
37-
"app", [this.internal["ico_dll"].file, 0],
38-
)
37+
for i, ico in ["app", "norse", "glagolitic", "turkic", "permic", "hungarian", "gothic", "ipa", "disabled", "math", "viet", "pinyin", "italic", "phoenician", "south_arabian", "north_arabian", "carian", "lycian", "tifinagh", "ugaritic", "persian"] {
38+
this.indexIcos.Set(ico, i)
39+
}
3940

4041
this.Init()
4142
}
4243

4344
static Init() {
44-
TraySetIcon(App.internal["ico_dll"].file, 1)
45+
TraySetIcon(App.internal["ico_dll"].file, App.indexIcos["app"])
4546
for dir in ["lib", "bin", "user", "temp"] {
4647
if !DirExist(this.paths.%dir%)
4748
DirCreate(this.paths.%dir%)

0 commit comments

Comments
 (0)