linhes-theme: pull in updates from upstream

1 files changed, 67 insertions, 110 deletions

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">