more language selection changes

1 files changed, 19 insertions, 8 deletions

diff --git a/iw/language.py b/iw/language.py
index efab0b200..ef3a3a67e 100644
--- a/iw/language.py
+++ b/iw/language.py
@@ -1,6 +1,6 @@
 from gtk import *
 from iw import *
-from gui import _
+from gui import _, setLanguage
 
 class LanguageWindow (InstallWindow):
 
@@ -13,24 +13,33 @@ class LanguageWindow (InstallWindow):
         ics.readHTML ("lang")
         self.question = (_("What language should be used during the "
                          "installation process?"))
-
-    def languageSelected (self, button, locale):
-        self.todo.language.set (locale)
+        self.languages = self.todo.language.available ()
+        self.running = 0
+        
+    def select_row (self, clist, row, col, event):
+        if self.running:
+            lang = clist.get_text (clist.selection[0], 0)
+            self.todo.language.set (lang)
+            setLanguage (self.languages[lang])
         
     def getScreen (self):
         mainBox = GtkVBox (FALSE, 10)
         label = GtkLabel (self.question)
         label.set_alignment (0.5, 0.5)
         
- 	language_keys = self.todo.language.available ().keys ()
+ 	language_keys = self.languages.keys ()
 
         self.language = GtkCList ()
         self.language.set_selection_mode (SELECTION_BROWSE)
+        self.language.connect ("select_row", self.select_row)
+
         for locale in language_keys[1:]:
-            self.language.append ((locale,))
+            row = self.language.append ((locale,))
 
-        print self.todo.language.available ().values ()
-        self.language.select_row (self.todo.language.available ().values ().index ((self.todo.language.get ())) - 1, 0)
+        print self.todo.language.get ()
+        default = self.languages.values ().index (self.todo.language.get ())
+        if default > 0:
+            self.language.select_row (default - 1, 0)
 
         sw = GtkScrolledWindow ()
         sw.set_border_width (5)
@@ -39,5 +48,7 @@ class LanguageWindow (InstallWindow):
         
         mainBox.pack_start (label, FALSE, FALSE, 10)
         mainBox.pack_start (sw, TRUE)
+
+        self.running = 1
         
         return mainBox