From d7023cd0ef1887b1b76d98089bd553f8858d36d5 Mon Sep 17 00:00:00 2001 From: DreymaR <7303297+DreymaR@users.noreply.github.com> Date: Tue, 23 May 2023 17:35:35 +0200 Subject: [PATCH] Name changes * Changed Grey -> Gray in Bg img names * Updated some link anchors from the BigBag pages --- ...Nice-Grey_ANS.png => Bg_Nice-Gray_ANS.png} | Bin ...Nice-Grey_ISO.png => Bg_Nice-Gray_ISO.png} | Bin ...le-Grey_ANS.png => Bg_Simple-Gray_ANS.png} | Bin ...le-Grey_ISO.png => Bg_Simple-Gray_ISO.png} | Bin Layouts/Colemak/README.md | 4 +-- Layouts/Dvorak/Dvk-eD_ANS/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ANS_AWide/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ANS_Angle/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ANS_AngleSym/Layout.ini | 2 +- .../Dvorak/Dvk-eD_ANS_CurlAWide/Layout.ini | 2 +- .../Dvorak/Dvk-eD_ANS_CurlAWideSym/Layout.ini | 2 +- .../Dvorak/Dvk-eD_ANS_CurlAngle/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ANS_Sym/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ISO/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ISO_AWide/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ISO_Angle/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ISO_AngleSym/Layout.ini | 2 +- .../Dvorak/Dvk-eD_ISO_CurlAWide/Layout.ini | 2 +- .../Dvorak/Dvk-eD_ISO_CurlAWideSym/Layout.ini | 2 +- .../Dvorak/Dvk-eD_ISO_CurlAngle/Layout.ini | 2 +- Layouts/Dvorak/Dvk-eD_ISO_Sym/Layout.ini | 2 +- Layouts/Dvorak/README.md | 4 +-- Layouts/QWERTY/QWE-VK_ANS_AWide/Layout.ini | 2 +- Layouts/QWERTY/QWE-VK_ANS_AWideSym/Layout.ini | 2 +- Layouts/QWERTY/QWE-VK_ANS_Angle/Layout.ini | 2 +- Layouts/QWERTY/QWE-VK_ISO/Layout.ini | 2 +- Layouts/QWERTY/QWE-VK_ISO_AWide/Layout.ini | 2 +- Layouts/QWERTY/QWE-VK_ISO_AWideSym/Layout.ini | 2 +- Layouts/QWERTY/QWE-VK_ISO_Angle/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ANS/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ANS_AWide/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ANS_AWideSym/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ANS_Angle/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ANS_Wide/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ANS_WideSym/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ISO/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ISO_AWide/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ISO_AWideSym/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ISO_Angle/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ISO_Wide/Layout.ini | 2 +- Layouts/QWERTY/QWE-eD_ISO_WideSym/Layout.ini | 2 +- Layouts/README.md | 14 ++++++++++ .../Tmk-eD-Tm1_ANS_AWide/Layout.ini | 2 +- .../Tmk-eD-Tm2_ANS_AWide/Layout.ini | 2 +- .../Tmk-eD-Tm3_ANS_AWide/Layout.ini | 2 +- .../Tmk-eD-Tm4_ANS_AWide/Layout.ini | 2 +- .../Tmk-eD-Tm1_ANS_CurlAWide/Layout.ini | 2 +- .../Tmk-eD-Tm2_ANS_CurlAWide/Layout.ini | 2 +- .../Tmk-eD-Tm3_ANS_CurlAWide/Layout.ini | 2 +- .../Tmk-eD-Tm4_ANS_CurlAWide/Layout.ini | 2 +- README.md | 2 +- Source/EPKL_Source/_PKL_main.ahk | 24 +++++++++++++++--- 52 files changed, 83 insertions(+), 51 deletions(-) rename Files/ImgBackground/{Bg_Nice-Grey_ANS.png => Bg_Nice-Gray_ANS.png} (100%) rename Files/ImgBackground/{Bg_Nice-Grey_ISO.png => Bg_Nice-Gray_ISO.png} (100%) rename Files/ImgBackground/{Bg_Simple-Grey_ANS.png => Bg_Simple-Gray_ANS.png} (100%) rename Files/ImgBackground/{Bg_Simple-Grey_ISO.png => Bg_Simple-Gray_ISO.png} (100%) diff --git a/Files/ImgBackground/Bg_Nice-Grey_ANS.png b/Files/ImgBackground/Bg_Nice-Gray_ANS.png similarity index 100% rename from Files/ImgBackground/Bg_Nice-Grey_ANS.png rename to Files/ImgBackground/Bg_Nice-Gray_ANS.png diff --git a/Files/ImgBackground/Bg_Nice-Grey_ISO.png b/Files/ImgBackground/Bg_Nice-Gray_ISO.png similarity index 100% rename from Files/ImgBackground/Bg_Nice-Grey_ISO.png rename to Files/ImgBackground/Bg_Nice-Gray_ISO.png diff --git a/Files/ImgBackground/Bg_Simple-Grey_ANS.png b/Files/ImgBackground/Bg_Simple-Gray_ANS.png similarity index 100% rename from Files/ImgBackground/Bg_Simple-Grey_ANS.png rename to Files/ImgBackground/Bg_Simple-Gray_ANS.png diff --git a/Files/ImgBackground/Bg_Simple-Grey_ISO.png b/Files/ImgBackground/Bg_Simple-Gray_ISO.png similarity index 100% rename from Files/ImgBackground/Bg_Simple-Grey_ISO.png rename to Files/ImgBackground/Bg_Simple-Gray_ISO.png diff --git a/Layouts/Colemak/README.md b/Layouts/Colemak/README.md index d81f7cb5..30e7f692 100644 --- a/Layouts/Colemak/README.md +++ b/Layouts/Colemak/README.md @@ -57,5 +57,5 @@ _Colemak-CAWS-ISO as above, showing the AltGr layer with dead keys marked in yel [BB_CeD]: https://dreymar.colemak.org/layers-colemaked.html (DreymaR's Big Bag of Tricks on the Colemak-eD layers) [BB_Erg]: https://dreymar.colemak.org/ergo-mods.html (DreymaR's Big Bag of Tricks on ergonomic mods) [BB_Loc]: https://dreymar.colemak.org/variants.html#locales (DreymaR's Big Bag of Tricks on Colemak Locale variants) -[BB_AWi]: https://dreymar.colemak.org/ergo-mods.html#AngleWide (DreymaR's Big Bag of Tricks on Angle+Wide ergo mods) -[BB_CDH]: https://dreymar.colemak.org/ergo-mods.html#CurlDH (DreymaR's Big Bag of Tricks on the Curl-DH ergo mod) +[BB_AWi]: https://dreymar.colemak.org/ergo-mods.html#angle-wide (DreymaR's Big Bag of Tricks on Angle+Wide ergo mods) +[BB_CDH]: https://dreymar.colemak.org/ergo-mods.html#curl-dh (DreymaR's Big Bag of Tricks on the Curl-DH ergo mod) diff --git a/Layouts/Dvorak/Dvk-eD_ANS/Layout.ini b/Layouts/Dvorak/Dvk-eD_ANS/Layout.ini index f853fdb6..c418cd08 100644 --- a/Layouts/Dvorak/Dvk-eD_ANS/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ANS/Layout.ini @@ -34,7 +34,7 @@ mapSC_layout = Dvorak ; Angle_@K, AWide_@K, Cmk-CAW-_@K etc - see _eD_R ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ANS_AWide/Layout.ini b/Layouts/Dvorak/Dvk-eD_ANS_AWide/Layout.ini index 1cd08f85..162208bd 100644 --- a/Layouts/Dvorak/Dvk-eD_ANS_AWide/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ANS_AWide/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ANS_Angle/Layout.ini b/Layouts/Dvorak/Dvk-eD_ANS_Angle/Layout.ini index 4ac12fb7..f624b655 100644 --- a/Layouts/Dvorak/Dvk-eD_ANS_Angle/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ANS_Angle/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = Angle_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ANS_AngleSym/Layout.ini b/Layouts/Dvorak/Dvk-eD_ANS_AngleSym/Layout.ini index 3dba78b3..3ece1d36 100644 --- a/Layouts/Dvorak/Dvk-eD_ANS_AngleSym/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ANS_AngleSym/Layout.ini @@ -39,7 +39,7 @@ mapSC_layout = Dvk-Sym,Angle_@K ; Angle_@K, AWide_@K, Cmk-CAW-_@K etc - s ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ANS_CurlAWide/Layout.ini b/Layouts/Dvorak/Dvk-eD_ANS_CurlAWide/Layout.ini index 952ee59c..9c2eb453 100644 --- a/Layouts/Dvorak/Dvk-eD_ANS_CurlAWide/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ANS_CurlAWide/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ANS_CurlAWideSym/Layout.ini b/Layouts/Dvorak/Dvk-eD_ANS_CurlAWideSym/Layout.ini index f54ef11e..fdf33574 100644 --- a/Layouts/Dvorak/Dvk-eD_ANS_CurlAWideSym/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ANS_CurlAWideSym/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ANS_CurlAngle/Layout.ini b/Layouts/Dvorak/Dvk-eD_ANS_CurlAngle/Layout.ini index 1fb16a72..db4463ff 100644 --- a/Layouts/Dvorak/Dvk-eD_ANS_CurlAngle/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ANS_CurlAngle/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = Angle_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ANS_Sym/Layout.ini b/Layouts/Dvorak/Dvk-eD_ANS_Sym/Layout.ini index ad61df7e..9f61c934 100644 --- a/Layouts/Dvorak/Dvk-eD_ANS_Sym/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ANS_Sym/Layout.ini @@ -39,7 +39,7 @@ mapSC_layout = Dvk-Sym ; Angle_@K, AWide_@K, Cmk-CAW-_@K etc - see _eD_ ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ISO/Layout.ini b/Layouts/Dvorak/Dvk-eD_ISO/Layout.ini index e03298e9..8268f538 100644 --- a/Layouts/Dvorak/Dvk-eD_ISO/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ISO/Layout.ini @@ -34,7 +34,7 @@ mapSC_layout = Dvorak ; Angle_@K, AWide_@K, Cmk-CAW-_@K etc - see _eD_R ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ISO_AWide/Layout.ini b/Layouts/Dvorak/Dvk-eD_ISO_AWide/Layout.ini index ddcec4f6..5498df4a 100644 --- a/Layouts/Dvorak/Dvk-eD_ISO_AWide/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ISO_AWide/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ISO_Angle/Layout.ini b/Layouts/Dvorak/Dvk-eD_ISO_Angle/Layout.ini index 104eb5a0..d0c57ba4 100644 --- a/Layouts/Dvorak/Dvk-eD_ISO_Angle/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ISO_Angle/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = Angle_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ISO_AngleSym/Layout.ini b/Layouts/Dvorak/Dvk-eD_ISO_AngleSym/Layout.ini index b6426648..5e07c46a 100644 --- a/Layouts/Dvorak/Dvk-eD_ISO_AngleSym/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ISO_AngleSym/Layout.ini @@ -39,7 +39,7 @@ mapSC_layout = Dvk-Sym,Angle_@K ; Angle_@K, AWide_@K, Cmk-CAW-_@K etc - s ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ISO_CurlAWide/Layout.ini b/Layouts/Dvorak/Dvk-eD_ISO_CurlAWide/Layout.ini index ee3f1fef..88ce5e32 100644 --- a/Layouts/Dvorak/Dvk-eD_ISO_CurlAWide/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ISO_CurlAWide/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ISO_CurlAWideSym/Layout.ini b/Layouts/Dvorak/Dvk-eD_ISO_CurlAWideSym/Layout.ini index e35a0da3..4ab9a2e0 100644 --- a/Layouts/Dvorak/Dvk-eD_ISO_CurlAWideSym/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ISO_CurlAWideSym/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ISO_CurlAngle/Layout.ini b/Layouts/Dvorak/Dvk-eD_ISO_CurlAngle/Layout.ini index e6afbce6..73468337 100644 --- a/Layouts/Dvorak/Dvk-eD_ISO_CurlAngle/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ISO_CurlAngle/Layout.ini @@ -34,7 +34,7 @@ mapSC_extend = Angle_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/Dvk-eD_ISO_Sym/Layout.ini b/Layouts/Dvorak/Dvk-eD_ISO_Sym/Layout.ini index 4fbb48ec..63b2226c 100644 --- a/Layouts/Dvorak/Dvk-eD_ISO_Sym/Layout.ini +++ b/Layouts/Dvorak/Dvk-eD_ISO_Sym/Layout.ini @@ -39,7 +39,7 @@ mapSC_layout = Dvk-Sym ; Angle_@K, AWide_@K, Cmk-CAW-_@K etc - see _eD_ ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K.png ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = ..\_Res\Dv_ diff --git a/Layouts/Dvorak/README.md b/Layouts/Dvorak/README.md index 0c4e04ae..8374b2a3 100644 --- a/Layouts/Dvorak/README.md +++ b/Layouts/Dvorak/README.md @@ -94,7 +94,7 @@ The Boo Layout [BB_Erg]: https://dreymar.colemak.org/ergo-mods.html (DreymaR's Big Bag of Tricks on ergo mods) -[BB_AWi]: https://dreymar.colemak.org/ergo-mods.html#AngleWide (DreymaR's Big Bag of Tricks on Angle+Wide ergo mods) -[BB_CAW]: https://dreymar.colemak.org/ergo-mods.html#CurlDH (DreymaR's Big Bag of Tricks on the Curl-DH ergo mod) +[BB_AWi]: https://dreymar.colemak.org/ergo-mods.html#angle-wide (DreymaR's Big Bag of Tricks on Angle+Wide ergo mods) +[BB_CAW]: https://dreymar.colemak.org/ergo-mods.html#curl-dh (DreymaR's Big Bag of Tricks on the Curl-DH ergo mod) [PrgDvk]: https://www.kaufmann.no/roland/dvorak/ (Programmer Dvorak, by Roland Kaufmann) [BooLay]: ../Boo/ (The Boo layout in EPKL) diff --git a/Layouts/QWERTY/QWE-VK_ANS_AWide/Layout.ini b/Layouts/QWERTY/QWE-VK_ANS_AWide/Layout.ini index 31f5ec77..4bf9fa69 100644 --- a/Layouts/QWERTY/QWE-VK_ANS_AWide/Layout.ini +++ b/Layouts/QWERTY/QWE-VK_ANS_AWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-VK_ANS_AWideSym/Layout.ini b/Layouts/QWERTY/QWE-VK_ANS_AWideSym/Layout.ini index 574cc357..b26eb91a 100644 --- a/Layouts/QWERTY/QWE-VK_ANS_AWideSym/Layout.ini +++ b/Layouts/QWERTY/QWE-VK_ANS_AWideSym/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-VK_ANS_Angle/Layout.ini b/Layouts/QWERTY/QWE-VK_ANS_Angle/Layout.ini index b9ba506b..f7267875 100644 --- a/Layouts/QWERTY/QWE-VK_ANS_Angle/Layout.ini +++ b/Layouts/QWERTY/QWE-VK_ANS_Angle/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Angle_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-VK_ISO/Layout.ini b/Layouts/QWERTY/QWE-VK_ISO/Layout.ini index 71712b36..749b5a2f 100644 --- a/Layouts/QWERTY/QWE-VK_ISO/Layout.ini +++ b/Layouts/QWERTY/QWE-VK_ISO/Layout.ini @@ -33,7 +33,7 @@ baseLayout = QWERTY\BaseLayout_QWE-VK ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-VK_ISO_AWide/Layout.ini b/Layouts/QWERTY/QWE-VK_ISO_AWide/Layout.ini index 530ecc6d..f3e94605 100644 --- a/Layouts/QWERTY/QWE-VK_ISO_AWide/Layout.ini +++ b/Layouts/QWERTY/QWE-VK_ISO_AWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-VK_ISO_AWideSym/Layout.ini b/Layouts/QWERTY/QWE-VK_ISO_AWideSym/Layout.ini index 6f259596..8607d0d2 100644 --- a/Layouts/QWERTY/QWE-VK_ISO_AWideSym/Layout.ini +++ b/Layouts/QWERTY/QWE-VK_ISO_AWideSym/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-VK_ISO_Angle/Layout.ini b/Layouts/QWERTY/QWE-VK_ISO_Angle/Layout.ini index 05be9d19..12530dcc 100644 --- a/Layouts/QWERTY/QWE-VK_ISO_Angle/Layout.ini +++ b/Layouts/QWERTY/QWE-VK_ISO_Angle/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Angle_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ANS/Layout.ini b/Layouts/QWERTY/QWE-eD_ANS/Layout.ini index 0c81d006..36c6e5a4 100644 --- a/Layouts/QWERTY/QWE-eD_ANS/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ANS/Layout.ini @@ -33,7 +33,7 @@ mapSC_layout = QWERTY ; Angle_@K, AWide_@K, Cmk-CAW-_@K etc - see _eD_R ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ANS_AWide/Layout.ini b/Layouts/QWERTY/QWE-eD_ANS_AWide/Layout.ini index f44d07d5..85a4c651 100644 --- a/Layouts/QWERTY/QWE-eD_ANS_AWide/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ANS_AWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ANS_AWideSym/Layout.ini b/Layouts/QWERTY/QWE-eD_ANS_AWideSym/Layout.ini index fd29b938..b7e5f1e9 100644 --- a/Layouts/QWERTY/QWE-eD_ANS_AWideSym/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ANS_AWideSym/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ANS_Angle/Layout.ini b/Layouts/QWERTY/QWE-eD_ANS_Angle/Layout.ini index 215cd590..9e6d72b3 100644 --- a/Layouts/QWERTY/QWE-eD_ANS_Angle/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ANS_Angle/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Angle_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ANS_Wide/Layout.ini b/Layouts/QWERTY/QWE-eD_ANS_Wide/Layout.ini index 85bfee21..0f7f5cad 100644 --- a/Layouts/QWERTY/QWE-eD_ANS_Wide/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ANS_Wide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Wide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-Trad_@K-Wide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ANS_WideSym/Layout.ini b/Layouts/QWERTY/QWE-eD_ANS_WideSym/Layout.ini index 5fad343c..237360e9 100644 --- a/Layouts/QWERTY/QWE-eD_ANS_WideSym/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ANS_WideSym/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Wide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-Trad_@K-Wide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ISO/Layout.ini b/Layouts/QWERTY/QWE-eD_ISO/Layout.ini index 5522f306..1cce3931 100644 --- a/Layouts/QWERTY/QWE-eD_ISO/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ISO/Layout.ini @@ -33,7 +33,7 @@ mapSC_layout = QWERTY ; Angle_@K, AWide_@K, Cmk-CAW-_@K etc - see _eD_R ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Q_ diff --git a/Layouts/QWERTY/QWE-eD_ISO_AWide/Layout.ini b/Layouts/QWERTY/QWE-eD_ISO_AWide/Layout.ini index 957021a0..cbb18152 100644 --- a/Layouts/QWERTY/QWE-eD_ISO_AWide/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ISO_AWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ISO_AWideSym/Layout.ini b/Layouts/QWERTY/QWE-eD_ISO_AWideSym/Layout.ini index 60366d3b..49b29239 100644 --- a/Layouts/QWERTY/QWE-eD_ISO_AWideSym/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ISO_AWideSym/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ISO_Angle/Layout.ini b/Layouts/QWERTY/QWE-eD_ISO_Angle/Layout.ini index b2f7052e..60b37a8d 100644 --- a/Layouts/QWERTY/QWE-eD_ISO_Angle/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ISO_Angle/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Angle_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Angle.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ISO_Wide/Layout.ini b/Layouts/QWERTY/QWE-eD_ISO_Wide/Layout.ini index 4abb348c..7adb2d3c 100644 --- a/Layouts/QWERTY/QWE-eD_ISO_Wide/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ISO_Wide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Wide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Wide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/QWERTY/QWE-eD_ISO_WideSym/Layout.ini b/Layouts/QWERTY/QWE-eD_ISO_WideSym/Layout.ini index 84deb0a3..eb0f333b 100644 --- a/Layouts/QWERTY/QWE-eD_ISO_WideSym/Layout.ini +++ b/Layouts/QWERTY/QWE-eD_ISO_WideSym/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Wide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel ;img_bgImage = Files\ImgBackground\Bg_Nice-Tinted_@K.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-Wide.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images diff --git a/Layouts/README.md b/Layouts/README.md index 43e4efb9..30925ed5 100644 --- a/Layouts/README.md +++ b/Layouts/README.md @@ -93,6 +93,7 @@ Entries are any-whitespace delimited. Layout variant tutorial ----------------------- You can make your own version of, say, a locale layout variant – for instance, using an ergonomic mod combo that isn't provided out-of-the-box: + * Determine which keyboard type (ISO/ANS), ergo mod and if applicable, existing locale variant you want to start from. * Determine whether you want to just move keys around by VirtualKey/ScanCode mappings or map all their shift states like Colemak-eD does. * Copy/Paste a promising layout folder and rename the result to what you want. @@ -135,6 +136,19 @@ You can make your own version of, say, a locale layout variant – for instance, - To see the "Create help images…" menu option, `advancedMode` must be on in [EPKL_Settings][PklIni]. - The HIG will make images for the currently active layout. - I recommend making state images only at first, since a full set of about 80 dead key images takes a _long_ time! +

