Merge pull request vial-kb#131 from bgkendall/organise-modifiers

Organise modifiers on Quantum tab
eldios · Sep 5, 2022 · 2629b4e · 2629b4e
2 parents e4bab78 + 4b22e27
commit 2629b4e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/main/python/keycodes.py b/src/main/python/keycodes.py
@@ -319,8 +319,11 @@ def LT(layer):
 RESET_KEYCODE = 0x5C00
 
 
-KEYCODES_QUANTUM = [
- K(RESET_KEYCODE, "RESET", "Reset", "Reboot to bootloader"),
+KEYCODES_BOOT = [
+ K(RESET_KEYCODE, "RESET", "Reset", "Reboot to bootloader")
+]
+
+KEYCODES_MODIFIERS = [
  K(QK_ONE_SHOT_MOD | MOD_LSFT, "OSM(MOD_LSFT)", "OSM\nLSft", "Enable Left Shift for one keypress"),
  K(QK_ONE_SHOT_MOD | MOD_LCTL, "OSM(MOD_LCTL)", "OSM\nLCtl", "Enable Left Control for one keypress"),
  K(QK_ONE_SHOT_MOD | MOD_LALT, "OSM(MOD_LALT)", "OSM\nLAlt", "Enable Left Alt for one keypress"),
@@ -402,7 +405,9 @@ def LT(layer):
  K(0x5CF5, "KC_LAPO", "LA\n(", "Left Alt when held, ( when tapped"),
  K(0x5CF6, "KC_RAPC", "RA\n)", "Right Alt when held, ) when tapped"),
  K(0x5CD9, "KC_SFTENT", "RS\nEnter", "Right Shift when held, Enter when tapped"),
+]
 
+KEYCODES_QUANTUM = [
  K(23554, "MAGIC_SWAP_CONTROL_CAPSLOCK", "Swap\nCtrl\nCaps", "Swap Caps Lock and Left Control", alias=["CL_SWAP"]),
  K(23563, "MAGIC_UNSWAP_CONTROL_CAPSLOCK", "Unswap\nCtrl\nCaps", "Unswap Caps Lock and Left Control",
  alias=["CL_NORM"]),
@@ -774,8 +779,8 @@ def recreate_keycodes():
 
  KEYCODES.clear()
  KEYCODES.extend(KEYCODES_SPECIAL + KEYCODES_BASIC + KEYCODES_SHIFTED + KEYCODES_ISO + KEYCODES_LAYERS +
- KEYCODES_QUANTUM + KEYCODES_BACKLIGHT + KEYCODES_MEDIA + KEYCODES_TAP_DANCE + KEYCODES_MACRO +
- KEYCODES_USER + KEYCODES_HIDDEN + KEYCODES_MIDI)
+ KEYCODES_BOOT + KEYCODES_MODIFIERS + KEYCODES_QUANTUM + KEYCODES_BACKLIGHT + KEYCODES_MEDIA +
+ KEYCODES_TAP_DANCE + KEYCODES_MACRO + KEYCODES_USER + KEYCODES_HIDDEN + KEYCODES_MIDI)
  KEYCODES_MAP.clear()
  for keycode in KEYCODES:
  KEYCODES_MAP[keycode.code] = keycode

diff --git a/src/main/python/tabbed_keycodes.py b/src/main/python/tabbed_keycodes.py
@@ -6,9 +6,10 @@
 
 from constants import KEYCODE_BTN_RATIO
 from widgets.display_keyboard import DisplayKeyboard
-from widgets.display_keyboard_defs import ansi_100, ansi_80, ansi_70, iso_100, iso_80, iso_70
+from widgets.display_keyboard_defs import ansi_100, ansi_80, ansi_70, iso_100, iso_80, iso_70, mods, mods_narrow
 from widgets.flowlayout import FlowLayout
 from keycodes import KEYCODES_BASIC, KEYCODES_ISO, KEYCODES_MACRO, KEYCODES_LAYERS, KEYCODES_QUANTUM, \
+ KEYCODES_BOOT, KEYCODES_MODIFIERS, \
  KEYCODES_BACKLIGHT, KEYCODES_MEDIA, KEYCODES_SPECIAL, KEYCODES_SHIFTED, KEYCODES_USER, Keycode, \
  KEYCODES_TAP_DANCE, KEYCODES_MIDI, KEYCODES_BASIC_NUMPAD, KEYCODES_BASIC_NAV, KEYCODES_ISO_KR
 from widgets.square_button import SquareButton
@@ -172,7 +173,9 @@ def __init__(self, parent=None, keycode_filter=keycode_filter_any):
  (None, KEYCODES_ISO),
  ], prefix_buttons=[("Any", -1)]),
  SimpleTab(self, "Layers", KEYCODES_LAYERS),
