linhes-theme: add osd_subtitle.xml

3 files changed, 170 insertions, 18 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 91d6ed4..b99f514 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.2
-pkgrel=8
+pkgrel=9
 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'
-         '6d200405600fd9aed3241097207d86c8'
+         '13bff6425487194cc7bc622e64c6176a'
          '5fccb4e20c15d87223ea5de4c40faa06'
          'c75c83b90969fb07755062113f858e88'
          '22ff4044c8c29560451fb51dcbf4d44e'
          '9fe3371a8b964a7028126405cfaa330b'
          '5a8fb2a5f0e657d52be6f0a6a006ce72'
          'a0201e0aa1608eeab27ee754e4d2c1de'
+         'bfc32b9fa5dca3d46dd6f365ecb449b5'
          '12d26a786fde397348653128a6d7676a'
          '4b1c27297bb5f8d9d7bbaf72b35130b5'
          '2bd09b8049aaf5ba21db5baf3a0ce077'
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index 981a0e8..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-11-23 22:04:30.823095573 +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>
@@ -178,22 +178,31 @@
          </fontdef>
  
          <shape name="osd-status-backdrop">
-@@ -437,11 +437,11 @@
+@@ -436,12 +436,19 @@
+             <align>left,vcenter</align>
          </textarea>
  
-         <textarea name="description">
+-        <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 +470,39 @@
+@@ -470,39 +477,39 @@
      <window name="program_info">
          <area>0,0,1280,720</area>
  
@@ -243,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>
  
@@ -280,7 +289,7 @@
          </fontdef>
  
          <shape name="browse-info-backdrop">
-@@ -1084,7 +1089,7 @@
+@@ -1084,7 +1096,7 @@
          </shape>
  
          <shape name="title-backdrop-line">
@@ -289,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">
@@ -303,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">
@@ -334,7 +343,7 @@
              <area>1212,492,2,62</area>
          </shape>
  
-@@ -1175,30 +1156,30 @@
+@@ -1175,30 +1163,30 @@
          </textarea>
  
          <textarea name="title">
@@ -372,7 +381,7 @@
          </clock>
  
          <textarea name="description">
-@@ -1214,9 +1195,9 @@
+@@ -1214,9 +1202,9 @@
      <window name="ChannelEditor">
          <area>0,0,1280,720</area>
  
@@ -384,7 +393,7 @@
          </fontdef>
  
          <fontdef name="smallblack" from="small">
-@@ -1224,7 +1205,7 @@
+@@ -1224,7 +1212,7 @@
          </fontdef>
  
          <fontdef name="smallblue" from="small">
@@ -393,7 +402,7 @@
          </fontdef>
  
          <fontdef name="smallgrey" from="small">
-@@ -1232,7 +1213,7 @@
+@@ -1232,7 +1220,7 @@
          </fontdef>
  
          <fontdef name="medium" from="small">
@@ -402,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>
  
@@ -414,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>
  
@@ -426,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>