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

macro_recorder: add a button to tap enter

main
Ilya Zhuravlev 2020-12-24 21:36:39 -05:00
parent ab7821e6aa
commit 4a4f0da684
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/python/macro_line.py
View File

@ -35,6 +35,7 @@ class MacroLine(QObject):
self.select_type = QComboBox() self.select_type = QComboBox()
self.select_type.addItems(self.types) self.select_type.addItems(self.types)
self.select_type.setCurrentIndex(self.type_to_cls.index(type(action)))
self.select_type.currentIndexChanged.connect(self.on_change_type) self.select_type.currentIndexChanged.connect(self.on_change_type)
self.action = action self.action = action

21
src/main/python/macro_recorder.py
View File

@ -5,7 +5,8 @@ from PyQt5.QtWidgets import QPushButton, QGridLayout, QHBoxLayout, QToolButton,
QTabWidget, QWidget, QLabel QTabWidget, QWidget, QLabel
from basic_editor import BasicEditor from basic_editor import BasicEditor
from macro_action import ActionText, ActionSequence from keycodes import find_keycode
from macro_action import ActionText, ActionSequence, ActionTap
from macro_key import KeyString from macro_key import KeyString
from macro_line import MacroLine from macro_line import MacroLine
from macro_optimizer import macro_optimize from macro_optimizer import macro_optimize
@ -35,9 +36,15 @@ class MacroTab(QVBoxLayout):
btn_add.setToolButtonStyle(Qt.ToolButtonTextOnly) btn_add.setToolButtonStyle(Qt.ToolButtonTextOnly)
btn_add.clicked.connect(self.on_add) btn_add.clicked.connect(self.on_add)
btn_tap_enter = QToolButton()
btn_tap_enter.setText(tr("MacroRecorder", "Tap Enter"))
btn_tap_enter.setToolButtonStyle(Qt.ToolButtonTextOnly)
btn_tap_enter.clicked.connect(self.on_tap_enter)
layout_buttons = QHBoxLayout() layout_buttons = QHBoxLayout()
layout_buttons.addStretch() layout_buttons.addStretch()
layout_buttons.addWidget(btn_add) layout_buttons.addWidget(btn_add)
layout_buttons.addWidget(btn_tap_enter)
layout_buttons.addWidget(btn_record) layout_buttons.addWidget(btn_record)
self.addLayout(self.container) self.addLayout(self.container)
@ -45,11 +52,14 @@ class MacroTab(QVBoxLayout):
self.addWidget(btn_add) self.addWidget(btn_add)
self.addStretch() self.addStretch()
def on_add(self): def add_action(self, act):
line = MacroLine(self, ActionText(self.container)) line = MacroLine(self, act)
line.changed.connect(self.on_change) line.changed.connect(self.on_change)
self.lines.append(line) self.lines.append(line)
self.lines[-1].insert(self.container.rowCount()) line.insert(self.container.rowCount())
def on_add(self):
self.add_action(ActionText(self.container))
def on_remove(self, obj): def on_remove(self, obj):
for line in self.lines: for line in self.lines:
@ -84,6 +94,9 @@ class MacroTab(QVBoxLayout):
def on_change(self): def on_change(self):
self.changed.emit() self.changed.emit()
def on_tap_enter(self):
self.add_action(ActionTap(self.container, [find_keycode(0x28)]))
class MacroRecorder(BasicEditor): class MacroRecorder(BasicEditor):