steven-y-e
/
vial
1
0
Fork 0
Code Pull Requests Releases Activity

Remember last selected keyboard layout (qwerty/etc) setting

main
Ilya Zhuravlev 2021-03-14 17:04:16 -04:00
parent 193d691c85
commit 4fb584b6c3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/python/keymap_editor.py
View File

@ -138,11 +138,9 @@ class KeymapEditor(BasicEditor):
self.container.update_layout() self.container.update_layout()
for btn in self.layer_buttons: for idx, btn in enumerate(self.layer_buttons):
btn.setEnabled(True) btn.setEnabled(idx != self.current_layer)
btn.setChecked(False) btn.setChecked(idx == self.current_layer)
self.layer_buttons[self.current_layer].setEnabled(False)
self.layer_buttons[self.current_layer].setChecked(True)
for widget in self.container.widgets: for widget in self.container.widgets:
if widget.desc.row is not None: if widget.desc.row is not None:

8
src/main/python/main_window.py
View File

@ -132,14 +132,19 @@ class MainWindow(QMainWindow):
keyboard_layout_menu = self.menuBar().addMenu(tr("Menu", "Keyboard layout")) keyboard_layout_menu = self.menuBar().addMenu(tr("Menu", "Keyboard layout"))
keymap_group = QActionGroup(self) keymap_group = QActionGroup(self)
selected_keymap = self.settings.value("keymap")
for idx, keymap in enumerate(KEYMAPS): for idx, keymap in enumerate(KEYMAPS):
act = QAction(tr("KeyboardLayout", keymap[0]), self) act = QAction(tr("KeyboardLayout", keymap[0]), self)
act.triggered.connect(lambda checked, x=idx: self.change_keyboard_layout(x)) act.triggered.connect(lambda checked, x=idx: self.change_keyboard_layout(x))
act.setCheckable(True) act.setCheckable(True)
if idx == 0: if selected_keymap == keymap[0]:
self.change_keyboard_layout(idx)
act.setChecked(True) act.setChecked(True)
keymap_group.addAction(act) keymap_group.addAction(act)
keyboard_layout_menu.addAction(act) keyboard_layout_menu.addAction(act)
# check "QWERTY" if nothing else is selected
if keymap_group.checkedAction() is None:
keymap_group.actions()[0].setChecked(True)
self.security_menu = self.menuBar().addMenu(tr("Menu", "Security")) self.security_menu = self.menuBar().addMenu(tr("Menu", "Security"))
self.security_menu.addAction(keyboard_unlock_act) self.security_menu.addAction(keyboard_unlock_act)
@ -294,6 +299,7 @@ class MainWindow(QMainWindow):
self.current_device.keyboard.reset() self.current_device.keyboard.reset()
def change_keyboard_layout(self, index): def change_keyboard_layout(self, index):
self.settings.setValue("keymap", KEYMAPS[index][0])
self.keymap_editor.set_keymap_override(KEYMAPS[index][1]) self.keymap_editor.set_keymap_override(KEYMAPS[index][1])
def set_theme(self, theme): def set_theme(self, theme):