From d4b8c5c7d1c30c71c85d0e36251e9af14c78879e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Oct 2016 20:53:25 +0000 Subject: linhes-theme: modify notifications add channel to osd when coverart is shown add recording input to info --- abs/core/linhes-theme/PKGBUILD | 25 +- abs/core/linhes-theme/checkmark.png | Bin 0 -> 24628 bytes abs/core/linhes-theme/error.png | Bin 0 -> 16172 bytes abs/core/linhes-theme/gears.png | Bin 0 -> 24505 bytes abs/core/linhes-theme/notification-ui.xml.patch | 361 +++++++++++++++++++++ abs/core/linhes-theme/osd.xml.patch | 69 ++-- abs/core/linhes-theme/progdetails_page1.html.patch | 10 + abs/core/linhes-theme/progdetails_page2.html.patch | 10 + abs/core/linhes-theme/question.png | Bin 0 -> 25883 bytes abs/core/linhes-theme/warning.png | Bin 0 -> 5436 bytes 10 files changed, 452 insertions(+), 23 deletions(-) create mode 100755 abs/core/linhes-theme/checkmark.png create mode 100755 abs/core/linhes-theme/error.png create mode 100755 abs/core/linhes-theme/gears.png create mode 100644 abs/core/linhes-theme/notification-ui.xml.patch create mode 100644 abs/core/linhes-theme/progdetails_page1.html.patch create mode 100644 abs/core/linhes-theme/progdetails_page2.html.patch create mode 100755 abs/core/linhes-theme/question.png create mode 100755 abs/core/linhes-theme/warning.png diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 7b0506c..d317765 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,18 +1,21 @@ pkgname=linhes-theme pkgver=8.4 -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-vert.xml.patch' 'schedule-ui.xml.patch' 'qtlook.txt.patch' + 'menu-ui-vert.xml.patch' 'notification-ui.xml.patch' + 'schedule-ui.xml.patch' 'qtlook.txt.patch' 'recordings-ui.xml.patch' 'video-ui.xml.patch') #The LinHES theme is based on TintedGlass 4.56 by Harley Peters source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml' 'bubble_background.png' 'preview.png' 'blank_coverart.png' + 'checkmark.png' 'error.png' 'gears.png' 'question.png' 'warning.png' + 'progdetails_page1.html.patch' 'progdetails_page2.html.patch' 'LHLogo.png' 'LHLogoAndText.png') install=$pkgname.install @@ -49,6 +52,9 @@ package() { patch -N -i ${srcdir}/$i || return 1 echo "-----------------------------" done + cd $pkgdir/$THEMEROOT/LinHES/htmls/ + patch -N -i ${srcdir}/progdetails_page1.html.patch || return 1 + patch -N -i ${srcdir}/progdetails_page2.html.patch || return 1 cd $startdir msg "--------------------------done applying patches-------------------------" @@ -57,6 +63,11 @@ package() { rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/* rsync -pL $srcdir/bubble_background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/background.png rsync -pL $srcdir/blank_coverart.png $pkgdir/$THEMEROOT/LinHES/images/ + rsync -pL $srcdir/checkmark.png $pkgdir/$THEMEROOT/LinHES/images/ + rsync -pL $srcdir/error.png $pkgdir/$THEMEROOT/LinHES/images/ + rsync -pL $srcdir/gears.png $pkgdir/$THEMEROOT/LinHES/images/ + rsync -pL $srcdir/question.png $pkgdir/$THEMEROOT/LinHES/images/ + rsync -pL $srcdir/warning.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/preview.png $pkgdir/$THEMEROOT/LinHES/ #tux_thoughts.png is the thought bubble for the menu descriptions @@ -84,9 +95,10 @@ package() { sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } md5sums=('2dca856c2a4d1f959473512c94e43b60' - '985f76e26a526e0727ec7afc44cf9b8c' + '0d95c596b460de777e12b89da0bf2e19' 'f2b9c85519e80843294315a42870e582' '43b1f213fd392fb07aac503e775e27bc' + '80bb72994eca59ca6dc9034ac185e7cc' '22ff4044c8c29560451fb51dcbf4d44e' '9fe3371a8b964a7028126405cfaa330b' 'e88dc1587a164aaa15b280cb66f6a82b' @@ -97,5 +109,12 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' '326a71eb795b322a9ea26f116d890c87' '8fcd0acc11f4db33a9442949fb1a293d' '699e3abe05523f454db3561bfc08b4b2' + '60cb915909c477dbc2e18233ee6424d9' + '30ea7d2001b8562177b8f85f34f050a2' + 'e8dee86a10ce7c4423a97305b38b4668' + 'e8ac15e38b3dc99c9e889e439ba356de' + 'e8cf0d3a55ba3be47deae55c05432141' + '759c9f34ecc6b9039e00fc12b384dd7b' + 'd331710be0dab8cbec77c70278f92146' 'b51ef0cbf8ed2d3a8c1a8257a89aceff' '09ad14842f828b7a8d24070ec8214fe5') diff --git a/abs/core/linhes-theme/checkmark.png b/abs/core/linhes-theme/checkmark.png new file mode 100755 index 0000000..0c8ba2d Binary files /dev/null and b/abs/core/linhes-theme/checkmark.png differ diff --git a/abs/core/linhes-theme/error.png b/abs/core/linhes-theme/error.png new file mode 100755 index 0000000..d5ccc2d Binary files /dev/null and b/abs/core/linhes-theme/error.png differ diff --git a/abs/core/linhes-theme/gears.png b/abs/core/linhes-theme/gears.png new file mode 100755 index 0000000..b2f78d6 Binary files /dev/null and b/abs/core/linhes-theme/gears.png differ diff --git a/abs/core/linhes-theme/notification-ui.xml.patch b/abs/core/linhes-theme/notification-ui.xml.patch new file mode 100644 index 0000000..98b1287 --- /dev/null +++ b/abs/core/linhes-theme/notification-ui.xml.patch @@ -0,0 +1,361 @@ +--- notification-ui.xml.orig 2016-10-10 19:55:20.796354375 +0000 ++++ notification-ui.xml 2016-10-10 19:40:05.992756927 +0000 +@@ -3,11 +3,9 @@ + + + +- 1280x720 +- + + +- -1,36,780,180 ++ 800,24,470,136 + + +
+@@ -24,83 +22,79 @@ + + + +- 0,0,780,180 ++ 0,0,470,122 + + + +- 1,1,778,178 ++ 1,1,468,120 + + + +- 2,2,776,2 ++ 2,2,466,2 + + + +- 1,176,776,2 ++ 1,118,466,2 + + + +- 2,4,2,170 ++ 2,4,2,112 + + + +- 776,4,2,170 ++ 466,4,2,112 + + + + + + + + + +- +- + + + +- +- + + + +- 14,148 ++ 230,90 + +- 0,0,752,10 ++ 0,0,226,10 + images/progressbar/progressbar_background.png + + +- 0,0,752,10 ++ 0,0,220,10 + images/progressbar/progressbar_fill.png + + +@@ -109,7 +103,7 @@ + + + +- -1,36,780,180 ++ 800,24,470,136 + + +
+@@ -126,31 +120,31 @@ + + + +- 0,0,780,180 ++ 0,0,470,122 + + + +- 1,1,778,178 ++ 1,1,468,120 + + + +- 2,2,776,2 ++ 2,2,466,2 + + + +- 1,176,776,2 ++ 1,118,466,2 + + + +- 2,4,2,170 ++ 2,4,2,112 + + + +- 776,4,2,170 ++ 466,4,2,112 + + + +- 14,14,152,152 ++ 352,4,114,114 + roundbox + + +@@ -163,9 +157,9 @@ + + 0,0,100%,100% + +- images/no_artwork.png ++ images/question.png + images/masks/notification_image_mask.png +- 18,18,144,144 ++ 356,8,106,106 + + + +@@ -178,15 +172,15 @@ + + images/error.png + images/masks/notification_image_mask.png +- 18,18,144,144 ++ 356,8,106,106 + + + + 0,0,100%,100% + +- images/check.png ++ images/checkmark.png + images/masks/notification_image_mask.png +- 18,18,144,144 ++ 356,8,106,106 + + + +@@ -194,65 +188,60 @@ + + images/warning.png + images/masks/notification_image_mask.png +- 18,18,144,144 ++ 356,8,106,106 + + + + 0,0,100%,100% + +- images/busy.png ++ images/gears.png + images/masks/notification_image_mask.png +- 18,18,144,144 ++ 356,8,106,106 + + + + + +- images/damaged.png ++ images/error.png + images/masks/notification_image_mask.png +- 18,18,144,144 ++ 356,8,106,106 + + + + + + + + + + +- +- + + +- +- + + + + + @@ -252,7 +252,36 @@ -@@ -1015,25 +1022,30 @@ +@@ -988,7 +995,7 @@ + 255 + + +- + +- + ++ ++ + + 0,0,1280,720 @@ -289,7 +318,7 @@ -@@ -1084,7 +1096,7 @@ +@@ -1084,7 +1103,7 @@ @@ -298,7 +327,7 @@ roundbox -@@ -1092,11 +1104,11 @@ +@@ -1092,11 +1111,11 @@ @@ -312,7 +341,7 @@ -@@ -1104,30 +1116,6 @@ +@@ -1104,30 +1123,6 @@ @@ -343,7 +372,7 @@ 1212,492,2,62 -@@ -1175,30 +1163,30 @@ +@@ -1175,30 +1170,30 @@ -@@ -1749,9 +1741,9 @@ +@@ -1749,9 +1748,9 @@ 0,0,1280,720 @@ -456,7 +485,7 @@ -@@ -1759,7 +1751,7 @@ +@@ -1759,7 +1758,7 @@ diff --git a/abs/core/linhes-theme/progdetails_page1.html.patch b/abs/core/linhes-theme/progdetails_page1.html.patch new file mode 100644 index 0000000..1098733 --- /dev/null +++ b/abs/core/linhes-theme/progdetails_page1.html.patch @@ -0,0 +1,10 @@ +--- progdetails_page1.html.orig 2016-10-10 19:58:30.445542674 +0000 ++++ progdetails_page1.html 2016-10-10 19:59:13.280088646 +0000 +@@ -42,6 +42,7 @@ +

%WATCH_LIST_STATUS_LABEL%

%WATCH_LIST_STATUS%

+

%FINDID_LABEL%

%FINDID%

+

%RECORDING_HOST_LABEL%

%RECORDING_HOST%

++

%RECORDING_INPUT_LABEL%

%RECORDING_INPUT%

+ +
+

%ACTORS_LABEL%

%ACTORS%

diff --git a/abs/core/linhes-theme/progdetails_page2.html.patch b/abs/core/linhes-theme/progdetails_page2.html.patch new file mode 100644 index 0000000..bd1703d --- /dev/null +++ b/abs/core/linhes-theme/progdetails_page2.html.patch @@ -0,0 +1,10 @@ +--- htmls/progdetails_page2.html.orig 2016-10-10 19:59:43.816200423 +0000 ++++ htmls/progdetails_page2.html 2016-10-10 19:59:22.072302460 +0000 +@@ -42,6 +42,7 @@ +

%WATCH_LIST_STATUS_LABEL%

%WATCH_LIST_STATUS%

+

%FINDID_LABEL%

%FINDID%

+

%RECORDING_HOST_LABEL%

%RECORDING_HOST%

++

%RECORDING_INPUT_LABEL%

%RECORDING_INPUT%

+
+
+

%ACTORS_LABEL%

%ACTORS%

diff --git a/abs/core/linhes-theme/question.png b/abs/core/linhes-theme/question.png new file mode 100755 index 0000000..1eda678 Binary files /dev/null and b/abs/core/linhes-theme/question.png differ diff --git a/abs/core/linhes-theme/warning.png b/abs/core/linhes-theme/warning.png new file mode 100755 index 0000000..047cac5 Binary files /dev/null and b/abs/core/linhes-theme/warning.png differ -- cgit v0.12