From df4d86040c76eabf0a13048079c621ac84963728 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 3 Jan 2014 21:13:18 +0000
Subject: linhes-theme: tweak menu

remove old patches
---
 abs/core/linhes-theme/PKGBUILD                     |   4 +-
 abs/core/linhes-theme/config-ui.xml.patch          | 200 ---------------------
 abs/core/linhes-theme/menu-ui-horizontal.xml.patch |  67 -------
 abs/core/linhes-theme/menu-ui-vert.xml.patch       |   8 +-
 abs/core/linhes-theme/schedule-ui.xml.patch        | 148 ---------------
 abs/core/linhes-theme/video-ui.xml.patch           |  58 ------
 6 files changed, 6 insertions(+), 479 deletions(-)
 delete mode 100644 abs/core/linhes-theme/config-ui.xml.patch
 delete mode 100644 abs/core/linhes-theme/menu-ui-horizontal.xml.patch
 delete mode 100644 abs/core/linhes-theme/schedule-ui.xml.patch
 delete mode 100644 abs/core/linhes-theme/video-ui.xml.patch

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 3121cf2..2b1aba3 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.1
-pkgrel=19
+pkgrel=20
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -58,7 +58,7 @@ md5sums=('SKIP'
          '95478bd9bab15e9e4365c1048757c225'
          'ed4f8baf431e20babc345e4e2602426f'
          '9c2c8f2a8d881e01ea84457ae508f655'
-         '74a66e91f7d329d297c749a8827f5c0a'
+         'ec11d601d47cd4b2954e1609262a571b'
          '4ad8bc893412eeeb890f0b1f1f1bd541'
          '9fe3371a8b964a7028126405cfaa330b'
          '7d7bc458a8f4af408700609f3e1f412e'
diff --git a/abs/core/linhes-theme/config-ui.xml.patch b/abs/core/linhes-theme/config-ui.xml.patch
deleted file mode 100644
index 36d6b67..0000000
--- a/abs/core/linhes-theme/config-ui.xml.patch
+++ /dev/null
@@ -1,200 +0,0 @@
---- config-ui.xml.orig	2013-12-14 17:21:38.882668570 +0000
-+++ config-ui.xml	2013-12-14 17:23:08.317851041 +0000
-@@ -347,6 +347,197 @@
- 
-     </window>
- 
-+    <window name="languageselection">
-+
-+        <textarea name="title" from="base_heading">
-+            <value>Language</value>
-+        </textarea>
-+
-+        <textarea name="countrylabel">
-+            <font>baselarge</font>
-+            <area>40,20,580,40</area>
-+            <value>Country</value>
-+            <align>allcenter</align>
-+        </textarea>
-+
-+        <shape name="countrybackground" from="base_backdrop">
-+            <area>40,65,580,550</area>
-+        </shape>
-+
-+        <shape name="country-top-backdrop-line" from="base_backdrop_line">
-+            <area>41,66,578,548</area>
-+        </shape>
-+
-+        <shape name="country-top-line" from="base_highlight_line">
-+            <area>42,67,576,2</area>
-+        </shape>
-+
-+        <shape name="country-bottom-line" from="base_highlight_line">
-+            <area>42,613,576,2</area>
-+        </shape>
-+
-+        <shape name="country-left-line" from="base_highlight_vertical_line">
-+            <area>42,69,2,544</area>
-+        </shape>
-+
-+        <shape name="country-right-line" from="base_highlight_vertical_line">
-+            <area>616,69,2,544</area>
-+        </shape>
-+
-+        <shape name="country-arrows-backdrop" from="base_arrows_backdrop">
-+            <area>48,615,50,12</area>
-+        </shape>
-+
-+        <buttonlist name="countries" from="base_list">
-+            <area>50,78,560,530</area>
-+            <scrollstyle>center</scrollstyle>
-+            <statetype name="buttonitem">
-+                <state name="active">
-+                    <area>0,0,100%,55</area>
-+                    <shape name="buttonbackground" from="base_select_bar_active">
-+                        <area>0,0,100%,100%</area>
-+                    </shape>
-+                    <imagetype name="buttonimage">
-+                        <area>5,7,60,40</area>
-+                    </imagetype>
-+                    <textarea name="buttontext" from="basetextarea">
-+                        <area>70,0,90%,30</area>
-+                        <font>basemediumgrey</font>
-+                        <cutdown>yes</cutdown>
-+                        <align>left,vcenter</align>
-+                    </textarea>
-+                    <textarea name="nativecountry" from="basetextarea">
-+                        <area>70,30,90%,20</area>
-+                        <font>basesmallgrey</font>
-+                        <cutdown>yes</cutdown>
-+                        <align>left,vcenter</align>
-+                    </textarea>
-+                </state>
-+                <state name="inactive" from="active"/>
-+                <state name="selectedactive" from="active">
-+                    <shape name="buttonbackground" from="base_select_bar_selectedactive">
-+                        <area>0,0,100%,100%</area>
-+                    </shape>
-+                    <textarea name="buttontext" from="basetextarea">
-+                        <area>70,0,90%,30</area>
-+                        <font>basemediumyellow</font>
-+                        <cutdown>yes</cutdown>
-+                        <align>left,vcenter</align>
-+                    </textarea>
-+                    <textarea name="nativecountry" from="basetextarea">
-+                        <area>70,30,90%,20</area>
-+                        <font>basesmall</font>
-+                        <cutdown>yes</cutdown>
-+                        <align>left,vcenter</align>
-+                    </textarea>
-+                </state>
-+                <state name="selectedinactive" from="inactive">
-+                    <shape name="buttonbackground" from="base_select_bar_selectedinactive">
-+                        <area>0,0,100%,100%</area>
-+                    </shape>
-+                </state>
-+            </statetype>
-+            <statetype name="upscrollarrow">
-+                <position>5,539</position>
-+            </statetype>
-+            <statetype name="downscrollarrow">
-+                <position>25,539</position>
-+            </statetype>
-+            <helptext>Select the country where you reside.</helptext>
-+        </buttonlist>
-+
-+        <textarea name="languagelabel" from="countrylabel">
-+            <area>660,20,580,40</area>
-+            <value>Language</value>
-+        </textarea>
-+
-+        <shape name="languagebackground" from="base_backdrop">
-+            <area>660,65,580,550</area>
-+        </shape>
-+
-+        <shape name="lang-top-backdrop-line" from="base_backdrop_line">
-+            <area>661,66,578,548</area>
-+        </shape>
-+
-+        <shape name="lang-top-line" from="base_highlight_line">
-+            <area>662,67,576,2</area>
-+        </shape>
-+
-+        <shape name="lang-bottom-line" from="base_highlight_line">
-+            <area>662,613,576,2</area>
-+        </shape>
-+
-+        <shape name="lang-left-line" from="base_highlight_vertical_line">
-+            <area>662,69,2,544</area>
-+        </shape>
-+
-+        <shape name="lang-right-line" from="base_highlight_vertical_line">
-+            <area>1236,69,2,544</area>
-+        </shape>
-+
-+        <shape name="lang-arrows-backdrop" from="base_arrows_backdrop">
-+            <area>668,615,50,12</area>
-+        </shape>
-+
-+        <buttonlist name="languages" from="countries">
-+            <area>670,78,560,530</area>
-+            <statetype name="buttonitem">
-+                <state name="active">
-+                    <area>0,0,100%,55</area>
-+                    <textarea name="buttontext" from="basetextarea">
-+                        <area>10,0,90%,30</area>
-+                        <font>basemediumgrey</font>
-+                        <cutdown>yes</cutdown>
-+                        <align>left,vcenter</align>
-+                    </textarea>
-+                    <textarea name="language" from="nativecountry">
-+                        <position>10,30</position>
-+                    </textarea>
-+                </state>
-+                <state name="inactive" from="active" />
-+                <state name="selectedactive" from="active">
-+                    <shape name="buttonbackground" from="base_select_bar_selectedactive">
-+                        <area>0,0,100%,100%</area>
-+                    </shape>
-+                    <textarea name="buttontext" from="basetextarea">
-+                        <area>10,0,90%,30</area>
-+                        <font>basemediumyellow</font>
-+                        <cutdown>yes</cutdown>
-+                        <align>left,vcenter</align>
-+                    </textarea>
-+                    <textarea name="language" from="nativecountry">
-+                        <area>10,30,90%,20</area>
-+                        <font>basesmall</font>
-+                        <cutdown>yes</cutdown>
-+                        <align>left,vcenter</align>
-+                    </textarea>
-+                </state>
-+                <state name="selectedinactive" from="inactive">
-+                    <shape name="buttonbackground" from="base_select_bar_selectedinactive">
-+                        <area>0,0,100%,100%</area>
-+                    </shape>
-+                </state>
-+            </statetype>
-+            <helptext>Select your language.</helptext>
-+        </buttonlist>
-+
-+        <textarea name="helptext" from="basetextarea">
-+            <area>200,630,880,60</area>
-+            <align>center</align>
-+        </textarea>
-+
-+        <button name="save" from="base_button">
-+            <position>1090,643</position>
-+            <value>Save</value>
-+        </button>
-+
-+        <button name="cancel" from="base_button">
-+            <position>40,643</position>
-+            <value>Cancel</value>
-+        </button>
-+
-+    </window>
-+
-     <window name="grabbersettings">
-         <area>0,0,1280,720</area>
- 
diff --git a/abs/core/linhes-theme/menu-ui-horizontal.xml.patch b/abs/core/linhes-theme/menu-ui-horizontal.xml.patch
deleted file mode 100644
index c099db6..0000000
--- a/abs/core/linhes-theme/menu-ui-horizontal.xml.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- menu-ui.xml.orig	2013-11-21 19:05:04.920817617 +0000
-+++ menu-ui.xml	2013-11-21 20:03:45.474172898 +0000
-@@ -9,16 +9,16 @@
-         </textarea>
- 
-         <shape name="menuscroll-background" from="base_backdrop">
--            <area>0,525,1280,70</area>
-+            <area>0,94,1280,70</area>
-             <type>box</type>
-         </shape>
- 
-         <shape name="menuscroll-top-line" from="base_line">
--            <area>0,526,1280,2</area>
-+            <area>0,95,1280,2</area>
-         </shape>
- 
-         <shape name="menuscroll-bottom-line" from="base_line">
--            <area>0,592,1280,2</area>
-+            <area>0,161,1280,2</area>
-         </shape>
- 
-         <statetype name="titles">
-@@ -135,7 +135,7 @@
-         </statetype>
- 
-         <buttonlist name="menu">
--            <area>20,528,1240,64</area>
-+            <area>20,98,1240,64</area>
-             <layout>horizontal</layout>
-             <spacing>20</spacing>
-             <scrollstyle>center</scrollstyle>
-@@ -157,6 +157,14 @@
-                 <state name="selectedactive"> 
-                     <area>0,0,232,64</area>
-                     <imagetype name="background" />
-+
-+                    <shape name="menu-left-line" from="base_highlight_vertical_line">
-+                        <area>-10,-2,2,66</area>
-+                    </shape>
-+                    <shape name="menu-right-line" from="base_highlight_vertical_line">
-+                        <area>240,-2,2,66</area>
-+                    </shape>
-+
-                     <textarea name="buttontext">
-                         <area>0,0,232,64</area>
-                         <font>basemediumlargerdarkyellow</font>
-@@ -168,6 +176,20 @@
-                         <cutdown>yes</cutdown>
-                         <case>upper</case>
-                     </textarea>
-+
-+                    <imagetype name="description_background">
-+                        <area>-100,100,410,180</area>
-+                        <filename>images/tux_thoughts.png</filename>
-+                    </imagetype>
-+                    
-+                    <textarea name="description">
-+                        <area>12,87,210,130</area>
-+                        <align>allcenter</align>
-+                        <font>basesmallyellow</font>
-+                        <alpha>225</alpha>
-+                        <multiline>yes</multiline>
-+                    </textarea>
-+
-                 </state>
-             </statetype>
-         </buttonlist>
diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch
index 411dd6a..4cfd697 100644
--- a/abs/core/linhes-theme/menu-ui-vert.xml.patch
+++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch
@@ -1,16 +1,16 @@
 --- 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
++++ menu-ui-vert.xml	2014-01-03 20:45:31.091048579 +0000
 @@ -18,6 +18,24 @@
              <area>394,0,2,720</area>
          </shape>
  
 +        <imagetype name="description_background">
-+            <area>567,165,487,210</area>
++            <area>594,165,487,210</area>
 +            <filename>images/tux_thoughts.png</filename>
 +        </imagetype>
 +
 +        <textarea name="description">
-+            <area>705,158,250,130</area>
++            <area>730,159,250,130</area>
 +            <align>allcenter</align>
 +            <font>basesmallyellow</font>
 +            <multiline>yes</multiline>
@@ -18,7 +18,7 @@
 +        </textarea>
 +
 +        <imagetype name="LHlogo">
-+            <area>492,348,638,207</area>
++            <area>519,348,638,207</area>
 +            <filename>images/LHLogoAndText.png</filename> <!--851x277 3.072-->
 +        </imagetype>
 +
diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch
deleted file mode 100644
index 7032a67..0000000
--- a/abs/core/linhes-theme/schedule-ui.xml.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- schedule-ui.xml.orig	2013-11-22 19:35:05.125862862 +0000
-+++ schedule-ui.xml	2013-11-25 22:17:02.323240208 +0000
-@@ -1471,7 +1471,7 @@
- 
-         <textarea name="title_text" from="basetextarea">
-             <area>10,4,480,46</area>
--            <font>basemediumlargerdarkyellow</font>
-+            <font>basemediumlarger</font>
-             <align>allcenter</align>
-             <value>Search Term</value>
-         </textarea>
-@@ -1578,7 +1578,7 @@
- 
-         <textarea name="title_text" from="basetextarea">
-             <area>10,4,480,46</area>
--            <font>basemediumlargerdarkyellow</font>
-+            <font>basemediumlarger</font>
-             <align>allcenter</align>
-             <value>Select Search</value>
-         </textarea>
-@@ -1681,7 +1681,7 @@
- 
-         <textarea name="title_text" from="basetextarea">
-             <area>10,4,480,46</area>
--            <font>basemediumlargerdarkyellow</font>
-+            <font>basemediumlarger</font>
-             <align>allcenter</align>
-             <value>Edit Power Search Fields</value>
-         </textarea>
-@@ -3225,7 +3225,7 @@
-     </window>
- 
-     <window name="schedulefiltereditor">
--        <area>-1,-1,500,500</area>
-+        <area>-1,-1,602,488</area>
- 
-         <animation trigger="AboutToShow">
-             <section>
-@@ -3242,85 +3242,85 @@
-         </animation>
- 
-         <shape name="schedule-filter-editor-backdrop" from="base_popup_backdrop">
--            <area>0,0,500,500</area>
-+            <area>0,0,602,488</area>
-         </shape>
- 
-         <shape name="schedule-filter-editor-backdrop-line" from="base_backdrop_line">
--            <area>1,1,498,498</area>
-+            <area>1,1,600,486</area>
-         </shape>
- 
-         <shape name="schedule-filter-editor-top-line" from="base_highlight_line">
--            <area>2,2,496,2</area>
-+            <area>2,2,596,2</area>
-         </shape>
- 
-         <shape name="schedule-filter-editor-bottom-line" from="base_highlight_line">
--            <area>2,496,496,2</area>
-+            <area>2,484,596,2</area>
-         </shape>
- 
-         <shape name="schedule-filter-editor-left-line" from="base_highlight_vertical_line">
--            <area>2,4,2,492</area>
-+            <area>2,4,2,480</area>
-         </shape>
- 
-         <shape name="schedule-filter-editor-right-line" from="base_highlight_vertical_line">
--            <area>496,4,2,492</area>
-+            <area>598,4,2,480</area>
-         </shape>
- 
-         <shape name="schedule-filter-editor-seperator-first-line" from="base_line">
--            <area>23,50,454,2</area>
-+            <area>23,50,552,2</area>
-         </shape>
- 
-         <shape name="schedule-filter-editor-seperator-second-line" from="base_line">
--            <area>23,435,454,2</area>
-+            <area>23,435,552,2</area>
-         </shape>
- 
-         <textarea name="title_text" from="basetextarea">
--            <area>10,4,480,46</area>
--            <font>basemediumlargerdarkyellow</font>
-+            <area>10,4,582,46</area>
-+            <font>basemediumlarger</font>
-             <align>allcenter</align>
-             <value>Schedule Filter Editor</value>
-         </textarea>
- 
-         <buttonlist name="filters" from="base_button_list">
--            <area>20,75,460,360</area>
-+            <area>15,60,570,360</area>
-             <statetype name="buttonitem">
-                 <state name="active">
--                    <area>0,0,460,40</area>
-+                    <area>0,0,100%,34</area>
-                     <textarea name="buttontext">
--                        <area>40,0,380,40</area>                     
-+                        <area>40,0,490,34</area>                     
-                     </textarea>
-                     <statetype name="buttoncheck">
--                        <position>15,10</position>
-+                        <position>15,7</position>
-                     </statetype>
-                 </state>
-                 <state name="selectedactive">
--                    <area>0,0,460,40</area>
-+                    <area>0,0,100%,34</area>
-                     <textarea name="buttontext">
--                        <area>40,0,380,40</area>
-+                        <area>40,0,490,34</area>
-                     </textarea>
-                     <statetype name="buttoncheck">
--                        <position>15,10</position>
-+                        <position>15,7</position>
-                     </statetype>
-                 </state>
-                 <state name="selectedinactive">
--                    <area>0,0,460,40</area>
-+                    <area>0,0,100%,34</area>
-                     <textarea name="buttontext">
--                        <area>40,0,380,40</area>
-+                        <area>40,0,490,34</area>
-                     </textarea>
-                     <statetype name="buttoncheck">
--                        <position>15,10</position>
-+                        <position>15,7</position>
-                     </statetype>
-                 </state>
-             </statetype>
-             <statetype name="upscrollarrow">
--                <position>0,343</position>
-+                <position>0,359</position>
-             </statetype>
-             <statetype name="downscrollarrow">
--                <position>20,343</position>
-+                <position>20,359</position>
-             </statetype>
-         </buttonlist>
- 
--        <button name="back" from="base_medium_button">
--            <position>75,447</position>
-+        <button name="back" from="base_wide_button">
-+            <position>60,440</position>
-             <value>Back</value>
-         </button>
- 
diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch
deleted file mode 100644
index 55fb750..0000000
--- a/abs/core/linhes-theme/video-ui.xml.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- video-ui.xml.orig	2013-12-10 21:58:00.909431846 +0000
-+++ video-ui.xml	2013-12-10 21:57:48.940952773 +0000
-@@ -3116,15 +3116,15 @@
-             <preserveaspect>false</preserveaspect>
-         </imagetype>
- 
--        <button name="done_button" from="base_wide_button">
--            <area>25,443,390,40</area>
-+        <button name="done_button" from="base_medium_button">
-+            <area>50,443,350,40</area> 
-             <statetype name="buttonstate">
-                 <state name="active">
-                     <shape name="background" from="base_button_background_active">
--                        <area>0,0,390,40</area>
-+                        <area>0,0,350,40</area>
-                     </shape>
-                     <textarea name="buttontext">
--                        <area>10,5,370,30</area>
-+                        <area>10,5,330,30</area>
-                         <align>allcenter</align>
-                         <font>basesmall</font>
-                         <value>Done</value>
-@@ -3132,21 +3132,21 @@
-                 </state>
-                 <state name="selected" from="active">
-                     <shape name="background" from="base_button_background_selected">
--                        <area>0,0,390,40</area>
-+                        <area>0,0,350,40</area>
-                     </shape>
-                 </state>
-             </statetype>
-         </button>
-         
--        <button name="play_button" from="base_wide_button">
--            <area>435,443,390,40</area>
-+        <button name="play_button" from="base_medium_button">
-+            <area>450,443,350,40</area>
-             <statetype name="buttonstate">
-                 <state name="active">
-                     <shape name="background" from="base_button_background_active">
--                        <area>0,0,390,40</area>
-+                        <area>0,0,350,40</area>
-                     </shape>
-                     <textarea name="buttontext">
--                        <area>10,5,370,30</area>
-+                        <area>10,5,330,30</area>
-                         <align>allcenter</align>
-                         <font>basesmall</font>
-                         <value>Play</value>
-@@ -3154,7 +3154,7 @@
-                 </state>
-                 <state name="selected" from="active">
-                     <shape name="background" from="base_button_background_selected">
--                        <area>0,0,390,40</area>
-+                        <area>0,0,350,40</area>
-                     </shape>
-                 </state>
-             </statetype>
-- 
cgit v0.12