add LanguageWizard to adapt to the wizard design of the start wizard

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 406136061550a5e68798e51df298e751144afe03..cc478d128146fbcd75f66046505cdd8de7a55434 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -394,6 +394,26 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3)
                        </convert>
                </widget>
        </screen>
+       <screen name="LanguageWizard" position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder">
+               <widget name="text" position="153,50" size="340,240" font="Regular;23" />
+               <widget source="languages" render="Listbox" position="50,300" size="440,200" scrollbarMode="showOnDemand">
+                       <convert type="TemplatedMultiContent">
+                               {"template": [
+                                               MultiContentEntryText(pos = (80, 10), size = (200, 50), flags = RT_HALIGN_LEFT, text = 1), # index 1 is the language name,
+                                               MultiContentEntryPixmap(pos = (10, 5), size = (60, 40), png = 2), # index 2 is the pixmap
+                                       ],
+                                "fonts": [gFont("Regular", 20)],
+                                "itemHeight": 50
+                               }
+                       </convert>
+               </widget>
+               <widget name="wizard" pixmap="skin_default/wizard.png" position="40,50" zPosition="10" size="110,174" alphatest="on" />
+               <widget name="rc" pixmaps="skin_default/rc.png,skin_default/rcold.png" position="500,50" zPosition="10" size="154,500" alphatest="on" />
+               <widget name="arrowdown" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
+               <widget name="arrowdown2" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
+               <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
+               <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
+       </screen>
        <!-- Location Box -->
        <screen name="LocationBox" position="100,75" size="540,460" >
                <widget name="text" position="0,2" size="540,22" font="Regular;22" />

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 7d5596fd2e331e3db843df30a492c3bca9d8f26f..0fe53d654da7caa5828df63134e93603af583ac2 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -4,8 +4,12 @@ from Components.ActionMap import ActionMap
 from Components.Language import language
 from Components.config import config
 from Components.Sources.List import List
+from Components.Label import Label
+from Components.Pixmap import Pixmap
 
-from Tools.Directories import *
+from Screens.Rc import Rc
+
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 
 from Tools.LoadPixmap import LoadPixmap
 
@@ -85,3 +89,27 @@ class LanguageSelection(Screen):
        def changed(self):
                self.run()
                self.updateList()
+
+class LanguageWizard(LanguageSelection, Rc):
+       def __init__(self, session):
+               LanguageSelection.__init__(self, session)
+               Rc.__init__(self)
+               self.onLayoutFinish.append(self.selectKeys)
+                               
+               self["wizard"] = Pixmap()
+               self["text"] = Label()
+               self.setText()
+               
+       def selectKeys(self):
+               self.clearSelectedKeys()
+               self.selectKey("UP")
+               self.selectKey("DOWN")
+               
+       def changed(self):
+               self.run()
+               self.updateList()
+               self.setText()
+               
+       def setText(self):
+               self["text"].setText(_("Please use the UP and DOWN keys to select your language. Afterwards press the OK button."))
+

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index ae806ab64dd6d8c6ddba153d4d5393e7f3265e93..aab81f634c6a7dc0476918d646b4887f2ac93f38 100644 (file)
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -7,7 +7,7 @@ from Screens.Rc import Rc
 from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
 from Components.config import config, ConfigBoolean, configfile, ConfigSubsection
 
-from LanguageSelection import LanguageSelection
+from LanguageSelection import LanguageWizard
 
 config.misc.firstrun = ConfigBoolean(default = True)
 config.misc.startwizard = ConfigSubsection()
@@ -28,5 +28,5 @@ class StartWizard(DefaultSatLists, Rc):
                config.misc.firstrun.save()
                configfile.save()
                
-wizardManager.registerWizard(LanguageSelection, config.misc.languageselected.value, priority = 5)
+wizardManager.registerWizard(LanguageWizard, config.misc.languageselected.value, priority = 5)
 wizardManager.registerWizard(StartWizard, config.misc.firstrun.value, priority = 20)