From 59c42b0e81a52a091ed469ec172f8d1bae597c62 Mon Sep 17 00:00:00 2001
From: Paul Goins <general@vultaire.net>
Date: Sun, 13 Feb 2011 20:48:46 +0900
Subject: [PATCH] Fixed JLPT dialog.  Linked in dialog to the KanjiListEditor.

---
 python/jben/interface/gtk/dialog/addkanjibyjlpt.py  |  7 +++++--
 python/jben/interface/gtk/dialog/kanjilisteditor.py | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/python/jben/interface/gtk/dialog/addkanjibyjlpt.py b/python/jben/interface/gtk/dialog/addkanjibyjlpt.py
index 8d7f8d0..0ac4d16 100644
--- a/python/jben/interface/gtk/dialog/addkanjibyjlpt.py
+++ b/python/jben/interface/gtk/dialog/addkanjibyjlpt.py
@@ -5,7 +5,7 @@ from __future__ import absolute_import
 
 import gtk
 from ..widget.comboboxtext import ComboBoxText
-from ..widget.storedsize import StoredSizeDialog
+from ..widget.infomessage import show_message
 
 
 class JlptComboBox(ComboBoxText):
@@ -69,7 +69,10 @@ class AddKanjiByJlptDialog(gtk.Dialog):
     def on_ok_clicked(self, widget):
         grade_min, grade_max = self.get_grades()
 
-        if grade_min <= grade_max:
+        # JLPT grades go from 4 (lowest) to 1 (highest), so the min
+        # grade should actually be equal to or higher than the max
+        # grade.
+        if grade_min >= grade_max:
             self.response(gtk.RESPONSE_OK)
         else:
             show_message(
diff --git a/python/jben/interface/gtk/dialog/kanjilisteditor.py b/python/jben/interface/gtk/dialog/kanjilisteditor.py
index 5f75666..0430987 100644
--- a/python/jben/interface/gtk/dialog/kanjilisteditor.py
+++ b/python/jben/interface/gtk/dialog/kanjilisteditor.py
@@ -11,9 +11,9 @@ from __future__ import absolute_import
 import gtk
 from ..widget.storedsize import StoredSizeDialog
 
-#from .addkanjibyfreq import AddKanjiByFreqDialog
-#from .addkanjibyjlpt import AddKanjiByJLPTDialog
 from .addkanjibyjouyou import AddKanjiByJouyouDialog
+from .addkanjibyjlpt import AddKanjiByJlptDialog
+#from .addkanjibyfreq import AddKanjiByFreqDialog
 
 
 class EditBox(gtk.TextView):
@@ -87,7 +87,7 @@ class AddByJouyou(BaseButton):
         result = dialog.run()
         if result == gtk.RESPONSE_OK:
             low, high = dialog.get_grades()
-            print "TODO: Add kanji from grades %d to %d" % (low, high)
+            print "TODO: Add kanji from Jouyou grades %d to %d" % (low, high)
             # Get kanji in specified range
             # Merge lists
             # Update edit box
@@ -99,7 +99,16 @@ class AddByJlpt(BaseButton):
         BaseButton.__init__(self, _("By _JLPT Level"), edit_box)
 
     def on_clicked(self, widget, edit_box):
-        print "add.by_jlpt clicked"
+        parent = self._get_parent_window()
+        dialog = AddKanjiByJlptDialog(parent)
+        result = dialog.run()
+        if result == gtk.RESPONSE_OK:
+            low, high = dialog.get_grades()
+            print "TODO: Add kanji from JLPT grades %d to %d" % (low, high)
+            # Get kanji in specified range
+            # Merge lists
+            # Update edit box
+        dialog.destroy()
 
 
 class AddByFreq(BaseButton):
-- 
2.11.4.GIT