diff --git a/src/main/python/macro_action.py b/src/main/python/macro_action.py index 81bd8e9..f2e630b 100644 --- a/src/main/python/macro_action.py +++ b/src/main/python/macro_action.py @@ -5,11 +5,11 @@ from PyQt5.QtCore import QObject, pyqtSignal, Qt from PyQt5.QtWidgets import QLineEdit, QToolButton, QComboBox, QWidget, QSizePolicy from flowlayout import FlowLayout -from keycodes import KEYCODES_BASIC +from keycodes import KEYCODES_SPECIAL, KEYCODES_BASIC from util import tr -KC_NO = KEYCODES_BASIC[0] +KC_NO = KEYCODES_SPECIAL[0] SS_TAP_CODE = 1 SS_DOWN_CODE = 2 diff --git a/src/main/python/tabbed_keycodes.py b/src/main/python/tabbed_keycodes.py index 7cc4d95..1339bd1 100644 --- a/src/main/python/tabbed_keycodes.py +++ b/src/main/python/tabbed_keycodes.py @@ -6,7 +6,7 @@ from PyQt5.QtWidgets import QTabWidget, QWidget, QPushButton, QScrollArea from constants import KEYCODE_BTN_WIDTH, KEYCODE_BTN_HEIGHT from flowlayout import FlowLayout from keycodes import keycode_tooltip, KEYCODES_BASIC, KEYCODES_ISO, KEYCODES_MACRO, KEYCODES_LAYERS, KEYCODES_QUANTUM, \ - KEYCODES_BACKLIGHT, KEYCODES_MEDIA + KEYCODES_BACKLIGHT, KEYCODES_MEDIA, KEYCODES_SPECIAL from keymaps import KEYMAPS from util import tr @@ -31,7 +31,7 @@ class TabbedKeycodes(QTabWidget): self.widgets = [] for (tab, label, keycodes) in [ - (self.tab_basic, "Basic", KEYCODES_BASIC), + (self.tab_basic, "Basic", KEYCODES_SPECIAL + KEYCODES_BASIC), (self.tab_iso, "ISO/JIS", KEYCODES_ISO), (self.tab_layers, "Layers", KEYCODES_LAYERS), (self.tab_quantum, "Quantum", KEYCODES_QUANTUM),