X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2%2Fenigma2_vuplus_skin.patch;h=6cd7d81678aa6098a76b149aa254ea27341c830f;hp=78c5f8e7963ed462840ac039df843ea502e1874b;hb=eefbae5f544c20f7a65f220faab4d6d62361d831;hpb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95;ds=sidebyside

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
index 78c5f8e..6cd7d81 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index f11245a..87be088 100644
+index 057ded7..233c934 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -134,6 +134,16 @@ data/skin_default/menu/Makefile
@@ -80,11 +80,11 @@ index 0000000..20f24d9
 +install_DATA = \
 +	*.png
 diff --git a/data/750S/skin.xml b/data/750S/skin.xml
-new file mode 100644
-index 0000000..356191e
+new file mode 100755
+index 0000000..3148751
 --- /dev/null
 +++ b/data/750S/skin.xml
-@@ -0,0 +1,2841 @@
+@@ -0,0 +1,2852 @@
 +<skin>
 +	<!-- VU+ skin (skin.xml)  -->
 +	<output id="0">
@@ -505,7 +505,6 @@ index 0000000..356191e
 +	<!-- Adapter setup -->
 +	<screen name="AdapterSetup" position="110,115" size="500,415" title="Network Setup" >
 +		<ePixmap pixmap="750S/buttons/red.png" position="0,375" size="140,40" alphatest="on" />
-+		<ePixmap pixmap="750S/buttons/blue.png" position="360,375" size="140,40" alphatest="on" />
 +		<widget source="key_red" render="Label" position="20,375" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
 +		<widget source="key_blue" render="Label" position="380,375" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
 +
@@ -2864,21 +2863,22 @@ index 0000000..356191e
 +	<screen name="WlanConfig" position="center,120" size="510,400" title="Wireless Network Configuration..." >
 +		<ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
 +		<ePixmap pixmap="750S/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
-+
 +		<widget source="key_red" render="Label" position="15,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
 +		<widget source="key_green" render="Label" position="365,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
-+
-+		<widget name="config" position="10,10" backgroundColor="#371e1c1a" transparent="1" size="480,210" scrollbarMode="showOnDemand" />
-+		<ePixmap pixmap="750S/div-h.png" position="0,225" zPosition="1" size="550,2" />
-+
-+		<eLabel text="IP Address : " position="100,250" size="190,21" font="Regular;19" />
-+		<widget source="ipaddress" render="Label" position="300,250" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />
-+		<eLabel text="NetMask : " position="100,275" size="190,21" font="Regular;19" />
-+		<widget source="netmask" render="Label" position="300,275" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />	
-+		<eLabel text="Gateway : " position="100,300" size="190,21" font="Regular;19" />
-+		<widget source="gateway" render="Label" position="300,300" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />
-+		<widget name="VKeyIcon" pixmap="750S/buttons/key_text.png" position="460,245" zPosition="10" size="35,25" transparent="1" alphatest="on" />                  
-+                <widget name="HelpWindow" pixmap="750S/vkey_icon.png" position="160,350" zPosition="1" size="1,1" transparent="1" alphatest="on" />
++		<widget name="config" position="10,10" backgroundColor="#371e1c1a" transparent="1" size="480,195" scrollbarMode="showOnDemand" />
++		<ePixmap pixmap="750S/div-h.png" position="0,210" zPosition="1" size="550,2" />
++		<widget source="ipaddresstext" render="Label" position="100,220" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="ipaddress" render="Label" position="300,220" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="netmasktext" render="Label" position="100,245" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="netmask" render="Label" position="300,245" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="gatewaytext" render="Label" position="100,270" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="gateway" render="Label" position="300,270" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="DNS1text" render="Label" position="100,295" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="DNS1" render="Label" position="300,295" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="DNS2text" render="Label" position="100,320" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++		<widget source="DNS2" render="Label" position="300,320" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++		<widget name="VKeyIcon" pixmap="750S/buttons/key_text.png" position="460,245" zPosition="10" size="35,25" transparent="1" alphatest="on" />
++		<widget name="HelpWindow" pixmap="750S/vkey_icon.png" position="160,350" zPosition="1" size="1,1" transparent="1" alphatest="on" />
 +	</screen>
 +
 +	<screen name="WlanScanAp" position="center,120" size="510,400" title="Wireless Network AP Scan..." >
