fix hdd initialize button

change "Abbrechen" to "Abbruch" to fit onto the pixmap
fix videomode after standby

diff --git a/data/skin.xml b/data/skin.xml
index 385b4bed28681022991f5bea4d196db7ca3358f5..6ffd678264813ae86b9d91a097ed46a20d8ee140 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -62,7 +62,7 @@
                        <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="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" position="40,110" size="120,30" zPosition="1" pixmap="/usr/share/enigma2/init.png" />
+                       <widget name="initialize" position="40,110" size="120,30" zPosition="1" pixmap="/usr/share/enigma2/init.png" transparent="1" />

                        <widget name="initializetext" position="40,110" size="120,30" valign="center" halign="center" zPosition="2" font="Regular;20" />
                </screen>
                <screen name="Setup" position="100,125" size="540,280" title="Setup">
                        <widget name="initializetext" position="40,110" size="120,30" valign="center" halign="center" zPosition="2" font="Regular;20" />
                </screen>
                <screen name="Setup" position="100,125" size="540,280" title="Setup">

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 09a87ce63ca8ab2364d596c0bbc64d980a80af0d..217f334c689e33c6cd0951c0b2d9c353c55a2567 100644 (file)
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -1,13 +1,14 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.config import config
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.config import config

+from Components.AVSwitch import AVSwitch

 from enigma import *
 
 class Standby(Screen):
        def Power(self):
                print "leave standby"
                #set input to encoder
 from enigma import *
 
 class Standby(Screen):
        def Power(self):
                print "leave standby"
                #set input to encoder

-               eAVSwitch.getInstance().setInput(0)
+               self.avswitch.setInput("ENCODER")

                #start last played service
                #self.infobar.servicelist.zap()
                self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
                #start last played service
                #self.infobar.servicelist.zap()
                self.session.nav.playService(eServiceReference(config.tv.lastservice.value))


@@ -34,6 +35,7 @@ class Standby(Screen):
        def __init__(self, session, infobar):
                Screen.__init__(self, session)
                self.infobar = infobar
        def __init__(self, session, infobar):
                Screen.__init__(self, session)
                self.infobar = infobar

+               self. avswitch = AVSwitch()

                print "enter standby"
 
                self["actions"] = ActionMap( [ "StandbyActions" ],
                print "enter standby"
 
                self["actions"] = ActionMap( [ "StandbyActions" ],


@@ -46,7 +48,7 @@ class Standby(Screen):
                #stop actual played dvb-service
                self.session.nav.stopService()
                #set input to vcr scart
                #stop actual played dvb-service
                self.session.nav.stopService()
                #set input to vcr scart

-               eAVSwitch.getInstance().setInput(1)
+               self.avswitch.setInput("SCART")

                #set lcd brightness to standby value
                eDBoxLCD.getInstance().setLCDBrightness(config.lcd.standby.value * 20)
                #clear lcd (servicename)
                #set lcd brightness to standby value
                eDBoxLCD.getInstance().setLCDBrightness(config.lcd.standby.value * 20)
                #clear lcd (servicename)

diff --git a/po/de.po b/po/de.po
index 590f27f5e4ac964b3095d68b37abc5b2290a0a44..97d1851fe59f6fca4d99bd2c7f4a8b1c05aec631 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -157,7 +157,7 @@ msgstr "Kabelanbieter"
 
 #: ../lib/python/Screens/Setup.py:110 ../lib/python/Screens/TimerEntry.py:19
 msgid "Cancel"
 
 #: ../lib/python/Screens/Setup.py:110 ../lib/python/Screens/TimerEntry.py:19
 msgid "Cancel"

-msgstr "Abbrechen"
+msgstr "Abbruch"

 
 #: ../lib/python/Screens/HarddiskSetup.py:30
 msgid "Capacity: "
 
 #: ../lib/python/Screens/HarddiskSetup.py:30
 msgid "Capacity: "