From 9900d56351b3beeeb004fc81ca00f810f0401192 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 30 Nov 2013 16:44:37 -0600 Subject: linhes-theme: some more menu adjustments. refs #940 go back to yellow in menu headers --- abs/core/linhes-theme/PKGBUILD | 23 +-- abs/core/linhes-theme/base.xml.patch | 119 ++++++-------- abs/core/linhes-theme/osd.xml.patch | 25 ++- abs/core/linhes-theme/preview.png | Bin 0 -> 339979 bytes abs/core/linhes-theme/progdetails_page1.html | 61 ------- abs/core/linhes-theme/recordings-ui.xml.patch | 228 ++++++++++++++++++++++++++ abs/core/linhes-theme/video-ui.xml.patch | 29 ---- 7 files changed, 312 insertions(+), 173 deletions(-) create mode 100644 abs/core/linhes-theme/preview.png delete mode 100644 abs/core/linhes-theme/progdetails_page1.html create mode 100644 abs/core/linhes-theme/recordings-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 18ed3cb..1b035d4 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,19 +1,18 @@ pkgname=linhes-theme pkgver=8.1 -pkgrel=7 +pkgrel=8 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' 'schedule-ui.xml.patch' 'video-ui.xml.patch') + 'menu-ui.xml.patch' 'recordings-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#branch=fixes/0.27" `echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' - 'background.png' 'qt-background.png' 'tux_thoughts.png' - 'progdetails_page1.html') + 'background.png' 'preview.png' 'qt-background.png' 'tux_thoughts.png') package() { THEMEROOT=usr/share/mythtv/themes @@ -37,15 +36,11 @@ package() { rsync -pL $srcdir/*.xml $pkgdir/$THEMEROOT/LinHES/ rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/* rsync -pL $srcdir/*background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/ + rsync -pL $srcdir/preview.png $pkgdir/$THEMEROOT/LinHES/ #tux_thoughts.png is the thought bubble for the menu descriptions rsync -pL $srcdir/tux_thoughts.png $pkgdir/$THEMEROOT/LinHES/images/ - #copy in progdetails - mkdir -p $pkgdir/$THEMEROOT/LinHES/htmls - rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/ - rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/progdetails_page2.html - msg "Modifying yellows and blue to LinHES yellow and blue" #yellow grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#d9d900/\#ebb81c/g" @@ -56,14 +51,14 @@ package() { } md5sums=('SKIP' '9c2fc68864cbedb6e449056972b457aa' - '15b4462932b7be0e56b2e69e0214823a' - '18dc450e33aaa9a21f4c293cf883b16b' + 'e061490fc869e0e14d4e144c17c3ec56' + 'ed60c5b0b30b1ad1d051a070bfd2f8dd' '83b03852c6f46bc791bfa6e8c894ca01' + '603420c2771a6ed88e23d961ef40f1cc' 'aff82cf901edc4baa058013d93610cfc' - 'ea05a00840b22004f6240913fdc7038d' '7d7bc458a8f4af408700609f3e1f412e' '909d7a8114436dcfc28a01d0d97ec11f' 'cbe5f663ebb5d51abe811f81dafec303' + 'fac3ab2c1aeb3ddb691f2cab8b2aa82e' '12d26a786fde397348653128a6d7676a' - '2bd09b8049aaf5ba21db5baf3a0ce077' - '93db934881cb438fc76ae544d4eee432') + '2bd09b8049aaf5ba21db5baf3a0ce077') diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index 43205a8..5ecde61 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,5 +1,5 @@ --- base.xml.orig 2013-11-22 18:52:58.956295819 +0000 -+++ base.xml 2013-11-26 21:11:40.854761920 +0000 ++++ base.xml 2013-11-30 22:28:57.188884895 +0000 @@ -424,26 +424,26 @@ @@ -65,7 +65,14 @@ baseextrasmall allcenter -@@ -539,8 +539,8 @@ +@@ -533,19 +533,19 @@ + + + +- ++ + + @@ -76,6 +83,21 @@ + +- ++ + + + +@@ -563,7 +563,7 @@ + + + +- ++ + + + @@ -579,7 +579,7 @@ 0,0,100%,100% @@ -85,6 +107,33 @@ yes allcenter +@@ -997,7 +997,7 @@ + + 0,0,100%,100% + roundbox +- ++ + + 90 + +@@ -1064,7 +1064,7 @@ + + 0,0,100%,100% + roundbox +- ++ + + 90 + +@@ -1117,7 +1117,7 @@ + + 0,0,100%,100% + roundbox +- ++ + + 90 + @@ -1235,15 +1235,13 @@ @@ -143,9 +192,8 @@ @@ -201,66 +249,3 @@ -@@ -1384,7 +1382,7 @@ - - -@@ -1458,7 +1456,7 @@ - - -@@ -1507,7 +1505,7 @@ - - - -@@ -1569,7 +1567,7 @@ - - - -@@ -1770,7 +1768,7 @@ - - diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index 587f985..916e629 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ ---- osd.xml.orig 2013-11-18 21:37:37.415954645 +0000 -+++ osd.xml 2013-11-18 22:57:08.390454672 +0000 +--- osd.xml.orig 2013-11-29 21:53:21.351030883 +0000 ++++ osd.xml 2013-11-30 22:28:42.477439824 +0000 @@ -440,7 +440,8 @@ 90,658,1100,24 small @@ -43,3 +43,24 @@ diff --git a/abs/core/linhes-theme/preview.png b/abs/core/linhes-theme/preview.png new file mode 100644 index 0000000..8fa1288 Binary files /dev/null and b/abs/core/linhes-theme/preview.png differ diff --git a/abs/core/linhes-theme/progdetails_page1.html b/abs/core/linhes-theme/progdetails_page1.html deleted file mode 100644 index 2f904c8..0000000 --- a/abs/core/linhes-theme/progdetails_page1.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - -

%TITLE%

%DESCRIPTION%

-

%TITLE_PRONOUNCE_LABEL%

%TITLE_PRONOUNCE%

-
-
-
-

%ORIGINAL_AIRDATE_LABEL%

%ORIGINAL_AIRDATE%

-

%EPISODE_LABEL%

%EPISODE%

-

%CATEGORY_LABEL%

%CATEGORY%

-

%CATEGORY_TYPE_LABEL%

%CATEGORY_TYPE%

-

%PROGRAMID_LABEL%

%PROGRAMID%

-

%MYTHTV_STATUS_LABEL%

%MYTHTV_STATUS%

-

%RECORDING_RULE_LABEL%

%RECORDING_RULE%

-

%SEARCH_PHRASE_LABEL%

%SEARCH_PHRASE%

-

%RECORDED_FILE_NAME_LABEL%

%RECORDED_FILE_NAME%

-

%RECORDED_FILE_SIZE_LABEL%

%RECORDED_FILE_SIZE%

-
-
-

%RECORDING_PROFILE_LABEL%

%RECORDING_PROFILE%

-

%RECORDING_GROUP_LABEL%

%RECORDING_GROUP%

-

%STORAGE_GROUP_LABEL%

%STORAGE_GROUP%

-

%PLAYBACK_GROUP_LABEL%

%PLAYBACK_GROUP%

-

%LAST_RECORDED_LABEL%

%LAST_RECORDED%

-

%NEXT_RECORDING_LABEL%

%NEXT_RECORDING%

-

%AVERAGE_TIME_SHIFT_LABEL%

%AVERAGE_TIME_SHIFT%

-

%WATCH_LIST_SCORE_LABEL%

%WATCH_LIST_SCORE%

-

%WATCH_LIST_STATUS_LABEL%

%WATCH_LIST_STATUS%

-

%FINDID_LABEL%

%FINDID%

-

%RECORDING_HOST_LABEL%

%RECORDING_HOST%

-
-
-

%ACTORS_LABEL%

%ACTORS%

-

%GUEST_STAR_LABEL%

%GUEST_STAR%

-

%GUEST_LABEL%

%GUEST%

-

%DIRECTOR_LABEL%

%DIRECTOR%

-

%PRODUCER_LABEL%

%PRODUCER%

-

%EXECUTIVE_PRODUCER_LABEL%

%EXECUTIVE_PRODUCER%

-

%WRITER_LABEL%

%WRITER%

-

%HOST_LABEL%

%HOST%

-

%ADAPTER_LABEL%

%ADAPTER%

-

%PRESENTER_LABEL%

%PRESENTER%

-

%COMMENTATOR_LABEL%

%COMMENTATOR%

-
-
- - - diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch new file mode 100644 index 0000000..743b79c --- /dev/null +++ b/abs/core/linhes-theme/recordings-ui.xml.patch @@ -0,0 +1,228 @@ +--- recordings-ui.xml.orig 2013-11-30 22:40:35.742466059 +0000 ++++ recordings-ui.xml 2013-11-30 22:29:06.554349302 +0000 +@@ -700,7 +700,7 @@ + + + +- -1,-1,380,463 ++ -1,-1,602,488 + + +
+@@ -717,100 +717,100 @@ + + + +- 0,0,380,463 ++ 0,0,602,488 + + + +- 1,1,378,461 ++ 1,1,600,486 + + + +- 2,2,376,2 ++ 2,2,596,2 + + + +- 2,459,376,2 ++ 2,484,596,2 + + + +- 2,4,2,455 ++ 2,4,2,480 + + + +- 376,4,2,455 ++ 598,4,2,480 + + + +- 23,74,334,2 ++ 23,50,552,2 + + + +- 23,407,334,2 ++ 23,435,552,2 + + + + + +- 60,102 ++ 150,102 + + + + + +- 60,152 ++ 150,152 + + + + + +- 60,202 ++ 150,202 + + + + + +- 60,252 ++ 150,252 + + + + + +- 60,302 ++ 150,302 + + + + + +- 60,352 ++ 150,352 + + + + +- + +@@ -885,7 +885,7 @@ + + + +- -1,-1,380,463 ++ -1,-1,602,488 + + +
+@@ -902,67 +902,67 @@ + + + +- 0,0,380,463 ++ 0,0,602,488 + + + +- 1,1,378,461 ++ 1,1,600,486 + + + +- 2,2,376,2 ++ 2,2,596,2 + + + +- 2,459,376,2 ++ 2,484,596,2 + + + +- 2,4,2,455 ++ 2,4,2,480 + + + +- 376,4,2,455 ++ 598,4,2,480 + + + +- 23,173,334,2 ++ 23,50,552,2 + + + + + +- 16,189,349,264 ++ 15,56,570,418 + yes + + +- 0,0,349,40 ++ 0,0,100%,34 + + + +- 0,0,349,40 ++ 0,0,100%,34 + + + + 0,0,349,40 + + + + +- 0,256 ++ 0,418 + + +- 20,256 ++ 20,418 + + + 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 cdb4a41..0000000 --- a/abs/core/linhes-theme/video-ui.xml.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- video-ui.xml.orig 2013-11-26 22:18:54.421966293 +0000 -+++ video-ui.xml 2013-11-25 22:17:14.998291698 +0000 -@@ -58,7 +58,7 @@ - - -@@ -169,7 +169,7 @@ - - -@@ -2757,7 +2757,7 @@ - - -- cgit v0.12