summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/core/LinHES-system/linhes_update.sh1
-rw-r--r--abs/core/linhes-theme/PKGBUILD10
-rw-r--r--abs/core/linhes-theme/base.xml.patch80
-rw-r--r--[-rwxr-xr-x]abs/core/linhes-theme/install-ui.xml22
-rw-r--r--abs/core/linhes-theme/schedule-ui.xml.patch29
-rw-r--r--abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml20
6 files changed, 130 insertions, 32 deletions
diff --git a/abs/core/LinHES-system/linhes_update.sh b/abs/core/LinHES-system/linhes_update.sh
index aa80d41..76501fb 100644
--- a/abs/core/LinHES-system/linhes_update.sh
+++ b/abs/core/LinHES-system/linhes_update.sh
@@ -57,6 +57,7 @@ chck () {
echo " <button>" >> /tmp/update3.xml.tmp
echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
echo " <text>$line</text>" >> /tmp/update3.xml.tmp
+ echo " <description>$line</description>" >> /tmp/update3.xml.tmp
echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
echo " </button>" >> /tmp/update3.xml.tmp
done < "/tmp/to_be_upgraded"
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index e330354..3e85367 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.1
-pkgrel=5
+pkgrel=6
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -10,7 +10,7 @@ patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
'menu-ui.xml.patch' 'schedule-ui.xml.patch')
#The LinHES theme is based on TintedGlass by Harley Peters
-source=("git://github.com/MythTV-Themes/TintedGlass.git"
+source=("git://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27"
`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
'background.png' 'qt-background.png' 'tux_thoughts.png'
'progdetails_page1.html')
@@ -57,11 +57,11 @@ package() {
md5sums=('SKIP'
'9c2fc68864cbedb6e449056972b457aa'
'15b4462932b7be0e56b2e69e0214823a'
- '2fb0990e8fef2c70e9bd8cfb36689b2b'
+ '18dc450e33aaa9a21f4c293cf883b16b'
'83b03852c6f46bc791bfa6e8c894ca01'
- '45d2f265218ab951eefe76adff38c54b'
+ 'aff82cf901edc4baa058013d93610cfc'
'7d7bc458a8f4af408700609f3e1f412e'
- 'eb94abdc196051db708e4a9eb938923a'
+ '909d7a8114436dcfc28a01d0d97ec11f'
'cbe5f663ebb5d51abe811f81dafec303'
'12d26a786fde397348653128a6d7676a'
'2bd09b8049aaf5ba21db5baf3a0ce077'
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index 5dde5ea..43205a8 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,6 +1,14 @@
---- base.xml.orig 2013-11-19 01:06:47.555458106 +0000
-+++ base.xml 2013-11-21 21:56:09.218085998 +0000
-@@ -431,19 +431,19 @@
+--- base.xml.orig 2013-11-22 18:52:58.956295819 +0000
++++ base.xml 2013-11-26 21:11:40.854761920 +0000
+@@ -424,26 +424,26 @@
+
+ <!-- Base definition of a base popup backdrop -->
+ <shape name="base_popup_backdrop" from="base_backdrop">
+- <fill color="#0a0a0e" alpha="255" />
++ <fill color="#0a0a0e" alpha="235" />
+ </shape>
+
+ <!-- Base definition of a heading group -->
<group name="base_heading_group">
<area>0,0,1280,720</area>
<shape name="base_heading_backdrop" from="base_backdrop">
@@ -95,13 +103,12 @@
<animation trigger="AboutToShow">
<section>
-@@ -1260,76 +1258,77 @@
+@@ -1260,76 +1258,76 @@
</animation>
<shape name="popup-backdrop" from="base_popup_backdrop">
- <area>0,0,400,463</area>
+ <area>0,0,602,488</area>
-+ <fill color="#0a0a0e" alpha="235" />
</shape>
<shape name="popup-backdrop-line" from="base_backdrop_line">
@@ -194,3 +201,66 @@
</statetype>
</buttonlist>
</window>
+@@ -1384,7 +1382,7 @@
+ <textarea name="messagearea" from="basetextarea">
+ <area>15,10,785,282</area>
+ <multiline>yes</multiline>
+- <font>basesmalldarkyellow</font>
++ <font>basesmall</font>
+ <align>allcenter</align>
+ </textarea>
+
+@@ -1458,7 +1456,7 @@
+
+ <textarea name="message" from="basetextarea">
+ <area>6,86,590,51</area>
+- <font>basesmalleryellow</font>
++ <font>basesmaller</font>
+ <multiline>true</multiline>
+ <align>allcenter</align>
+ </textarea>
+@@ -1507,7 +1505,7 @@
+
+ <textarea name="message" from="basetextarea">
+ <area>14,14,552,66</area>
+- <font>basesmalldarkyellow</font>
++ <font>basesmall</font>
+ <align>allcenter</align>
+ </textarea>
+
+@@ -1569,7 +1567,7 @@
+
+ <textarea name="message" from="basetextarea">
+ <area>8,8,571,127</area>
+- <font>basesmalldarkyellow</font>
++ <font>basesmall</font>
+ <align>allcenter</align>
+ <multiline>yes</multiline>
+ <cutdown>no</cutdown>
+@@ -1713,7 +1711,7 @@
+
+ <textarea name="message" from="basetextarea">
+ <area>10,14,567,36</area>
+- <font>basesmalldarkyellow</font>
++ <font>basesmall</font>
+ <align>allcenter</align>
+ </textarea>
+
+@@ -1770,7 +1768,7 @@
+
+ <textarea name="message" from="basetextarea">
+ <area>0,7,580,50</area>
+- <font>basemediumdarkyellow</font>
++ <font>basemedium</font>
+ <align>allcenter</align>
+ <value>Select Time &amp; Date</value>
+ <multiline>true</multiline>
+@@ -1863,7 +1861,7 @@
+
+ <textarea name="title" from="basetextarea">
+ <area>18,4,484,66</area>
+- <font>basesmalldarkyellow</font>
++ <font>basesmall</font>
+ <multiline>yes</multiline>
+ <align>allcenter</align>
+ </textarea>
diff --git a/abs/core/linhes-theme/install-ui.xml b/abs/core/linhes-theme/install-ui.xml
index 4d10d0f..a521256 100755..100644
--- a/abs/core/linhes-theme/install-ui.xml
+++ b/abs/core/linhes-theme/install-ui.xml
@@ -11,7 +11,7 @@
<!--version info-->
<textarea name="date_text" from="basetextarea">
<multiline>yes</multiline>
- <font>basemedium</font>
+ <font>baselarge</font>
<area>20,22,1240,100</area>
<value></value>
<align>allcenter</align>
@@ -34,10 +34,10 @@
<textarea name="recording_text" from="basetextarea">
<multiline>yes</multiline>
- <font>basemediumyellow</font>
- <area>20,140,1240,60</area>
+ <font>basemedium</font>
+ <area>20,170,1240,60</area>
<value>Press MENU for options</value>
- <align>allcenter</align>
+ <align>center</align>
</textarea>
<!--not used by mythinstall-->
@@ -48,23 +48,23 @@
</textarea>
<textarea name="scheduled_text">
- <font>basemediumyellow</font>
- <area>20,210,1240,120</area>
+ <font>basemedium</font>
+ <area>20,230,1240,30</area>
<value></value>
- <align>allcenter</align>
+ <align>center</align>
</textarea>
<textarea name="mythvantage_text">
<multiline>no</multiline>
- <font>basesmallyellow</font>
- <area>20,660,1240,30</area>
+ <font>basesmall</font>
+ <area>20,660,1240,20</area>
<value></value>
- <align>right</align>
+ <align>center</align>
<cutdown>yes</cutdown>
</textarea>
<imagetype name="logo">
- <position>565,490</position>
+ <position>565,500</position>
<preserveaspect>true</preserveaspect>
<!--<crop>x,y,w,h</crop>-->
<filepattern low="0" high="30">/usr/MythVantage/logos/logo-%1.png</filepattern>
diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch
index 88e643b..7032a67 100644
--- a/abs/core/linhes-theme/schedule-ui.xml.patch
+++ b/abs/core/linhes-theme/schedule-ui.xml.patch
@@ -1,5 +1,32 @@
--- schedule-ui.xml.orig 2013-11-22 19:35:05.125862862 +0000
-+++ schedule-ui.xml 2013-11-22 19:34:04.307006412 +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>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml
index 5c3d7cc..283a9ea 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml
@@ -9,14 +9,14 @@
<button>
<type>MV_ADVANCED_SETUP_MENU</type>
<text>Advanced</text>
- <description>Settings for Boot Screen, CallerID &amp; MythFrontend</description>
+ <description>Manage Boot Screen, CallerID &amp; MythFrontend</description>
<action>EXEC mythinstall -s advanced</action>
</button>
<button>
<type>MV_AUDIO_SETUP_MENU</type>
<text>Audio</text>
- <description>Settings for Audio drivers, cards &amp; devices</description>
+ <description>Manage Audio drivers, cards &amp; devices</description>
<action>EXEC mythinstall -s sound </action>
</button>
@@ -30,28 +30,28 @@
<button>
<type>MV_NETWORK_SETUP_MENU</type>
<text>Dynamic DNS</text>
- <description>Settings for your dyndns.com account</description>
+ <description>Manage your dyndns.com account</description>
<action>EXEC mythinstall -s ddns </action>
</button>
<button>
<type>MV_FILESHARES_MENU</type>
<text>File Sharing</text>
- <description>Settings for file sharing via NFS or SMB</description>
+ <description>Manage file sharing via NFS or SMB</description>
<action>EXEC mythinstall -s fileshare</action>
</button>
<button>
<type>MV_MISC_SETUP_MENU</type>
<text>Miscellanous</text>
- <description>Set timezone, shortcuts &amp; automatic updates</description>
+ <description>Set timezone, shortcuts &amp; auto updates</description>
<action>EXEC mythinstall -s misc </action>
</button>
<button>
<type>MV_NETWORK_SETUP_MENU</type>
<text>Network</text>
- <description>Settings for the network device &amp; hostname</description>
+ <description>Manage network devices &amp; hostname</description>
<action>EXEC mythinstall -s network </action>
</button>
@@ -65,21 +65,21 @@
<button>
<type>MV_IR_SETUP_MENU</type>
<text>Remotes</text>
- <description>Settings for remotes, receivers &amp; blasters</description>
+ <description>Manage remotes, receivers &amp; blasters</description>
<action>EXEC mythinstall -s ir </action>
</button>
<button>
<type>MV_SCREENSAVER_SETUP_MENU</type>
<text>Screensaver</text>
- <description>Set the Screensaver program and settings</description>
+ <description>Manage the Screensaver</description>
<action>EXEC mythinstall -s screensaver </action>
</button>
<button>
<type>MV_VNC_SETUP_MENU</type>
<text>Screen Sharing</text>
- <description>Settings for VNC and XVNC screen sharing</description>
+ <description>Manage VNC and XVNC screen sharing</description>
<action>EXEC mythinstall -s vnc </action>
</button>
@@ -93,7 +93,7 @@
<button>
<type>MV_SYSTEM_SETUP_MENU</type>
<text>System Type</text>
- <description>Settings for LinHES system type, pointer size &amp; MythWelcome</description>
+ <description>Manage LinHES system type, pointer size &amp; MythWelcome</description>
<action>EXEC mythinstall -s hostype </action>
</button>