- SimpleTab(self, "Quantum", KEYCODES_QUANTUM),
+ Tab(self, "Quantum", [(mods, (KEYCODES_BOOT + KEYCODES_QUANTUM)),
+ (mods_narrow, (KEYCODES_BOOT + KEYCODES_QUANTUM)),
+ (None, (KEYCODES_BOOT + KEYCODES_MODIFIERS + KEYCODES_QUANTUM))]),
  SimpleTab(self, "Backlight", KEYCODES_BACKLIGHT),
  SimpleTab(self, "App, Media and Mouse", KEYCODES_MEDIA),
  SimpleTab(self, "MIDI", KEYCODES_MIDI),

diff --git a/src/main/python/widgets/display_keyboard_defs.py b/src/main/python/widgets/display_keyboard_defs.py
@@ -23,3 +23,11 @@
 iso_70 = r"""
 [["KC_ESCAPE",{"x":1},"KC_F1","KC_F2","KC_F3","KC_F4",{"x":0.5},"KC_F5","KC_F6","KC_F7","KC_F8",{"x":0.5},"KC_F9","KC_F10","KC_F11","KC_F12"],[{"y":0.25},"KC_GRAVE","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINUS","KC_EQUAL","KC_JYEN","KC_BSPACE"],[{"w":1.5},"KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRACKET","KC_RBRACKET",{"x":0.25,"w":1.25,"h":2},"KC_ENTER"],[{"w":1.75},"KC_CAPSLOCK","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCOLON","KC_QUOTE","KC_NONUS_HASH"],[{"w":1.25},"KC_LSHIFT","KC_NONUS_BSLASH","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMMA","KC_DOT","KC_SLASH","KC_RO",{"w":1.75},"KC_RSHIFT"],[{"w":1.25},"KC_LCTRL",{"w":1.25},"KC_LGUI",{"w":1.25},"KC_LALT",{"w":1.25},"KC_MHEN",{"w":2.5},"KC_SPACE",{"w":1.25},"KC_HENK",{"w":1.25},"KC_KANA",{"w":1.25},"KC_RALT",{"w":1.25},"KC_RGUI",{"w":1.25},"KC_APPLICATION",{"w":1.25},"KC_RCTRL"]]
 """
