From 79cb0661623c5f6ca9f9edf0a01f99de5640e99e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Jan 2014 21:45:55 +0000
Subject: linhes-theme: pull in updates from upstream

---
 abs/core/linhes-theme/PKGBUILD                     |  34 ++-
 abs/core/linhes-theme/background-with-logo.png     | Bin 0 -> 821488 bytes
 abs/core/linhes-theme/background.png               | Bin 821488 -> 781602 bytes
 abs/core/linhes-theme/base.xml.patch               | 275 +--------------------
 abs/core/linhes-theme/menu-ui-vert.xml.patch       | 177 +++++--------
 abs/core/linhes-theme/osd.xml.patch                |  61 +----
 abs/core/linhes-theme/qt-background.png            | Bin 781602 -> 0 bytes
 abs/core/linhes-theme/qtlook.txt.patch             |  11 +
 .../mythtv/stable-0.27/mythtv/menu-xml/linhes.xml  |   2 +-
 .../stable-0.27/mythtv/menu-xml/mythbackup.xml     |   2 +-
 .../stable-0.27/mythtv/menu-xml/mythrestore.xml    |   4 +-
 .../mythtv/stable-0.27/mythtv/menu-xml/update.xml  |   2 +-
 .../mythtv/stable-0.27/mythtv/menu-xml/update2.xml |   3 +-
 13 files changed, 110 insertions(+), 461 deletions(-)
 create mode 100644 abs/core/linhes-theme/background-with-logo.png
 delete mode 100644 abs/core/linhes-theme/qt-background.png
 create mode 100644 abs/core/linhes-theme/qtlook.txt.patch

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index fb894fb..5a11a8e 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,20 +1,19 @@
 pkgname=linhes-theme
 pkgver=8.1
-pkgrel=15
+pkgrel=16
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://linhes.org/"
 
 patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
-         'menu-ui-vert.xml.patch' 'recordings-ui.xml.patch' 'schedule-ui.xml.patch'
-         'video-ui.xml.patch' 'config-ui.xml.patch')
+         'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
 
