projects / vuplus_openvuplus / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed infobar skin(support A-H tuner).
[vuplus_openvuplus] / meta-openvuplus / recipes-vuplus / enigma2 / enigma2 / enigma2_vuplus_skin.patch
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 6cd7d81..6b83890 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
-index 057ded7..233c934 100644
+index c0601c7..b2f460d 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 100755
-index 0000000..3148751
+new file mode 100644
+index 0000000..541df3d
 --- /dev/null
 +++ b/data/750S/skin.xml
-@@ -0,0 +1,2852 @@
+@@ -0,0 +1,2892 @@
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
@@ -198,36 +198,76 @@ index 0000000..3148751
 +                      <convert type="ValueRange">1,1</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.FrontendInfo" render="Pixmap" position="350,32" size="8,9" pixmap="750S/nim_active.png" alphatest="on">
++              <widget source="session.FrontendInfo" render="Pixmap" position="290,9" size="8,9" pixmap="750S/nim_active.png" alphatest="on">
 +                      <convert type="FrontendInfo">NUMBER</convert>
 +                      <convert type="ValueRange">2,2</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.FrontendInfo" render="Pixmap" position="350,45" size="8,9" pixmap="750S/nim_active.png" alphatest="on">
++              <widget source="session.FrontendInfo" render="Pixmap" position="290,9" size="8,9" pixmap="750S/nim_active.png" alphatest="on">
 +                      <convert type="FrontendInfo">NUMBER</convert>
 +                      <convert type="ValueRange">3,3</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.TunerInfo" render="FixedLabel" text="A" position="265,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
++              <widget source="session.FrontendInfo" render="Pixmap" position="290,9" size="8,9" pixmap="750S/nim_active.png" alphatest="on">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">4,4</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.FrontendInfo" render="Pixmap" position="290,9" size="8,9" pixmap="750S/nim_active.png" alphatest="on">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">5,5</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.FrontendInfo" render="Pixmap" position="290,9" size="8,9" pixmap="750S/nim_active.png" alphatest="on">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">6,6</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.FrontendInfo" render="Pixmap" position="290,9" size="8,9" pixmap="750S/nim_active.png" alphatest="on">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">7,7</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="A" position="193,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
 +                      <convert type="TunerInfo">TunerUseMask</convert>
 +                      <convert type="ValueBitTest">1</convert>
-+                      <convert type="ConditionalShowHide" />
++                      <convert type="ConditionalShowHide" />                  
 +              </widget>
-+              <widget source="session.TunerInfo" render="FixedLabel" text="B" position="277,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
++              <widget source="session.TunerInfo" render="FixedLabel" text="B" position="205,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
 +                      <convert type="TunerInfo">TunerUseMask</convert>
 +                      <convert type="ValueBitTest">2</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.TunerInfo" render="FixedLabel" text="C" position="265,30" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
++              <widget source="session.TunerInfo" render="FixedLabel" text="C" position="217,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
 +                      <convert type="TunerInfo">TunerUseMask</convert>
 +                      <convert type="ValueBitTest">4</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.TunerInfo" render="FixedLabel" text="D" position="265,43" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
++              <widget source="session.TunerInfo" render="FixedLabel" text="D" position="229,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
 +                      <convert type="TunerInfo">TunerUseMask</convert>
 +                      <convert type="ValueBitTest">8</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="E" position="241,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
++                      <convert type="TunerInfo">TunerUseMask</convert>
++                      <convert type="ValueBitTest">16</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="F" position="253,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
++                      <convert type="TunerInfo">TunerUseMask</convert>
++                      <convert type="ValueBitTest">32</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="G" position="265,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
++                      <convert type="TunerInfo">TunerUseMask</convert>
++                      <convert type="ValueBitTest">64</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="H" position="277,6" size="20,13" font="Regular;18" backgroundColor="#4e5a74" transparent="1">
++                      <convert type="TunerInfo">TunerUseMask</convert>
++                      <convert type="ValueBitTest">128</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
 +              <ePixmap pixmap="750S/icons/clock.png" position="568,4" zPosition="1" size="16,16" alphatest="on" />
 +              <widget source="global.CurrentTime" render="Label" position="580,5" zPosition="1" size="50,20" font="Regular;19" halign="right">
 +                      <convert type="ClockToText">Format:%H:%M</convert>
@@ -3008,11 +3048,11 @@ index 0000000..9d4f458
 +install_DATA = \
 +      *.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
