diff options
| -rwxr-xr-x | abs/core/linhes-theme/PKGBUILD | 8 | ||||
| -rw-r--r-- | abs/core/linhes-theme/base.xml.patch | 11 | ||||
| -rw-r--r-- | abs/core/linhes-theme/osd.xml.patch | 418 | ||||
| -rw-r--r-- | abs/core/linhes-theme/recordings-ui.xml.patch | 21 |
4 files changed, 412 insertions, 46 deletions
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 5ac73cd..6c0d18f 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="Default LinHES MythTV theme" arch=('x86_64') license=('GPL2') @@ -101,8 +101,8 @@ package() { sed -i "s/MIN_VER/${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } md5sums=('2dca856c2a4d1f959473512c94e43b60' - '3fc2c8838a9e331a2d19c114760a5acb' - '391f8e5d43ca846b04a5e8119dccc8cf' + '7ad16012e4c5f9419089e42c539fe6af' + '31cd00ab3f10329a15f238dbe2b43708' 'd1d54968a2297924673d9653f707df33' '25ff929dc4aca3b2a0bd38d9ded5a6b8' '26a6db272dee225b9e4dc282f1494e51' @@ -115,7 +115,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' '643e7d548587b8742ed5accb6d736257' 'dd1e013e806efc26049ea89637a51f83' '9fe3371a8b964a7028126405cfaa330b' - '814b52b7ad9a6918585764f5790d1c3b' + '9eb628e751ad0cccc199779b5b23ac16' '373e1fd01ba18640992bd5d2e7fd7bfe' '384871202030f41148536e2e89bb1801' '8efbd524cef4dd3f5fbe5b7d5ad854f0' diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index 1357b37..51c7c72 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,5 +1,5 @@ --- base.xml.orig 2018-04-17 14:44:34.438582684 +0000 -+++ base.xml 2018-05-24 19:32:20.152603456 +0000 ++++ base.xml 2019-03-22 17:16:10.683904892 +0000 @@ -3,55 +3,55 @@ <mythuitheme> @@ -967,3 +967,12 @@ </textarea> <group name="clock-backdrop-group" from="base_clock_backdrop_group" /> +@@ -3114,7 +3262,7 @@ + <area>14,4,552,92</area> + <font>basesmalldarkyellow</font> + <align>hcenter,bottom</align> +- <value>Please Wait...</value> ++ <value>Starting Playback...</value> + </textarea> + + <progressbar name="progress" from="baseprogressbar"> diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index a5629d4..d406747 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ ---- osd.xml.orig 2016-11-16 18:00:59.736588734 +0000 -+++ osd.xml 2017-01-13 18:57:07.721509072 +0000 +--- osd.xml.orig 2019-03-23 13:50:23.868516705 +0000 ++++ osd.xml 2019-03-22 21:48:01.193894529 +0000 @@ -7,13 +7,13 @@ <window name="osd_debug"> <area>0,0,1280,720</area> @@ -254,7 +254,357 @@ </fontdef> <shape name="osd-input-backdrop"> -@@ -378,9 +366,9 @@ +@@ -375,12 +363,359 @@ + + </window> + ++ <window name="osd_navigation"> ++ <fontdef name="small" face="Overlock"> ++ <color>#e6e6e6</color> ++ <pixelsize>20</pixelsize> ++ </fontdef> ++ ++ <fontdef name="smallgrey" from="small"> ++ <color>#999999</color> ++ </fontdef> ++ ++ <fontdef name="smallyellow" from="small"> ++ <color>#ebb81c</color> ++ </fontdef> ++ ++ <fontdef name="mediumgrey" from="smallgrey"> ++ <pixelsize>28</pixelsize> ++ </fontdef> ++ ++ <fontdef name="mediumyellow" from="smallyellow"> ++ <pixelsize>28</pixelsize> ++ </fontdef> ++ ++ <button name="more"> ++ <focusorder>2</focusorder> ++ <area>1020,626,50,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,50,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>MORE</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <group name="grp0"> ++ <area>260,626,760,24</area> ++ ++ <button name="MENU"> ++ <focusorder>2</focusorder> ++ <area>72,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,64,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>MENU</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="INFO"> ++ <focusorder>2</focusorder> ++ <area>141,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,64,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>INFO</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="JUMPRWND"> ++ <focusorder>2</focusorder> ++ <area>210,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,-3,64,24</area> ++ <align>allcenter</align> ++ <font>mediumgrey</font> ++ <cutdown>none</cutdown> ++ <value><<</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>mediumyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="SEEKRWND"> ++ <focusorder>2</focusorder> ++ <area>279,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,-3,64,24</area> ++ <align>allcenter</align> ++ <font>mediumgrey</font> ++ <cutdown>none</cutdown> ++ <value><</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>mediumyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="PLAY"> ++ <area>348,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,64,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>PLAY</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="PAUSE"> ++ <area>348,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,64,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>PAUSE</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="SEEKFFWD"> ++ <area>417,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,-3,64,24</area> ++ <align>allcenter</align> ++ <font>mediumgrey</font> ++ <cutdown>none</cutdown> ++ <value>></value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>mediumyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="JUMPFFWD"> ++ <area>486,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,-3,64,24</area> ++ <align>allcenter</align> ++ <font>mediumgrey</font> ++ <cutdown>none</cutdown> ++ <value>>></value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>mediumyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="NEXTCC"> ++ <area>555,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,64,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>CC</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="TOGGLEFILL"> ++ <area>624,0,64,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,64,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>FILL</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ </group> ++ ++ <group name="grp1"> ++ <area>260,626,760,24</area> ++ ++ <button name="JUMPSTART"> ++ <area>75,0,128,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,200,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>JUMP TO BEGINNING</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="SETBOOKMARK"> ++ <area>280,0,200,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,200,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>BOOKMARK</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ <button name="JUMPBKMRK"> ++ <area>485,0,200,24</area> ++ <statetype name="buttonstate"> ++ <state name="active"> ++ <textarea name="text"> ++ <area>0,0,200,24</area> ++ <align>allcenter</align> ++ <font>smallgrey</font> ++ <cutdown>none</cutdown> ++ <value>JUMP TO BOOKMARK</value> ++ </textarea> ++ </state> ++ <state name="selected" from="active"> ++ <textarea name="text"> ++ <font>smallyellow</font> ++ </textarea> ++ </state> ++ <state name="disabled" from="active" /> ++ <state name="pushed" from="selected" /> ++ </statetype> ++ </button> ++ ++ </group> ++ ++ </window> ++ <window name="osd_status"> <area>0,0,1280,720</area> @@ -266,7 +616,7 @@ </fontdef> <shape name="osd-status-backdrop"> -@@ -436,12 +424,19 @@ +@@ -436,12 +771,19 @@ <align>left,vcenter</align> </textarea> @@ -290,7 +640,7 @@ </textarea> <clock name="clock"> -@@ -470,39 +465,39 @@ +@@ -470,39 +812,39 @@ <window name="program_info"> <area>0,0,1280,720</area> @@ -341,7 +691,7 @@ </fontdef> <shape name="program-info-backdrop"> -@@ -628,7 +623,7 @@ +@@ -628,7 +970,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -350,7 +700,7 @@ </textarea> </state> <state name="WatchingPreRecorded"> -@@ -685,7 +680,7 @@ +@@ -685,7 +1027,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -359,7 +709,7 @@ </textarea> </state> <state name="PCM_BLURAY"> -@@ -787,7 +782,7 @@ +@@ -787,7 +1129,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -368,7 +718,7 @@ </textarea> </state> <state name="2"> -@@ -805,7 +800,7 @@ +@@ -805,7 +1147,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -377,7 +727,7 @@ </textarea> </state> <state name="6"> -@@ -823,7 +818,7 @@ +@@ -823,7 +1165,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -386,7 +736,7 @@ </textarea> </state> <state name="8"> -@@ -832,7 +827,7 @@ +@@ -832,7 +1174,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -395,7 +745,7 @@ </textarea> </state> </statetype> -@@ -865,6 +860,15 @@ +@@ -865,6 +1207,15 @@ <value>VideoCodec: H.264</value> </textarea> </state> @@ -411,7 +761,7 @@ <state name="MPEG-4"> <textarea name="MPEG-4"> <area>830,432,180,16</area> -@@ -910,7 +914,7 @@ +@@ -910,7 +1261,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -420,7 +770,7 @@ </textarea> </state> <state name="HD_720_P"> -@@ -919,7 +923,7 @@ +@@ -919,7 +1270,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -429,7 +779,7 @@ </textarea> </state> <state name="HD_1080_I"> -@@ -928,7 +932,7 @@ +@@ -928,7 +1279,7 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -438,7 +788,7 @@ </textarea> </state> <state name="HD_1080_P"> -@@ -937,23 +941,32 @@ +@@ -937,23 +1288,32 @@ <font>supersmallblue</font> <cutdown>no</cutdown> <align>allcenter</align> @@ -478,7 +828,7 @@ </textarea> <imagetype name="coverart"> -@@ -988,13 +1001,22 @@ +@@ -988,13 +1348,22 @@ <alpha>255</alpha> </imagetype> @@ -502,7 +852,7 @@ <textarea name="description"> <font>small</font> <area>284,523,912,126</area> -@@ -1003,37 +1025,62 @@ +@@ -1003,37 +1372,62 @@ <template>%"|SUBTITLE|" %%YEARSTARS| %%DESCRIPTION%</template> </textarea> @@ -572,7 +922,7 @@ </fontdef> <shape name="browse-info-backdrop"> -@@ -1084,7 +1131,7 @@ +@@ -1084,7 +1478,7 @@ </shape> <shape name="title-backdrop-line"> @@ -581,7 +931,7 @@ <type>roundbox</type> <fill color="#000000" alpha="0" /> <line color="#ffffff" alpha="45" width="2" /> -@@ -1092,11 +1139,11 @@ +@@ -1092,11 +1486,11 @@ </shape> <shape name="title-top-line" from="channel-top-line"> @@ -595,7 +945,7 @@ </shape> <shape name="title-left-line" from="channel-left-line"> -@@ -1104,30 +1151,6 @@ +@@ -1104,30 +1498,6 @@ </shape> <shape name="title-right-line" from="channel-left-line"> @@ -626,7 +976,7 @@ <area>1212,492,2,62</area> </shape> -@@ -1175,30 +1198,29 @@ +@@ -1175,30 +1545,29 @@ </textarea> <textarea name="title"> @@ -667,7 +1017,7 @@ </clock> <textarea name="description"> -@@ -1214,9 +1236,9 @@ +@@ -1214,9 +1583,9 @@ <window name="ChannelEditor"> <area>0,0,1280,720</area> @@ -679,7 +1029,7 @@ </fontdef> <fontdef name="smallblack" from="small"> -@@ -1224,7 +1246,7 @@ +@@ -1224,7 +1593,7 @@ </fontdef> <fontdef name="smallblue" from="small"> @@ -688,7 +1038,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1232,7 +1254,7 @@ +@@ -1232,7 +1601,7 @@ </fontdef> <fontdef name="medium" from="small"> @@ -697,7 +1047,7 @@ </fontdef> <shape name="channel-editor-backdrop"> -@@ -1610,9 +1632,9 @@ +@@ -1610,9 +1979,9 @@ <window name="osd_program_editor"> <area>0,0,1280,720</area> @@ -709,7 +1059,7 @@ </fontdef> <shape name="osd-program-editor-backdrop"> -@@ -1663,13 +1685,17 @@ +@@ -1663,13 +2032,17 @@ </shape> <textarea name="title"> @@ -730,7 +1080,7 @@ <align>right,vcenter</align> </textarea> -@@ -1749,9 +1775,9 @@ +@@ -1749,9 +2122,9 @@ <window name="MythPopupBox"> <area>0,0,1280,720</area> @@ -742,7 +1092,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1759,7 +1785,7 @@ +@@ -1759,7 +2132,7 @@ </fontdef> <fontdef name="smallyellow" from="small"> @@ -751,7 +1101,7 @@ </fontdef> <shape name="mythpopupbox-backdrop"> -@@ -1810,7 +1836,7 @@ +@@ -1810,7 +2183,7 @@ </shape> <shape name="message-area-seperator-line"> @@ -760,7 +1110,7 @@ <type>box</type> <fill style="gradient"> <gradient direction="horizontal" alpha="45"> -@@ -1822,21 +1848,21 @@ +@@ -1822,21 +2195,21 @@ </shape> <shape name="mythpopup-box-arrows-backdrop"> @@ -787,7 +1137,7 @@ <layout>vertical</layout> <spacing>4</spacing> <showarrow>yes</showarrow> -@@ -1922,7 +1948,7 @@ +@@ -1922,7 +2295,7 @@ </fill> </shape> <textarea name="buttontext"> @@ -796,7 +1146,7 @@ </textarea> <imagetype name="buttonarrow"> <alpha>255</alpha> -@@ -1964,7 +1990,7 @@ +@@ -1964,7 +2337,7 @@ </state> </statetype> <statetype name="upscrollarrow"> @@ -805,7 +1155,7 @@ <state type="off"> <imagetype name="upon"> <filename>images/osd/lists_up_arrow.png</filename> -@@ -1978,7 +2004,7 @@ +@@ -1978,7 +2351,7 @@ </state> </statetype> <statetype name="downscrollarrow"> diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch index 15d80fc..205d671 100644 --- a/abs/core/linhes-theme/recordings-ui.xml.patch +++ b/abs/core/linhes-theme/recordings-ui.xml.patch @@ -1,5 +1,5 @@ --- recordings-ui.xml.orig 2018-05-25 17:44:18.266763054 +0000 -+++ recordings-ui.xml 2018-05-25 17:43:56.879526676 +0000 ++++ recordings-ui.xml 2019-03-24 22:52:51.874815241 +0000 @@ -105,19 +105,11 @@ </shape> @@ -158,12 +158,19 @@ </textarea> <imagetype name="no_preview_image_without_fanart" depends="!fanart"> -@@ -688,7 +674,7 @@ - <textarea name="norecordings"> - <area>350,87,906,351</area> - <font>basemedium</font> +@@ -685,12 +671,10 @@ + <alpha>255</alpha> + </imagetype> + +- <textarea name="norecordings"> +- <area>350,87,906,351</area> +- <font>basemedium</font> - <value>No Recordings available, or screen loading...</value> -+ <value>No recordings available.</value> ++ <textarea name="norecordings" from="basetextarea"> ++ <area>38,498,833,140</area> <multiline>yes</multiline> - <align>allcenter</align> +- <align>allcenter</align> ++ <value>No recordings are available.</value> </textarea> + + <group name="clock-backdrop-group" from="base_clock_backdrop_group" /> |