Skip to content

Commit b2e6381

Browse files
committed
optimize protocol shortcut show
1 parent a764f77 commit b2e6381

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

COMTool/assets/qss/style-dark.qss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ QPushButton:default {
282282
.remark {
283283
min-width: 10px;
284284
min-height: 10px;
285-
width: 20px;
286285
height: 20px;
287286
}
288287

COMTool/assets/qss/style.qss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ QPushButton:default {
282282
.remark {
283283
min-width: 10px;
284284
min-height: 10px;
285-
width: 20px;
286285
height: 20px;
287286
}
288287

COMTool/plugins/protocol.py

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def onInit(self, config, plugins):
236236
self.encodeMethod = lambda x:x
237237
self.decodeMethod = lambda x:x
238238
self.pressedKeys = []
239-
self.keyModeClickTimes = 0
239+
self.keyModeClickTime = 0
240240

241241
def print(self, *args, **kw_args):
242242
end = "\n"
@@ -297,12 +297,12 @@ def onWidgetMain(self, parent, rootWindow):
297297
customSendItemsLayoutWrapper.setContentsMargins(0,0,0,0)
298298
cutomSendItemsWraper.setLayout(customSendItemsLayoutWrapper)
299299
# items container
300-
customItems = QWidget()
300+
self.customItems = QWidget()
301301
self.customSendItemsLayout = QVBoxLayout()
302302
self.customSendItemsLayout.setContentsMargins(0,0,0,0)
303-
customItems.setLayout(self.customSendItemsLayout)
303+
self.customItems.setLayout(self.customSendItemsLayout)
304304

305-
customSendItemsLayoutWrapper.addWidget(customItems)
305+
customSendItemsLayoutWrapper.addWidget(self.customItems)
306306
customSendItemsLayoutWrapper.addWidget(self.addButton)
307307
customSendItemsLayoutWrapper.addStretch(0)
308308

@@ -320,16 +320,26 @@ def clearReceived():
320320
def keyModeOn(event):
321321
self.keyModeBtn.setProperty("class", "deleteBtn")
322322
utils_ui.updateStyle(self.mainWidget, self.keyModeBtn)
323-
self.keyModeClickTimes = time.time()
323+
self.keyModeClickTime = time.time()
324+
# show all shortcut
325+
widgets = self.customItems.findChildren(QPushButton, "editRemark")
326+
for i, w in enumerate(widgets):
327+
shortcut = "+".join((name for v, name in self.config["customSendItems"][i]["shortcut"]))
328+
w.setText(shortcut)
329+
utils_ui.updateStyle(self.mainWidget, w)
324330

325331
def keyModeOff(event):
326332
self.keyModeBtn.setProperty("class", "")
327333
utils_ui.updateStyle(self.mainWidget, self.keyModeBtn)
328-
self.keyModeClickTimes = 0
334+
self.keyModeClickTime = 0
335+
# hide all shortcut
336+
widgets = self.customItems.findChildren(QPushButton, "editRemark")
337+
for w in widgets:
338+
w.setText("")
329339

330340
def keyModeTuggle():
331341
if self.keyModeBtn.property("class") == "deleteBtn":
332-
if time.time() - self.keyModeClickTimes < 0.2:
342+
if time.time() - self.keyModeClickTime < 0.2:
333343
return
334344
else:
335345
self.keyModeBtn.clearFocus()
@@ -550,6 +560,7 @@ def insertSendItem(self, item = None, load = False):
550560
item["shortcut"] = []
551561
utils_ui.setButtonIcon(send, item["icon"])
552562
editRemark = QPushButton("")
563+
editRemark.setObjectName("editRemark")
553564
utils_ui.setButtonIcon(editRemark, "ei.pencil")
554565
editRemark.setProperty("class", "remark")
555566
cmd.setToolTip(text)

0 commit comments

Comments
 (0)