* Fixed Return/Enter key shortcuts and search update on edit in KanjiDic.

diff --git a/jiten-pai.py b/jiten-pai.py
index 6a52dfeb9fa548396ab728ccef8f34324895520e..e0ae68c2ab0e38e68da228396037b5972e870bc5 100755 (executable)
--- a/jiten-pai.py
+++ b/jiten-pai.py
@@ -1110,6 +1110,7 @@ class jpMainWindow(QMainWindow):
         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)
         search_button = QPushButton('Search')
         search_button.setDefault(True)
         search_button.setIcon(jpIcon.find)
@@ -1270,7 +1271,7 @@ class jpMainWindow(QMainWindow):
         QApplication.processEvents()
 
     def _search_deinflected(self, inflist, dic, mode, limit):
-        re_isnoun = re.compile(r'\(n\)')
+        re_isnoun = re.compile(r'\(n)\)')
         result = []
         ok = True
         for inf in inflist:

diff --git a/kanjidic.py b/kanjidic.py
index df885ab3967a1e23609b24a4ff88b2676d609eba..1c391e10a114f6b7f3b5c78ed9af228b222044ad 100755 (executable)
--- a/kanjidic.py
+++ b/kanjidic.py
@@ -578,7 +578,8 @@ 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.rad_search_box).activated.connect(self.update_search)
+        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():
@@ -627,7 +628,7 @@ class kdMainWindow(QDialog):
         self.rad_search_box.setCurrentIndex(-1)
         self.rad_search_box.setEditable(True)
         self.rad_search_box.lineEdit().textChanged.connect(self.on_search_edit)
-        self.rad_search_box.lineEdit().editingFinished.connect(self.update_search)
+        self.rad_search_box.lineEdit().textEdited.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)
@@ -648,7 +649,6 @@ 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().editingFinished.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(''))