-#The LinHES theme is based on TintedGlass by Harley Peters
-source=("git://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27"
+#The LinHES theme is based on TintedGlass 4.39 by Harley Peters
+source=("git+https://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'
-        'LHLogo.png' 'LHLogoAndText.png')
+        'background.png' 'preview.png' 'tux_thoughts.png'
+        'LHLogo.png')
 
 package() {
     THEMEROOT=usr/share/mythtv/themes
@@ -37,12 +36,12 @@ package() {
     msg "Copy *.xml and adding backgrounds and images for LinHES"
     rsync -pL $srcdir/*.xml $pkgdir/$THEMEROOT/LinHES/
     rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/*
-    rsync -pL $srcdir/*background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/
+    rsync -pL $srcdir/background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/
     rsync -pL $srcdir/preview.png $pkgdir/$THEMEROOT/LinHES/
 
     #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/
+    rsync -pL $srcdir/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/
 
     msg "Modifying yellows and blue to LinHES yellow and blue"
     #yellow
@@ -54,18 +53,13 @@ package() {
 }
 md5sums=('SKIP'
          '9c2fc68864cbedb6e449056972b457aa'
-         'e061490fc869e0e14d4e144c17c3ec56'
-         'e7af3675fc706a7cb4ea9d0c321219d5'
-         '9e4fcf840f14c6f17f30432e28edd885'
-         '33609e27406f00bdc0243a5ef840c6f9'
-         'aff82cf901edc4baa058013d93610cfc'
-         'e502da82e6d76b3f43dd7ddc20c1e2e7'
-         '78b64e567cd799df52045d9fc5a59cc0'
+         'ed4f8baf431e20babc345e4e2602426f'
+         '9c2c8f2a8d881e01ea84457ae508f655'
+         '74a66e91f7d329d297c749a8827f5c0a'
+         '9fe3371a8b964a7028126405cfaa330b'
          '7d7bc458a8f4af408700609f3e1f412e'
          'a0201e0aa1608eeab27ee754e4d2c1de'
-         'cbe5f663ebb5d51abe811f81dafec303'
-         '4b1c27297bb5f8d9d7bbaf72b35130b5'
          '12d26a786fde397348653128a6d7676a'
+         '4b1c27297bb5f8d9d7bbaf72b35130b5'
          '2bd09b8049aaf5ba21db5baf3a0ce077'
-         'b51ef0cbf8ed2d3a8c1a8257a89aceff'
-         '09ad14842f828b7a8d24070ec8214fe5')
+         'b51ef0cbf8ed2d3a8c1a8257a89aceff')
diff --git a/abs/core/linhes-theme/background-with-logo.png b/abs/core/linhes-theme/background-with-logo.png
new file mode 100644
index 0000000..ffdf9ef
Binary files /dev/null and b/abs/core/linhes-theme/background-with-logo.png differ
diff --git a/abs/core/linhes-theme/background.png b/abs/core/linhes-theme/background.png
index ffdf9ef..12544b2 100644
Binary files a/abs/core/linhes-theme/background.png and b/abs/core/linhes-theme/background.png differ
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index 2ff8487..bbf971d 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,276 +1,11 @@
---- base.xml.orig	2013-11-22 18:52:58.956295819 +0000
-+++ base.xml	2013-12-17 16:44:18.909675491 +0000
-@@ -424,26 +424,26 @@
+--- base.xml.orig	2014-01-02 20:11:41.055260777 +0000
++++ base.xml	2014-01-02 20:20:50.598179696 +0000
+@@ -424,7 +424,7 @@
  
      <!-- Base definition of a base popup backdrop -->
      <shape name="base_popup_backdrop" from="base_backdrop">
--        <fill color="#0a0a0e" alpha="255" />
-+        <fill color="#0a0a0e" alpha="235" />
+-        <fill color="#000000" alpha="255" />
++        <fill color="#000000" alpha="235" />
      </shape>
  
      <!-- Base definition of a heading group -->
-     <group name="base_heading_group">
-         <area>0,0,1280,720</area>
-         <shape name="base_heading_backdrop" from="base_backdrop">
--            <area>500,-7,280,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>485,-7,310,32</area>
-         </shape>
-         <shape name="heading-left-line" from="base_highlight_vertical_line">
--            <area>501,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>792,0,2,22</area>
-         </shape>
-         <shape name="heading-bottom-line" from="base_highlight_line">
--            <area>501,22,278,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>485,695,310,32</area>
-         </shape>
-         <shape name="base_clock_backdrop_line" from="base_backdrop_line">
--            <area>500,695,280,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>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>486,698,2,22</area>
-         </shape>
-         <shape name="clock_right_line" from="base_highlight_vertical_line">
--            <area>777,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>494,698,292,22</area>
-         <font>baseextrasmall</font>
-         <template>%DATE%, %TIME%</template>
-         <align>allcenter</align>
-@@ -533,19 +533,19 @@
- 
-     <!-- Base definition of a active button background -->
-     <shape name="base_button_background_active" from="base_button_background_selected">
--        <fill color="#333333" alpha="175" />
-+        <fill color="#000000" alpha="175" />
-         <line color="#454545" alpha="180" width="2" />
-     </shape>
- 
-     <!-- Base definition of a active button list background -->
-     <shape name="base_button_list_background_active" from="base_button_background_selected">
--        <fill color="#CCCCCC" alpha="150" />
--        <line color="#CCCCCC" alpha="150" width="2" />
-+        <fill color="#000000" alpha="175" />
-+        <line color="#454545" alpha="180" width="2" />
-     </shape>
- 
-     <!-- Base definition of a disabled button background -->
-     <shape name="base_button_background_disabled" from="base_button_background_selected">
--        <fill color="#333333" alpha="175" />
-+        <fill color="#000000" alpha="175" />
-         <line color="#454545" alpha="180" width="2" />    
-     </shape>
- 
-@@ -563,7 +563,7 @@
- 
-     <!-- Base definition of a inactve button background list style -->
-     <shape name="base_button_background_inactive_list_style" from="base_button_background_selected">
--        <fill color="#333333" alpha="175" />
-+        <fill color="#000000" alpha="175" />
-         <line color="#454545" alpha="180" width="2" />
-     </shape>
- 
-@@ -571,6 +571,7 @@
-     <buttonlist name="base_button_list">
-         <layout>vertical</layout>
-         <spacing>2</spacing>
-+        <wrapstyle>selection</wrapstyle>
-         <drawfrombottom>yes</drawfrombottom>
-         <buttonarea>0,0,100%,100%</buttonarea>
-         <statetype name="buttonitem">
-@@ -579,7 +580,7 @@
-                     <area>0,0,100%,100%</area>
-                 </shape>
-                 <textarea name="buttontext">
--                    <font>basesmallblack</font>
-+                    <font>basesmallgrey</font>
-                     <cutdown>yes</cutdown>
-                     <align>allcenter</align>
-                 </textarea>
-@@ -997,7 +998,7 @@
-                 <shape name="buttonbackground">
-                     <area>0,0,100%,100%</area>
-                     <type>roundbox</type>
--                    <fill color="#333333" alpha="175" />
-+                    <fill color="#000000" alpha="175" />
-                     <line color="#454545" alpha="180" width="2" />
-                     <cornerradius>90</cornerradius>
-                 </shape>
-@@ -1064,7 +1065,7 @@
-                 <shape name="buttonbackground">
-                     <area>0,0,100%,100%</area>
-                     <type>roundbox</type>
--                    <fill color="#333333" alpha="175" />
-+                    <fill color="#000000" alpha="175" />
-                     <line color="#454545" alpha="180" width="2" />
-                     <cornerradius>90</cornerradius>
-                 </shape>
-@@ -1117,7 +1118,7 @@
-                <shape name="background">
-                     <area>0,0,100%,100%</area>
-                     <type>roundbox</type>
--                    <fill color="#333333" alpha="175" />
-+                    <fill color="#000000" alpha="175" />
-                     <line color="#454545" alpha="180" width="2" />
-                     <cornerradius>90</cornerradius>
-                 </shape>
-@@ -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" />
- 
--	<clock name="time" from="base_clock">
--            <area>529,698,219,22</area>
--        </clock>
-+	<clock name="time" from="base_clock" />
- 
-     </window>
- 
-     <!-- Popup Dialogue Box -->
-     <window name="MythPopupBox">
--        <area>-1,-1,400,463</area>
-+        <area>-1,-1,602,488</area>
- 
-         <animation trigger="AboutToShow">
-             <section>
-@@ -1260,76 +1259,76 @@
-         </animation>
- 
-         <shape name="popup-backdrop" from="base_popup_backdrop">
--            <area>0,0,400,463</area>
-+            <area>0,0,602,488</area>
-         </shape>
- 
-         <shape name="popup-backdrop-line" from="base_backdrop_line">
--            <area>1,1,398,461</area>
-+            <area>1,1,600,486</area>
-         </shape>
- 
-         <shape name="popup-first-line" from="base_highlight_line">
--            <area>2,2,396,2</area>
-+            <area>2,2,596,2</area>
-         </shape>
- 
-         <shape name="popup-second-line" from="base_line">
--            <area>23,174,354,2</area>
-+            <area>23,212,552,2</area>
-         </shape>
- 
-         <shape name="popup-third-line" from="base_highlight_line">
--            <area>2,459,396,2</area>
-+            <area>2,484,596,2</area>
-         </shape>
- 
-         <shape name="popup-left-line" from="base_highlight_vertical_line">
--            <area>2,4,2,455</area>
-+            <area>2,4,2,480</area>
-         </shape>
- 
-         <shape name="popup-right-line" from="base_highlight_vertical_line">
--            <area>396,4,2,455</area>
-+            <area>598,4,2,480</area>
-         </shape>
- 
-         <textarea name="messagearea" from="basetextarea">
--            <area>16,8,368,162</area>
-+            <area>10,8,582,196</area>
-             <font>basesmalldarkyellow</font>
-             <multiline>yes</multiline>
-             <align>allcenter</align>     
-         </textarea>
- 
-         <buttonlist name="list" from="base_button_list">
--            <area>15,191,370,264</area>
-+            <area>15,222,570,252</area>
-             <statetype name="buttonitem">
-                 <state name="active">
--                    <area>0,0,370,40</area>
-+                    <area>0,0,100%,34</area>
-                     <textarea name="buttontext">
--                        <area>8,0,354,40</area>
-+                        <area>8,0,570,34</area>
-                     </textarea>
-                     <imagetype name="buttonarrow">
--                        <position>347,11</position>
-+                        <position>544,8</position>
-                     </imagetype>
-                 </state>
-                 <state name="selectedactive">
--                    <area>0,0,370,40</area>
-+                    <area>0,0,100%,34</area>
-                     <textarea name="buttontext">
--                        <area>8,0,354,40</area>
-+                        <area>8,0,570,34</area>
-                     </textarea>
-                     <imagetype name="buttonarrow">
--                        <position>347,11</position>
-+                        <position>544,8</position>
-                     </imagetype>
-                 </state>
-                 <state name="selectedinactive">
--                    <area>0,0,370,40</area>
-+                    <area>0,0,100%,34</area>
-                     <textarea name="buttontext">
--                        <area>8,0,354,40</area>
-+                        <area>8,0,570,34</area>
-                     </textarea>
-                     <imagetype name="buttonarrow">
--                        <position>347,11</position>
-+                        <position>544,8</position>
-                     </imagetype>
-                 </state>
-             </statetype>
-         <statetype name="upscrollarrow">
--            <position>0,255</position>
-+            <position>0,251</position>
-         </statetype>
-         <statetype name="downscrollarrow">
--            <position>20,255</position>
-+            <position>20,251</position>
-         </statetype>
-         </buttonlist>
-     </window>
diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch
index fdff21e..411dd6a 100644
--- a/abs/core/linhes-theme/menu-ui-vert.xml.patch
+++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch
@@ -1,33 +1,14 @@
---- menu-ui.xml.orig	2013-12-14 21:10:55.569721394 +0000
-+++ menu-ui.xml	2013-12-18 01:03:39.690460829 +0000
-@@ -3,24 +3,43 @@
- <mythuitheme>
- 
-     <window name="mainmenu">
-+        <area>0,0,1280,720</area>
- 
-         <textarea name="heading" from="base_heading">
-             <value>Main Menu</value>
-         </textarea>
- 
-         <shape name="menuscroll-background" from="base_backdrop">
--            <area>0,525,1280,70</area>
-+            <area>35,0,310,720</area>
-             <type>box</type>
-         </shape>
- 
--        <shape name="menuscroll-top-line" from="base_line">
--            <area>0,526,1280,2</area>
-+        <shape name="menuscroll-left-line" from="base_line">
-+            <area>36,0,2,1280</area>
-         </shape>
- 
--        <shape name="menuscroll-bottom-line" from="base_line">
--            <area>0,592,1280,2</area>
-+        <shape name="menuscroll-right-line" from="base_line">
-+            <area>342,0,2,1280</area>
+--- menu-ui-vert.xml.orig	2014-01-02 20:22:20.736627009 +0000
++++ menu-ui-vert.xml	2014-01-02 21:08:40.596758246 +0000
+@@ -18,6 +18,24 @@
+             <area>394,0,2,720</area>
          </shape>
  
++        <imagetype name="description_background">
++            <area>567,165,487,210</area>
++            <filename>images/tux_thoughts.png</filename>
++        </imagetype>
++
 +        <textarea name="description">
 +            <area>705,158,250,130</area>
 +            <align>allcenter</align>
@@ -36,99 +17,75 @@
 +            <value>I have no idea</value>
 +        </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 +129,7 @@
-                     <value>Manage Recordings</value>
+             <state name="MAIN">
+                 <textarea name="heading">
+@@ -123,6 +141,41 @@
+                     <value>Archive Utilities</value>
                  </textarea>
              </state>
--            <state name="LIBRARY">
-+            <state name="MENU_MEDIA_LIBRARY">
-                 <textarea name="heading" from="base_heading">
-                     <value>Media Library</value>
-                 </textarea>
-@@ -135,18 +154,20 @@
++            <state name="LH_SERVICE_MENU" from="MAIN">
++                 <textarea name="heading">
++                     <value>Service Menu</value>
++                 </textarea>
++             </state>
++            <state name="LH_UPDATE" from="MAIN">
++                 <textarea name="heading">
++                     <value>Update LinHES</value>
++                 </textarea>
++             </state>
++            <state name="LH_BACKUP" from="MAIN">
++                 <textarea name="heading">
++                     <value>Backup LinHES</value>
++                 </textarea>
++             </state>
++            <state name="LH_RESTORE" from="MAIN">
++                 <textarea name="heading">
++                     <value>Restore LinHES</value>
++                 </textarea>
++             </state>
++             <state name="HOST_SETTINGS" from="MAIN">
++                 <textarea name="heading">
++                     <value>LinHES Settings</value>
++                 </textarea>
++             </state>
++             <state name="TRAILERS" from="MAIN">
++                 <textarea name="heading">
++                     <value>Apple Trailers</value>
++                 </textarea>
++             </state>
++             <state name="INTERNET_STREAMS" from="MAIN">
++                 <textarea name="heading">
++                     <value>Online Content</value>
++                 </textarea>
++             </state>
          </statetype>
  
          <buttonlist name="menu">
--            <area>20,528,1240,64</area>
--            <layout>horizontal</layout>
--            <spacing>20</spacing>
--            <scrollstyle>center</scrollstyle>
--            <wrapstyle>items</wrapstyle>	
--            <buttonarea>0,0,1240,64</buttonarea>
-+            <area>35,62,310,596</area>
-+            <layout>vertical</layout>
-+            <spacing>4</spacing>
-+            <scrollstyle>free</scrollstyle>
-+            <wrapstyle>selection</wrapstyle>
-+            <arrange>Stack</arrange>
-+            <align>vcenter</align>
-+            <buttonarea>0,0,100%,100%</buttonarea>
-             <statetype name="buttonitem">
-                 <state name="active">
--                    <area>0,0,232,64</area>
-+                    <area>0,0,310,64</area>
-                     <imagetype name="background" />
-                     <textarea name="buttontext">
--                        <area>0,0,232,64</area>
-+                        <area>12,0,286,64</area>
-                         <font>basemediumlightgrey</font>
-                         <multiline>yes</multiline>
-                         <align>allcenter</align>
-@@ -155,10 +176,13 @@
-                     </textarea>
-                 </state>
-                 <state name="selectedactive"> 
--                    <area>0,0,232,64</area>
--                    <imagetype name="background" />
-+                    <area>-10,0,330,64</area>
-+                    <shape name="background" from="base_select_bar_selectedactive">
-+                        <area>0,0,100%,100%</area>
-+                    </shape>
-+
-                     <textarea name="buttontext">
--                        <area>0,0,232,64</area>
-+                        <area>5,0,320,64</area>
-                         <font>basemediumlargerdarkyellow</font>
-                         <multiline>yes</multiline>
-                         <!-- cpu usage is very high
-@@ -170,6 +194,27 @@
+@@ -162,21 +215,6 @@
+                         <cutdown>yes</cutdown>
+                         <case>upper</case>
                      </textarea>
+-                    <group name="variable-size-text-backdrop-group">
+-                        <area>330,12,843,40</area>
+-                        <minsize vanish="true">252,40</minsize>
+-                        <shape name="text-backdrop" from="base_backdrop">
+-                            <area>0,0,-1,-1</area>
+-                            <minsize vanish="true">252,40</minsize>
+-                        </shape>
+-                        <textarea name="description" from="basetextarea">
+-                            <area>20,1,-20,-1</area>
+-                            <minsize shrink="short" vanish="true">5,5</minsize>
+-                            <font>basesmalldarkyellow</font>
+-                            <align>left,vcenter</align>
+-                            <multiline>no</multiline>
+-                        </textarea>
+-                    </group>
                  </state>
              </statetype>
-+            <statetype name="upscrollarrow">
-+                <position>147,0</position>
-+                <showempty>yes</showempty>
-+                <state type="full">
-+                    <imagetype name="upon">
-+                        <filename>images/lists_up_arrow.png</filename>
-+                        <alpha>200</alpha>
-+                    </imagetype>
-+                </state>
-+            </statetype>
-+            <statetype name="downscrollarrow">
-+                <position>147,588</position>
-+                <showempty>yes</showempty>
-+                <state type="full">
-+                    <imagetype name="dnon">
-+                        <filename>images/lists_down_arrow.png</filename>
-+                        <alpha>200</alpha>
-+                    </imagetype>
-+                </state>
-+            </statetype>
-+
-         </buttonlist>
- 
-     </window>
+             <statetype name="upscrollarrow">
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index 916e629..67748f7 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,29 +1,6 @@
---- osd.xml.orig	2013-11-29 21:53:21.351030883 +0000
-+++ osd.xml	2013-11-30 22:28:42.477439824 +0000
-@@ -440,7 +440,8 @@
-             <area>90,658,1100,24</area>
-             <font>small</font>
-             <align>allcenter</align>
--            <template>%DESCRIPTION% %VALUE%%UNITS%</template>
-+            <template>%DESCRIPTION%
-+            %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template>
-         </textarea>
- 
-         <clock name="clock">
-@@ -980,6 +981,12 @@
-             <align>allcenter</align>
-         </textarea>
- 
-+        <textarea name="callsign">
-+            <font>large</font>
-+            <area>68,634,162,46</area>
-+            <align>allcenter</align>
-+        </textarea>
-+
-         <imagetype name="iconpath">
-             <area>84,536,130,98</area>
-             <preserveaspect>true</preserveaspect>
-@@ -989,17 +996,11 @@
+--- osd.xml.orig	2014-01-02 19:56:57.605092545 +0000
++++ osd.xml	2014-01-02 20:02:34.958563960 +0000
+@@ -996,12 +996,12 @@
  
  <!-- Commit 6216029d2 makes this show up in both recordings and video. --> 
  <!-- Since I only want it in video and there is no way to control it. I have no choice but to disable it. -->
@@ -31,36 +8,10 @@
 +
          <imagetype name="coverart">
              <area>70,492,158,186</area>
--            <alpha>225</alpha>
-+            <alpha>255</alpha>
+             <alpha>255</alpha>
          </imagetype>
 --->
--        <textarea name="callsign">
--            <font>large</font>
--            <area>68,634,162,46</area>
--            <align>allcenter</align>
--        </textarea>
- 
++
  	<textarea name="category">
              <font>supersmallblue</font>
-@@ -1604,6 +1605,11 @@
-             <color>#808080</color>
-         </fontdef>
- 
-+        <fontdef name="smallyellow" face="DejaVu Sans">
-+            <color>#d9d900</color>
-+            <pixelsize>21</pixelsize>
-+        </fontdef>
-+
-         <shape name="mythpopupbox-backdrop">
-             <area>339,116,602,488</area>
-             <type>roundbox</type>
-@@ -1665,7 +1671,7 @@
- 
-         <textarea name="messagearea">
-             <area>349,126,582,196</area>
--            <font>small</font>
-+            <font>smallyellow</font>
-             <multiline>yes</multiline>
-             <align>allcenter</align>
-         </textarea>
+             <area>257,490,937,28</area>
diff --git a/abs/core/linhes-theme/qt-background.png b/abs/core/linhes-theme/qt-background.png
deleted file mode 100644
index 12544b2..0000000
Binary files a/abs/core/linhes-theme/qt-background.png and /dev/null differ
diff --git a/abs/core/linhes-theme/qtlook.txt.patch b/abs/core/linhes-theme/qtlook.txt.patch
new file mode 100644
index 0000000..7435db4
--- /dev/null
+++ b/abs/core/linhes-theme/qtlook.txt.patch
@@ -0,0 +1,11 @@
+--- qtlook.txt.orig	2014-01-02 21:32:43.941375600 +0000
++++ qtlook.txt	2014-01-02 21:32:57.946243387 +0000
+@@ -3,7 +3,7 @@
+ # Color of lines, text, etc
+ str ForegroundColor=1a1a1a
+ # Pixmap to use for the background
+-str BackgroundPixmap=images/backgrounds/qt-background.png
++str BackgroundPixmap=images/backgrounds/background.png
+ str Font=DejaVu Sans
+ 
+ # Forground for dialogs
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml
index b661b23..8f8cc9f 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml
@@ -1,4 +1,4 @@
-<mythmenu name="LinHES">
+<mythmenu name="LH_SERVICE_MENU">
 
     <button>
         <type>SETUP_GENERAL</type>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml
index 61dc4d3..176591b 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml
@@ -1,4 +1,4 @@
-<mythmenu name="LinHES">
+<mythmenu name="LH_BACKUP">
    <button>
      <type>BACKUP</type>
      <text>Backup Now?</text>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml
index c4025c5..af38ba7 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml
@@ -1,9 +1,9 @@
-<mythmenu name="LinHES">
+<mythmenu name="LH_RESTORE">
 
    <button>
      <type>RESTORE</type>
      <text>Restore Now?</text>
-     <description>This will restore from the most recent backup.</description>
+     <description>Restore the database from the most recent backup.</description>
      <action>NONE</action>
    </button>
 
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
index 802774b..2d47e7d 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
@@ -1,4 +1,4 @@
-<mythmenu name="LinHES">
+<mythmenu name="LH_UPDATE">
 
    <button>
      <type>JUMP Reload Theme</type>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
index ed527fd..4eee8cc 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
@@ -1,10 +1,11 @@
-<mythmenu name="LinHES">
+<mythmenu name="LH_UPDATE">
 
    <button>
      <type>UPGRADE</type>
      <text>Install Updates</text>
      <description>Install updates for the LinHES system</description>
      <action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action>
+     <action>JUMP Reload Theme</action>
    </button>
 
    <button>
-- 
cgit v0.12