Merge pull request #19 from deinsoftware/swept

update AHK keys
deintech · Mar 8, 2023 · 2799378 · 2799378
2 parents cabeb81 + 404a33c
commit 2799378
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 24 deletions.
diff --git a/.github/images/icons/AXN.png b/.github/images/icons/AXN.png
diff --git a/.github/images/layers/AXN.png b/.github/images/layers/AXN.png
diff --git a/.github/images/layers/BAS.png b/.github/images/layers/BAS.png
diff --git a/.github/images/layers/DEV.png b/.github/images/layers/DEV.png
diff --git a/.github/images/layers/STG.png b/.github/images/layers/STG.png
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 5.6.0
+
+- Update layer icons replacing emoji icons for Unicode letters
+- update AHK keys combinations
+
 ## 5.5.0
 
 - Add task manager key on `STG` layer

diff --git a/ahk/dev.ahk b/ahk/dev.ahk
@@ -5,23 +5,21 @@
 ; # Win
 
 ; Dev
-  !+=::Send("{U+002B}{U+003D}")                    ;       Alt++  +=      Addition Assignment
-  !-::Send("{U+002D}{U+003D}")                    ;       Alt+-  -=      Subtraction Assignment
-  !+8::Send("{U+002A}{U+003D}")                    ;       Alt+*  *=      Multiply Assignment
-  !/::Send("{U+002F}{U+003D}")                    ;       Alt+/  /=      Division Assignment
-  !=::Send("{U+003D}{U+003D}{U+003D}")            ;       Alt+=  ===     Strict Equality
- !+1::Send("{U+0021}{U+003D}{U+003D}")            ;       Alt+!  !==     Strict Inequality
- !+7::Send("{U+0026}{U+0026}{U+003D}")            ;       Alt+&  &&=     Logical And Assignment
- !+\::Send("{U+007C}{U+007C}{U+003D}")            ;       Alt+|  ||=     Logical OR Assignment
- !+/::Send("{U+003F}{U+003F}{U+003D}")            ;       Alt+?  ??=     Nullish Coalescing Assignment
- !+,::Send("{U+003C}{U+003D}")                    ;       Alt+<  <=      Less than or equal to
-#!+,::Send("{U+003C}{U+002F}{U+003E}{left 2}")    ;   Win+Alt+<  <░/>    React Component Tag
- !+.::Send("{U+003E}{U+003D}")                    ;       Alt+>  >=      Greater than or equal to
-#+!.::Send("{U+003C}{U+002F}{U+003E}{left 1}")    ;   Win+Alt+>  </░>    HTML Close Tag
-
-; Settings
 #HotIf WinActive("ahk_exe code.exe")
-    #^+,::                                        ;  Win+Ctrl+<  <>░</>  React Fragment Tag
+    !+=::Send("{U+002B}{U+003D}")                   ;       Alt++  +=      Addition Assignment
+    !-::Send("{U+002D}{U+003D}")                    ;       Alt+-  -=      Subtraction Assignment
+    !+8::Send("{U+002A}{U+003D}")                   ;       Alt+*  *=      Multiply Assignment
+    !/::Send("{U+002F}{U+003D}")                    ;       Alt+/  /=      Division Assignment
+    !=::Send("{U+003D}{U+003D}{U+003D}")            ;       Alt+=  ===     Strict Equality
+    !+1::Send("{U+0021}{U+003D}{U+003D}")           ;       Alt+!  !==     Strict Inequality
+    !+7::Send("{U+0026}{U+0026}{U+003D}")           ;       Alt+&  &&=     Logical And Assignment
+    !+\::Send("{U+007C}{U+007C}{U+003D}")           ;       Alt+|  ||=     Logical OR Assignment
+    !+/::Send("{U+003F}{U+003F}{U+003D}")           ;       Alt+?  ??=     Nullish Coalescing Assignment
+    !+,::Send("{U+003C}{U+003D}")                   ;       Alt+<  <=      Less than or equal to
+    #!+,::Send("{U+003C}{U+002F}{U+003E}{left 2}")  ;   Win+Alt+<  <░/>    React Component Tag
+    !+.::Send("{U+003E}{U+003D}")                   ;       Alt+>  >=      Greater than or equal to
+    #+!.::Send("{U+003C}{U+002F}{U+003E}{left 1}")  ;   Win+Alt+>  </░>    HTML Close Tag
+    #^+,::                                          ;  Win+Ctrl+<  <>░</>  React Fragment Tag
     {
         Send("{U+003C}{U+003E}")
         Send("{U+003C}{U+002F}{U+003E}")
@@ -31,11 +29,13 @@
 #HotIf
 
 #HotIf WinActive("ahk_exe Tabby.exe")
-    ^PgUp:: Send("^+{Left}")                      ;  Previous Tab
-    ^PgDn:: Send("^+{Right}")                     ;  Next Tab
+    ^PgUp::Send("^+{Left}")                      ;  Previous Tab
+    ^PgDn::Send("^+{Right}")                     ;  Next Tab
 #HotIf
 
 #HotIf WinActive("ahk_exe WindowsTerminal.exe")
-    ^PgUp:: Send("^+{Tab}")                       ;  Previous Tab
-    ^PgDn:: Send("^{Tab}")                        ;  Next Tab
+    ^PgUp::Send("^+{Tab}")                       ;  Previous Tab
+    ^PgDn::Send("^{Tab}")                        ;  Next Tab
+       ^\::Send("!\")                            ;  Split Pane Right
+       ^/::Send("!/")                            ;  Split Pane Down
 #HotIf
diff --git a/ahk/keys.ahk b/ahk/keys.ahk
@@ -24,7 +24,6 @@
 
 
 ; Symbols
-  !q::Send("{U+0040}")                   ;      Alt+q  @
 #!+/::Send("{U+00BF}")                   ;  Win+Alt+?  ¿
 #^+/::Send("{U+00BF}{U+003F}{left 1}")   ; Win+Ctrl+?  ¿?
 #!+1::Send("{U+00A1}")                   ;  Win+Alt+!  ¡
@@ -41,5 +40,5 @@
 
 ; Settings
 #HotIf WinActive("ahk_exe code.exe")
- ^0::Send("^{Numpad0}")                 ;      Ctrl+0  Zoom Reset
+  ^0::Send("^{Numpad0}")                 ;      Ctrl+0  Zoom Reset
 #HotIf
diff --git a/ahk/startup.ahk b/ahk/startup.ahk
@@ -9,8 +9,8 @@ ChangeIcon("KBD")
 ; Fix to stuck keys
 A_MenuMaskKey := "vkFF"        ;  Unassigned. Avoid Ctrl get stuck
 ; A_MenuMaskKey := "vkE8"      ;  No Mapping. Avoid Alt get stuck
-KeyWait "RControl", "L"        ; Wait for both Control and Alt to be released.
-KeyWait "RAlt", "L"            ; Wait for both Control and Alt to be released.
+KeyWait "RControl", "L"        ;  Wait for Control to be released
+KeyWait "RAlt", "L"            ;  Wait for Alt to be released
 
 ; Combos
 #Include "keys.ahk"