X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2%2Fenigma2_vuplus_skin.patch;h=ff3c483cef8981ee4d233c9a2d9ff3bd2ac8bf18;hp=78c5f8e7963ed462840ac039df843ea502e1874b;hb=f245ba336280c8345ac70a5b06f36f92c5d5996c;hpb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95

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..ff3c483 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
@@ -81,10 +81,10 @@ index 0000000..20f24d9
 +	*.png
 diff --git a/data/750S/skin.xml b/data/750S/skin.xml
 new file mode 100644
-index 0000000..356191e
+index 0000000..294cf68
 --- /dev/null
 +++ b/data/750S/skin.xml
-@@ -0,0 +1,2841 @@
+@@ -0,0 +1,2852 @@
 +<skin>
 +	<!-- VU+ skin (skin.xml)  -->
 +	<output id="0">
@@ -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
@@ -2998,10 +3009,10 @@ index 0000000..9d4f458
 +	*.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
 new file mode 100644
-index 0000000..ccf3ae3
+index 0000000..a78c611
 --- /dev/null
 +++ b/data/Vu_HD/skin.xml
-@@ -0,0 +1,3377 @@
+@@ -0,0 +1,3448 @@
 +<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">
@@ -6377,6 +6395,70 @@ 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>
++
++	<!-- 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