+
+mods = r"""
+[["KC_GESC",{"x":0.75,"w":1.25},"KC_LSPO",{"w":1.25},"KC_RSPC",{"x":0.25,"w":1.25},"KC_LCPO",{"w":1.25},"KC_RCPC",{"x":0.25,"w":1.25},"KC_LAPO",{"w":1.25},"KC_RAPC",{"x":0.5,"w":2.25},"KC_SFTENT"],[{"y":0.5},"OSM(MOD_LSFT)","OSM(MOD_LCTL)","OSM(MOD_LALT)","OSM(MOD_LGUI)",{"x":0.25},"OSM(MOD_RSFT)","OSM(MOD_RCTL)","OSM(MOD_RALT)","OSM(MOD_RGUI)",{"x":0.25},"OSM(MOD_LCTL|MOD_LSFT)","OSM(MOD_LCTL|MOD_LALT)","OSM(MOD_LCTL|MOD_LGUI)","OSM(MOD_LCTL|MOD_LSFT|MOD_LGUI)","OSM(MOD_LSFT|MOD_LALT)","OSM(MOD_LSFT|MOD_LGUI)","OSM(MOD_LSFT|MOD_LALT|MOD_LGUI)","OSM(MOD_LCTL|MOD_LALT|MOD_LGUI)","OSM(MOD_LALT|MOD_LGUI)","OSM(MOD_MEH)","OSM(MOD_HYPR)"],["LSFT(kc)","LCTL(kc)","LALT(kc)","LGUI(kc)",{"x":0.25},"RSFT(kc)","RCTL(kc)","RALT(kc)","RGUI(kc)",{"x":0.25},"C_S(kc)","LCA(kc)","LCG(kc)","RCG(kc)","LSA(kc)","SGUI(kc)",{"x":1},"LCAG(kc)",{"x":1},"MEH(kc)","HYPR(kc)"],["LSFT_T(kc)","LCTL_T(kc)","LALT_T(kc)","LGUI_T(kc)",{"x":0.25},"RSFT_T(kc)","RCTL_T(kc)","RALT_T(kc)","RGUI_T(kc)",{"x":0.25},"C_S_T(kc)","LCA_T(kc)","LCG_T(kc)","RCG_T(kc)","LSA_T(kc)","SGUI_T(kc)",{"x":1},"LCAG_T(kc)","RCAG_T(kc)","MEH_T(kc)","ALL_T(kc)"]]
+"""
+
+mods_narrow = r"""
+[["KC_GESC",{"x":0.75},"KC_LSPO","KC_RSPC",{"x":0.5},"KC_LCPO","KC_RCPC",{"x":0.5},"KC_LAPO","KC_RAPC",{"x":0.5,"w":1.25},"KC_SFTENT"],[{"y":0.5},"OSM(MOD_LSFT)","OSM(MOD_LCTL)","OSM(MOD_LALT)","OSM(MOD_LGUI)",{"x":0.5},"OSM(MOD_LCTL|MOD_LSFT)","OSM(MOD_LCTL|MOD_LALT)","OSM(MOD_LCTL|MOD_LGUI)","OSM(MOD_LCTL|MOD_LSFT|MOD_LGUI)","OSM(MOD_LSFT|MOD_LALT)","OSM(MOD_LSFT|MOD_LGUI)"],["OSM(MOD_RSFT)","OSM(MOD_RCTL)","OSM(MOD_RALT)","OSM(MOD_RGUI)",{"x":0.5},"OSM(MOD_LSFT|MOD_LALT|MOD_LGUI)","OSM(MOD_LCTL|MOD_LALT|MOD_LGUI)","OSM(MOD_LALT|MOD_LGUI)","OSM(MOD_MEH)","OSM(MOD_HYPR)"],["LSFT(kc)","LCTL(kc)","LALT(kc)","LGUI(kc)",{"x":0.5},"C_S(kc)","LCA(kc)","LCG(kc)","RCG(kc)","LSA(kc)","SGUI(kc)"],["RSFT(kc)","RCTL(kc)","RALT(kc)","RGUI(kc)",{"x":1.5},"LCAG(kc)",{"x":1},"MEH(kc)","HYPR(kc)"],["LSFT_T(kc)","LCTL_T(kc)","LALT_T(kc)","LGUI_T(kc)",{"x":0.5},"C_S_T(kc)","LCA_T(kc)","LCG_T(kc)","RCG_T(kc)","LSA_T(kc)","SGUI_T(kc)"],["RSFT_T(kc)","RCTL_T(kc)","RALT_T(kc)","RGUI_T(kc)",{"x":1.5},"LCAG_T(kc)","RCAG_T(kc)","MEH_T(kc)","ALL_T(kc)"]]
+"""