-new file mode 100755
-index 0000000..45c42d3
+new file mode 100644
+index 0000000..b6e4235
 --- /dev/null
 +++ b/data/Vu_HD/skin.xml
-@@ -0,0 +1,3460 @@
+@@ -0,0 +1,3510 @@
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
@@ -3130,42 +3170,92 @@ index 0000000..45c42d3
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
 +              -->
-+              <eLabel text="Tuner" position="845,125" size="60,20" font="Regular;20" backgroundColor="#d9dee2" foregroundColor="#1c1c1c" transparent="1" />
-+              <widget source="session.TunerInfo" render="FixedLabel" text="A" position="905,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
++              <eLabel text="Tuner" position="815,125" size="60,20" font="Regular;20" backgroundColor="#d9dee2" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="session.TunerInfo" render="FixedLabel" text="A" position="875,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
 +                      <convert type="TunerInfo">TunerUseMask</convert>
 +                      <convert type="ValueBitTest">1</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.TunerInfo" render="FixedLabel" text="B" position="917,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
++              <widget source="session.TunerInfo" render="FixedLabel" text="B" position="887,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
 +                      <convert type="TunerInfo">TunerUseMask</convert>
 +                      <convert type="ValueBitTest">2</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.TunerInfo" render="FixedLabel" text="C" position="929,125" size="30,20" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++              <widget source="session.TunerInfo" render="FixedLabel" text="C" position="899,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
 +                      <convert type="TunerInfo">TunerUseMask</convert>
 +                      <convert type="ValueBitTest">4</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.TunerInfo" render="FixedLabel" text="D" position="941,125" size="30,20" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++              <widget source="session.TunerInfo" render="FixedLabel" text="D" position="911,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
 +                      <convert type="TunerInfo">TunerUseMask</convert>
 +                      <convert type="ValueBitTest">8</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="E" position="923,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="TunerInfo">TunerUseMask</convert>
++                      <convert type="ValueBitTest">16</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="F" position="935,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="TunerInfo">TunerUseMask</convert>
++                      <convert type="ValueBitTest">32</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="G" position="945,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="TunerInfo">TunerUseMask</convert>
++                      <convert type="ValueBitTest">64</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.TunerInfo" render="FixedLabel" text="H" position="957,125" size="30,20" font="Semibold;20" foregroundColor="#5c5c5c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="TunerInfo">TunerUseMask</convert>
++                      <convert type="ValueBitTest">128</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
 +              <ePixmap pixmap="Vu_HD/icons/clock.png" position="862,18" zPosition="1" size="20,20" alphatest="blend" />
 +              <widget source="global.CurrentTime" render="Label" position="882,20" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" halign="right" backgroundColor="#acacac" transparent="1">
 +                      <convert type="ClockToText">Format:%H:%M</convert>
 +              </widget>
 +              <!-- tuners in use? -->
-+              <widget source="session.FrontendInfo" render="FixedLabel" position="905,125" size="30,20" text="A" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++              <widget source="session.FrontendInfo" render="FixedLabel" position="875,125" size="30,20" text="A" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
 +                      <convert type="FrontendInfo">NUMBER</convert>
 +                      <convert type="ValueRange">0,0</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
-+              <widget source="session.FrontendInfo" render="FixedLabel" position="917,125" size="30,20" text="B" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++              <widget source="session.FrontendInfo" render="FixedLabel" position="887,125" size="30,20" text="B" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
 +                      <convert type="FrontendInfo">NUMBER</convert>
 +                      <convert type="ValueRange">1,1</convert>
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
++              <widget source="session.FrontendInfo" render="FixedLabel" position="899,125" size="30,20" text="C" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">2,2</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.FrontendInfo" render="FixedLabel" position="911,125" size="30,20" text="D" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">3,3</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.FrontendInfo" render="FixedLabel" position="923,125" size="30,20" text="E" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">4,4</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.FrontendInfo" render="FixedLabel" position="935,125" size="30,20" text="F" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">5,5</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.FrontendInfo" render="FixedLabel" position="945,125" size="30,20" text="G" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">6,6</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="session.FrontendInfo" render="FixedLabel" position="957,125" size="30,20" text="H" font="Semibold;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="FrontendInfo">NUMBER</convert>
++                      <convert type="ValueRange">7,7</convert>
++                      <convert type="ConditionalShowHide" />
++              </widget>
 +              <!--
 +              <widget source="global.CurrentTime" render="Label" position="633,6" zPosition="1" size="26,18" font="Regular;16" valign="top">
 +                      <convert type="ClockToText">Format:%S</convert>
openvuplus 2.1 repository.