@@ -2911,20 +2911,31 @@ index 0000000..356191e
 +	</screen>
 +
 +	<!-- Wireless Access Point plugin-->
-+	<screen name="WirelessAccessPoint" position="center,center" size="560,450" title="Wireless Access Point Setup" >
++	<screen name="WirelessAccessPoint" position="65,130" size="590,400" title="Wireless Access Point Setup" >
 +		<ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
 +		<ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
 +		<widget source="key_red" render="Label" position="115,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
 +		<widget source="key_green" render="Label" position="315,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
-+		<widget name="config" zPosition="2" position="5,70" size="550,270" scrollbarMode="showOnDemand" transparent="1" />
-+		<widget source="current_settings" render="Label" position="10,340" size="570,20" font="Regular;19" halign="center" valign="center" transparent="1" />
-+		<widget source="IPAddress_text" render="Label" position="130,370" size="190,21" font="Regular;19" transparent="1" />
-+		<widget source="Netmask_text" render="Label" position="130,395" size="190,21" font="Regular;19" transparent="1" />
-+		<widget source="Gateway_text" render="Label" position="130,420" size="190,21" font="Regular;19" transparent="1" />
-+		<widget source="IPAddress" render="Label" position="340,370" size="240,21" font="Regular;19" transparent="1" />
-+		<widget source="Netmask" render="Label" position="340,395" size="240,21" font="Regular;19" transparent="1" />
-+		<widget source="Gateway" render="Label" position="340,420" size="240,21" font="Regular;19" transparent="1" />
-+	</screen>"""
++		<widget name="config" zPosition="2" position="5,70" size="550,220" scrollbarMode="showOnDemand" transparent="1" />
++		<widget source="current_settings" render="Label" position="10,290" size="550,20" font="Regular;19" halign="center" valign="center" transparent="1" />
++		<widget source="IPAddress_text" render="Label" position="130,320" size="190,21" font="Regular;19" transparent="1" />
++		<widget source="Netmask_text" render="Label" position="130,345" size="190,21" font="Regular;19" transparent="1" />
++		<widget source="Gateway_text" render="Label" position="130,370" size="190,21" font="Regular;19" transparent="1" />
++		<widget source="IPAddress" render="Label" position="340,320" size="240,21" font="Regular;19" transparent="1" />
++		<widget source="Netmask" render="Label" position="340,345" size="240,21" font="Regular;19" transparent="1" />
++		<widget source="Gateway" render="Label" position="340,370" size="240,21" font="Regular;19" transparent="1" />
++	</screen>
++
++	<!-- OperaBrowser Plugin MenuWindow -->
++	<screen name="OperaBrowser" position="0,0" size="720,576" backgroundColor="transparent" flags="wfNoBorder" title="Opera Browser">
++		<widget name="topArea" zPosition="-1" position="0,0" size="1280,60" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" />
++		<widget name="menuitemFile" position="30,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
++		<widget name="menuitemTool" position="180,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
++		<widget name="menuitemHelp" position="330,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
++		<widget name="menulist" position="50,60" size="200,150" backgroundColor="#000000" zPosition="10" scrollbarMode="showOnDemand" />
++		<widget name="submenulist" position="252,60" size="200,150" backgroundColor="#000000" zPosition="10" scrollbarMode="showOnDemand" />
++		<widget name="bottomArea" position="0,496" size="720,80" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" />
++	</screen>
 +</skin>
 diff --git a/data/Makefile.am b/data/Makefile.am
 index 0eaa082..869a16e 100644
@@ -2997,11 +3008,11 @@ index 0000000..9d4f458
 +install_DATA = \
 +	*.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
-new file mode 100644
-index 0000000..ccf3ae3
+new file mode 100755
+index 0000000..45c42d3
 --- /dev/null
 +++ b/data/Vu_HD/skin.xml
-@@ -0,0 +1,3377 @@
+@@ -0,0 +1,3460 @@
 +<skin>
 +	<!-- VU+ skin (skin.xml)  -->
 +	<output id="0">
@@ -3231,6 +3242,13 @@ index 0000000..ccf3ae3
 +		<widget source="RecordingPossible" render="FixedLabel" text="Record" position="100,125" zPosition="1" size="130,22" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#d2dee2" transparent="1">
 +			<convert type="ConditionalShowHide" />
 +		</widget>
++		<!-- Red button, Hbbtv (only if record is not on red, for now) -->
++		<widget source="HbbtvApplication" render="Pixmap" pixmap="Vu_HD/buttons/red.png" position="60,122" zPosition="1" size="25,25" alphatest="on">
++			<convert type="ConditionalShowHide" />
++		</widget>
++		<widget source="HbbtvApplication" render="Label" position="100,125" zPosition="1" size="130,22" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++			<convert type="HbbtvApplicationInfo">Name</convert>
++		</widget>
 +		<!-- Green button (is subservices available?) -->
 +		<ePixmap pixmap="Vu_HD/buttons/button_off.png" position="250,122" size="25,25" alphatest="blend" />
 +		<widget source="session.CurrentService" render="Pixmap" pixmap="Vu_HD/buttons/green.png" position="250,122" zPosition="1" size="25,25" alphatest="blend">
@@ -3395,7 +3413,7 @@ index 0000000..ccf3ae3
 +		<ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
 +		<ePixmap pixmap="Vu_HD/buttons/button_off.png" position="240,98" size="25,25" alphatest="blend" />
 +		<ePixmap pixmap="Vu_HD/buttons/button_off.png" position="435,98" size="25,25" alphatest="blend" />
-+		<ePixmap pixmap="Vu_HD/buttons/blue.png" position="630,98" size="25,25" alphatest="blend" />
++		<ePixmap pixmap="Vu_HD/buttons/button_off.png" position="630,98" size="25,25" alphatest="blend" />
 +		<widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +		<widget source="key_blue" render="Label" position="668,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +		<widget name="config" position="160,140" transparent="1" backgroundColor="#27d9dee2" size="500,125" scrollbarMode="showOnDemand" />	
@@ -6310,13 +6328,17 @@ index 0000000..ccf3ae3
 +		<widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +		<ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
 +		<widget name="config" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
-+		<eLabel text="IP Address : " position="500,160" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />		
-+		<widget source="ipaddress" render="Label" position="530,190" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />		
-+		<eLabel text="NetMask : " position="500,220" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />		
-+		<widget source="netmask" render="Label" position="530,250" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />		
-+		<eLabel text="Gateway : " position="500,280" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />		
-+		<widget source="gateway" render="Label" position="530,310" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />		
-+		<widget name="VKeyIcon" pixmap="Vu_HD/buttons/key_text.png" position="500,350" zPosition="10" size="35,25" transparent="1" alphatest="on" />
++		<widget source="ipaddresstext" render="Label" position="500,160" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++		<widget source="ipaddress" render="Label" position="530,190" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />	
++		<widget source="netmasktext" render="Label" position="500,220" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++		<widget source="netmask" render="Label" position="530,250" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++		<widget source="gatewaytext" render="Label" position="500,280" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++		<widget source="gateway" render="Label" position="530,310" zPosition="1" size="150,26" font="Regular;20"  valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++		<widget source="DNS1text" render="Label" position="500,350" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++		<widget source="DNS1" render="Label" position="530,380" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++		<widget source="DNS2text" render="Label" position="500,410" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++		<widget source="DNS2" render="Label" position="530,440" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++		<widget name="VKeyIcon" pixmap="Vu_HD/buttons/key_text.png" position="500,480" zPosition="10" size="35,25" transparent="1" alphatest="on" />
 +                <widget name="HelpWindow" pixmap="Vu_HD/vkey_icon.png" position="310,535" zPosition="1" size="1,1" transparent="1" alphatest="on" />
 +	</screen>
 +
@@ -6377,6 +6399,78 @@ index 0000000..ccf3ae3
 +		<widget source="Gateway" render="Label" position="370,490" size="240,21" font="Regular;19" transparent="1" />
 +	</screen>
 +
++	<!-- DeviceManager Plugin -->
++	<screen name="DeviceManager" position="center,center" size="670,400" title="DeviceManager">
++		<ePixmap pixmap="skin_default/buttons/red.png" position="20,0" size="140,40" alphatest="on" />
++		<ePixmap pixmap="skin_default/buttons/green.png" position="180,0" size="140,40" alphatest="on" />
++		<ePixmap pixmap="skin_default/buttons/yellow.png" position="340,0" size="140,40" alphatest="on" />
++		<ePixmap pixmap="skin_default/buttons/blue.png" position="500,0" size="140,40" alphatest="on" />
++		<widget name="key_red" position="20,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#9f1313" transparent="1" />
++		<widget name="key_green" position="180,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#1f771f" transparent="1" />
++		<widget name="key_yellow" position="340,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#a08500" transparent="1" />
++		<widget name="key_blue" position="500,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#18188b" transparent="1" />
++		<ePixmap pixmap="skin_default/div-h.png" position="0,48" size="670,2" alphatest="on" />
++		<widget source="menu" render="Listbox" position="0,48" size="670,350" scrollbarMode="showOnDemand">
++			<convert type="TemplatedMultiContent">
++			{"templates":
++				{"default": (54,[
++						MultiContentEntryText(pos = (100, 0), size = (560, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0), # index 0 is vendor  - model
++						MultiContentEntryText(pos = (100, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 1 is Device
++						MultiContentEntryText(pos = (230, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 2 is Size
++						MultiContentEntryText(pos = (360, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 3), # index 3 is Partitions
++						MultiContentEntryText(pos = (490, 32), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 4), # index 4 is Removable
++						MultiContentEntryPixmapAlphaTest(pos = (0, 52), size = (670, 2), png = 5), # png 5 is the div pixmap
++					]),
++				"partitions": (98, [
++						MultiContentEntryText(pos = (100, 0), size = (560, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0), # index 1 is Partition
++						MultiContentEntryText(pos = (100, 32), size = (560, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 2 is Mounted on
++						MultiContentEntryText(pos = (100, 54), size = (560, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 3 UUID
++						MultiContentEntryText(pos = (100, 76), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 3), # index 4 Type
++						MultiContentEntryText(pos = (230, 76), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 4), # index 5 Size_total
++						MultiContentEntryText(pos = (380, 76), size = (200, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 5), # index 6 Size_free
++						MultiContentEntryPixmapAlphaTest(pos = (0, 96), size = (670, 2), png = 6), # png 6 is the div pixmap
++					]),
++				"mountpoint": (54,[
++						MultiContentEntryPixmapAlphaTest(pos = (10, 7), size = (30, 30), png = 0), # index 0: picture
++						MultiContentEntryText(pos = (40, 0), size = (500, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 1 name
++						MultiContentEntryText(pos = (40, 32), size = (500, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 2 path
++						MultiContentEntryPixmapAlphaTest(pos = (0, 52), size = (670, 2), png = 5), # index 5 is the div pixmap
++					])
++				},
++				"fonts": [gFont("Regular", 22),gFont("Regular", 16),gFont("Regular", 28)],
++				"itemHeight": 54
++			}
++			</convert>
++		</widget>
++	</screen>
++
++	<!-- TranscodingSetup Plugin -->
++	<screen name="TranscodingSetup" position="center,center" size="560,270" title="Transcoding Setup" >
++		<ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++		<ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++		<widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
++		<widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
++		<widget name="config" zPosition="2" position="5,70" size="550,70" scrollbarMode="showOnDemand" transparent="1" />
++		<widget source="text" render="Label" position="20,140" size="520,130" font="Regular;18" halign="center" valign="center" />
++	</screen>
++	<screen name="TranscodingSetup_ext" position="center,center" size="560,320" title="Transcoding Setup" >
++		<ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++		<ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++		<widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
++		<widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
++		<widget name="config" zPosition="2" position="5,70" size="550,120" scrollbarMode="showOnDemand" transparent="1" />
++		<widget source="text" render="Label" position="20,190" size="520,130" font="Regular;18" halign="center" valign="center" />
++	</screen>
++
++	<!-- ZappingModeSelection Plugin -->
++	<screen name="ZappingModeSelection" position="center,center" size="560,250" title="Zapping Mode Selection" >
++		<ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++		<ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++		<widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
++		<widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
++		<widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++	</screen>
++
 +</skin>
 +
 diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am