From 7594c5fc804d881a0b0c7fc96cb4858a3dac4cfe Mon Sep 17 00:00:00 2001 From: Urban Wallasch Date: Wed, 23 Jun 2021 20:58:05 +0200 Subject: [PATCH] * Dropped Return/Enter shortcuts in favor of connecting the appropriate signals. --- jiten-pai.py | 3 +-- kanjidic.py | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jiten-pai.py b/jiten-pai.py index a8a0165..19995d1 100755 --- a/jiten-pai.py +++ b/jiten-pai.py @@ -1109,8 +1109,7 @@ class jpMainWindow(QMainWindow): self.search_box_edit_style = self.search_box.lineEdit().styleSheet() self.search_box_edit_valid = True self.search_box.lineEdit().textChanged.connect(lambda t: self.search_onedit(t)) - QShortcut('Return', self.search_box).activated.connect(self.search) - QShortcut('Enter', self.search_box).activated.connect(self.search) + self.search_box.lineEdit().returnPressed.connect(self.search) search_button = QPushButton('Search') search_button.setDefault(True) search_button.setIcon(jpIcon.find) diff --git a/kanjidic.py b/kanjidic.py index 1c391e1..904bf91 100755 --- a/kanjidic.py +++ b/kanjidic.py @@ -578,8 +578,6 @@ class kdMainWindow(QDialog): QShortcut('Ctrl+W', self).activated.connect(lambda: self.close()) QShortcut('Ctrl+C', self).activated.connect(self.kbd_copy) QShortcut('Ctrl+V', self).activated.connect(self.kbd_paste) - QShortcut('Return', self).activated.connect(self.update_search) - QShortcut('Enter', self).activated.connect(self.update_search) QApplication.processEvents() # load radkfile, kradfile, kanjidic if not _rad_load(): @@ -629,6 +627,8 @@ class kdMainWindow(QDialog): self.rad_search_box.setEditable(True) self.rad_search_box.lineEdit().textChanged.connect(self.on_search_edit) self.rad_search_box.lineEdit().textEdited.connect(self.update_search) + self.rad_search_box.lineEdit().returnPressed.connect(self.update_search) + self.rad_search_box.activated.connect(self.update_search) self.rad_search_clearbtn = QPushButton('&Clear') self.rad_search_clearbtn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) self.rad_search_clearbtn.clicked.connect(self.on_search_clear) @@ -649,6 +649,8 @@ class kdMainWindow(QDialog): self.text_search_box.setCurrentIndex(-1) self.text_search_box.setEditable(True) self.text_search_box.lineEdit().textChanged.connect(self.on_search_edit) + self.text_search_box.lineEdit().returnPressed.connect(self.update_search) + self.text_search_box.activated.connect(self.update_search) self.text_search_clearbtn = QPushButton('&Clear') self.text_search_clearbtn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) self.text_search_clearbtn.clicked.connect(lambda: self.text_search_box.lineEdit().setText('')) -- 2.30.2