* Properly set max history size where appropriate.

diff --git a/jiten-pai.py b/jiten-pai.py
index 28b8fa1cab9a7aca60587b225cc190fc3cd15dd0..7247f7e8424c4276df9b01199581e38224ef614b 100755 (executable)
--- a/jiten-pai.py
+++ b/jiten-pai.py
@@ -1115,6 +1115,7 @@ class jpMainWindow(QMainWindow):
         # search area
         search_group = zQGroupBox('Enter expression')
         self.search_box = QComboBox()
+        self.search_box.setMaxCount(int(cfg['max_hist']))
         for h in cfg['history']:
             self.search_box.insertItem(self.search_box.count(), h)
         self.search_box.setCurrentIndex(-1)

diff --git a/kanjidic.py b/kanjidic.py
index a5e4fcc5f0fcecbce85be5594c90fde21f48f374..10d6b548d71ee028de6cd4235b88cfe5dad947e7 100755 (executable)
--- a/kanjidic.py
+++ b/kanjidic.py
@@ -80,6 +80,7 @@ cfg = {
     'lfont': 'IPAPMincho',
     'lfont_sz': 24.0,
     'hl_col': 'blue',
+    'max_hist': 12,
 }
 
 def _get_cfile_path(fname, mode=os.R_OK):
@@ -637,6 +638,7 @@ class kdMainWindow(QDialog):
         self.rad_search_box = QComboBox()
         self.rad_search_box.setMinimumWidth(200)
         self.rad_search_box.setMaximumWidth(340)
+        self.rad_search_box.setMaxCount(int(cfg['max_hist']))
         self.rad_search_box.setCurrentIndex(-1)
         self.rad_search_box.setEditable(True)
         self.rad_search_box.lineEdit().textChanged.connect(self.on_rad_search_edit)
@@ -667,6 +669,7 @@ class kdMainWindow(QDialog):
         self.text_search_box = QComboBox()
         self.text_search_box.setMinimumWidth(200)
         self.text_search_box.setMaximumWidth(340)
+        self.text_search_box.setMaxCount(int(cfg['max_hist']))
         self.text_search_box.setCurrentIndex(-1)
         self.text_search_box.setEditable(True)
         self.text_search_box.lineEdit().returnPressed.connect(lambda: self.update_search(save_text_hist=True))
@@ -902,7 +905,7 @@ class kdMainWindow(QDialog):
             self.info_hist.insert_top_uniq(btn)
             self.info_hist.verticalScrollBar().setValue(0)
             # limit history length
-            while self.info_hist.widget().layout().takeAt(10):
+            while self.info_hist.widget().layout().takeAt(int(cfg['max_hist'])):
                 pass
         info = ['']
         res = _kanjidic_lookup(kanji)