projects / vuplus_openvuplus / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aa6b1da)
updated dvbapp and 750S-skin.
authorkos <kos@dev3>
Fri, 15 Feb 2013 04:58:01 +0000 (13:58 +0900)
committerkos <kos@dev3>
Fri, 15 Feb 2013 07:53:49 +0000 (16:53 +0900)
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb patch | blob | history
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch patch | blob | history

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 34263cf..d80df88 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -85,7 +85,7 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"
-PR = "r10"
+PR = "r11"
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision
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..17329b4 100644 (file)
--- 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
 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
 --- 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
 +      *.png
 diff --git a/data/750S/skin.xml b/data/750S/skin.xml
 new file mode 100644
-index 0000000..356191e
+index 0000000..ad5b6ee
 --- /dev/null
 +++ b/data/750S/skin.xml
 --- /dev/null
 +++ b/data/750S/skin.xml
-@@ -0,0 +1,2841 @@
+@@ -0,0 +1,2853 @@
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
@@ -2924,7 +2924,19 @@ index 0000000..356191e
 +              <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" />
 +              <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>"""
++      </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
 +</skin>
 diff --git a/data/Makefile.am b/data/Makefile.am
 index 0eaa082..869a16e 100644
@@ -2998,10 +3010,10 @@ index 0000000..9d4f458
 +      *.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
 new file mode 100644
 +      *.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
 new file mode 100644
-index 0000000..ccf3ae3
+index 0000000..faac709
 --- /dev/null
 +++ b/data/Vu_HD/skin.xml
 --- /dev/null
 +++ b/data/Vu_HD/skin.xml
-@@ -0,0 +1,3377 @@
+@@ -0,0 +1,3384 @@
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
@@ -3231,6 +3243,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>
 +              <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">
 +              <!-- 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">
openvuplus 2.1 repository.