diff options
| author | pnfisher <pnfisher> | 1999-09-14 06:15:03 +0000 |
|---|---|---|
| committer | pnfisher <pnfisher> | 1999-09-14 06:15:03 +0000 |
| commit | a70f67b0ef101cd21da0322612648880d97219cd (patch) | |
| tree | 09be97a0c3fa03052bdfbb13a889ceef55ffec4f /iw | |
| parent | 322480a1f37e0f4e189e049fdd15a76a5c479976 (diff) | |
| download | anaconda-a70f67b0ef101cd21da0322612648880d97219cd.tar.gz anaconda-a70f67b0ef101cd21da0322612648880d97219cd.tar.xz anaconda-a70f67b0ef101cd21da0322612648880d97219cd.zip | |
Make keyboard select work -- default to US.
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/keyboard.py | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/iw/keyboard.py b/iw/keyboard.py index 5ba54a699..872afa75f 100644 --- a/iw/keyboard.py +++ b/iw/keyboard.py @@ -9,8 +9,6 @@ class KeyboardWindow (InstallWindow): InstallWindow.__init__ (self, ics) ics.setTitle (_("Keyboard Configuration")) -## ics.setHTML ("<HTML><BODY>Select your keyboard." -## "</BODY></HTML>") ics.readHTML ("kybd") ics.setNextEnabled (TRUE) self.kb = xkb.XKB () @@ -20,9 +18,14 @@ class KeyboardWindow (InstallWindow): # self.todo.keyboard.set (self.keyboardList.get_selection ()[0].children ()[0].get ()) return None + def select_row (self, clist, row, col, event): + self.kb.setRule (self.modelList.get_row_data (self.modelList.selection[0]), + self.layoutList.get_row_data (self.layoutList.selection[0]), + self.variantList.get_row_data (self.variantList.selection[0]), + "complete") + def getScreen (self): -# print self.todo.keyboard.available () - box = GtkVBox (FALSE) + box = GtkVBox (FALSE, 5) im = self.ics.readPixmap ("gnome-keyboard.png") if im: im.render () @@ -34,43 +37,56 @@ class KeyboardWindow (InstallWindow): box.pack_start (GtkLabel (_("Model")), FALSE) sw = GtkScrolledWindow () - sw.set_border_width (5) +# sw.set_border_width (5) sw.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC) self.modelList = GtkCList () self.modelList.set_selection_mode (SELECTION_BROWSE) - for model in self.rules[0].values (): - self.modelList.append ((model,)) + for (key, model) in self.rules[0].items (): + loc = self.modelList.append ((model,)) + self.modelList.set_row_data (loc, key) + if key == "pc104": + self.modelList.select_row (loc, 0) + self.modelList.sort () + self.modelList.connect ("select_row", self.select_row) self.modelList.columns_autosize () sw.add (self.modelList) box.pack_start (sw, TRUE) box.pack_start (GtkLabel (_("Layout")), FALSE) sw = GtkScrolledWindow () - sw.set_border_width (5) +# sw.set_border_width (5) sw.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC) self.layoutList = GtkCList () self.layoutList.set_selection_mode (SELECTION_BROWSE) - layouts = self.rules[1].values () - layouts.sort () - for layout in layouts: - self.layoutList.append ((layout,)) + for (key, layout) in self.rules[1].items (): + loc = self.layoutList.append ((layout,)) + self.layoutList.set_row_data (loc, key) + if key == "en_US": + self.layoutList.select_row (loc, 0) + self.layoutList.sort () + self.layoutList.connect ("select_row", self.select_row) self.layoutList.columns_autosize () sw.add (self.layoutList) box.pack_start (sw, TRUE) box.pack_start (GtkLabel (_("Variant")), FALSE) sw = GtkScrolledWindow () - sw.set_border_width (5) +# sw.set_border_width (5) sw.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC) self.variantList = GtkCList () self.variantList.set_selection_mode (SELECTION_BROWSE) self.variantList.append (("None",)) - for variant in self.rules[2].values (): - self.variantList.append ((variant,)) + for (key, variant) in self.rules[2].items (): + loc = self.variantList.append ((variant,)) + self.variantList.set_row_data (loc, key) + self.variantList.sort () + self.variantList.connect ("select_row", self.select_row) self.variantList.columns_autosize () sw.add (self.variantList) box.pack_start (sw, FALSE) -# print self.kb.getOptions () + entry = GtkEntry () + box.pack_start (entry, FALSE) + box.set_border_width (5) return box |