From e957696c35ffe53466633b329d3cc10ba7ca6841 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 14 Dec 2013 17:12:55 -0600
Subject: linhes-theme: theme the language screen for installs. refs #940.

change menu to vertical. kept menu-ui-horizontal.xml.patch in case
---
 abs/core/linhes-theme/PKGBUILD                     |   9 +-
 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       | 122 +++++++++++++
 abs/core/linhes-theme/menu-ui.xml.patch            |  67 -------
 5 files changed, 394 insertions(+), 71 deletions(-)
 create mode 100644 abs/core/linhes-theme/config-ui.xml.patch
 create mode 100644 abs/core/linhes-theme/menu-ui-horizontal.xml.patch
 create mode 100644 abs/core/linhes-theme/menu-ui-vert.xml.patch
 delete mode 100644 abs/core/linhes-theme/menu-ui.xml.patch

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 3eda250..a97f0e6 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,14 +1,14 @@
 pkgname=linhes-theme
 pkgver=8.1
-pkgrel=11
+pkgrel=12
 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.xml.patch' 'recordings-ui.xml.patch' 'schedule-ui.xml.patch'
-         'video-ui.xml.patch')
+         'menu-ui-vert.xml.patch' 'recordings-ui.xml.patch' 'schedule-ui.xml.patch'
+         'video-ui.xml.patch' 'config-ui.xml.patch')
 
 #The LinHES theme is based on TintedGlass by Harley Peters
 source=("git://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27"
@@ -54,10 +54,11 @@ md5sums=('SKIP'
          '9c2fc68864cbedb6e449056972b457aa'
          'e061490fc869e0e14d4e144c17c3ec56'
          'abf14a78424114b6d9ba1d9e58ab754d'
-         '83b03852c6f46bc791bfa6e8c894ca01'
+         '2475f2c38d029e20080d52a752a2638a'
          '33609e27406f00bdc0243a5ef840c6f9'
          'aff82cf901edc4baa058013d93610cfc'
          'e502da82e6d76b3f43dd7ddc20c1e2e7'
+         '78b64e567cd799df52045d9fc5a59cc0'
          '7d7bc458a8f4af408700609f3e1f412e'
          '909d7a8114436dcfc28a01d0d97ec11f'
          'cbe5f663ebb5d51abe811f81dafec303'
diff --git a/abs/core/linhes-theme/config-ui.xml.patch b/abs/core/linhes-theme/config-ui.xml.patch
new file mode 100644
index 0000000..36d6b67
--- /dev/null
+++ b/abs/core/linhes-theme/config-ui.xml.patch
@@ -0,0 +1,200 @@
+--- 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
new file mode 100644
index 0000000..c099db6
--- /dev/null
+++ b/abs/core/linhes-theme/menu-ui-horizontal.xml.patch
@@ -0,0 +1,67 @@
+--- 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
new file mode 100644
index 0000000..42a9b54
--- /dev/null
+++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch
@@ -0,0 +1,122 @@
+--- 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 @@
+         </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>
+         </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>
++            <align>allcenter</align>
++            <font>basesmallyellow</font>
++<!--            <alpha>225</alpha>-->
++            <multiline>yes</multiline>
++        </textarea>
++
+         <statetype name="titles">
+             <loadondemand>true</loadondemand>
+             <state name="TV">
+@@ -110,7 +123,7 @@
+                     <value>Manage Recordings</value>
+                 </textarea>
+             </state>
+-            <state name="LIBRARY">
++            <state name="MENU_MEDIA_LIBRARY">
+                 <textarea name="heading" from="base_heading">
+                     <value>Media Library</value>
+                 </textarea>
+@@ -135,18 +148,20 @@
+         </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 +170,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 +188,27 @@
+                     </textarea>
+                 </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>
diff --git a/abs/core/linhes-theme/menu-ui.xml.patch b/abs/core/linhes-theme/menu-ui.xml.patch
deleted file mode 100644
index c099db6..0000000
--- a/abs/core/linhes-theme/menu-ui.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>
-- 
cgit v0.12

