From 8e4814feb5cb7c24c5f2efeb221fb495810d1de2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 13 Jan 2016 19:47:25 +0000 Subject: linhes-theme: refresh with new background and some other adjustments base.xml: change warning colors to orange menu-ui-vert.xml: adjust logo for new background and menus video-ui.xml: swap Runtime and UserRating location; increase width of Video #; make video stats (video#, runtime, etc) white and the label blue for easier visiblility recordings-ui.xml: made selection colors yellow to be more consistant; moved coverart to appear over the groups when available install-ui.xml: adjustments for background --- abs/core/linhes-theme/PKGBUILD | 30 +- abs/core/linhes-theme/base.xml.patch | 47 +- abs/core/linhes-theme/blank_coverart.png | Bin 0 -> 50947 bytes abs/core/linhes-theme/bubble_background.png | Bin 0 -> 1857101 bytes abs/core/linhes-theme/install-ui.xml | 28 +- abs/core/linhes-theme/menu-ui-vert.xml.patch | 114 ++- abs/core/linhes-theme/preview.png | Bin 736603 -> 264596 bytes abs/core/linhes-theme/recordings-ui.xml.patch | 116 +++ abs/core/linhes-theme/video-ui.xml.patch | 1194 +++++++++++++++++++++++++ 9 files changed, 1460 insertions(+), 69 deletions(-) create mode 100755 abs/core/linhes-theme/blank_coverart.png create mode 100644 abs/core/linhes-theme/bubble_background.png mode change 100644 => 100755 abs/core/linhes-theme/preview.png create mode 100644 abs/core/linhes-theme/recordings-ui.xml.patch create 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 02ee1db..e3af746 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,5 +1,5 @@ pkgname=linhes-theme -pkgver=8.3 +pkgver=8.4 pkgrel=1 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') @@ -7,12 +7,13 @@ 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' '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' - 'background.png' 'preview.png' 'tux_thoughts.png' - 'LHLogoAndText.png') + 'bubble_background.png' 'preview.png' 'blank_coverart.png' + 'LHLogo.png' 'LHLogoAndText.png') prepare() { _gitroot="https://github.com/MythTV-Themes/TintedGlass.git" @@ -53,11 +54,13 @@ package() { msg "Copy *.xml and adding backgrounds and images for LinHES" 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/bubble_background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/background.png + rsync -pL $srcdir/blank_coverart.png $pkgdir/$THEMEROOT/LinHES/images/ 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/ + #rsync -pL $srcdir/tux_thoughts.png $pkgdir/$THEMEROOT/LinHES/images/ + rsync -pL $srcdir/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/LHLogoAndText.png $pkgdir/$THEMEROOT/LinHES/images/ #vertical menu @@ -81,14 +84,17 @@ package() { } md5sums=('2dca856c2a4d1f959473512c94e43b60' '13bff6425487194cc7bc622e64c6176a' - '5fccb4e20c15d87223ea5de4c40faa06' - 'acf2fa359f7be7db30a81cae4dd5fa3f' + 'f2b9c85519e80843294315a42870e582' + 'e17b628a6a9d8e0bdb20f6f5e0651a0c' '22ff4044c8c29560451fb51dcbf4d44e' '9fe3371a8b964a7028126405cfaa330b' + '919d02ffb789b2ec3c1fd5d2866d12dc' + 'a04b287a48d5d67ee6d95a8e975684cc' '5a8fb2a5f0e657d52be6f0a6a006ce72' - 'a0201e0aa1608eeab27ee754e4d2c1de' + '35d77d91125e46728a30ab23d0903223' 'bfc32b9fa5dca3d46dd6f365ecb449b5' - '12d26a786fde397348653128a6d7676a' - '4b1c27297bb5f8d9d7bbaf72b35130b5' - '2bd09b8049aaf5ba21db5baf3a0ce077' + '326a71eb795b322a9ea26f116d890c87' + '8fcd0acc11f4db33a9442949fb1a293d' + '699e3abe05523f454db3561bfc08b4b2' + 'b51ef0cbf8ed2d3a8c1a8257a89aceff' '09ad14842f828b7a8d24070ec8214fe5') diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index a0715f6..f672114 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,5 +1,5 @@ ---- base.xml.orig 2014-10-26 18:47:37.279439028 +0000 -+++ base.xml 2014-10-26 19:02:50.565913686 +0000 +--- base.xml.orig 2016-01-13 18:47:41.473066307 +0000 ++++ base.xml 2016-01-13 01:12:57.516392855 +0000 @@ -3,55 +3,55 @@ @@ -195,6 +195,33 @@ +@@ -305,7 +305,7 @@ + baseextrasmallverylightgrey + baseextrasmalllightgrey + baseextrasmallred +- baseextrasmallyellow ++ baseextrasmallorange + baseextrasmallverylightgrey + baseextrasmallgreen + yes +@@ -317,7 +317,7 @@ + basesmallerverylightgrey + basesmallerlightgrey + basesmallerred +- basesmalleryellow ++ basesmallerorange + basesmallerverylightgrey + basesmallergreen + yes +@@ -329,7 +329,7 @@ + basesmallverylightgrey + basesmalllightgrey + basesmallred +- basesmallyellow ++ basesmallorange + basesmallverylightgrey + basesmallgreen + yes @@ -411,7 +411,7 @@ 283,436,50,11 roundbox @@ -221,10 +248,10 @@ - - - -+ -+ -+ -+ ++ ++ ++ ++ @@ -236,10 +263,10 @@ - - - -+ -+ -+ -+ ++ ++ ++ ++ diff --git a/abs/core/linhes-theme/blank_coverart.png b/abs/core/linhes-theme/blank_coverart.png new file mode 100755 index 0000000..c44148e Binary files /dev/null and b/abs/core/linhes-theme/blank_coverart.png differ diff --git a/abs/core/linhes-theme/bubble_background.png b/abs/core/linhes-theme/bubble_background.png new file mode 100644 index 0000000..28d83f1 Binary files /dev/null and b/abs/core/linhes-theme/bubble_background.png differ diff --git a/abs/core/linhes-theme/install-ui.xml b/abs/core/linhes-theme/install-ui.xml index 1c95ef3..b3f1884 100644 --- a/abs/core/linhes-theme/install-ui.xml +++ b/abs/core/linhes-theme/install-ui.xml @@ -9,10 +9,28 @@ @@ -57,27 +75,27 @@ - 365,450,550,179 + 365,480,550,179 true images/LHLogoAndText.png - 107,465,150,150 + 107,495,150,150 true /usr/MythVantage/logos/logo-%1.png 5000 - 1022,465,150,150 + 1022,495,150,150 diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index 5d6f330..543b638 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,56 +1,48 @@ ---- menu-ui-vert.xml.orig 2014-12-15 17:49:37.474734296 +0000 -+++ menu-ui-vert.xml 2014-12-15 17:51:03.670344843 +0000 -@@ -18,6 +18,49 @@ +--- menu-ui-vert.xml.orig 2016-01-13 18:48:20.631382184 +0000 ++++ menu-ui-vert.xml 2016-01-13 18:24:57.804680515 +0000 +@@ -18,6 +18,41 @@ 394,0,2,720 -+ -+ 594,165,487,210 -+ images/tux_thoughts.png -+ -+ -+ -+ -+ -+ 519,348,638,207 -+ images/LHLogoAndText.png -+ -+ + + ++ ++ 554,645,172,43 ++ images/LHLogo.png ++ ++ ++ ++ @@ -102,36 +94,57 @@ -@@ -136,9 +224,9 @@ +- 87,62,310,596 ++ 87,62,310,586 + vertical + 4 + free +@@ -136,9 +216,9 @@ 0,0,100%,100% - 0,0,310,64 -+ 0,0,310,66 ++ 0,0,310,60 - -10,0,330,64 -+ -10,0,330,66 ++ -12,0,330,80 - 0,0,330,100% +- 0,0,330,100% ++ 0,0,100%,100% ++ ++ -1,-1,100%+2,100%+2 ++ box ++ ++ ++ 0,4,2,100%-6 ++ ++ ++ 100%-2,4,2,100%-6 ++ - - 330,12,843,40 @@ -148,6 +161,23 @@ - no - - ++ ++ +@@ -190,7 +270,7 @@ + + + +- 147,588 ++ 147,578 + yes + + diff --git a/abs/core/linhes-theme/preview.png b/abs/core/linhes-theme/preview.png old mode 100644 new mode 100755 index 506ab1d..7c1efdb Binary files a/abs/core/linhes-theme/preview.png and b/abs/core/linhes-theme/preview.png differ 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..af599c0 --- /dev/null +++ b/abs/core/linhes-theme/recordings-ui.xml.patch @@ -0,0 +1,116 @@ +--- recordings-ui.xml.orig 2016-01-13 18:49:43.937377460 +0000 ++++ recordings-ui.xml 2016-01-13 01:12:57.516392855 +0000 +@@ -105,19 +105,11 @@ + + + +- 188,487,684,2 ++ 37,487,835,2 + + + +- 188,643,684,2 +- +- +- +- 37,464,136,204 +- roundbox +- +- +- 6 ++ 37,643,835,2 + + + +@@ -194,6 +186,7 @@ + + +@@ -232,11 +225,12 @@ + 0,0,898,64 + + + + + + + +- 189,659 ++ 38,659 + +- 0,0,682,8 ++ 0,0,833,8 + images/progressbar/progressbar_background.png + + +- 0,0,682,8 ++ 0,0,833,8 + images/progressbar/progressbar_fill.png + + + + + +@@ -876,13 +877,6 @@ + left,vcenter + + +- +- + + 1206,416,30,30 + +@@ -890,238 +884,273 @@ + 0,0,30,30 + images/mv_level_none.png + ++ + + + + 0,0,30,30 + images/mv_level_lowest.png + ++ + + + + 0,0,30,30 + images/mv_level_low.png + ++ + + + + 0,0,30,30 + images/mv_level_medium.png + ++ + + + + 0,0,30,30 + images/mv_level_high.png + ++ + + + + + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- +- +- +- +- +- +- +- +- +- + + + + + + + + + + + + + + + +@@ -1369,14 +1398,14 @@ + basemediumlargeryellow + left,vcenter + +- ++ + + 1206,414,30,30 + +@@ -1384,238 +1413,273 @@ + 0,0,30,30 + images/mv_level_none.png + ++ + + + + 0,0,30,30 + images/mv_level_lowest.png + ++ + + + + 0,0,30,30 + images/mv_level_low.png + ++ + + + + 0,0,30,30 + images/mv_level_medium.png + ++ + + + + 0,0,30,30 + images/mv_level_high.png + ++ + + + + + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- +- +- +- +- +- +- +- +- +- + + + + + + + + + + + + + + + +@@ -1798,6 +1862,7 @@ + + + + + +@@ -1875,7 +1940,7 @@ + 0,0,30,30 + images/mv_level_high.png + +- + + ++ ++ + +- ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- +- +- +- +- +- +- +- +- +- + + + + + + + + + + + + + + + + +@@ -2947,82 +3013,84 @@ + no + basesmalldarkyellow + allcenter +- yes ++ + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v0.12