Merge branch 'master' of git.opendreambox.org:/git/enigma2

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 67f8d16349ad33173ff5a879f2ccf609359a75c5..330c31d4c4c9932effef1d197620627af817feb9 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -350,8 +350,10 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3)
                <widget name="model" position="20,10" size="380,25" font="Regular;23" />
                <widget name="capacity" position="20,40" size="380,25" font="Regular;23" />
                <widget name="bus" position="20,70" size="380,25" font="Regular;23" />
-               <widget name="initialize" pixmap="skin_default/buttons/red.png" position="140,110" size="140,40" alphatest="on" />
-               <widget name="initializetext" position="140,110" size="140,40" zPosition="1" font="Regular;20" halign="center" valign="center" transparent="1" />
+               <ePixmap pixmap="skin_default/buttons/button_red.png" position="120,110" zPosition="10" size="15,16" transparent="1" alphatest="on" />
+               <widget name="initializetext" position="140,110" size="140,40" zPosition="10" font="Regular;20" transparent="1" />
+               <!--widget name="initialize" pixmap="skin_default/buttons/red.png" position="140,110" size="140,40" alphatest="on" />
+               <widget name="initializetext" position="140,110" size="140,40" zPosition="1" font="Regular;20" halign="center" valign="center" transparent="1" /-->
        </screen>
        <!-- Harddisk wait -->
        <screen name="HarddiskWait" position="100,150" size="540,60">
@@ -566,7 +568,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <ePixmap pixmap="skin_default/buttons/button_red.png" position="410,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
                <widget name="ButtonBluetext" position="60,325" size="300,21" zPosition="10" font="Regular;21" transparent="1" />
                <widget name="ButtonBlue" pixmap="skin_default/buttons/button_blue.png" position="30,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
-               <widget name="introduction" position="140,360" size="300,21" zPosition="10" font="Regular;21" halign="center" transparent="1" />
+               <widget name="introduction" position="30,360" size="500,21" zPosition="10" font="Regular;21" halign="center" transparent="1" />
        </screen>
        <!-- Network adapter test Black = "#000000" Grey = "#8c8c93" Green = "#1cff1c" Red = #f23d21-->
        <screen name="NetworkAdapterTest" position="70,100" size="570,400" title="Network test..." >
@@ -635,8 +637,8 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="number" position="145,15" size="80,25" halign="right" font="Regular;23" />
        </screen>
        <!-- Numerical help dialog -->
-       <screen name="NumericalTextInputHelpDialog" position="170,420" zPosition="2" size="394,94" backgroundColor="#202020" flags="wfNoBorder">
-               <eLabel position="0,0" size="392,92" backgroundColor="#c0c0c0" zPosition="-1" />
+       <screen name="NumericalTextInputHelpDialog" position="190,400" zPosition="2" size="394,124" backgroundColor="#202020" flags="wfNoBorder">
+               <eLabel position="0,0" size="392,122" backgroundColor="#c0c0c0" zPosition="-1" />
                <widget name="key1" position="2,2" size="130,30" font="Console;16" halign="center" valign="center" />
                <widget name="key2" position="132,2" size="130,30" font="Console;16" halign="center" valign="center" />
                <widget name="key3" position="262,2" size="130,30" font="Console;16" halign="center" valign="center" />
@@ -646,6 +648,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="key7" position="2,62" size="130,30" font="Console;16" halign="center" valign="center" />
                <widget name="key8" position="132,62" size="130,30" font="Console;16" halign="center" valign="center" />
                <widget name="key9" position="262,62" size="130,30" font="Console;16" halign="center" valign="center" />
+               <widget name="help1" position="2,92" size="130,30" font="Console;16" halign="center" valign="center" />
+               <widget name="key0" position="132,92" size="130,30" font="Console;12" halign="center" valign="center" />
+               <widget name="help2" position="262,92" size="130,30" font="Console;16" halign="center" valign="center" />
        </screen>
        <!-- Parental control - change pin -->
        <screen name="ParentalControlChangePin" position="100,200" size="520,160" title="Change pin code">
@@ -965,7 +970,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="timerlist" position="0,60" size="560,350" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Timer entry -->
-       <screen name="TimerEntry" position="90,95" size="560,430" title="Timer entry">
+       <screen name="TimerEntry" position="90,95" size="560,440" title="Timer entry">
                <widget name="cancel" pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
                <widget name="ok" pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
                <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />

diff --git a/lib/python/Screens/NumericalTextInputHelpDialog.py b/lib/python/Screens/NumericalTextInputHelpDialog.py
index e097958717226ce7161fb97f1f27849012fb050d..de8e8d6604bb75e8adfe503a9b76120d7f84cf50 100644 (file)
--- a/lib/python/Screens/NumericalTextInputHelpDialog.py
+++ b/lib/python/Screens/NumericalTextInputHelpDialog.py
@@ -4,13 +4,15 @@ from Components.Label import Label
 class NumericalTextInputHelpDialog(Screen):
        def __init__(self, session, textinput):
                Screen.__init__(self, session)
-               for x in (1, 2, 3, 4, 5, 6, 7, 8, 9):
+               self["help1"] = Label(text="<")
+               self["help2"] = Label(text=">")
+               for x in (1, 2, 3, 4, 5, 6, 7, 8, 9, 0):
                        self["key%d" % x] = Label(text=textinput.mapping[x].encode("utf-8"))
                self.last_marked = 0
 
        def update(self, textinput):
-               if 1 <= self.last_marked <= 9:
+               if 0 <= self.last_marked <= 9:
                        self["key%d" % self.last_marked].setMarkedPos(-1)
-               if 1 <= textinput.lastKey <= 9:
+               if 0 <= textinput.lastKey <= 9:
                        self["key%d" % textinput.lastKey].setMarkedPos(textinput.pos)
                        self.last_marked = textinput.lastKey

diff --git a/po/de.po b/po/de.po
index fc412eadc565f61a64ba6290851e125f9e1790a0..a4bf7671b7f609353e8884d93bc9f3c59e7a55ee 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-04 21:43+0200\n"
-"PO-Revision-Date: 2009-09-03 13:46+0100\n"
+"PO-Revision-Date: 2009-09-03 14:50+0100\n"
 "Last-Translator: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -1551,13 +1551,13 @@ msgid "Gateway"
 msgstr "Gateway"
 
 msgid "General AC3 Delay"
-msgstr ""
+msgstr "Allgemeine AC3 Verzögerung"
 
 msgid "General AC3 delay"
 msgstr ""
 
 msgid "General PCM Delay"
-msgstr ""
+msgstr "Allgemeine PCM Verzögerung"
 
 msgid "General PCM delay"
 msgstr ""
@@ -1771,7 +1771,7 @@ msgid "Ipkg"
 msgstr ""
 
 msgid "Is this videomode ok?"
-msgstr ""
+msgstr "Diesen Videomodus beibehalten?"
 
 msgid "Italian"
 msgstr "Italienisch"
@@ -2251,7 +2251,7 @@ msgid "OSD Settings"
 msgstr "OSD-Einstellungen"
 
 msgid "OSD visibility"
-msgstr ""
+msgstr "GUI Deckkraft"
 
 msgid "Off"
 msgstr "Aus"