Minor tweak to modifier organisation change

* Renamed `KEYCODES_RESET` to `KEYCODES_BOOT` since `RESET` will become `QK_BOOT` in the near future. * Reordered includes to minimise changes in pull request. * Remover spurious `"`
eldios · Sep 4, 2022 · 4ecb14c · 4ecb14c
1 parent 674ba06
commit 4ecb14c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/python/keycodes.py b/src/main/python/keycodes.py
@@ -319,7 +319,7 @@ def LT(layer):
 RESET_KEYCODE = 0x5C00
 
 
-KEYCODES_RESET = [
+KEYCODES_BOOT = [
  K(RESET_KEYCODE, "RESET", "Reset", "Reboot to bootloader")
 ]
 

diff --git a/src/main/python/tabbed_keycodes.py b/src/main/python/tabbed_keycodes.py
@@ -9,9 +9,9 @@
 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, \
- KEYCODES_RESET, KEYCODES_MODIFIERS
+ KEYCODES_TAP_DANCE, KEYCODES_MIDI, KEYCODES_BASIC_NUMPAD, KEYCODES_BASIC_NAV, KEYCODES_ISO_KR
 from widgets.square_button import SquareButton
 from util import tr, KeycodeDisplay
 
@@ -173,9 +173,9 @@ def __init__(self, parent=None, keycode_filter=keycode_filter_any):
  (None, KEYCODES_ISO),
  ], prefix_buttons=[("Any", -1)]),
  SimpleTab(self, "Layers", KEYCODES_LAYERS),
- Tab(self, "Quantum", [(mods, (KEYCODES_RESET + KEYCODES_QUANTUM)),
- (mods_narrow, (KEYCODES_RESET + KEYCODES_QUANTUM)),
- (None, (KEYCODES_RESET + KEYCODES_MODIFIERS + 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
@@ -1,4 +1,4 @@
-# SPDX-License-Identifie"r": GPL-2.0-or-later
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 ansi_100 = 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",{"x":0.25},"KC_PSCREEN","KC_SCROLLLOCK","KC_PAUSE"],[{"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",{"w":2},"KC_BSPACE",{"x":0.25},"KC_INSERT","KC_HOME","KC_PGUP",{"x":0.25},"KC_NUMLOCK","KC_KP_SLASH","KC_KP_ASTERISK","KC_KP_MINUS"],[{"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",{"w":1.5},"KC_BSLASH",{"x":0.25},"KC_DELETE","KC_END","KC_PGDOWN",{"x":0.25},"KC_KP_7","KC_KP_8","KC_KP_9","KC_KP_PLUS"],[{"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",{"w":2.25},"KC_ENTER",{"x":3.5},"KC_KP_4","KC_KP_5","KC_KP_6","KC_KP_COMMA"],[{"w":2.25},"KC_LSHIFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMMA","KC_DOT","KC_SLASH",{"w":2.75},"KC_RSHIFT",{"x":1.25},"KC_UP",{"x":1.25},"KC_KP_1","KC_KP_2","KC_KP_3","KC_KP_EQUAL"],[{"w":1.25},"KC_LCTRL",{"w":1.25},"KC_LGUI",{"w":1.25},"KC_LALT",{"w":6.25},"KC_SPACE",{"w":1.25},"KC_RALT",{"w":1.25},"KC_RGUI",{"w":1.25},"KC_APPLICATION",{"w":1.25},"KC_RCTRL",{"x":0.25},"KC_LEFT","KC_DOWN","KC_RIGHT",{"x":0.25,"w":2},"KC_KP_0","KC_KP_DOT","KC_KP_ENTER"]]