add some translations (translations in the wizard don't work in some places)

remove every moving pixmap from the startwizard (because of flickering)

diff --git a/data/keymap.xml b/data/keymap.xml
index 1a0c5c55af3f2a0ac715e36466d11d38e02a9539..693f933066cea2bc3521cf03de548ed161c4cbf9 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -72,6 +72,7 @@
                <key id="KEY_UP" mapto="up" flags="mr" />
                <key id="KEY_DOWN" mapto="down" flags="mr" />
                <key id="KEY_OK" mapto="ok" flags="m" />
+               <key id="KEY_EXIT" mapto="back" flags="m" />
        </map>
        
        <map context="InfobarMenuActions">

diff --git a/data/skin.xml b/data/skin.xml
index 71b4b1684062bec48d04faa5cb99d87293e9b96f..3c9f55dba2d38509af00d720a47fcc94b28cfc15 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -70,8 +70,8 @@
                        <widget name="ok" position="140,240" size="38,20" font="Arial;20" backgroundColor="green" />
                        <widget name="cancel" position="240,240" size="70,20" font="Arial;20" backgroundColor="red" />
                </screen>
-               <screen name="LanguageSelection" position="100,125" size="540,280" title="Language selection">
-                       <widget name="list" position="10,50" size="520,175" />
+               <screen name="LanguageSelection" position="200,125" size="220,250" title="Language selection">
+                       <widget name="list" position="10,0" size="190,240" />
                </screen>
                <screen name="NimSelection" position="140,165" size="400,100" title="select Slot">
                        <widget name="nimlist" position="20,10" size="360,75" />

diff --git a/data/startwizard.xml b/data/startwizard.xml
index d4c7efab61428aa241ef10af6a8df7e1f835f682..d15082fd793c9d619121a81f52da5867c65b47db 100644 (file)
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -2,9 +2,11 @@
                <step number="1">
                        <text value="Hello User.\n\nThis start-wizard will guide you through the basic setup of your Dreambox.\n\nPress the OK button on your remote control to move to the next step." />
                        <code>
-self["arrowdown"].moveTo(557, 232, 10)
-self["rc"].moveTo(500, 50, 10)         
+self["arrowdown"].moveTo(557, 232, 1)
 self["arrowdown"].startMoving()
+self["arrowup"].moveTo(800, 232, 1)
+self["arrowup"].startMoving()
+self["rc"].moveTo(500, 50, 1)
 self["rc"].startMoving()
                        </code>
                </step>
@@ -15,34 +17,39 @@ self["rc"].startMoving()
                                <listentry caption="Exit wizard" step="end" />
                        </list>
                        <code>
-self["arrowdown"].moveTo(557, 200, 10)
-self["arrowup"].moveTo(557, 355, 10)
+self["arrowdown"].moveTo(557, 200, 1)
+self["arrowup"].moveTo(557, 355, 1)
 self["arrowdown"].startMoving()
 self["arrowup"].startMoving()
+self["rc"].moveTo(500, 50, 1)
+self["rc"].startMoving()
                        </code>
                </step>
                <step number="3">
-                       <text value="Please set up tuner A" />
+                       <text value="Use the left and right buttons to change an option.\n\nPlease set up tuner A" />
                        <config screen="NimSetup" module="Satconfig" args="0" type="ConfigList" />
                        <code>
-self["arrowup"].moveTo(740, 355, 10)
+self["rc"].moveTo(500, 50, 1)
+self["rc"].startMoving()
+self["arrowup"].moveTo(525, 320, 1)
 self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
+self["arrowup2"].moveTo(590, 320, 1)
+self["arrowup2"].startMoving()
+self["arrowdown"].moveTo(740, 355, 1)
 self["arrowdown"].startMoving()
+
                        </code>
                </step>
                <step number="4">
                        <text value="Please set up tuner B" />
                        <config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
                        <code>
-self["arrowup"].moveTo(740, 355, 10)
+self["rc"].moveTo(800, 50, 1)
+self["rc"].startMoving()
+self["arrowup"].moveTo(800, 310, 1)
 self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
-self["arrowdown"].startMoving()
+self["arrowup2"].moveTo(800, 310, 1)
+self["arrowup2"].startMoving()
                        </code>
                </step>
                <step number="5">
@@ -55,24 +62,8 @@ self["arrowdown"].startMoving()
                <step number="6">
                        <text value="What do you want to scan?" />
                        <config screen="ScanSimple" module="ScanSetup" type="ConfigList" />
-                       <code>
-self["arrowup"].moveTo(740, 355, 10)
-self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
-self["arrowdown"].startMoving()
-                       </code>
                </step>
                <step number="7">
                        <text value="Thanx for using the wizard. Your box is now ready to use." />
-                       <code>
-self["arrowdown"].moveTo(740, 200, 10)
-self["arrowup"].moveTo(740, 355, 10)
-self["arrowdown"].startMoving()
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 600, 5)
-self["rc"].startMoving()
-                       </code>
                </step> 
 </wizard>

