diff options
Diffstat (limited to 'abs/core/linhes-theme')
| -rw-r--r-- | abs/core/linhes-theme/PKGBUILD | 11 | ||||
| -rw-r--r-- | abs/core/linhes-theme/menu-ui-vert.xml.patch | 45 | ||||
| -rw-r--r-- | abs/core/linhes-theme/osd.xml.patch | 176 | ||||
| -rw-r--r-- | abs/core/linhes-theme/osd_subtitle.xml | 142 |
4 files changed, 352 insertions, 22 deletions
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index c8e97ab..02ee1db 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme -pkgver=8.2 -pkgrel=7 +pkgver=8.3 +pkgrel=1 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -10,7 +10,7 @@ patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' 'menu-ui-vert.xml.patch' 'schedule-ui.xml.patch' 'qtlook.txt.patch') #The LinHES theme is based on TintedGlass 4.56 by Harley Peters -source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' +source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml' 'background.png' 'preview.png' 'tux_thoughts.png' 'LHLogoAndText.png') @@ -80,13 +80,14 @@ package() { sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } md5sums=('2dca856c2a4d1f959473512c94e43b60' - 'e857e084963166bb37c6236463750dc1' + '13bff6425487194cc7bc622e64c6176a' '5fccb4e20c15d87223ea5de4c40faa06' - 'c75c83b90969fb07755062113f858e88' + 'acf2fa359f7be7db30a81cae4dd5fa3f' '22ff4044c8c29560451fb51dcbf4d44e' '9fe3371a8b964a7028126405cfaa330b' '5a8fb2a5f0e657d52be6f0a6a006ce72' 'a0201e0aa1608eeab27ee754e4d2c1de' + 'bfc32b9fa5dca3d46dd6f365ecb449b5' '12d26a786fde397348653128a6d7676a' '4b1c27297bb5f8d9d7bbaf72b35130b5' '2bd09b8049aaf5ba21db5baf3a0ce077' diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index 914ecf7..5d6f330 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,5 +1,5 @@ ---- menu-ui-vert.xml.orig 2014-03-26 17:04:48.808874995 +0000 -+++ menu-ui-vert.xml 2014-03-26 17:06:18.504013928 +0000 +--- 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 @@ <area>394,0,2,720</area> </shape> @@ -50,7 +50,7 @@ <statetype name="titles"> <state name="MAIN"> <textarea name="heading"> -@@ -123,6 +166,41 @@ +@@ -123,6 +166,51 @@ <value>Archive Utilities</value> </textarea> </state> @@ -74,6 +74,16 @@ + <value>Restore LinHES</value> + </textarea> + </state> ++ <state name="LH_TOOLS" from="MAIN"> ++ <textarea name="heading"> ++ <value>LinHES Tools</value> ++ </textarea> ++ </state> ++ <state name="LH_BACKEND" from="MAIN"> ++ <textarea name="heading"> ++ <value>MythBackend Control</value> ++ </textarea> ++ </state> + <state name="HOST_SETTINGS" from="MAIN"> + <textarea name="heading"> + <value>LinHES Settings</value> @@ -92,7 +102,34 @@ </statetype> <buttonlist name="menu"> -@@ -162,21 +240,6 @@ +@@ -136,9 +224,9 @@ + <buttonarea>0,0,100%,100%</buttonarea> + <statetype name="buttonitem"> + <state name="active"> +- <area>0,0,310,64</area> ++ <area>0,0,310,66</area> + <textarea name="buttontext"> +- <area>12,0,286,64</area> ++ <area>12,0,286,66</area> + <font>basemediumlightgrey</font> + <multiline>yes</multiline> + <align>allcenter</align> +@@ -147,12 +235,12 @@ + </textarea> + </state> + <state name="selectedactive"> +- <area>-10,0,330,64</area> ++ <area>-10,0,330,66</area> + <group name="select_bar" from="base_select_bar_selectedactive_group"> + <area>0,0,330,100%</area> + </group> + <textarea name="buttontext"> +- <area>5,0,320,64</area> ++ <area>5,0,320,66</area> + <font>basemediumlargerdarkyellow</font> + <multiline>yes</multiline> + <!-- cpu usage is very high +@@ -162,21 +250,6 @@ <cutdown>yes</cutdown> <case>upper</case> </textarea> diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index 6c29161..104e145 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ --- osd.xml.orig 2014-10-26 18:47:55.853729172 +0000 -+++ osd.xml 2014-10-26 19:11:25.023453880 +0000 ++++ osd.xml 2014-11-24 14:41:20.269044512 +0000 @@ -7,13 +7,13 @@ <window name="osd_debug"> <area>0,0,1280,720</area> @@ -17,6 +17,132 @@ </fontdef> <shape name="osd-debug-backdrop"> +@@ -71,7 +71,7 @@ + </textarea> + + <textarea name="load"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>241,51,216,25</area> + <align>left,vcenter</align> + </textarea> +@@ -84,7 +84,7 @@ + </textarea> + + <textarea name="filename"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>515,51,685,25</area> + <align>left,vcenter</align> + </textarea> +@@ -97,7 +97,7 @@ + </textarea> + + <textarea name="storagerate"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>247,76,123,25</area> + <align>left,vcenter</align> + </textarea> +@@ -110,7 +110,7 @@ + </textarea> + + <textarea name="decoderrate"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>247,101,123,25</area> + <align>left,vcenter</align> + </textarea> +@@ -123,7 +123,7 @@ + </textarea> + + <textarea name="bufferavail"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>247,126,123,25</area> + <align>left,vcenter</align> + <template>%BUFFERAVAIL% of %BUFFERSIZE%Mb</template> +@@ -137,7 +137,7 @@ + </textarea> + + <textarea name="videowidth"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>515,76,250,25</area> + <align>left,vcenter</align> + <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template> +@@ -151,7 +151,7 @@ + </textarea> + + <textarea name="videocodec"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>515,101,150,25</area> + <align>left,vcenter</align> + </textarea> +@@ -164,7 +164,7 @@ + </textarea> + + <textarea name="videodecoder"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>515,126,150,25</area> + <align>left,vcenter</align> + </textarea> +@@ -177,7 +177,7 @@ + </textarea> + + <textarea name="avsync"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>875,76,100,25</area> + <align>left,vcenter</align> + </textarea> +@@ -190,7 +190,7 @@ + </textarea> + + <textarea name="framerate"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>875,101,100,25</area> + <align>left,vcenter</align> + </textarea> +@@ -203,7 +203,7 @@ + </textarea> + + <textarea name="videoframes"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>875,126,100,25</area> + <align>left,vcenter</align> + </textarea> +@@ -216,7 +216,7 @@ + </textarea> + + <textarea name="audiocodec"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>1129,76,77,25</area> + <align>left,vcenter</align> + </textarea> +@@ -229,7 +229,7 @@ + </textarea> + + <textarea name="audiochannels"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>1129,101,77,25</area> + <align>left,vcenter</align> + </textarea> +@@ -242,7 +242,7 @@ + </textarea> + + <textarea name="samplerate"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>1129,126,77,25</area> + <align>left,vcenter</align> + </textarea> @@ -252,8 +252,8 @@ <window name="osd_message"> <area>0,0,1280,720</area> @@ -52,7 +178,31 @@ </fontdef> <shape name="osd-status-backdrop"> -@@ -470,39 +470,39 @@ +@@ -436,12 +436,19 @@ + <align>left,vcenter</align> + </textarea> + +- <textarea name="description"> +- <area>90,658,1100,24</area> ++ <textarea name="value"> ++ <area>90,657,1100,24</area> + <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>%PLAYEDTIME% of %TOTALTIME% ++ %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template> + </textarea> + + <clock name="clock"> +@@ -470,39 +477,39 @@ <window name="program_info"> <area>0,0,1280,720</area> @@ -102,7 +252,7 @@ </fontdef> <shape name="program-info-backdrop"> -@@ -1015,25 +1015,30 @@ +@@ -1015,25 +1022,30 @@ <window name="browse_info"> <area>0,0,1280,720</area> @@ -139,7 +289,7 @@ </fontdef> <shape name="browse-info-backdrop"> -@@ -1084,7 +1089,7 @@ +@@ -1084,7 +1096,7 @@ </shape> <shape name="title-backdrop-line"> @@ -148,7 +298,7 @@ <type>roundbox</type> <fill color="#000000" alpha="0" /> <line color="#ffffff" alpha="45" width="2" /> -@@ -1092,11 +1097,11 @@ +@@ -1092,11 +1104,11 @@ </shape> <shape name="title-top-line" from="channel-top-line"> @@ -162,7 +312,7 @@ </shape> <shape name="title-left-line" from="channel-left-line"> -@@ -1104,30 +1109,6 @@ +@@ -1104,30 +1116,6 @@ </shape> <shape name="title-right-line" from="channel-left-line"> @@ -193,7 +343,7 @@ <area>1212,492,2,62</area> </shape> -@@ -1175,30 +1156,30 @@ +@@ -1175,30 +1163,30 @@ </textarea> <textarea name="title"> @@ -231,7 +381,7 @@ </clock> <textarea name="description"> -@@ -1214,9 +1195,9 @@ +@@ -1214,9 +1202,9 @@ <window name="ChannelEditor"> <area>0,0,1280,720</area> @@ -243,7 +393,7 @@ </fontdef> <fontdef name="smallblack" from="small"> -@@ -1224,7 +1205,7 @@ +@@ -1224,7 +1212,7 @@ </fontdef> <fontdef name="smallblue" from="small"> @@ -252,7 +402,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1232,7 +1213,7 @@ +@@ -1232,7 +1220,7 @@ </fontdef> <fontdef name="medium" from="small"> @@ -261,7 +411,7 @@ </fontdef> <shape name="channel-editor-backdrop"> -@@ -1610,9 +1591,9 @@ +@@ -1610,9 +1598,9 @@ <window name="osd_program_editor"> <area>0,0,1280,720</area> @@ -273,7 +423,7 @@ </fontdef> <shape name="osd-program-editor-backdrop"> -@@ -1749,9 +1730,9 @@ +@@ -1749,9 +1737,9 @@ <window name="MythPopupBox"> <area>0,0,1280,720</area> @@ -285,7 +435,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1759,7 +1740,7 @@ +@@ -1759,7 +1747,7 @@ </fontdef> <fontdef name="smallyellow" from="small"> diff --git a/abs/core/linhes-theme/osd_subtitle.xml b/abs/core/linhes-theme/osd_subtitle.xml new file mode 100644 index 0000000..7640654 --- /dev/null +++ b/abs/core/linhes-theme/osd_subtitle.xml @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd"> +<mythuitheme> + <window name="osd_subtitle"> + <!-- + This is a reference implementation of the system/provider + defaults specified in + SubtitleFormat:CreateProviderDefault(). + + Note that if all attributes/elements are simply inherited + from provider, then the specification is optional. E.g., + the following could be omitted: + + <fontdef name="sample" from="provider"></fontdef> + <shape name="sample" from="provider"></shape> + + Also note that these specific definitions are unnecessary + since they are the same as the defaults in the code. A + theme only needs to include the definitions that it wants + to change/override. + --> + + <!-- + Define a black background which is used below for 608 and + text subtitles. If a background is not used, it is + recommended to use a 2-pixel outline or shadow in the + fontdef, in order to provide sufficient contrast. Note + that 708 captions providers almost always specify an + explicit black background. + --> + <shape name="black_background" from="provider"> + <type>roundbox</type> + <cornerradius>8</cornerradius> + <fill color="#000000" alpha="140" /> + </shape> + + + <!-- + Subtitle type "text" generally comes from external text + files like .srt or .txt files. + --> + <fontdef name="text" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <shape name="text" from="black_background"> + </shape> + + + <!-- + Digital teletext text-based subtitles. Not to be confused + with bitmap teletext subtitles, or CEA-608 teletext + captions. A monospaced font should be used. + --> + <fontdef name="teletext" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + + <!-- + CEA-608 closed captions. These also apply to CEA-608 VBI + teletext captions. A monospaced font should be used. + --> + <fontdef name="608" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <shape name="608" from="black_background"> + </shape> + + + <!-- + CEA-708 closed captions. The spec defines 8 different + font tags, but in practice (at least in the U.S.), only + tags 0 and 3 are used by broadcasters. + --> + <!-- Font tag 0: "Default" --> + <fontdef name="708_0" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 1: "Monospaced Serif" --> + <fontdef name="708_1" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 2: "Proportional Serif" --> + <fontdef name="708_2" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 3: "Monospaced Sans Serif" --> + <fontdef name="708_3" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 4: "Proportional Sans Serif" --> + <fontdef name="708_4" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 5: "Casual" --> + <fontdef name="708_5" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 6: "Cursive" --> + <fontdef name="708_6" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 7: "Small Capitals" --> + <!-- Note: The Qt property QFont::SmallCaps is automatically + applied to this font. --> + <fontdef name="708_7" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + </window> +</mythuitheme> |