linhes-theme: change menu logo and though bubble position. refs #940.

update preview image.

5 files changed, 44 insertions, 18 deletions

diff --git a/abs/core/linhes-theme/LHLogo.png b/abs/core/linhes-theme/LHLogo.png
new file mode 100755
index 0000000..9ff4fd2
--- /dev/null
+++ b/abs/core/linhes-theme/LHLogo.png
diff --git a/abs/core/linhes-theme/LHLogoAndText.png b/abs/core/linhes-theme/LHLogoAndText.png
new file mode 100755
index 0000000..39504e7
--- /dev/null
+++ b/abs/core/linhes-theme/LHLogoAndText.png
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index a97f0e6..cc584c8 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.1
-pkgrel=12
+pkgrel=13
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -13,7 +13,8 @@ patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
 #The LinHES theme is based on TintedGlass by Harley Peters
 source=("git://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27"
         `echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
-        'background.png' 'preview.png' 'qt-background.png' 'tux_thoughts.png')
+        'background.png' 'preview.png' 'qt-background.png' 'tux_thoughts.png'
+        'LHLogo.png' 'LHLogoAndText.png')
 
 package() {
     THEMEROOT=usr/share/mythtv/themes
@@ -41,6 +42,7 @@ package() {
 
     #tux_thoughts.png is the thought bubble for the menu descriptions
     rsync -pL $srcdir/tux_thoughts.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/LHLogo*.png $pkgdir/$THEMEROOT/LinHES/images/
 
     msg "Modifying yellows and blue to LinHES yellow and blue"
     #yellow
@@ -54,7 +56,7 @@ md5sums=('SKIP'
          '9c2fc68864cbedb6e449056972b457aa'
          'e061490fc869e0e14d4e144c17c3ec56'
          'abf14a78424114b6d9ba1d9e58ab754d'
-         '2475f2c38d029e20080d52a752a2638a'
+         'c876f3fc191ba564b760268c86c967f1'
          '33609e27406f00bdc0243a5ef840c6f9'
          'aff82cf901edc4baa058013d93610cfc'
          'e502da82e6d76b3f43dd7ddc20c1e2e7'
@@ -62,6 +64,8 @@ md5sums=('SKIP'
          '7d7bc458a8f4af408700609f3e1f412e'
          '909d7a8114436dcfc28a01d0d97ec11f'
          'cbe5f663ebb5d51abe811f81dafec303'
-         'fac3ab2c1aeb3ddb691f2cab8b2aa82e'
+         '4b1c27297bb5f8d9d7bbaf72b35130b5'
          '12d26a786fde397348653128a6d7676a'
-         '2bd09b8049aaf5ba21db5baf3a0ce077')
+         '2bd09b8049aaf5ba21db5baf3a0ce077'
+         'b51ef0cbf8ed2d3a8c1a8257a89aceff'
+         '09ad14842f828b7a8d24070ec8214fe5')
diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch
index 42a9b54..c0d2d8a 100644
--- a/abs/core/linhes-theme/menu-ui-vert.xml.patch
+++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch
@@ -1,6 +1,24 @@
 --- menu-ui.xml.orig	2013-12-14 21:10:55.569721394 +0000
-+++ menu-ui.xml	2013-12-14 23:04:33.830757181 +0000
-@@ -9,18 +9,31 @@
++++ menu-ui.xml	2013-12-15 23:21:56.873026251 +0000
+@@ -3,24 +3,53 @@
+ <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>
          </textarea>
  
          <shape name="menuscroll-background" from="base_backdrop">
@@ -21,23 +39,27 @@
 +            <area>342,0,2,1280</area>
          </shape>
  
-+        <imagetype name="description_background">
-+            <area>425,200,410,180</area>
-+            <filename>images/tux_thoughts.png</filename>
-+        </imagetype>
-+                    
 +        <textarea name="description">
-+            <area>527,187,220,130</area>
++            <area>705,158,250,130</area>
 +            <align>allcenter</align>
 +            <font>basesmallyellow</font>
-+<!--            <alpha>225</alpha>-->
 +            <multiline>yes</multiline>
 +        </textarea>
 +
++        <imagetype name="description_background">
++            <area>567,165,487,210</area>
++            <filename>images/tux_thoughts.png</filename>
++        </imagetype>
++
++        <imagetype name="LHlogo">
++            <area>492,348,638,207</area>
++            <filename>images/LHLogoAndText.png</filename> <!--851x277 3.072-->
++        </imagetype>
++
          <statetype name="titles">
              <loadondemand>true</loadondemand>
              <state name="TV">
-@@ -110,7 +123,7 @@
+@@ -110,7 +139,7 @@
                      <value>Manage Recordings</value>
                  </textarea>
              </state>
@@ -46,7 +68,7 @@
                  <textarea name="heading" from="base_heading">
                      <value>Media Library</value>
                  </textarea>
-@@ -135,18 +148,20 @@
+@@ -135,18 +164,20 @@
          </statetype>
  
          <buttonlist name="menu">
@@ -75,7 +97,7 @@
                          <font>basemediumlightgrey</font>
                          <multiline>yes</multiline>
                          <align>allcenter</align>
-@@ -155,10 +170,13 @@
+@@ -155,10 +186,13 @@
                      </textarea>
                  </state>
                  <state name="selectedactive"> 
@@ -92,7 +114,7 @@
                          <font>basemediumlargerdarkyellow</font>
                          <multiline>yes</multiline>
                          <!-- cpu usage is very high
-@@ -170,6 +188,27 @@
+@@ -170,6 +204,27 @@
                      </textarea>
                  </state>
              </statetype>
diff --git a/abs/core/linhes-theme/preview.png b/abs/core/linhes-theme/preview.png
index 8fa1288..506ab1d 100644
--- a/abs/core/linhes-theme/preview.png
+++ b/abs/core/linhes-theme/preview.png