diff --git a/lib/python/Components/LanguageList.py b/lib/python/Components/LanguageList.py
index 23f78003f367fadf1610148147337fb49cea5cf4..def29c93c7614041aa79d74cc3c38c318a993df6 100644 (file)
--- a/lib/python/Components/LanguageList.py
+++ b/lib/python/Components/LanguageList.py
@@ -18,11 +18,11 @@ RT_VALIGN_BOTTOM = 16
 
 def LanguageEntryComponent(file, name):
        res = [ None ]
-       res.append((70, 0, 400, 40, 0, RT_VALIGN_CENTER, name))
+       res.append((80, 10, 200, 50, 0, RT_HALIGN_LEFT , name))
        png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/countries/" + file + ".png"))
        if png == None:
                png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/countries/missing.png"))
-       res.append((0, 5, 60, 40, png))
+       res.append((10, 5, 60, 40, png))
        
        return res
 
@@ -33,7 +33,7 @@ class LanguageList(HTMLComponent, GUIComponent, MenuList):
                self.l = eListboxPythonMultiContent()
                self.list = list
                self.l.setList(list)
-               self.l.setFont(0, gFont("Arial", 25))
+               self.l.setFont(0, gFont("Arial", 20))
        
        def GUIcreate(self, parent):
                self.instance = eListbox(parent)

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index a53bb97e37616ea4b208fc8925ac0f06ce53b8f6..e845d84b571794889a5226274989095a61f0a035 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -17,7 +17,7 @@ class LanguageSelection(Screen):
                else:
                        for x in language.lang:
                                self.list.append(LanguageEntryComponent(x[2], x[0]))
