diff options
| author | jakub <jakub> | 1999-09-30 18:50:26 +0000 |
|---|---|---|
| committer | jakub <jakub> | 1999-09-30 18:50:26 +0000 |
| commit | 038c281383c23442e40cbe877a45be9805031574 (patch) | |
| tree | 5ccb3b1beda0547de361c352c702e8efc482d3d8 | |
| parent | 615b006b9aaeb2673c6694fba5235f93e6f6792e (diff) | |
| download | anaconda-038c281383c23442e40cbe877a45be9805031574.tar.gz anaconda-038c281383c23442e40cbe877a45be9805031574.tar.xz anaconda-038c281383c23442e40cbe877a45be9805031574.zip | |
Highlight probed keyboard. Make xconfig run with Mach64.
| -rw-r--r-- | iw/keyboard.py | 8 | ||||
| -rw-r--r-- | iw/xconfig.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/iw/keyboard.py b/iw/keyboard.py index 8bdbfb6c3..caf0e16da 100644 --- a/iw/keyboard.py +++ b/iw/keyboard.py @@ -2,6 +2,7 @@ from gtk import * from iw import * import xkb import string +import keyboard from gui import _ class KeyboardWindow (InstallWindow): @@ -18,6 +19,9 @@ class KeyboardWindow (InstallWindow): self.rulesbase = rules[string.rfind (rules, "/")+1:] self.model = "pc101" self.layout = "en_US" + if self.todo.keyboard.type == "Sun": + self.model = self.todo.keyboard.model + self.layout = self.todo.keyboard.layout self.variant = "" self.hasrun = 0 @@ -57,7 +61,7 @@ class KeyboardWindow (InstallWindow): for (key, model) in self.rules[0].items (): loc = self.modelList.append ((model,)) self.modelList.set_row_data (loc, key) - if key == "pc101": + if key == self.model: self.modelList.select_row (loc, 0) self.modelList.sort () self.modelList.connect ("select_row", self.select_row) @@ -76,7 +80,7 @@ class KeyboardWindow (InstallWindow): for (key, layout) in self.rules[1].items (): loc = self.layoutList.append ((layout,)) self.layoutList.set_row_data (loc, key) - if key == "en_US": + if key == self.layout: self.layoutList.select_row (loc, 0) self.layoutList.sort () self.layoutList.connect ("select_row", self.select_row) diff --git a/iw/xconfig.py b/iw/xconfig.py index f2ee3fd30..ec04c540d 100644 --- a/iw/xconfig.py +++ b/iw/xconfig.py @@ -24,7 +24,6 @@ class XCustomWindow (InstallWindow): self.ics.setNextEnabled (TRUE) self.didTest = 0 - self.sunServer = 0 def getNext (self): newmodes = {} @@ -105,6 +104,7 @@ class XConfigWindow (InstallWindow): self.ics.setNextEnabled (TRUE) self.todo = ics.getToDo () + self.sunServer = 0 if self.todo.x.server and len (self.todo.x.server) >= 3 and self.todo.x.server[0:3] == 'Sun': self.sunServer = 1 ics.setTitle (_("X Configuration")) |