summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--iw/keyboard.py3
-rw-r--r--kbd.py75
2 files changed, 39 insertions, 39 deletions
diff --git a/iw/keyboard.py b/iw/keyboard.py
index 95e973043..db70fe52d 100644
--- a/iw/keyboard.py
+++ b/iw/keyboard.py
@@ -36,8 +36,7 @@ class KeyboardWindow (InstallWindow):
self.model = self.modelList.get_row_data (self.modelList.selection[0])
self.layout = self.layoutList.get_row_data (self.layoutList.selection[0])
self.variant = self.variantList.get_row_data (self.variantList.selection[0])
- print self.variant
-
+
self.kb.setRule (self.model, self.layout, self.variant, "complete")
def getScreen (self):
diff --git a/kbd.py b/kbd.py
index 0a1a75853..9e9fd3547 100644
--- a/kbd.py
+++ b/kbd.py
@@ -4,44 +4,45 @@ from simpleconfig import SimpleConfigFile
class Keyboard (SimpleConfigFile):
console2x = {
- "be-latin1" : ('pc102', 'be'),
- "be2-latin1" : ('pc102', 'be'),
- "fr-latin0" : ('pc102', 'fr'),
- "fr-latin1" : ('pc102', 'fr'),
- "fr-pc" : ('pc102', 'fr'),
- "fr" : ('pc102', 'fr'),
- "bg" : ('pc102', 'bg'),
- "cf" : ('pc102', 'cf'),
- "cz-lat2-prog" : ('pc102', 'cs'),
- "cz-lat2" : ('pc102', 'cs'),
- "dk-latin1" : ('pc102', 'dk'),
- "dk" : ('pc102', 'dk'),
- "es" : ('pc102', 'es'),
- "fi-latin1" : ('pc102', 'fi'),
- "fi" : ('pc102', 'fi'),
- "hu101" : ('pc102', 'hu'),
- "it-ibm" : ('pc101', 'it'),
- "it" : ('pc102', 'it'),
- "it2" : ('pc102', 'it'),
- "jp106" : ('jp106', 'jp'),
- "no-latin1" : ('pc102', 'no'),
- "no" : ('pc102', 'no'),
- "pl" : ('pc102', 'pl'),
- "pt-latin1" : ('pc102', 'pt'),
- "ru-cp1251" : ('pc102', 'ru'),
- "ru-ms" : ('microsoft', 'ru'),
- "ru" : ('pc102', 'ru'),
- "ru1" : ('pc102', 'ru'),
- "ru2" : ('pc102', 'ru'),
- "ru_win" : ('pc105', 'ru'),
- "se-latin1" : ('pc102', 'se'),
- "us" : ('pc101', 'us'),
+ "be-latin1" : ('pc102', 'be'),
+ "be2-latin1" : ('pc102', 'be'),
+ "bg" : ('pc102', 'bg'),
+ "cf" : ('pc102', 'cf'),
+ "cz-lat2" : ('pc102', 'cs'),
+ "cz-lat2-prog" : ('pc102', 'cs'),
+ "de" : ('pc102', 'de'),
+ "de-latin1" : ('pc102', 'de'),
"de-latin1-nodeadkeys" : ('pc102', 'de'),
- "de-latin1" : ('pc102', 'de'),
- "de" : ('pc102', 'de'),
- "fr_CH-latin1" : ('pc102', 'fr_CH'),
- "fr_CH" : ('pc102', 'fr_CH'),
- "hu" : ('pc102', 'fr_CH'),
+ "dk" : ('pc102', 'dk'),
+ "dk-latin1" : ('pc102', 'dk'),
+ "es" : ('pc102', 'es'),
+ "fi" : ('pc102', 'fi'),
+ "fi-latin1" : ('pc102', 'fi'),
+ "fr" : ('pc102', 'fr'),
+ "fr-latin0" : ('pc102', 'fr'),
+ "fr-latin1" : ('pc102', 'fr'),
+ "fr-pc" : ('pc102', 'fr'),
+ "fr_CH" : ('pc102', 'fr_CH'),
+ "fr_CH-latin1" : ('pc102', 'fr_CH'),
+ "hu" : ('pc102', 'fr_CH'),
+ "hu101" : ('pc102', 'hu'),
+ "it" : ('pc102', 'it'),
+ "it-ibm" : ('pc101', 'it'),
+ "it2" : ('pc102', 'it'),
+ "jp106" : ('jp106', 'jp'),
+ "no" : ('pc102', 'no'),
+ "no-latin1" : ('pc102', 'no'),
+ "pl" : ('pc102', 'pl'),
+ "pt-latin1" : ('pc102', 'pt'),
+ "ru" : ('pc102', 'ru'),
+ "ru-cp1251" : ('pc102', 'ru'),
+ "ru-ms" : ('microsoft', 'ru'),
+ "ru1" : ('pc102', 'ru'),
+ "ru2" : ('pc102', 'ru'),
+ "ru_win" : ('pc105', 'ru'),
+ "se-latin1" : ('pc102', 'se'),
+ "uk" : ('pc101', 'gb'),
+ "us" : ('pc101', 'us'),
}
console2xsun = {
"sun-pl-altgraph" : 'pl',