← Back to branch summary

~ubuntu-branches/ubuntu/quantal/system-config-kickstart/quantal

« back to all changes in this revision

Viewing changes to src/basic.py

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2006-10-11 22:39:07 UTC
  • Revision ID: james.westby@ubuntu.com-20061011223907-hko1dg9n23gg7zle
Tags: 2.5.20-0ubuntu15
* Adjust to new localechooser-data, which has languagelist format changes
  and doesn't ship /usr/share/localechooser/SUPPORTED-short; use
  /usr/share/i18n/SUPPORTED instead (closes: Malone #59820).
* Use keyboard lists from console-setup.
* Convert to new Python policy, using python-support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/basic.py
29
29
import shlex
30
30
 
31
31
import mouse
32
 
from hardwareLists import langDict
 
32
from hardwareLists import langDict, layoutDict, variantDict
33
33
 
34
34
import kickstartGui
35
35
 
126
126
        self.mouse_combo.set_popdown_strings(self.mouse_list)
127
127
        self.mouse_combo.list.select_item(0)
128
128
 
129
 
        #populate keyboard combo, add keyboards here
 
129
        #populate keyboard combo
130
130
        self.keyboard_dict = {}
131
 
        keymapFile = open("/usr/share/console/lists/console-data.keymap-list")
132
 
        lines = keymapFile.readlines()
133
 
        for line in lines:
134
 
            # TODO: refinement by architecture; internationalisation
135
 
            (arch, keymap) = line.split()
136
 
            self.keyboard_dict[keymap] = [keymap]
 
131
        for layoutname, layoutcode in layoutDict.iteritems():
 
132
            # TODO: internationalisation
 
133
            self.keyboard_dict[layoutname] = layoutcode
 
134
            for variantname, variantcode in variantDict[layoutcode].iteritems():
 
135
                if variantcode:
 
136
                    code = '%s_%s' % (layoutcode, variantcode)
 
137
                    self.keyboard_dict[variantname] = code
137
138
 
138
139
        keys = self.keyboard_dict.keys()
139
140
        keys.sort()
140
141
        keyboard_list = []
141
142
 
142
143
        for item in keys:
143
 
            keyboard_list.append(self.keyboard_dict[item][0])
 
144
            keyboard_list.append(item)
144
145
        self.keyboard_combo.set_popdown_strings(keyboard_list)
145
146
 
146
 
        # TODO: fill with current keymap; for now, default to English
 
147
        # TODO: fill with current keymap; for now, default to U.S. English
147
148
        #set keyboard to current keymap
148
 
        self.keyboard_combo.entry.set_text(self.keyboard_dict["us"][0])
 
149
        for layoutname, layoutcode in layoutDict.iteritems():
 
150
            if layoutcode == 'us':
 
151
                self.keyboard_combo.entry.set_text(layoutname)
 
152
                break
149
153
 
150
154
        #set default mouse to generic ps/2
151
155
        self.mouse_combo.list.select_item(8)
222
226
        keys = self.keyboard_dict.keys()
223
227
        keys.sort()
224
228
        for item in keys:
225
 
            if self.keyboard_dict[item][0] == self.keyboard_combo.entry.get_text():
226
 
                self.kickstartData.setKeyboard([item])
 
229
            if item == self.keyboard_combo.entry.get_text():
 
230
                self.kickstartData.setKeyboard([self.keyboard_dict[item]])
227
231
                break
228
232
 
229
233
        self.kickstartData.setMouse([self.mouseLookup(self.mouse_combo.entry.get_text())])
428
432
                self.lang_combo.list.select_item(self.lang_list.index(lang))
429
433
 
430
434
        #set keyboard
431
 
        self.keyboard_combo.entry.set_text(self.keyboard_dict[self.kickstartData.getKeyboard()][0])
 
435
        for keyboardname, keyboardcode in self.keyboard_dict.iteritems():
 
436
            if keyboardcode == self.kickstartData.getKeyboard():
 
437
                self.keyboard_combo.entry.set_text(keyboardname)
432
438
 
433
439
        mouseLine = self.kickstartData.getMouse()
434
440