linhes-theme: adjustments to font sizes

4 files changed, 440 insertions, 13 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index aa83de9..c8e97ab 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,13 +1,13 @@
 pkgname=linhes-theme
 pkgver=8.2
-pkgrel=6
+pkgrel=7
 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' 'qtlook.txt.patch')
+         'menu-ui-vert.xml.patch' 'schedule-ui.xml.patch' 'qtlook.txt.patch')
 
 #The LinHES theme is based on TintedGlass 4.56 by Harley Peters
 source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
@@ -80,9 +80,10 @@ package() {
     sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
 }
 md5sums=('2dca856c2a4d1f959473512c94e43b60'
-         'ae7e975caea816bf16eba651c8fa8e6a'
-         '71f4fa39d7fefe5443ef0f7bd6820ccd'
+         'e857e084963166bb37c6236463750dc1'
+         '5fccb4e20c15d87223ea5de4c40faa06'
          'c75c83b90969fb07755062113f858e88'
+         '22ff4044c8c29560451fb51dcbf4d44e'
          '9fe3371a8b964a7028126405cfaa330b'
          '5a8fb2a5f0e657d52be6f0a6a006ce72'
          'a0201e0aa1608eeab27ee754e4d2c1de'
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index 13aba27..a0715f6 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,5 +1,200 @@
---- base.xml.orig	2014-09-23 18:09:09.984607409 +0000
-+++ base.xml	2014-09-23 18:09:22.626356280 +0000
+--- base.xml.orig	2014-10-26 18:47:37.279439028 +0000
++++ base.xml	2014-10-26 19:02:50.565913686 +0000
+@@ -3,55 +3,55 @@
+ <mythuitheme>
+ 
+     <!-- Base Font Definitions -->
+-    <fontdef name="basefont" face="DejaVu Sans">
++    <fontdef name="basefont" face="Overlock">
+         <color>#e6e6e6</color>
+-        <pixelsize>21</pixelsize>
++        <pixelsize>23</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basesupersmall" from="basefont">
+-        <pixelsize>11</pixelsize>
++        <pixelsize>13</pixelsize>
+         <weight>bold</weight>
+     </fontdef>
+ 
+     <fontdef name="baseextrasmall" from="basefont">
+         <weight>bold</weight>
+-        <pixelsize>13</pixelsize>
++        <pixelsize>15</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="baseevensmaller" from="basefont">
+         <weight>bold</weight>
+-        <pixelsize>16</pixelsize>
++        <pixelsize>18</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basesmaller" from="basefont">
+-        <pixelsize>18</pixelsize>
++        <pixelsize>20</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basesomewhatsmaller" from="basefont">
+-        <pixelsize>19</pixelsize>
++        <pixelsize>21</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basesmall" from="basefont">
+-        <pixelsize>20</pixelsize>
++        <pixelsize>22</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basemedium" from="basefont">
+-        <pixelsize>22</pixelsize>
++        <pixelsize>24</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basemediumshadow" from="basefont">
+-        <pixelsize>22</pixelsize>
++        <pixelsize>24</pixelsize>
+         <shadowcolor>#000000</shadowcolor>
+         <shadowoffset>2,2</shadowoffset>
+         <shadowalpha>100</shadowalpha>
+     </fontdef>
+ 
+     <fontdef name="basemediumlarger" from="basefont">
+-        <pixelsize>25</pixelsize>
++        <pixelsize>27</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basemediumlargerbold" from="basefont">
+-        <pixelsize>25</pixelsize>
++        <pixelsize>27</pixelsize>
+         <shadowcolor>#000000</shadowcolor>
+         <shadowoffset>3,3</shadowoffset>
+         <shadowalpha>100</shadowalpha>
+@@ -59,15 +59,15 @@
+     </fontdef>
+ 
+     <fontdef name="baselarge" from="basefont">
+-        <pixelsize>28</pixelsize>
++        <pixelsize>30</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="baseextralarge" from="basefont">
+-        <pixelsize>32</pixelsize>
++        <pixelsize>34</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="baseextralargebold" from="basefont">
+-        <pixelsize>32</pixelsize>
++        <pixelsize>34</pixelsize>
+         <shadowcolor>#000000</shadowcolor>
+         <shadowoffset>3,3</shadowoffset>
+         <shadowalpha>100</shadowalpha>
+@@ -85,31 +85,31 @@
+     </fontdef>
+ 
+     <fontdef name="basesupersmallblue" from="basesupersmall">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="baseextrasmallblue" from="baseextrasmall">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="baseevensmallerblue" from="baseevensmaller">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basesomewhatsmallerblue" from="basesomewhatsmaller">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basesmallerblue" from="basesmaller">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basesmallblue" from="basesmall">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumblue" from="basemedium">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basesupersmallgreen" from="basesupersmall">
+@@ -241,55 +241,55 @@
+     </fontdef>
+ 
+     <fontdef name="basesupersmallyellow" from="basesupersmall">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baseextrasmallyellow" from="baseextrasmall">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baseevensmalleryellow" from="basesmaller">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basesmalleryellow" from="basesmaller">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basesmallyellow" from="basesmall">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumyellow" from="basemedium">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumlargeryellow" from="basemediumlarger">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baselargeyellow" from="baselarge">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baseextralargeyellow" from="baseextralarge">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basesmalldarkyellow" from="basesmall">
+-        <color>#CCCC29</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumdarkyellow" from="basemedium">
+-        <color>#CCCC29</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumlargerdarkyellow" from="basemediumlarger">
+-        <color>#CCCC29</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baselargedarkyellow" from="baselarge">
+-        <color>#CCCC29</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <!-- Base definition of a textarea -->
 @@ -411,7 +411,7 @@
          <area>283,436,50,11</area>
          <type>roundbox</type>
@@ -18,6 +213,36 @@
      </shape>
  
      <!-- Base definition of a heading group -->
+@@ -667,10 +667,10 @@
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="50">
+-                    <stop position="0" color="#d9d900" />
+-                    <stop position="25" color="#d9d900" alpha="255" />
+-                    <stop position="50" color="#d9d900" />
+-                    <stop position="100" color="#d9d900" />
++                    <stop position="0" color="#ebb81c" />
++                    <stop position="25" color="#ebb81c" alpha="255" />
++                    <stop position="50" color="#ebb81c" />
++                    <stop position="100" color="#ebb81c" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -679,10 +679,10 @@
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="50">
+-                    <stop position="0" color="#d9d900" />
+-                    <stop position="50" color="#d9d900" />
+-                    <stop position="75" color="#d9d900" alpha="255"/>
+-                    <stop position="100" color="#d9d900" />
++                    <stop position="0" color="#ebb81c" />
++                    <stop position="50" color="#ebb81c" />
++                    <stop position="75" color="#ebb81c" alpha="255"/>
++                    <stop position="100" color="#ebb81c" />
+                 </gradient>
+             </fill>
+         </shape>
 @@ -863,7 +863,7 @@
              <type>roundbox</type>
              <fill color="#1a1a1a" alpha="175" />
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index 787408f..6c29161 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,17 +1,144 @@
---- 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>
+--- osd.xml.orig	2014-10-26 18:47:55.853729172 +0000
++++ osd.xml	2014-10-26 19:11:25.023453880 +0000
+@@ -7,13 +7,13 @@
+     <window name="osd_debug">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="medium" face="DejaVu Sans">
+-            <pixelsize>16</pixelsize>
++        <fontdef name="medium" face="Overlock">
++            <pixelsize>18</pixelsize>
+             <color>#e6e6e6</color>
          </fontdef>
  
-+        <fontdef name="title" from="small">
-+            <color>#d9d900</color>
+         <fontdef name="mediumblue" from="medium">
+-            <color>#3a9ade</color>
++            <color>#0072bc</color>
+         </fontdef>
+ 
+         <shape name="osd-debug-backdrop">
+@@ -252,8 +252,8 @@
+     <window name="osd_message">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="medium" face="DejaVu Sans">
+-            <pixelsize>24</pixelsize>
++        <fontdef name="medium" face="Overlock">
++            <pixelsize>28</pixelsize>
+             <color>#e6e6e6</color>
+         </fontdef>
+ 
+@@ -315,9 +315,9 @@
+     <window name="osd_input">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="large" face="DejaVu Sans">
++        <fontdef name="large" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>32</pixelsize>
++            <pixelsize>34</pixelsize>
+         </fontdef>
+ 
+         <shape name="osd-input-backdrop">
+@@ -378,9 +378,9 @@
+     <window name="osd_status">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>18</pixelsize>
++            <pixelsize>20</pixelsize>
+         </fontdef>
+ 
+         <shape name="osd-status-backdrop">
+@@ -470,39 +470,39 @@
+     <window name="program_info">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>21</pixelsize>
++            <pixelsize>23</pixelsize>
+         </fontdef>
+ 
+ 	<fontdef name="supersmall" from="small">
+             <weight>bold</weight>
+-            <pixelsize>12</pixelsize>
++            <pixelsize>14</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="smaller" from="small">
+-            <pixelsize>16</pixelsize>
++            <pixelsize>18</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="mediumsmall" from="small">
+-            <pixelsize>18</pixelsize>
++            <pixelsize>20</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="medium" from="small">
+-            <pixelsize>22</pixelsize>
++            <pixelsize>24</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="title" from="small">
+-            <color>#d9d900</color>
+-            <pixelsize>26</pixelsize>
++            <color>#ebb81c</color>
++            <pixelsize>28</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="large" from="small">
+-            <pixelsize>28</pixelsize>
++            <pixelsize>30</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="supersmallblue" from="supersmall">
+-            <color>#3a9ade</color>
++            <color>#0072bc</color>
+         </fontdef>
+ 
+         <shape name="program-info-backdrop">
+@@ -1015,25 +1015,30 @@
+     <window name="browse_info">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>21</pixelsize>
++            <pixelsize>23</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="smaller" from="small">
+-            <pixelsize>18</pixelsize>
++            <pixelsize>20</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="medium" from="small">
+-            <pixelsize>24</pixelsize>
 +            <pixelsize>26</pixelsize>
 +        </fontdef>
 +
++        <fontdef name="title" from="small">
++            <color>#ebb81c</color>
++            <pixelsize>28</pixelsize>
+         </fontdef>
+ 
          <fontdef name="large" from="small">
-             <pixelsize>26</pixelsize>
+-            <pixelsize>26</pixelsize>
++            <pixelsize>28</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="smallerblue" from="smaller">
+-            <color>#3a9ade</color>
++            <color>#0072bc</color>
          </fontdef>
+ 
+         <shape name="browse-info-backdrop">
 @@ -1084,7 +1089,7 @@
          </shape>
  
@@ -104,3 +231,66 @@
          </clock>
  
          <textarea name="description">
+@@ -1214,9 +1195,9 @@
+     <window name="ChannelEditor">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>20</pixelsize>
++            <pixelsize>22</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="smallblack" from="small">
+@@ -1224,7 +1205,7 @@
+         </fontdef>
+ 
+         <fontdef name="smallblue" from="small">
+-            <color>#3a9ade</color>
++            <color>#0072bc</color>
+         </fontdef>
+ 
+         <fontdef name="smallgrey" from="small">
+@@ -1232,7 +1213,7 @@
+         </fontdef>
+ 
+         <fontdef name="medium" from="small">
+-            <pixelsize>24</pixelsize>
++            <pixelsize>26</pixelsize>
+         </fontdef>
+ 
+         <shape name="channel-editor-backdrop">
+@@ -1610,9 +1591,9 @@
+     <window name="osd_program_editor">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>18</pixelsize>
++            <pixelsize>20</pixelsize>
+         </fontdef>
+ 
+         <shape name="osd-program-editor-backdrop">
+@@ -1749,9 +1730,9 @@
+     <window name="MythPopupBox">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#ffffff</color>
+-            <pixelsize>21</pixelsize>
++            <pixelsize>23</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="smallgrey" from="small">
+@@ -1759,7 +1740,7 @@
+         </fontdef>
+ 
+         <fontdef name="smallyellow" from="small">
+-            <color>#d9d900</color>
++            <color>#ebb81c</color>
+         </fontdef>
+ 
+         <shape name="mythpopupbox-backdrop">
diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch
new file mode 100644
index 0000000..930c26f
--- /dev/null
+++ b/abs/core/linhes-theme/schedule-ui.xml.patch
@@ -0,0 +1,11 @@
+--- schedule-ui.xml.orig	2014-10-26 18:47:27.740659484 +0000
++++ schedule-ui.xml	2014-10-26 18:45:31.642195458 +0000
+@@ -126,7 +126,7 @@
+             <conflictingcolor>#ff6600</conflictingcolor>
+             <cutdown>no</cutdown>
+             <multiline>yes</multiline>
+-            <textoffset>6,7</textoffset>
++            <textoffset>6,2</textoffset>
+             <recordstatus type="SingleRecord" image="images/gg-rs-single.png"></recordstatus>
+             <recordstatus type="TimeslotRecord" image="images/gg-rs-timeslot.png"></recordstatus>
+             <recordstatus type="ChannelRecord" image="images/gg-rs-channel.png"></recordstatus>