From: acid-burn <acid-burn@opendreambox.org>
Date: Wed, 23 Dec 2009 05:42:27 +0000 (+0100)
Subject: Merge branch 'bug157_wizard_virtualkeyboard'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=d6ad23c5be62bc24cc08a5c8db91f64ae2d8cf3b;hp=-c

Merge branch 'bug157_wizard_virtualkeyboard'
---

d6ad23c5be62bc24cc08a5c8db91f64ae2d8cf3b
diff --combined data/skin_default.xml
index 16504ab,dfab4d8..649ceda
--- 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>
  
@@@ -803,9 -805,9 +805,9 @@@ self.instance.move(ePoint(orgpos.x() + 
  		<widget name="config" position="10,165" size="500,225" scrollbarMode="showOnDemand" />
  	</screen>
  	<!-- Scan setup -->
 -	<screen name="ScanSetup" position="center,center" size="520,390" title="Service scan">
 +	<screen name="ScanSetup" position="center,center" size="520,450" title="Service scan">
  		<widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
 -		<widget name="introduction" position="10,365" size="500,25" font="Regular;20" halign="center" />
 +		<widget name="introduction" position="10,365" size="500,75" font="Regular;20" halign="center" />
  	</screen>
  	<!-- Scan simple -->
  	<screen name="ScanSimple" position="center,center" size="420,350" title="Service scan">