-
+               
                self["list"] = LanguageList(self.list)
                
                self["actions"] = ActionMap(["OkCancelActions"], 

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index 1cb0bd893814c82402e0c2267ad1ec2d9d7cb593..037c0757c73c46a771d17352a04e16e69ac3e105 100644 (file)
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -14,6 +14,7 @@ class StartWizard(Wizard):
                        <widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
                        <widget name="arrowdown" pixmap="/usr/share/enigma2/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
                        <widget name="arrowup" pixmap="/usr/share/enigma2/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+                       <widget name="arrowup2" pixmap="/usr/share/enigma2/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
                </screen>"""
        
        def __init__(self, session):
@@ -24,6 +25,7 @@ class StartWizard(Wizard):
                self["rc"] = MovingPixmap()
                self["arrowdown"] = MovingPixmap()
                self["arrowup"] = MovingPixmap()
+               self["arrowup2"] = MovingPixmap()
                
 wizardManager.registerWizard(LanguageSelection)
 wizardManager.registerWizard(StartWizard)
\ No newline at end of file

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index e4f69290a2b117ee00887f20d2624d449b7937f1..a5726f6fa54f0078d34c09278f2a294157ab97e8 100644 (file)
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -78,7 +78,7 @@ class Wizard(Screen, HelpableScreen):
                self["actions"] = NumberActionMap(["WizardActions", "NumberActions"],
                {
                        "ok": self.ok,
-                       #"cancel": self.keyCancel,
+                       "back": self.back,
                        "left": self.left,
                        "right": self.right,
                        "up": self.up,
@@ -100,6 +100,12 @@ class Wizard(Screen, HelpableScreen):
                                #"ok": (self.ok, _("Close this Screen...")),
                        #})
 
+       def back(self):
+               self.currStep -= 1
+               if self.currStep < 1:
+                       self.currStep = 1
+               self.updateValues()
+               
        def ok(self):
                print "OK"
                if (self.wizard[self.currStep]["config"]["screen"] != None):
@@ -171,7 +177,7 @@ class Wizard(Screen, HelpableScreen):
                if (len(self.wizard[self.currStep]["list"]) > 0):
                        self["list"].instance.setZPosition(2)
                        for x in self.wizard[self.currStep]["list"]:
-                               self.list.append((x[0], None))
+                               self.list.append((_(x[0]), None))
                self["list"].l.setList(self.list)
 
                self["config"].instance.setZPosition(1)

diff --git a/po/de.po b/po/de.po
index 326dbca86fa01edf472ca2143d1bb8dd7a6f9f9f..83ec4c9599d1e9120226c9ace7a0aabadd79e6bc 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-11 05:05+0100\n"
+"POT-Creation-Date: 2005-12-11 23:54+0100\n"
 "PO-Revision-Date: 2005-11-17 20:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -181,7 +181,7 @@ msgid "EndTime"
 msgstr "Endzeit"
 
 #: ../lib/python/Components/SetupDevices.py:24
-#: ../lib/python/Components/Language.py:9
+#: ../lib/python/Components/Language.py:11
 msgid "English"
 msgstr "Englisch"
 
@@ -208,7 +208,7 @@ msgid "Gateway"
 msgstr ""
 
 #: ../lib/python/Components/SetupDevices.py:24
-#: ../lib/python/Components/Language.py:10
+#: ../lib/python/Components/Language.py:12
 msgid "German"
 msgstr "Deutsch"
 
@@ -291,6 +291,10 @@ msgstr "Keins"
 msgid "North"
 msgstr "Nord"
 
+#: ../lib/python/Screens/InfoBar.py:35
+msgid "Play recorded movies..."
+msgstr ""
+
 #: ../lib/python/Screens/ScanSetup.py:90
 msgid "Polarity"
 msgstr "Polaritaet"
@@ -377,7 +381,7 @@ msgstr "Aufnahme beginnen?"
 msgid "StartTime"
 msgstr "Startzeit"
 
-#: ../lib/python/Screens/Wizard.py:160
+#: ../lib/python/Screens/Wizard.py:166
 msgid "Step "
 msgstr ""
 
@@ -447,6 +451,9 @@ msgid ""
 "Please refer to the user-manual.\n"
 "Error: "
 msgstr ""
+"Konnte Festplatte nicht initialisieren..\n"
+"Bitte lesen Sie im Handbuch nach.\n"
+"Fehler: "
 
 #: ../lib/python/Screens/NetworkSetup.py:40
 #: ../lib/python/Screens/NetworkSetup.py:52 ../data/
@@ -486,6 +493,10 @@ msgstr "leer/unbekannt"
 msgid "horizontal"
 msgstr ""
 
+#: ../lib/python/Screens/InfoBar.py:65
+msgid "leave movie player..."
+msgstr ""
+
 #: ../lib/python/Components/NimManager.py:429
 msgid "manual"
 msgstr "manuell"
@@ -553,7 +564,7 @@ msgstr "Status"
 msgid "show EPG..."
 msgstr "zeige EPG..."
 
-#: ../lib/python/Screens/Wizard.py:163
+#: ../lib/python/Screens/Wizard.py:169
 msgid "text"
 msgstr ""
 
@@ -629,6 +640,8 @@ msgid ""
 "Use the up/down keys on your remote control to select an option. After that, "
 "press OK."
 msgstr ""
+"Mit den hoch/runter Tasten koennen Sie eine Option auswaehlen. Danach bitte "
+"OK druecken."
 
 #: ../data/
 msgid "Show Satposition"
@@ -643,8 +656,8 @@ msgid "#000000"
 msgstr ""
 
 #: ../data/
-msgid "Thanx for using the wizard. Your box is now ready to use."
-msgstr ""
+msgid "Use wizard to set up basic features"
+msgstr "Grundeinstellungen jetzt vornehmen"
 
 #: ../data/
 msgid "Sat / Dish Setup"
@@ -830,6 +843,10 @@ msgstr "Kanalsuche"
 msgid "LCD Setup"
 msgstr "LCD Einstellung"
 
+#: ../data/
+msgid "No, scan later manually"
+msgstr ""
+
 #: ../data/
 msgid "Soundcarrier"
 msgstr "Tontraeger"
@@ -854,10 +871,6 @@ msgstr "Wiederholung"
 msgid "Network Setup"
 msgstr "Netzwerkeinstellungen"
 
-#: ../data/
-msgid "Please set up tuner A"
-msgstr ""
-
 #: ../data/
 msgid "#ffffffff"
 msgstr ""
@@ -890,6 +903,10 @@ msgstr "Tastenlayout"
 msgid "InfoBar"
 msgstr ""
 
+#: ../data/
+msgid "Exit wizard"
+msgstr "Assistenten beenden"
+
 #: ../data/
 msgid "Serviceinfo"
 msgstr ""
@@ -910,6 +927,10 @@ msgstr "Bestaetigungen ueberspringen"
 msgid "Plugins"
 msgstr "Erweiterungen"
 
+#: ../data/
+msgid "Yes, scan now"
+msgstr ""
+
 #: ../data/
 msgid "Information"
 msgstr "Informationen"
@@ -920,7 +941,7 @@ msgstr "Menue"
 
 #: ../data/
 msgid "Please set up tuner B"
-msgstr ""
+msgstr "Einstellungen fuer Tuner B."
 
 #: ../data/
 msgid "Networksetup"
@@ -950,6 +971,16 @@ msgstr "Experteneinstellungen"
 msgid "Language"
 msgstr "Sprache"
 
+#: ../data/
+msgid ""
+"Use the left and right buttons to change an option.\n"
+"\n"
+"Please set up tuner A"
+msgstr ""
+"Mit den recht-/links-Tasten koennen Sie Optionen aendern.\n"
+"\n"
+"Einstellungen fuer Tuner A"
+
 #: ../data/
 msgid "Parental Control"
 msgstr "Jugendschutz"
@@ -1006,6 +1037,11 @@ msgid ""
 "\n"
 "Press the OK button on your remote control to move to the next step."
 msgstr ""
+"Willkommen auf Ihrer DM7025.\n"
+"\n"
+"This start-wizard will guide you through the basic setup of your Dreambox.\n"
+"\n"
+"Press the OK button on your remote control to move to the next step."
 
 #: ../data/
 msgid "Audio"
@@ -1019,34 +1055,10 @@ msgstr ""
 msgid "Do you want to do a service scan?"
 msgstr ""
 
+#: ../data/
+msgid "Thanx for using the wizard. Your box is now ready to use."
+msgstr ""
+
 #: ../data/
 msgid "Satelliteconfig"
 msgstr "Satelliteneinstellungen"
-
-#~ msgid "Linked to"
-#~ msgstr "Verbunden mit"
-
-#~ msgid "Linked tuner"
-#~ msgstr "Verbundene Tuner"
-
-#~ msgid ""
-#~ "Welcome!\n"
-#~ "\n"
-#~ "You can always press the help key!\n"
-#~ "\n"
-#~ "Please Note: Do a service search first!"
-#~ msgstr ""
-#~ "Willkommen!\n"
-#~ "\n"
-#~ "Sie koennen jederzeit auf Help (Hilfe) druecken!\n"
-#~ "\n"
-#~ "Bitte zuerst eine Kanalsuche durchfuehren!"
-
-#~ msgid "waiting for event data..."
-#~ msgstr "warte auf Programmdaten..."
-
-#~ msgid "Expert"
-#~ msgstr "Experten"
-
-#~ msgid "Advanced"
-#~ msgstr "Erweitert"

diff --git a/po/xml2po.py b/po/xml2po.py
index dac3a773908fe12a1ce3de40e2180386a21d4758..bf277987442def52ee7ff1f82e1772d2b134869e 100755 (executable)
--- a/po/xml2po.py
+++ b/po/xml2po.py
@@ -14,6 +14,10 @@ class parseXML(ContentHandler):
                        attrlist[attrs.get('text', "")] = "foo"
                if (attrs.has_key('title')):
                        attrlist[attrs.get('title', "")] = "foo"
+               if (attrs.has_key('value')):
+                       attrlist[attrs.get('value', "")] = "foo"
+               if (attrs.has_key('caption')):
+                       attrlist[attrs.get('caption', "")] = "foo"
 
 parser = make_parser()