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

layout_editor -> keymap_editor

main
Ilya Zhuravlev 2020-12-20 19:21:22 -05:00
parent 56300d1ddc
commit 657a4a18f1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/python/layout_editor.py → src/main/python/keymap_editor.py
View File

@ -8,7 +8,7 @@ from tabbed_keycodes import TabbedKeycodes
from vial_device import VialKeyboard from vial_device import VialKeyboard
class LayoutEditor(QVBoxLayout): class KeymapEditor(QVBoxLayout):
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)

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

@ -7,7 +7,7 @@ from PyQt5.QtWidgets import QWidget, QComboBox, QToolButton, QHBoxLayout, QVBoxL
import json import json
from firmware_flasher import FirmwareFlasher from firmware_flasher import FirmwareFlasher
from layout_editor import LayoutEditor from keymap_editor import KeymapEditor
from util import tr, find_vial_devices from util import tr, find_vial_devices
@ -32,7 +32,7 @@ class MainWindow(QMainWindow):
layout_combobox.addWidget(self.combobox_devices) layout_combobox.addWidget(self.combobox_devices)
layout_combobox.addWidget(self.btn_refresh_devices) layout_combobox.addWidget(self.btn_refresh_devices)
self.layout_editor = LayoutEditor() self.keymap_editor = KeymapEditor()
self.firmware_flasher = FirmwareFlasher(self) self.firmware_flasher = FirmwareFlasher(self)
self.tabs = QTabWidget() self.tabs = QTabWidget()
@ -83,7 +83,7 @@ class MainWindow(QMainWindow):
if dialog.exec_() == QDialog.Accepted: if dialog.exec_() == QDialog.Accepted:
with open(dialog.selectedFiles()[0], "rb") as inf: with open(dialog.selectedFiles()[0], "rb") as inf:
data = inf.read() data = inf.read()
self.layout_editor.restore_layout(data) self.keymap_editor.restore_layout(data)
def on_layout_save(self): def on_layout_save(self):
dialog = QFileDialog() dialog = QFileDialog()
@ -92,7 +92,7 @@ class MainWindow(QMainWindow):
dialog.setNameFilters(["Vial layout (*.vil)"]) dialog.setNameFilters(["Vial layout (*.vil)"])
if dialog.exec_() == QDialog.Accepted: if dialog.exec_() == QDialog.Accepted:
with open(dialog.selectedFiles()[0], "wb") as outf: with open(dialog.selectedFiles()[0], "wb") as outf:
outf.write(self.layout_editor.save_layout()) outf.write(self.keymap_editor.save_layout())
def on_click_refresh(self): def on_click_refresh(self):
self.devices = find_vial_devices(self.sideload_vid, self.sideload_pid) self.devices = find_vial_devices(self.sideload_vid, self.sideload_pid)
@ -112,14 +112,14 @@ class MainWindow(QMainWindow):
if self.current_device is not None: if self.current_device is not None:
self.current_device.open(self.sideload_json if self.current_device.sideload else None) self.current_device.open(self.sideload_json if self.current_device.sideload else None)
self.layout_editor.rebuild(self.current_device) self.keymap_editor.rebuild(self.current_device)
self.firmware_flasher.rebuild(self.current_device) self.firmware_flasher.rebuild(self.current_device)
self.refresh_tabs() self.refresh_tabs()
def refresh_tabs(self): def refresh_tabs(self):
self.tabs.clear() self.tabs.clear()
for container, lbl in [(self.layout_editor, "Layout"), (self.firmware_flasher, "Firmware updater")]: for container, lbl in [(self.keymap_editor, "Keymap"), (self.firmware_flasher, "Firmware updater")]:
if not container.valid(): if not container.valid():
continue continue