From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 3 Jan 2006 11:36:12 +0000 (+0000)
Subject: fix hdd initialize button
X-Git-Tag: 2.6.0~4535
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/8c84c2a2c0b8d33404540ab50278de63d3c7fccc

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 385b4bed..6ffd6782 100644
--- 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="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">
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 09a87ce6..217f334c 100644
--- 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 Components.AVSwitch import AVSwitch
 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))
@@ -34,6 +35,7 @@ class Standby(Screen):
 	def __init__(self, session, infobar):
 		Screen.__init__(self, session)
 		self.infobar = infobar
+		self. avswitch = AVSwitch()
 		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
-		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)
diff --git a/po/de.po b/po/de.po
index 590f27f5..97d1851f 100644
--- 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"
-msgstr "Abbrechen"
+msgstr "Abbruch"
 
 #: ../lib/python/Screens/HarddiskSetup.py:30
 msgid "Capacity: "