+ +Layout locale naming +-------------------- +I try to keep to the same locale naming standard as Linux X.Org (xkb-data). That is, the ISO letter codes for countries, languages and scripts. +* Country and language codes can be seen in the Variant selections, primarily prepackaged for the Colemak main layout. +* Codes for scripts (such as Cyrillic or Hebrew) are used internally. Note that I use `Kyr` instead of `Cyrl` for Kyrillic script. +* For most scripts, the 3-letter language code is used instead (Gre for Grek, Heb for Hebr etc), as per X.Org and Unicode tradition. + +The relevant ISO codes can be found at the following addresses: +* 2-letter ISO codes - Country: http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm +* 3-letter ISO codes - Language: http://www.loc.gov/standards/iso639-2/php/code_list.php +* 4-letter ISO codes - Script: http://www.unicode.org/iso15924/iso15924-codes.html
diff --git a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm1_ANS_AWide/Layout.ini b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm1_ANS_AWide/Layout.ini index 145d5051..6c41583d 100644 --- a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm1_ANS_AWide/Layout.ini +++ b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm1_ANS_AWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Co-3_ diff --git a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm2_ANS_AWide/Layout.ini b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm2_ANS_AWide/Layout.ini index 51807571..e3b1d1a0 100644 --- a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm2_ANS_AWide/Layout.ini +++ b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm2_ANS_AWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Co-3_ diff --git a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm3_ANS_AWide/Layout.ini b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm3_ANS_AWide/Layout.ini index a77d543e..6cfd25e8 100644 --- a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm3_ANS_AWide/Layout.ini +++ b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm3_ANS_AWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Co-3_ diff --git a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm4_ANS_AWide/Layout.ini b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm4_ANS_AWide/Layout.ini index b3fd1a8a..ebfe7fb4 100644 --- a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm4_ANS_AWide/Layout.ini +++ b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_AWide/Tmk-eD-Tm4_ANS_AWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Co-3_ diff --git a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm1_ANS_CurlAWide/Layout.ini b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm1_ANS_CurlAWide/Layout.ini index 4e9215db..476a547b 100644 --- a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm1_ANS_CurlAWide/Layout.ini +++ b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm1_ANS_CurlAWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = AWide_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Co-3_ diff --git a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm2_ANS_CurlAWide/Layout.ini b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm2_ANS_CurlAWide/Layout.ini index 0a482a71..7fb379ad 100644 --- a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm2_ANS_CurlAWide/Layout.ini +++ b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm2_ANS_CurlAWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Ext-CAW-_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Co-3_ diff --git a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm3_ANS_CurlAWide/Layout.ini b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm3_ANS_CurlAWide/Layout.ini index d90df8e1..cfec1cbc 100644 --- a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm3_ANS_CurlAWide/Layout.ini +++ b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm3_ANS_CurlAWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Ext-CAW-_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Co-3_ diff --git a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm4_ANS_CurlAWide/Layout.ini b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm4_ANS_CurlAWide/Layout.ini index 537b989b..c2b1188e 100644 --- a/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm4_ANS_CurlAWide/Layout.ini +++ b/Layouts/Tarmak/opt-Tmk-eD_ANS_AW-CAW/Tmk-eD-ANS_CAW/Tmk-eD-Tm4_ANS_CurlAWide/Layout.ini @@ -33,7 +33,7 @@ mapSC_extend = Ext-CAW-_@K ; As _layout but only "hard" (non-letter) mods ;; Background image (key caps etc) and a background color for the image panel img_bgImage = Files\ImgBackground\Bg_FingerShui-eD_@K-AWide.png -;img_bgImage = Files\ImgBackground\Bg_Simple-Grey_@K.png +;img_bgImage = Files\ImgBackground\Bg_Simple-Gray_@K.png ;img_bgColor = 999999 ;; On/Off, Extend, Dead key and Shift state marker (e.g., MagBlob, GrnBlob) images icons_OnOff = Files\ImgIcons\Co-3_ diff --git a/README.md b/README.md index 91c0ea11..a7197dae 100644 --- a/README.md +++ b/README.md @@ -518,7 +518,7 @@ _Øystein "DreymaR" Bech-Aase_ [CmkOrg]: https://www.colemak.org (The Colemak Community site) [orgBBT]: https://dreymar.colemak.org/ (DreymaR's Big Bag of Keyboard Tricks) [BBText]: https://dreymar.colemak.org/layers-extend.html (about Extend, in DreymaR's Big Bag of Keyboard Tricks) -[BBTawi]: https://dreymar.colemak.org/ergo-mods.html#AngleWide (about the Angle/Wide ergo mods, in DreymaR's Big Bag of Keyboard Tricks) +[BBTawi]: https://dreymar.colemak.org/ergo-mods.html#angle-wide (about the Angle/Wide ergo mods, in DreymaR's Big Bag of Keyboard Tricks) [BBT_eD]: https://dreymar.colemak.org/layers-colemaked.html (about Colemak-eD layers, in DreymaR's Big Bag of Keyboard Tricks) [CmkBBT]: https://forum.colemak.com/topic/2315-dreymars-big-bag-of-keyboard-tricks-main-topic/ (BigBagOfKbdTrix on the Colemak forums) [CmkPKL]: https://forum.colemak.com/topic/1467-dreymars-big-bag-of-keyboard-tricks-pklwindows-edition/ (BigBag-PKL on the Colemak forums) diff --git a/Source/EPKL_Source/_PKL_main.ahk b/Source/EPKL_Source/_PKL_main.ahk index fc35bd62..eff3d387 100644 --- a/Source/EPKL_Source/_PKL_main.ahk +++ b/Source/EPKL_Source/_PKL_main.ahk @@ -15,18 +15,36 @@ WIPs: NEXT: TODO: -2FIX: APT?!? It shouldn't show up in the layout selector since it holds no layout.ini file, but it does. - - Make a README, link to the GitHub site and implement the layout too, of course. +2FIX: APT shows?!? It shouldn't show up in the layout selector since it holds no layout.ini file, but it does. + - The main layout detection doesn't filter out anything, no. It's just the variants etc that look for a Layout.ini file. Is that okay? + - Could implement a check at the end of UIselLay as to whether all settings (or just layType?) turn out empty, and if they do then remove the main layout in question? +WIPs: APT & Co? + - Make a README, link to the GitHub site and implement the APTv3 layout too, of course. + - Unless... Is APTv3 a stable candidate anymore? Word has it, it's superseded by APTv4 which is still unstable. + - We already have Semimak-JQ and Canary, so consider adding the other "best candidates"? + - https://getreuer.info/posts/keyboards/alt-layouts/index.html#which-alt-keyboard-layout-should-i-learn + - APTv3, Nerps, Sturdy and Engram(?) look good in this comparison. + - Oxey for instance has several candidates, but it'd make sense to focus on one. + +WIPs: Improve GUI responsiveness by running some of its routines at init time. + - GUI startup is slow. Where are the bottlenecks? Try to tic-toc GUI startup? + - Heavy startup routines could be added to the setUIGlobals section, which is indeed run at init time. + - Could also make GUI startup more responsive by pre-initializing the GUI at init. As it is now, it's made from scratch each time. + - Candidate: Layout selection. Premake the list of eligible layouts (and LayType? KbdType? Variants? Mods?) beforehand. WIPs: Maybe I can emulate AHK Send so it doesn't send KeyUp even for state-mapped layouts?!? - - Ask around at the AHK forums as to what Send really does, and whether there's an existing workaround for KeyUp. + - Just adding " DownR}" to the normal pkl_SendThis() didn't work; the KeyUp events are still sent. + - Ask around at the AHK forums as to what Send really does, and whether there's an existing workaround for KeyUp. Or at the AHK Discord! - One possibility might be to send keys for simple letters, but that's not robust vis-a-vis the OS layout? There's the ## mappings for that, too. 2FIX: DK detection works for my eD2VK layout, but not its pure VK counterpart. What gives?! - Is the BaseLayout wrong somehow? No, copying a key mapping from the Colemak-VK BaseLayout to the eD(2VK) Layout_Override preserves DK functionality. - Also, do DK detection when it's set to auto, and the old way otherwise? Then, what about when there is a table entry? + - Call getWinLayDKs() (in pkl_deadkey) more robustly? No, it's the test for "śķιᶈForDK" in pkl_keypress that matters. + - But keyPressed( HKey ) in pkl_keypress handles eD2VK and VK keys the same? So why then is the DK ruined by one and not the other? 2FIX: For the NNO WinLay, it registers SC00D as "1" and SC01B as "0:6"; they should be "1:6" (àá) and "0:1:6" (äâã), resp.?! How come some states get lost?! + - Both are missing their state 6 dead key, acute and tilde respectively. There are no other dead keys in the layout. The Cmk-eD layout gets state 6 registered. - Might using ToUnicodeEx make a difference? - Reverting to listing DKs in the settings sounds like a defeat now... - Test it on the Colemak-eD MSKLC, since it has a ton of DKs? Only on levels 0:1 or 6 though.