From 8daa6d62e101464d309797d25fd275f368fe86be Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 26 Oct 2017 18:51:38 +0000 Subject: linhes-theme: update for mythtv 29 add standardsettings-ui.xml for new MythUI settings --- abs/core/linhes-theme/PKGBUILD | 41 ++- abs/core/linhes-theme/base.xml.patch | 328 ++++++++++++++++++++- abs/core/linhes-theme/browser-ui.xml.patch | 13 +- abs/core/linhes-theme/config-ui.xml.patch | 38 +++ abs/core/linhes-theme/controls-ui.xml.patch | 11 +- abs/core/linhes-theme/musicsettings-ui.xml.patch | 85 ++++++ abs/core/linhes-theme/mytharchive-ui.xml.patch | 29 ++ abs/core/linhes-theme/mythburn-ui.xml.patch | 20 ++ abs/core/linhes-theme/mythnative-ui.xml.patch | 20 ++ abs/core/linhes-theme/schedule-ui.xml.patch | 117 +++++++- abs/core/linhes-theme/settings-ui.xml.patch | 11 + abs/core/linhes-theme/standardsetting-ui.xml | 355 +++++++++++++++++++++++ abs/core/linhes-theme/video-ui.xml.patch | 46 ++- abs/core/linhes-theme/weather-ui.xml.patch | 126 ++++++++ 14 files changed, 1207 insertions(+), 33 deletions(-) create mode 100644 abs/core/linhes-theme/config-ui.xml.patch create mode 100644 abs/core/linhes-theme/musicsettings-ui.xml.patch create mode 100644 abs/core/linhes-theme/mytharchive-ui.xml.patch create mode 100644 abs/core/linhes-theme/mythburn-ui.xml.patch create mode 100644 abs/core/linhes-theme/mythnative-ui.xml.patch create mode 100644 abs/core/linhes-theme/settings-ui.xml.patch create mode 100644 abs/core/linhes-theme/standardsetting-ui.xml create mode 100644 abs/core/linhes-theme/weather-ui.xml.patch diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 07cb1b5..9b13ba4 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,23 +1,26 @@ pkgname=linhes-theme -pkgver=8.4 -pkgrel=22 +pkgver=8.5 +pkgrel=1 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' 'browser-ui.xml.patch' - 'controls-ui.xml.patch' 'menu-ui-vert.xml.patch' - 'music-base.xml.patch' 'music-ui.xml.patch' + 'config-ui.xml.patch' 'controls-ui.xml.patch' 'menu-ui-vert.xml.patch' + 'music-base.xml.patch' 'music-ui.xml.patch' 'musicsettings-ui.xml.patch' + 'mytharchive-ui.xml.patch' 'mythburn-ui.xml.patch' + 'mythnative-ui.xml.patch' 'notification-ui.xml.patch' 'qtlook.txt.patch' - 'recordings-ui.xml.patch' 'schedule-ui.xml.patch' - 'status-ui.xml.patch' 'stream-ui.xml.patch' 'video-ui.xml.patch') + 'recordings-ui.xml.patch' 'schedule-ui.xml.patch' 'settings-ui.xml.patch' + 'status-ui.xml.patch' 'stream-ui.xml.patch' 'video-ui.xml.patch' + 'weather-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' 'image-ui.xml' + 'image-ui.xml' 'standardsetting-ui.xml' 'LHLogo.png' 'LHLogoAndText.png') install=$pkgname.install @@ -59,8 +62,6 @@ package() { msg "Copy *.xml and adding backgrounds and images for LinHES" rsync -pL $srcdir/*.xml $pkgdir/$THEMEROOT/LinHES/ - rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/ - rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/progdetails_page2.html rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/* rm -r $pkgdir/$THEMEROOT/LinHES/osd.xml.alt rsync -pL $srcdir/bubble_background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/background.png @@ -75,6 +76,9 @@ package() { rsync -pL $srcdir/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/LHLogoAndText.png $pkgdir/$THEMEROOT/LinHES/images/ + #remove old htmls directory + rm -r $pkgdir/$THEMEROOT/LinHES/htmls + #vertical menu mv $pkgdir/$THEMEROOT/LinHES/menu-ui-vert.xml $pkgdir/$THEMEROOT/LinHES/menu-ui.xml @@ -95,19 +99,26 @@ package() { } md5sums=('2dca856c2a4d1f959473512c94e43b60' '3fc2c8838a9e331a2d19c114760a5acb' - '66dd0365257d88b48ffeec00289e3b22' - '66436e11442b31bf8238f36eae453298' - 'ed56a335f8523d288609a81c005cab3f' + 'f9ed8fe7ccb8e11a1c933e42c6c204ac' + 'd1d54968a2297924673d9653f707df33' + 'def0a86ce722ef819c3c19ac370f895b' + '26a6db272dee225b9e4dc282f1494e51' 'b90b745c72a057c78ebd0b6f2c5530b9' 'a0ea2d3e386c0b483b31aa1a2703f9eb' '8f8c27146e11954f60913da6d1fce073' + '1c086689fea12b35da378526c4864453' + '128984d8de805e3227a4de279f292f46' + '52bb1c1a6c693adc8c04227fb124955a' + '643e7d548587b8742ed5accb6d736257' '80bb72994eca59ca6dc9034ac185e7cc' '9fe3371a8b964a7028126405cfaa330b' '537e12f58ae8da81176d8b982ac9c783' - '0a50f8ecd3d73622b31b52b905307c34' + 'a0b6733e4a6734a3c24e8dc3b0c14e74' + '384871202030f41148536e2e89bb1801' '4d01487b534e45c631734501ec0da501' '8312aff444945f80a76100696c81cb2e' - '5527190d8dd74e720b9160f851727390' + 'e25cf6e1783545b2c3a90f4497de407c' + '4125880d1739b196a8041ecc3d773ee2' '5a8fb2a5f0e657d52be6f0a6a006ce72' '36952501471b05395e4f061557447b2f' 'bfc32b9fa5dca3d46dd6f365ecb449b5' @@ -119,7 +130,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' 'e8dee86a10ce7c4423a97305b38b4668' 'e8ac15e38b3dc99c9e889e439ba356de' 'e8cf0d3a55ba3be47deae55c05432141' - '58834fbee0230c713802c61e635cbab0' '3f600b966bd813dd27f620762ddb3ac8' + '9b2e2def02127a5722f46c42ef6fc600' 'b51ef0cbf8ed2d3a8c1a8257a89aceff' '09ad14842f828b7a8d24070ec8214fe5') diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index 1f3b71a..3de8de5 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,5 +1,5 @@ --- base.xml.orig 2016-12-13 20:41:54.779274682 +0000 -+++ base.xml 2017-01-12 17:34:48.863983285 +0000 ++++ base.xml 2017-10-26 17:04:02.966374691 +0000 @@ -3,55 +3,55 @@ @@ -233,6 +233,15 @@ basesmallverylightgrey basesmallgreen yes +@@ -392,7 +396,7 @@ + + + -@@ -2186,7 +2194,7 @@ +@@ -1732,7 +1740,7 @@ + 15,1,100%-15,100% + allcenter + basemedium +- basemedium ++ basemediumyellow + basemediumdarkgrey + + +@@ -1831,16 +1839,20 @@ + 0,0,30,30 + + +- ++ + images/unchecked.png + + +- +- ++ + + images/checked.png + + ++ ++ ++ images/checked_selected.png ++ ++ + + + +@@ -2186,7 +2198,7 @@ @@ -440,7 +491,7 @@ -@@ -2202,18 +2210,18 @@ +@@ -2202,18 +2214,18 @@ @@ -463,7 +514,7 @@ 0,0,100%,34 -@@ -2244,10 +2252,10 @@ +@@ -2244,10 +2256,10 @@ @@ -476,7 +527,7 @@ -@@ -2299,7 +2307,7 @@ +@@ -2299,7 +2311,7 @@ @@ -485,7 +536,7 @@ + + +- 150,62,287,40 ++ 50,62,487,40 + + + ++ ++ + + -1,-1,602,488 + +@@ -2795,10 +2864,10 @@ @@ -511,3 +641,187 @@ +@@ -2819,7 +2888,7 @@ + + + + + +@@ -2836,87 +2905,85 @@ + + + +- 20,92,615,592 ++ 645,92,615,592 + + + +- 21,93,613,590 ++ 646,93,613,590 + + + +- 22,94,611,2 ++ 647,94,611,2 + + + +- 22,680,611,2 ++ 647,680,611,2 + + + +- 22,96,2,584 ++ 647,96,2,584 + + + +- 631,96,2,584 ++ 1256,96,2,584 + + + +- 42,158,571,324 ++ 667,107,571,324 + + + +- 43,159,569,2 ++ 668,108,569,2 + + + +- 43,479,569,2 ++ 668,428,569,2 + + + +- 43,161,2,318 ++ 668,110,2,318 + + + +- 610,161,2,318 ++ 1235,110,2,318 + + + +- 645,92,615,592 ++ 20,92,615,592 + + + +- 646,93,613,590 ++ 21,93,613,590 + + + +- 647,94,611,2 ++ 22,94,611,2 + + + +- 647,680,611,2 ++ 22,680,611,2 + + + +- 647,96,2,584 ++ 22,96,2,584 + + + +- 1256,96,2,584 ++ 631,96,2,584 + + + +- 1207,684,50,10 ++ 582,684,50,10 + + + + + +- 653,100,599,578 ++ 28,100,599,578 + + + 0,0,599,54 +@@ -3029,52 +3096,53 @@ + + + +- 40,107,575,40 ++ 665,446,575,40 + + + +- 46,161,563,318 ++ 671,110,563,318 + images/file_browser_no_preview.png + images/masks/file_browser_preview_mask.png + true + + + +- 46,161,563,318 ++ 671,110,563,318 + images/masks/file_browser_preview_mask.png + true + + + + + + + + + + + + + + + diff --git a/abs/core/linhes-theme/browser-ui.xml.patch b/abs/core/linhes-theme/browser-ui.xml.patch index b307572..4fc4d0e 100644 --- a/abs/core/linhes-theme/browser-ui.xml.patch +++ b/abs/core/linhes-theme/browser-ui.xml.patch @@ -1,5 +1,14 @@ ---- browser-ui.xml.orig 2017-06-07 14:40:58.276800749 +0000 -+++ browser-ui.xml 2017-06-07 14:39:39.636910230 +0000 +--- browser-ui.xml.orig 2017-10-26 18:22:20.964735039 +0000 ++++ browser-ui.xml 2017-10-26 18:22:03.746982358 +0000 +@@ -322,7 +322,7 @@ + + @@ -411,40 +411,50 @@ diff --git a/abs/core/linhes-theme/config-ui.xml.patch b/abs/core/linhes-theme/config-ui.xml.patch new file mode 100644 index 0000000..de81a12 --- /dev/null +++ b/abs/core/linhes-theme/config-ui.xml.patch @@ -0,0 +1,38 @@ +--- config-ui.xml.orig 2017-10-26 17:17:36.860480362 +0000 ++++ config-ui.xml 2017-10-26 17:04:02.966374691 +0000 +@@ -645,7 +645,7 @@ + + +@@ -734,7 +734,7 @@ + + +@@ -901,7 +901,7 @@ + + +@@ -1000,7 +1000,7 @@ + + diff --git a/abs/core/linhes-theme/controls-ui.xml.patch b/abs/core/linhes-theme/controls-ui.xml.patch index 6da0bcd..2e20aa5 100644 --- a/abs/core/linhes-theme/controls-ui.xml.patch +++ b/abs/core/linhes-theme/controls-ui.xml.patch @@ -1,5 +1,5 @@ --- controls-ui.xml.orig 2016-12-13 20:38:02.325765836 +0000 -+++ controls-ui.xml 2016-12-13 20:34:54.356551993 +0000 ++++ controls-ui.xml 2017-10-26 17:04:02.966374691 +0000 @@ -73,7 +73,7 @@ 0,0,1280,720 @@ -9,3 +9,12 @@ +@@ -225,7 +225,7 @@ + + diff --git a/abs/core/linhes-theme/musicsettings-ui.xml.patch b/abs/core/linhes-theme/musicsettings-ui.xml.patch new file mode 100644 index 0000000..d0181ac --- /dev/null +++ b/abs/core/linhes-theme/musicsettings-ui.xml.patch @@ -0,0 +1,85 @@ +--- musicsettings-ui.xml.orig 2017-10-26 18:28:30.226541178 +0000 ++++ musicsettings-ui.xml 2017-10-26 18:28:11.558977405 +0000 +@@ -129,7 +129,7 @@ + + + + +@@ -223,7 +223,7 @@ + + + +@@ -253,7 +253,7 @@ + + + +@@ -263,7 +263,7 @@ + + + +@@ -282,7 +282,7 @@ + + @@ -1437,10 +1437,10 @@ @@ -35,7 +44,111 @@ -@@ -3098,10 +3098,10 @@ +@@ -1854,7 +1854,7 @@ + + + +- ++ + 0,0,1280,720 + + ++ ++ ++ ++ ++ ++ + ++ ++ 1192,645 ++ ++ ++ images/lists_up_arrow.png ++ 80 ++ ++ ++ ++ ++ images/lists_up_arrow.png ++ 200 ++ ++ ++ ++ ++ 1212,645 ++ ++ ++ images/lists_down_arrow.png ++ 80 ++ ++ ++ ++ ++ images/lists_down_arrow.png ++ 200 ++ ++ ++ ++ + + + +@@ -3098,10 +3176,10 @@ diff --git a/abs/core/linhes-theme/settings-ui.xml.patch b/abs/core/linhes-theme/settings-ui.xml.patch new file mode 100644 index 0000000..d7b082a --- /dev/null +++ b/abs/core/linhes-theme/settings-ui.xml.patch @@ -0,0 +1,11 @@ +--- settings-ui.xml.orig 2017-10-26 17:20:33.167538071 +0000 ++++ settings-ui.xml 2017-10-26 17:04:02.976373390 +0000 +@@ -103,7 +103,7 @@ + + + diff --git a/abs/core/linhes-theme/standardsetting-ui.xml b/abs/core/linhes-theme/standardsetting-ui.xml new file mode 100644 index 0000000..31bc634 --- /dev/null +++ b/abs/core/linhes-theme/standardsetting-ui.xml @@ -0,0 +1,355 @@ + + + + + + + + + + 0,36,1280,40 + box + + + + 0,37,1280,2 + + + + 0,73,1280,2 + + + + 20,86,1240,420 + + + + 21,87,1238,418 + + + + 22,88,1236,2 + + + + 22,502,1236,2 + + + + 22,90,2,412 + + + + 1256,90,2,412 + + + + 1207,506,50,11 + + + + 20,516,1240,169 + + + + 21,517,1238,167 + + + + 22,518,1236,2 + + + + 22,681,1236,2 + + + + 22,520,2,161 + + + + 1256,520,2,161 + + + + 43,554,1194,2 + + + + 28,94,1224,404 + vertical + 4 + free + stack + items + 0,0,100%,100% + + + 0,0,1224,30 + + 0,0,100%,100% + + + + + 50%+5,0,100%,100% + + 0,0,100%-24,100% + + 0,0,100%,100% + + + 0,0,100%,100% + + + 0,0,100%,100% + + + 0,0,100%,100% + + 0,0,100%,100% + + + + 0,0,100%,100% + + + + + 0,0,100%,100% + + + + + + + + + 100%-56,50%-15 + + + images/unchecked.png + + + + + images/checked.png + + + + + images/checked_selected.png + + + + + + 100%-20,50%-8 + images/lists_right_arrow.png + + + + + 0,0,1224,64 + + 0,0,100%,100% + + + + + + + 0,0,100%,100% + + 0,5%,100%,95% + + + + + + + + + + + + 0,-1,100%,2 + box + + + + + + + + + + 0,100%-1,100%,2 + box + + + + + + + + + + -1,0,2,100% + box + + + + + + + + + + 100%-1,0,2,100% + box + + + + + + + + + + + + + + + + + + + + + + + + 1186,413 + + + 1206,413 + + + + + + + + + + + + + + + 0,0,100%,90% + stack + left + + + + + + + + + + + + + + 0,90% + + + + diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch index 5c84fcd..52305bb 100644 --- a/abs/core/linhes-theme/video-ui.xml.patch +++ b/abs/core/linhes-theme/video-ui.xml.patch @@ -1,5 +1,5 @@ --- video-ui.xml.orig 2016-12-13 20:43:30.600314830 +0000 -+++ video-ui.xml 2016-12-13 20:34:54.359884898 +0000 ++++ video-ui.xml 2017-10-26 17:04:02.976373390 +0000 @@ -171,6 +171,7 @@ + + @@ -1273,3 +1273,37 @@ vcenter +@@ -3200,12 +3266,13 @@ + + + +- 750,413 ++ 442,413 + + + + +@@ -3221,7 +3288,7 @@ + + +@@ -3345,7 +3412,7 @@ + + diff --git a/abs/core/linhes-theme/weather-ui.xml.patch b/abs/core/linhes-theme/weather-ui.xml.patch new file mode 100644 index 0000000..01c058a --- /dev/null +++ b/abs/core/linhes-theme/weather-ui.xml.patch @@ -0,0 +1,126 @@ +--- weather-ui.xml.orig 2017-10-26 17:16:29.549239075 +0000 ++++ weather-ui.xml 2017-10-26 17:04:02.976373390 +0000 +@@ -111,7 +111,7 @@ + + + +@@ -217,7 +217,7 @@ + + + +@@ -385,7 +385,7 @@ + + + +@@ -662,7 +662,7 @@ + + + +@@ -698,7 +698,7 @@ + + + +@@ -746,7 +746,7 @@ + + + +@@ -775,7 +775,7 @@ + + + +@@ -1205,7 +1205,7 @@ + + + +@@ -1263,7 +1263,7 @@ + 8,0,383,64 + yes + +- ++ + 399,22 + + +@@ -1285,7 +1285,7 @@ + + +@@ -1438,7 +1438,7 @@ + + +@@ -1542,7 +1542,7 @@ + + + + + -- cgit v0.12