summaryrefslogtreecommitdiffstats
path: root/textw
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-05-28 15:24:57 +0000
committerJeremy Katz <katzj@redhat.com>2002-05-28 15:24:57 +0000
commitd5688c4b480affe8a87ffc189a6586ef9689f812 (patch)
tree47cdaf8965b0f7de9f95e2fb3cc095f66f330d60 /textw
parent080fbabea1a5024e957eefbed8a51cea01a88ece (diff)
downloadanaconda-d5688c4b480affe8a87ffc189a6586ef9689f812.tar.gz
anaconda-d5688c4b480affe8a87ffc189a6586ef9689f812.tar.xz
anaconda-d5688c4b480affe8a87ffc189a6586ef9689f812.zip
use redhat-config-keyboard for gui screen, tui changes to coexist happily
Diffstat (limited to 'textw')
-rw-r--r--textw/keyboard_text.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py
index 5a0f9849c..c9fe2f200 100644
--- a/textw/keyboard_text.py
+++ b/textw/keyboard_text.py
@@ -21,16 +21,16 @@ from rhpl.log import log
from rhpl.translate import _
class KeyboardWindow:
- def __call__(self, screen, instLang, kbd, xconfig):
+ def __call__(self, screen, defaultByLang, kbd, xconfig):
if flags.serial:
return INSTALL_NOOP
- keyboards = kbd.available ()
+ keyboards = kbd.modelDict.keys()
keyboards.sort ()
if kbd.beenset:
default = kbd.get ()
else:
- default = instLang.getDefaultKeyboard()
+ default = defaultByLang
(button, choice) = \
ListboxChoiceWindow(screen, _("Keyboard Selection"),
@@ -44,9 +44,11 @@ class KeyboardWindow:
kbd.set (keyboards[choice])
kbd.beenset = 1
- if (xconfig != (None, None)) and (xconfig != None):
- apply(xconfig.setKeyboard, kbd.getXKB())
-
+ kbd.activate()
+## if (xconfig != (None, None)) and (xconfig != None):
+## apply(xconfig.setKeyboard, kbd.getXKB())
+
+ # FIXME: eventually, kbd.activate will do this
try:
isys.loadKeymap(keyboards[choice])
except SystemError, (errno, msg):