linhes-theme: background and logo tweaks. refs #940

4 files changed, 52 insertions, 37 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index cc584c8..081a4c9 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.1
-pkgrel=13
+pkgrel=14
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -55,14 +55,14 @@ package() {
 md5sums=('SKIP'
          '9c2fc68864cbedb6e449056972b457aa'
          'e061490fc869e0e14d4e144c17c3ec56'
-         'abf14a78424114b6d9ba1d9e58ab754d'
-         'c876f3fc191ba564b760268c86c967f1'
+         'e7af3675fc706a7cb4ea9d0c321219d5'
+         '2eb3feadbfbfcd945ff80e5f4b1ce0a4'
          '33609e27406f00bdc0243a5ef840c6f9'
          'aff82cf901edc4baa058013d93610cfc'
          'e502da82e6d76b3f43dd7ddc20c1e2e7'
          '78b64e567cd799df52045d9fc5a59cc0'
          '7d7bc458a8f4af408700609f3e1f412e'
-         '909d7a8114436dcfc28a01d0d97ec11f'
+         'a0201e0aa1608eeab27ee754e4d2c1de'
          'cbe5f663ebb5d51abe811f81dafec303'
          '4b1c27297bb5f8d9d7bbaf72b35130b5'
          '12d26a786fde397348653128a6d7676a'
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index 95bfa1e..2ff8487 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,5 +1,5 @@
 --- base.xml.orig	2013-11-22 18:52:58.956295819 +0000
-+++ base.xml	2013-12-04 18:36:51.715548849 +0000
++++ base.xml	2013-12-17 16:44:18.909675491 +0000
 @@ -424,26 +424,26 @@
  
      <!-- Base definition of a base popup backdrop -->
@@ -13,55 +13,64 @@
          <area>0,0,1280,720</area>
          <shape name="base_heading_backdrop" from="base_backdrop">
 -            <area>500,-7,280,32</area>
-+            <area>490,-7,300,32</area>
++            <area>485,-7,310,32</area>
          </shape>
          <shape name="base_heading_backdrop_line" from="base_backdrop_line">
 -            <area>500,-7,280,32</area>
-+            <area>490,-7,300,32</area>
++            <area>485,-7,310,32</area>
          </shape>
          <shape name="heading-left-line" from="base_highlight_vertical_line">
 -            <area>501,0,2,22</area>
-+            <area>491,0,2,22</area>
++            <area>486,0,2,22</area>
          </shape>
          <shape name="heading-right-line" from="base_highlight_vertical_line">
 -            <area>777,0,2,22</area>
-+            <area>787,0,2,22</area>
++            <area>792,0,2,22</area>
          </shape>
          <shape name="heading-bottom-line" from="base_highlight_line">
 -            <area>501,22,278,2</area>
-+            <area>491,22,298,2</area>
++            <area>486,22,308,2</area>
          </shape>
      </group>
  
+@@ -452,7 +452,7 @@
+         <area>0,0,1280,720</area>
+         <imagetype name="background">
+             <area>0,0,1280,720</area>
+-            <filename>images/backgrounds/background.png</filename>
++            <filename>images/backgrounds/qt-background.png</filename>
+         </imagetype>
+         <imagetype name="fanart">
+             <area>0,0,1280,720</area>
 @@ -463,25 +463,25 @@
      <!-- Base definition of a clock  group -->
      <group name="base_clock_backdrop_group">
          <shape name="base_clock_backdrop" from="base_backdrop">
 -            <area>500,695,280,32</area>
-+            <area>490,695,300,32</area>
++            <area>485,695,310,32</area>
          </shape>
          <shape name="base_clock_backdrop_line" from="base_backdrop_line">
 -            <area>500,695,280,32</area>
-+            <area>490,695,300,32</area>
++            <area>485,695,310,32</area>
          </shape>
          <shape name="base_clock_backdrop_top_line" from="base_highlight_line">
 -            <area>501,696,278,2</area>
-+            <area>491,696,298,2</area>
++            <area>486,696,308,2</area>
          </shape>
          <shape name="base_clock_backdrop_left_line" from="base_highlight_vertical_line">
 -            <area>501,698,2,22</area>
-+            <area>491,698,2,22</area>
++            <area>486,698,2,22</area>
          </shape>
          <shape name="clock_right_line" from="base_highlight_vertical_line">
 -            <area>777,698,2,22</area>
-+            <area>787,698,2,22</area>
++            <area>792,698,2,22</area>
          </shape>
      </group>
  
      <!-- Base denfinition of a clock -->
      <clock name="base_clock">
 -        <area>529,698,219,22</area>
-+        <area>499,698,282,22</area>
++        <area>494,698,292,22</area>
          <font>baseextrasmall</font>
          <template>%DATE%, %TIME%</template>
          <align>allcenter</align>
@@ -142,7 +151,15 @@
                      <line color="#454545" alpha="180" width="2" />
                      <cornerradius>90</cornerradius>
                  </shape>
-@@ -1235,15 +1236,13 @@
+@@ -1228,22 +1229,20 @@
+ 
+         <imagetype name="background">
+             <area>0,0,1280,720</area>
+-            <filename>images/backgrounds/background.png</filename>
++            <filename>images/backgrounds/qt-background.png</filename>
+         </imagetype>
+ 
+         <group name="heading-backdrop" from="base_heading_group" />
  
          <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
  
diff --git a/abs/core/linhes-theme/install-ui.xml b/abs/core/linhes-theme/install-ui.xml
index a521256..1c95ef3 100644
--- a/abs/core/linhes-theme/install-ui.xml
+++ b/abs/core/linhes-theme/install-ui.xml
@@ -63,14 +63,23 @@
             <cutdown>yes</cutdown>
         </textarea>
 
+        <imagetype name="LHLogo">
+            <area>365,450,550,179</area>
+            <preserveaspect>true</preserveaspect>
+            <filename>images/LHLogoAndText.png</filename>
+        </imagetype>
+
         <imagetype name="logo">
-            <position>565,500</position>
+            <area>107,465,150,150</area>
             <preserveaspect>true</preserveaspect>
-            <!--<crop>x,y,w,h</crop>-->
-            <filepattern low="0" high="30">/usr/MythVantage/logos/logo-%1.png</filepattern>
+            <filepattern low="1" high="6">/usr/MythVantage/logos/logo-%1.png</filepattern>
             <delay>5000</delay>
         </imagetype>
 
+        <imagetype name="logo2" from="logo">
+            <area>1022,465,150,150</area>
+        </imagetype>
+
     </window>
 
 </mythuitheme>
diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch
index c0d2d8a..852cc42 100644
--- a/abs/core/linhes-theme/menu-ui-vert.xml.patch
+++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch
@@ -1,21 +1,10 @@
 --- menu-ui.xml.orig	2013-12-14 21:10:55.569721394 +0000
-+++ menu-ui.xml	2013-12-15 23:21:56.873026251 +0000
-@@ -3,24 +3,53 @@
++++ menu-ui.xml	2013-12-16 23:47:58.786338423 +0000
+@@ -3,24 +3,42 @@
  <mythuitheme>
  
      <window name="mainmenu">
 +        <area>0,0,1280,720</area>
-+
-+        <imagetype name="background">
-+            <area>0,0,1280,720</area>
-+            <filename>images/backgrounds/qt-background.png</filename>
-+        </imagetype>
-+
-+        <group name="heading-backdrop" from="base_heading_group" />
-+
-+        <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
-+
-+        <clock name="time" from="base_clock" />
  
          <textarea name="heading" from="base_heading">
              <value>Main Menu</value>
@@ -59,7 +48,7 @@
          <statetype name="titles">
              <loadondemand>true</loadondemand>
              <state name="TV">
-@@ -110,7 +139,7 @@
+@@ -110,7 +128,7 @@
                      <value>Manage Recordings</value>
                  </textarea>
              </state>
@@ -68,7 +57,7 @@
                  <textarea name="heading" from="base_heading">
                      <value>Media Library</value>
                  </textarea>
-@@ -135,18 +164,20 @@
+@@ -135,18 +153,20 @@
          </statetype>
  
          <buttonlist name="menu">
@@ -97,7 +86,7 @@
                          <font>basemediumlightgrey</font>
                          <multiline>yes</multiline>
                          <align>allcenter</align>
-@@ -155,10 +186,13 @@
+@@ -155,10 +175,13 @@
                      </textarea>
                  </state>
                  <state name="selectedactive"> 
@@ -114,7 +103,7 @@
                          <font>basemediumlargerdarkyellow</font>
                          <multiline>yes</multiline>
                          <!-- cpu usage is very high
-@@ -170,6 +204,27 @@
+@@ -170,6 +193,27 @@
                      </textarea>
                  </state>
              </statetype>