From 2891a76e20dc9f7323b3fc2510c0ee1a3be51a84 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 17 Apr 2018 21:22:08 +0000 Subject: linhes-theme: make the channel scan page delete button more clear add channelscanner --- abs/core/linhes-theme/PKGBUILD | 8 +- abs/core/linhes-theme/base.xml.patch | 54 ++++-- abs/core/linhes-theme/config-ui.xml.patch | 279 +++++++++++++++++++++++++++++- abs/core/linhes-theme/video-ui.xml.patch | 180 +++++++++++++++---- 4 files changed, 455 insertions(+), 66 deletions(-) diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index d45b85e..9db52b4 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.5.1 -pkgrel=4 +pkgrel=6 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -99,9 +99,9 @@ package() { } md5sums=('2dca856c2a4d1f959473512c94e43b60' '3fc2c8838a9e331a2d19c114760a5acb' - 'b534a456304ed75d0082e04e4fd7a965' + '027739567b8dd634a09af7c86276c9e3' 'd1d54968a2297924673d9653f707df33' - 'b7ab73f7e445b617b1ea293ca40ef4e4' + '25ff929dc4aca3b2a0bd38d9ded5a6b8' '26a6db272dee225b9e4dc282f1494e51' 'b90b745c72a057c78ebd0b6f2c5530b9' 'a0ea2d3e386c0b483b31aa1a2703f9eb' @@ -117,7 +117,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' '384871202030f41148536e2e89bb1801' '979cdd540b672e3383b33188ccb247b6' '8312aff444945f80a76100696c81cb2e' - '81a2706cd36a16a1e0c54d87f3a0857b' + '2803a328cd276393964240842da03010' '4125880d1739b196a8041ecc3d773ee2' '5a8fb2a5f0e657d52be6f0a6a006ce72' '274b6f8cb5cd82c5ce28422decd7754b' diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index fb6091f..b113f5f 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,5 +1,5 @@ ---- base.xml.orig 2017-12-01 19:19:20.906194024 +0000 -+++ base.xml 2017-12-01 19:13:11.344053140 +0000 +--- base.xml.orig 2018-04-17 14:44:34.438582684 +0000 ++++ base.xml 2018-04-17 14:41:40.151269060 +0000 @@ -3,55 +3,55 @@ @@ -485,7 +485,27 @@ -@@ -2186,7 +2199,7 @@ +@@ -1916,6 +1929,9 @@ + + 0,0,100%,100% + ++ + + + +@@ -1992,6 +2008,9 @@ + + 0,0,100%,100% + ++ + + + +@@ -2186,7 +2205,7 @@ @@ -494,7 +514,7 @@ -@@ -2202,23 +2215,23 @@ +@@ -2202,23 +2221,23 @@ @@ -523,7 +543,7 @@ 560,8 -@@ -2227,7 +2240,8 @@ +@@ -2227,7 +2246,8 @@ 0,0,100%,34 560,8 -@@ -2236,7 +2250,7 @@ +@@ -2236,7 +2256,7 @@ 0,0,100%,34 560,8 -@@ -2244,10 +2258,10 @@ +@@ -2244,10 +2264,10 @@ @@ -555,7 +575,7 @@ -@@ -2299,7 +2313,7 @@ +@@ -2299,7 +2319,7 @@ @@ -564,7 +584,7 @@ -@@ -2836,87 +2908,85 @@ +@@ -2836,87 +2914,85 @@ @@ -804,7 +824,7 @@ 0,0,599,54 -@@ -3029,52 +3099,53 @@ +@@ -3029,52 +3105,53 @@ diff --git a/abs/core/linhes-theme/config-ui.xml.patch b/abs/core/linhes-theme/config-ui.xml.patch index 0ce47cf..6203f79 100644 --- a/abs/core/linhes-theme/config-ui.xml.patch +++ b/abs/core/linhes-theme/config-ui.xml.patch @@ -1,6 +1,68 @@ ---- config-ui.xml.orig 2017-12-01 19:19:08.627784142 +0000 -+++ config-ui.xml 2017-12-01 19:10:38.513844323 +0000 -@@ -645,7 +645,7 @@ +--- config-ui.xml.orig 2018-04-17 14:44:54.355990144 +0000 ++++ config-ui.xml 2018-04-17 21:15:29.208674746 +0000 +@@ -151,7 +151,7 @@ + 0,0,1280,720 + + + + +@@ -261,13 +261,7 @@ + right,vcenter + + +- +- +- 0,0,100%,100% +- +- 0,70,100%,2 +- +- ++ + + + +@@ -301,7 +295,7 @@ + + + +- 415,460,580,40 ++ 415,460,560,40 + + + + + +- 415,515,580,40 ++ 415,515,560,40 + + + + +- + + +- 410,572 ++ 685,575 + + + + + ++ ++ 0,0,1280,720 ++ ++ ++ ++ ++ 0,37,1280,44 ++ box ++ ++ ++ ++ 0,38,1280,2 ++ ++ ++ ++ 0,77,1280,2 ++ ++ ++ ++ 645,92,615,592 ++ ++ ++ ++ 646,93,613,590 ++ ++ ++ ++ 647,94,611,2 ++ ++ ++ ++ 647,680,611,2 ++ ++ ++ ++ 647,96,2,584 ++ ++ ++ ++ 1256,96,2,584 ++ ++ ++ ++ 20,92,615,592 ++ ++ ++ ++ 21,93,613,590 ++ ++ ++ ++ 22,94,611,2 ++ ++ ++ ++ 22,680,611,2 ++ ++ ++ ++ 22,96,2,584 ++ ++ ++ ++ 631,96,2,584 ++ ++ ++ ++ 1207,684,50,10 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 60,225 ++ ++ ++ ++ 60,300,535,200 ++ ++ ++ ++ 0,35 ++ ++ ++ ++ ++ 60,400,535,200 ++ ++ ++ ++ 0,35 ++ ++ ++ ++ ++ 60,500,535,200 ++ ++ ++ ++ 0,35 ++ ++ ++ ++ ++ 653,100,599,578 ++ ++ ++ 0,0,599,54 ++ ++ ++ ++ 0,0,599,112 ++ ++ 0,0,100%,100% ++ ++ 0,110,100%,2 ++ ++ ++ ++ ++ ++ ++ 0,0,100%,100% ++ ++ 0,110,100%,2 ++ ++ ++ ++ ++ ++ 561,585 ++ ++ ++ 581,585 ++ ++ ++ ++ diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch index e3a9f7d..2a336ef 100644 --- a/abs/core/linhes-theme/video-ui.xml.patch +++ b/abs/core/linhes-theme/video-ui.xml.patch @@ -1,8 +1,54 @@ ---- video-ui.xml.orig 2016-12-13 20:43:30.600314830 +0000 -+++ video-ui.xml 2017-10-26 19:57:07.944986189 +0000 -@@ -171,6 +171,7 @@ +--- video-ui.xml.orig 2018-04-17 14:44:43.827360598 +0000 ++++ video-ui.xml 2018-04-17 14:47:36.544853593 +0000 +@@ -58,8 +58,8 @@ + + + +@@ -98,10 +98,10 @@ + + + +- 0,368 ++ 507,368 + + +- 20,368 ++ 527,368 + + + +@@ -154,7 +154,7 @@ + + + +- 23,45,517,2 ++ 23,74,517,2 + + + +@@ -162,15 +162,16 @@ + + + + @@ -528,16 +577,19 @@ @@ -862,18 +914,22 @@ -165,3,158,24 basesmallred no -@@ -1887,210 +1951,210 @@ +@@ -1886,211 +1950,211 @@ + @@ -1225,7 +1281,23 @@ -@@ -2947,82 +3011,84 @@ +@@ -2367,13 +2431,13 @@ + + + + + +- 177,126,366,36 ++ 167,126,366,36 + + + @@ -1268,16 +1344,17 @@ @@ -1298,36 +1375,63 @@ -@@ -3200,12 +3266,13 @@ + +@@ -3050,6 +3116,9 @@ + + 0,0,100%,100% + ++ + + + +@@ -3080,6 +3149,9 @@ + + 0,0,100%,100% + ++ + + + +@@ -3200,12 +3272,13 @@ @@ -1343,7 +1447,7 @@ Enable Alternate Player: -@@ -3221,19 +3288,19 @@ +@@ -3221,19 +3294,19 @@