linhes-theme: update for upstream and patch osd.xml browse_info window

2 files changed, 102 insertions, 38 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index cb85af5..79917dc 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -9,7 +9,7 @@ url="http://linhes.org/"
 patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
          'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
 
-#The LinHES theme is based on TintedGlass 4.54 by Harley Peters
+#The LinHES theme is based on TintedGlass 4.56 by Harley Peters
 source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
         'background.png' 'preview.png' 'tux_thoughts.png'
         'LHLogoAndText.png')
@@ -77,7 +77,7 @@ package() {
     sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
 }
 md5sums=('2dca856c2a4d1f959473512c94e43b60'
-         '51e11c48dc73467f7c94644b6db1b840'
+         'ae7e975caea816bf16eba651c8fa8e6a'
          '71f4fa39d7fefe5443ef0f7bd6820ccd'
          'c75c83b90969fb07755062113f858e88'
          '9fe3371a8b964a7028126405cfaa330b'
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index b6cb761..787408f 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,42 +1,106 @@
---- osd.xml.orig	2014-09-23 17:43:57.630552593 +0000
-+++ osd.xml	2014-09-23 17:46:50.325639736 +0000
-@@ -975,19 +975,19 @@
-             <template>%LONGREPEAT%     Size: %FILESIZE_STR%</template>
+--- osd.xml.orig	2014-10-17 22:50:17.316245246 +0000
++++ osd.xml	2014-10-17 22:55:11.065572222 +0000
+@@ -1028,6 +1028,11 @@
+             <pixelsize>24</pixelsize>
+         </fontdef>
+ 
++        <fontdef name="title" from="small">
++            <color>#d9d900</color>
++            <pixelsize>26</pixelsize>
++        </fontdef>
++
+         <fontdef name="large" from="small">
+             <pixelsize>26</pixelsize>
+         </fontdef>
+@@ -1084,7 +1089,7 @@
+         </shape>
+ 
+         <shape name="title-backdrop-line">
+-            <area>219,489,834,68</area>
++            <area>219,489,996,68</area>
+             <type>roundbox</type>
+             <fill color="#000000" alpha="0" />
+             <line color="#ffffff" alpha="45" width="2" />
+@@ -1092,11 +1097,11 @@
+         </shape>
+ 
+         <shape name="title-top-line" from="channel-top-line">
+-            <area>220,490,832,2</area>
++            <area>220,490,994,2</area>
+         </shape>
+ 
+         <shape name="title-bottom-line" from="channel-top-line">
+-            <area>220,554,832,2</area>
++            <area>220,554,994,2</area>
+         </shape>
+ 
+         <shape name="title-left-line" from="channel-left-line">
+@@ -1104,30 +1109,6 @@
+         </shape>
+ 
+         <shape name="title-right-line" from="channel-left-line">
+-            <area>1050,492,2,62</area>
+-        </shape>
+-
+-        <shape name="clock-backdrop-line">
+-            <area>1057,489,158,68</area>
+-            <type>roundbox</type>
+-            <fill color="#000000" alpha="0" />
+-            <line color="#ffffff" alpha="45" width="2" />
+-            <cornerradius>6</cornerradius>
+-        </shape>
+-
+-        <shape name="clock-top-line" from="channel-top-line">
+-            <area>1058,490,156,2</area>
+-        </shape>
+-
+-        <shape name="clock-bottom-line" from="channel-top-line">
+-            <area>1058,554,156,2</area>
+-        </shape>
+-
+-        <shape name="clock-left-line" from="channel-left-line">
+-            <area>1058,492,2,62</area>
+-        </shape>
+-
+-        <shape name="clock-right-line" from="channel-left-line">
+             <area>1212,492,2,62</area>
+         </shape>
+ 
+@@ -1175,30 +1156,30 @@
+         </textarea>
+ 
+         <textarea name="title">
+-            <font>medium</font>
++            <font>title</font>
+             <area>228,494,816,30</area>
+             <align>left,vcenter</align>
          </textarea>
  
--        <textarea name="channum">
-+        <textarea name="channum" depends="!coverart">
-             <font>large</font>
-             <area>68,490,162,46</area>
-             <align>allcenter</align>
+         <textarea name="timedate">
+-            <font>smallerblue</font>
++            <font>smaller</font>
+             <area>228,529,497,22</area>
+             <align>vcenter</align>
+             <template>%TIMEDATE% : %LENMINS%</template>
          </textarea>
  
--        <textarea name="callsign">
-+        <textarea name="callsign" depends="!coverart">
-             <font>large</font>
-             <area>68,634,162,46</area>
-             <align>allcenter</align>
+         <textarea name="longrepeat">
+-            <font>smallerblue</font>
+-            <area>740,530,304,20</area>
++            <font>smaller</font>
++            <area>902,530,310,20</area>
+             <align>right,vcenter</align>
+             <template>%LONGREPEAT%</template>
          </textarea>
  
--        <imagetype name="iconpath">
-+        <imagetype name="iconpath" depends="!coverart">
-             <area>84,536,130,98</area>
-             <preserveaspect>true</preserveaspect>
-             <mask>images/osd/masks/osd_program_icon_mask.png</mask>
-@@ -996,12 +996,14 @@
+         <clock name="clock">
+-            <area>1060,492,152,62</area>
+-            <font>large</font>
++            <area>1086,494,120,30</area>
++            <font>medium</font>
+             <template>%TIME%</template>
+-            <align>allcenter</align>
++            <align>right,vcenter</align>
+         </clock>
  
- <!-- 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. -->
--<!--
-+
-         <imagetype name="coverart">
-             <area>70,492,158,186</area>
-+            <preserveaspect>true</preserveaspect>
-+            <mask>images/masks/watchrecordings_coverart_mask.png</mask>
-             <alpha>255</alpha>
-         </imagetype>
---->
-+
- 	<textarea name="category">
-             <font>supersmallblue</font>
-             <area>257,490,937,28</area>
+         <textarea name="description">