From: thedoc <thedoc@atom.(none)>
Date: Wed, 23 Dec 2009 10:24:17 +0000 (+0100)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=bc8b453f3e2a5a142faa23efdb777165b33e788d;hp=-c

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

bc8b453f3e2a5a142faa23efdb777165b33e788d
diff --combined data/skin_default.xml
index db9974c,649ceda..71f579c
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@@ -43,7 -43,9 +43,9 @@@
  		<widget source="Adaptertext" render="Label" position="10,355" size="120,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1" />
  		<widget source="Adapter" render="Label" position="120,355" size="400,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1" />
  		<widget source="introduction2" render="Label" position="10,380" size="540,21" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
- 		<widget name="VKeyIcon" pixmap="skin_default/buttons/key_text.png" position="10,380" zPosition="10" size="35,25" transparent="1" alphatest="on" />
+ 		<widget source="VKeyIcon" render="Pixmap" pixmap="skin_default/buttons/key_text.png" position="10,380" zPosition="10" size="35,25" transparent="1" alphatest="on" >
+ 			<convert type="ConditionalShowHide" />
+ 		</widget>
  		<widget name="HelpWindow" pixmap="skin_default/vkey_icon.png" position="160,315" zPosition="1" size="1,1" transparent="1" alphatest="on" />
  	</screen>
  
@@@ -248,7 -250,7 +250,7 @@@ self.instance.move(ePoint((720-wsizex)/
  			<widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
  	</screen>
  	<!-- Dish -->
 -	<screen name="Dish" flags="wfNoBorder" position="300,100" size="130,160" title="Dish" zPosition="-1" backgroundColor="transparent">
 +	<screen name="Dish" flags="wfNoBorder" position="300,100" size="130,160" title="Dish" zPosition="100" backgroundColor="transparent">
  		<widget name="Dishpixmap" pixmap="skin_default/icons/dish.png" position="0,0" size="130,160" alphatest="off" />
  	</screen>
  	<!-- EPG Selection - Single -->