diff options
Diffstat (limited to 'abs/core')
| -rwxr-xr-x | abs/core/linhes-theme/PKGBUILD | 5 | ||||
| -rw-r--r-- | abs/core/linhes-theme/osd.xml.patch | 213 |
2 files changed, 186 insertions, 32 deletions
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 7660af9..3cce956 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=10 +pkgrel=11 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -60,6 +60,7 @@ package() { 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 rsync -pL $srcdir/blank_coverart.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/checkmark.png $pkgdir/$THEMEROOT/LinHES/images/ @@ -94,7 +95,7 @@ package() { sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } md5sums=('2dca856c2a4d1f959473512c94e43b60' - '0383edbb16b0d15f47492cde738f164b' + '37482d0332e1efb31433cc9e6f451565' 'f2b9c85519e80843294315a42870e582' '43b1f213fd392fb07aac503e775e27bc' '80bb72994eca59ca6dc9034ac185e7cc' diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index d4b225b..3ad39d1 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-10-25 18:54:13.696402426 +0000 -+++ osd.xml 2016-10-25 18:53:00.649172353 +0000 +--- osd.xml.orig 2016-11-16 18:00:59.736588734 +0000 ++++ osd.xml 2016-11-16 19:17:20.803037116 +0000 @@ -7,13 +7,13 @@ <window name="osd_debug"> <area>0,0,1280,720</area> @@ -264,17 +264,17 @@ - <area>90,658,1100,24</area> + <textarea name="value"> + <area>90,657,1100,24</area> -+ <font>small</font> -+ <align>allcenter</align> + <font>small</font> + <align>allcenter</align> +- <template>%DESCRIPTION% +- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template> + <template>%VALUE%%UNITS%</template> + </textarea> + + <textarea name="playedtime" depends="!value"> + <area>90,657,1100,24</area> - <font>small</font> - <align>allcenter</align> -- <template>%DESCRIPTION% -- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template> ++ <font>small</font> ++ <align>allcenter</align> + <template>%PLAYEDTIME% of %TOTALTIME% + %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template> </textarea> @@ -291,7 +291,8 @@ + <pixelsize>23</pixelsize> </fontdef> - <fontdef name="supersmall" from="small"> +- <fontdef name="supersmall" from="small"> ++ <fontdef name="supersmall" from="small"> <weight>bold</weight> - <pixelsize>12</pixelsize> + <pixelsize>14</pixelsize> @@ -330,6 +331,60 @@ </fontdef> <shape name="program-info-backdrop"> +@@ -628,7 +623,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>WatchingLiveTM</value> ++ <value>WatchingLiveTV</value> + </textarea> + </state> + <state name="WatchingPreRecorded"> +@@ -685,7 +680,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>AudioCodec: PCM_DVD</value> ++ <value>AudioCodec: PCM DVD</value> + </textarea> + </state> + <state name="PCM_BLURAY"> +@@ -787,7 +782,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>Audio: Mono</value> ++ <value>AudioChannels: Mono</value> + </textarea> + </state> + <state name="2"> +@@ -805,7 +800,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>Audio: 5 CH.</value> ++ <value>AudioChannels: 5.0</value> + </textarea> + </state> + <state name="6"> +@@ -823,7 +818,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>Audio: 7 CH.</value> ++ <value>AudioChannels: 7.0</value> + </textarea> + </state> + <state name="8"> +@@ -832,7 +827,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>Audio: 7.1 CH.</value> ++ <value>AudioChannels: 7.1</value> + </textarea> + </state> + </statetype> @@ -865,6 +860,15 @@ <value>VideoCodec: H.264</value> </textarea> @@ -346,34 +401,129 @@ <state name="MPEG-4"> <textarea name="MPEG-4"> <area>830,432,180,16</area> -@@ -988,7 +992,7 @@ +@@ -910,7 +914,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>VideoDesc: SD</value> ++ <value>VideoRes: SD</value> + </textarea> + </state> + <state name="HD_720_P"> +@@ -919,7 +923,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>VideoDesc: HD_720_P</value> ++ <value>VideoRes: HD 720p</value> + </textarea> + </state> + <state name="HD_1080_I"> +@@ -928,7 +932,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>VideoDesc: HD_1080_I</value> ++ <value>VideoRes: HD 1080i</value> + </textarea> + </state> + <state name="HD_1080_P"> +@@ -937,23 +941,32 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>VideoDesc: HD_1080_P</value> ++ <value>VideoRes: HD 1080p</value> + </textarea> + </state> + </statetype> + +- <textarea name="timedate"> ++ <!--use channum to detect if in videos--> ++ <textarea name="timedate" depends="channum"> + <font>mediumsmall</font> +- <area>274,453,481,24</area> ++ <area>274,453,581,24</area> + <align>vcenter</align> +- <template>%TIMEDATE% : %LENMINS%</template> ++ <template>%TIMEDATE% %LONGREPEAT%</template> + </textarea> + +- <textarea name="longrepeat"> ++ <!--use channum to detect if in videos--> ++ <textarea name="lenminsFilesize" depends="channum"> + <font>mediumsmall</font> +- <area>771,453,435,22</area> ++ <area>871,453,335,22</area> ++ <align>right,vcenter</align> ++ <template>%LENMINS% (%FILESIZE_STR%)</template> ++ </textarea> ++ ++ <!--use channum to detect if in videos--> ++ <textarea name="lenmins" depends="!channum"> ++ <font>mediumsmall</font> ++ <area>871,453,335,22</area> + <align>right,vcenter</align> +- <template>%LONGREPEAT% Size: %FILESIZE_STR%</template> + </textarea> + + <imagetype name="coverart"> +@@ -988,13 +1001,22 @@ <alpha>255</alpha> </imagetype> - <textarea name="category"> -+ <textarea name="category"> ++ <!--use channum to detect if in videos--> ++ <textarea name="category" depends="channum"> <font>supersmallblue</font> <area>284,490,912,28</area> <align>allcenter</align> -@@ -1003,37 +1007,49 @@ + <template>Category: %CATEGORY% PlayBackGroup: %PLAYGROUP% RecGroup: %RECORDINGGROUP% StorageGroup: %STORAGEGROUP%</template> + </textarea> + ++ <!--use channum to detect if in videos--> ++ <textarea name="playback" depends="!channum"> ++ <font>supersmallblue</font> ++ <area>284,490,912,28</area> ++ <align>allcenter</align> ++ <template>PlayBackGroup: %PLAYGROUP% RecGroup: %RECORDINGGROUP% StorageGroup: %STORAGEGROUP%</template> ++ </textarea> ++ + <textarea name="description"> + <font>small</font> + <area>284,523,912,126</area> +@@ -1003,37 +1025,62 @@ <template>%"|SUBTITLE|" %%YEARSTARS| %%DESCRIPTION%</template> </textarea> - <textarea name="programid"> -+ <textarea name="programid" depends="iconpath&!coverart"> ++ <textarea name="programid" depends="channum&!coverart"> <font>supersmallblue</font> <area>284,653,912,27</area> <align>allcenter</align> <template>Season/Episode: %s00e00% ProgramID: %PROGRAMID% SeriesID: %SERIESID%</template> </textarea> -+ <textarea name="channame" depends="iconpath&coverart"> ++ <textarea name="channame" depends="channum&coverart"> + <font>supersmallblue</font> + <area>284,653,912,27</area> + <align>allcenter</align> + <template>Channel: %channum% - %channame% - %callsign% Season/Episode: %s00e00% ProgramID: %PROGRAMID% SeriesID: %SERIESID%</template> + </textarea> + ++ <!--use channum to detect if in videos--> ++ <textarea name="s00e00" depends="!channum"> ++ <font>supersmallblue</font> ++ <area>2284,653,912,27</area> ++ <align>allcenter</align> ++ </textarea> ++ <textarea name="seasoneps" depends="!channum&s00e00"> ++ <font>supersmallblue</font> ++ <area>284,653,912,27</area> ++ <align>allcenter</align> ++ <template>Season/Episode: %s00e00%</template> ++ </textarea> ++ </window> <window name="browse_info"> @@ -412,7 +562,7 @@ </fontdef> <shape name="browse-info-backdrop"> -@@ -1084,7 +1100,7 @@ +@@ -1084,7 +1131,7 @@ </shape> <shape name="title-backdrop-line"> @@ -421,7 +571,7 @@ <type>roundbox</type> <fill color="#000000" alpha="0" /> <line color="#ffffff" alpha="45" width="2" /> -@@ -1092,11 +1108,11 @@ +@@ -1092,11 +1139,11 @@ </shape> <shape name="title-top-line" from="channel-top-line"> @@ -435,7 +585,7 @@ </shape> <shape name="title-left-line" from="channel-left-line"> -@@ -1104,30 +1120,6 @@ +@@ -1104,30 +1151,6 @@ </shape> <shape name="title-right-line" from="channel-left-line"> @@ -466,7 +616,7 @@ <area>1212,492,2,62</area> </shape> -@@ -1175,30 +1167,30 @@ +@@ -1175,30 +1198,29 @@ </textarea> <textarea name="title"> @@ -478,19 +628,22 @@ <textarea name="timedate"> - <font>smallerblue</font> +- <area>228,529,497,22</area> + <font>smaller</font> - <area>228,529,497,22</area> ++ <area>228,529,843,22</area> <align>vcenter</align> - <template>%TIMEDATE% : %LENMINS%</template> +- <template>%TIMEDATE% : %LENMINS%</template> ++ <template>%TIMEDATE% %LONGREPEAT%</template> </textarea> - <textarea name="longrepeat"> +- <textarea name="longrepeat"> - <font>smallerblue</font> - <area>740,530,304,20</area> ++ <textarea name="lenmins"> + <font>smaller</font> -+ <area>902,530,310,20</area> ++ <area>1086,530,120,22</area> <align>right,vcenter</align> - <template>%LONGREPEAT%</template> +- <template>%LONGREPEAT%</template> </textarea> <clock name="clock"> @@ -504,7 +657,7 @@ </clock> <textarea name="description"> -@@ -1214,9 +1206,9 @@ +@@ -1214,9 +1236,9 @@ <window name="ChannelEditor"> <area>0,0,1280,720</area> @@ -516,7 +669,7 @@ </fontdef> <fontdef name="smallblack" from="small"> -@@ -1224,7 +1216,7 @@ +@@ -1224,7 +1246,7 @@ </fontdef> <fontdef name="smallblue" from="small"> @@ -525,7 +678,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1232,7 +1224,7 @@ +@@ -1232,7 +1254,7 @@ </fontdef> <fontdef name="medium" from="small"> @@ -534,7 +687,7 @@ </fontdef> <shape name="channel-editor-backdrop"> -@@ -1610,9 +1602,9 @@ +@@ -1610,9 +1632,9 @@ <window name="osd_program_editor"> <area>0,0,1280,720</area> @@ -546,7 +699,7 @@ </fontdef> <shape name="osd-program-editor-backdrop"> -@@ -1663,13 +1655,17 @@ +@@ -1663,13 +1685,17 @@ </shape> <textarea name="title"> @@ -567,7 +720,7 @@ <align>right,vcenter</align> </textarea> -@@ -1749,9 +1745,9 @@ +@@ -1749,9 +1775,9 @@ <window name="MythPopupBox"> <area>0,0,1280,720</area> @@ -579,7 +732,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1759,7 +1755,7 @@ +@@ -1759,7 +1785,7 @@ </fontdef> <fontdef name="smallyellow" from="small"> |