From ade70aca7375ce8984a0534d163080eb41410f7d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 26 Mar 2023 18:30:25 -0400
Subject: linhes-theme: adjust recordings properties

osd.xml: adjust debug res

base.xml: make spinbox entry wider
---
 linhes/linhes-theme/PKGBUILD                |   8 +-
 linhes/linhes-theme/base.xml.patch          |  15 ++-
 linhes/linhes-theme/osd.xml.patch           |   6 +-
 linhes/linhes-theme/recordings-ui.xml.patch | 171 +++++++++++++++++++++-------
 4 files changed, 149 insertions(+), 51 deletions(-)

diff --git a/linhes/linhes-theme/PKGBUILD b/linhes/linhes-theme/PKGBUILD
index d3a592f..707f6b2 100755
--- a/linhes/linhes-theme/PKGBUILD
+++ b/linhes/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=9.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Default LinHES MythTV theme"
 arch=('x86_64')
 license=('GPL2')
@@ -25,8 +25,8 @@ source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xm
         'LHLogo.png' 'LHLogoAndText.png')
 install=$pkgname.install
 sha256sums=('30aa74482dfa47bb394e7926f36271ed14b43872c582b283c63fb10c399309ee'
-            '3394426a36f351ff5b037e7a031313564991f68756cb09d79684468f873f7f12'
-            '78ec99150273a6da34c7a4041bebb307de2bb74443336715f328f01dfdc9272c'
+            '8eeeda114fcc19d49bcbf74166253cf5ea1ba7d1880d6f8ef784609d55387091'
+            '603ea611c81a61114999616e3b16877d17fde882fbaf992556ac376f68b09990'
             '1cb0b64ea18c1e54e3cd8c56e9460f73eb8b26dfefc27c7e0bba642b1fed11cd'
             'd799134e6c06ed6039bbae71d50edb83e7fbc4a420700a2028ec90562333d812'
             'acb2d10e897c5e05ed0069e737a272632ca7370f958968556d8d1108c8c17239'
@@ -39,7 +39,7 @@ sha256sums=('30aa74482dfa47bb394e7926f36271ed14b43872c582b283c63fb10c399309ee'
             'd3f1135a069029419b14e5fdcf6e6732136bdb4779f4e5bac1f2343aa1a5d8d5'
             'a2e3bb5e3114299f4f539e62593d1d1c455ceae1d779a65f33569952ad28db3f'
             'e99f9c643b787b7d0f5d95ec48b9c2fe8ba746a68f557583af31bdafcd9b7577'
-            '6ba726d6f85fdfb9ddfe503322a8835450808888723a8cc91adb05e81377a8f1'
+            'f2f92ad1eb74a18a85c5d37a6b3f4c13865a03d2ceb633b367f33b56c9018832'
             '6dac358eeaa1448b40ae7807aa3cbebb81bf2b13f3a9e848b0f2a9000ba69937'
             'e6c6a115c6d45290aa9cfea1a09ba4abd3d15483412150746997cb786dd96ce1'
             'de53064496b5e1bd7b9b0a0a5b346c0e0263efbfb21f768d6f1ec736a6b45f41'
diff --git a/linhes/linhes-theme/base.xml.patch b/linhes/linhes-theme/base.xml.patch
index 51c7c72..a974519 100644
--- a/linhes/linhes-theme/base.xml.patch
+++ b/linhes/linhes-theme/base.xml.patch
@@ -1,5 +1,5 @@
---- base.xml.orig	2018-04-17 14:44:34.438582684 +0000
-+++ base.xml	2019-03-22 17:16:10.683904892 +0000
+--- base.xml.orig	2023-03-26 17:37:38.480671264 -0400
++++ base.xml	2023-03-26 17:34:08.591834788 -0400
 @@ -3,55 +3,55 @@
  <mythuitheme>
  
@@ -485,6 +485,15 @@
          </statetype>
          <statetype name="background">
              <state name="active" />
+@@ -1897,7 +1910,7 @@
+ 
+     <!-- Base definition of a spinbox -->
+     <spinbox name="base_spinbox">
+-        <area>0,0,80,40</area>
++        <area>0,0,160,40</area>
+         <layout>horizontal</layout>
+         <statetype name="buttonitem">
+             <state name="active">
 @@ -1916,6 +1929,9 @@
                  <group name="select_bar" from="base_spinbox_select_bar_selectedactive_group">
                      <area>0,0,100%,100%</area>
@@ -681,7 +690,7 @@
 +        </textarea>
 +
 +        <spinbox name="input" from="base_spinbox">
-+            <position>253,62</position>
++            <position>213,62</position>
 +        </spinbox>
 +
 +        <button name="ok" from="base_button">
diff --git a/linhes/linhes-theme/osd.xml.patch b/linhes/linhes-theme/osd.xml.patch
index afb478b..feed3fc 100644
--- a/linhes/linhes-theme/osd.xml.patch
+++ b/linhes/linhes-theme/osd.xml.patch
@@ -1,5 +1,5 @@
 --- osd.xml.orig	2023-02-28 10:13:02.297842607 -0500
-+++ osd.xml	2023-02-28 15:34:38.449672606 -0500
++++ osd.xml	2023-03-26 17:34:08.618503279 -0400
 @@ -7,13 +7,13 @@
      <window name="osd_debug">
          <area>0,0,1280,720</area>
@@ -84,7 +84,7 @@
 -            <area>247,101,123,25</area>
 +        <textarea name="videowidth">
 +            <font>medium</font>
-+            <area>211,101,169,25</area>
++            <area>211,101,189,25</area>
              <align>left,vcenter</align>
 +            <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template>
          </textarea>
@@ -134,7 +134,7 @@
 +        <textarea name="fps">
              <font>medium</font>
 -            <area>410,101,100,25</area>
-+            <area>395,101,170,25</area>
++            <area>405,101,160,25</area>
              <align>right,vcenter</align>
 -            <value>Codec :</value>
 +            <value>FPS :</value>
diff --git a/linhes/linhes-theme/recordings-ui.xml.patch b/linhes/linhes-theme/recordings-ui.xml.patch
index 7f84a76..f2650c3 100644
--- a/linhes/linhes-theme/recordings-ui.xml.patch
+++ b/linhes/linhes-theme/recordings-ui.xml.patch
@@ -1,5 +1,5 @@
 --- recordings-ui.xml.orig	2023-02-28 10:30:24.782781888 -0500
-+++ recordings-ui.xml	2023-03-02 15:02:16.115690412 -0500
++++ recordings-ui.xml	2023-03-26 17:34:08.638504647 -0400
 @@ -105,19 +105,11 @@
          </shape>
  
@@ -38,7 +38,7 @@
                          <align>right,vcenter</align>
                      </textarea>
                      <textarea name="filesize_str" from="base_text_font_state_extrasmall">
-@@ -232,16 +226,17 @@
+@@ -232,23 +226,24 @@
                      <area>0,0,898,64</area>
                      <textarea name="titlesubtitle" from="base_text_font_state_small">
                          <area>8,2,694,24</area>
@@ -60,13 +60,66 @@
                          <cutdown>no</cutdown>
                          <align>right,vcenter</align>
                      </textarea>
-@@ -307,13 +302,22 @@
+                     <statetype name="playlist">
+                         <state name="no">
+                             <textarea name="play-list" from="basetextarea">
+-                                <area>24,24,80,20</area>
++                                <area>8,24,80,20</area>
+                                 <font>basesupersmall</font>
+                                 <cutdown>no</cutdown>
+                                 <align>left,vcenter</align>
+@@ -258,7 +253,7 @@
+                         </state>
+                         <state name="yes">
+                             <textarea name="play-list" from="basetextarea">
+-                                <area>24,24,80,20</area>
++                                <area>8,24,80,20</area>
+                                 <font>basesupersmallblue</font>
+                                 <cutdown>no</cutdown>
+                                 <align>left,vcenter</align>
+@@ -270,7 +265,7 @@
+                         <showempty>yes</showempty>
+                         <state name="mono">
+                             <textarea name="mono" from="basetextarea">
+-                                <area>78,24,80,20</area>
++                                <area>62,24,80,20</area>
+                                 <font>basesupersmallblue</font>
+                                 <cutdown>no</cutdown>
+                                 <align>allcenter</align>
+@@ -279,7 +274,7 @@
+                         </state>
+                         <state name="stereo">
+                             <textarea name="stereo" from="basetextarea">
+-                                <area>78,24,80,20</area>
++                                <area>62,24,80,20</area>
+                                 <font>basesupersmallblue</font>
+                                 <cutdown>no</cutdown>
+                                 <align>allcenter</align>
+@@ -288,7 +283,7 @@
+                         </state>
+                         <state name="surround">
+                             <textarea name="surround" from="basetextarea">
+-                                <area>78,24,80,20</area>
++                                <area>62,24,80,20</area>
+                                 <font>basesupersmallblue</font>
+                                 <cutdown>no</cutdown>
+                                 <align>allcenter</align>
+@@ -297,7 +292,7 @@
+                         </state>
+                         <state name="dolby">
+                             <textarea name="dolby" from="basetextarea">
+-                                <area>78,24,80,20</area>
++                                <area>62,24,80,20</area>
+                                 <font>basesupersmallblue</font>
+                                 <cutdown>no</cutdown>
+                                 <align>allcenter</align>
+@@ -307,56 +302,131 @@
                      </statetype>
                      <statetype name="videoprops">
                          <showempty>yes</showempty>
 +                        <state name="sd">
 +                            <textarea name="sd" from="basetextarea">
-+                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
 +                                <font>basesupersmallblue</font>
 +                                <cutdown>no</cutdown>
 +                                <align>allcenter</align>
@@ -75,7 +128,8 @@
 +                        </state>
                          <state name="hdtv">
                              <textarea name="hdtv" from="basetextarea">
-                                 <area>142,24,80,20</area>
+-                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -84,7 +138,9 @@
                              </textarea>
                          </state>
                          <state name="widescreen">
-@@ -322,7 +326,7 @@
+                             <textarea name="widescreen" from="basetextarea">
+-                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -93,7 +149,9 @@
                              </textarea>                       
                          </state>
                          <state name="avchd">
-@@ -331,7 +335,7 @@
+                             <textarea name="avchd" from="basetextarea">
+-                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -102,7 +160,9 @@
                              </textarea>
                          </state>
                          <state name="hd720">
-@@ -340,7 +344,7 @@
+                             <textarea name="hd720" from="basetextarea">
+-                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -111,7 +171,10 @@
                              </textarea>
                          </state>
                          <state name="hd1080">
-@@ -350,13 +354,79 @@
+                             <textarea name="hd1080" from="basetextarea">
+-                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
+                                 <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
                                  <value>HD1080</value>
@@ -120,7 +183,7 @@
 +                        </state>
 +                        <state name="hd1080i">
 +                            <textarea name="hd1080i" from="basetextarea">
-+                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
 +                                <font>basesupersmallblue</font>
 +                                <cutdown>no</cutdown>
 +                                <align>allcenter</align>
@@ -129,7 +192,7 @@
 +                        </state>
 +                        <state name="hd1080p">
 +                            <textarea name="hd1080p" from="basetextarea">
-+                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
 +                                <font>basesupersmallblue</font>
 +                                <cutdown>no</cutdown>
 +                                <align>allcenter</align>
@@ -138,7 +201,7 @@
 +                        </state>
 +                        <state name="uhd4ki">
 +                            <textarea name="uhd4ki" from="basetextarea">
-+                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
 +                                <font>basesupersmallblue</font>
 +                                <cutdown>no</cutdown>
 +                                <align>allcenter</align>
@@ -147,7 +210,7 @@
 +                        </state>
 +                        <state name="uhd4kp">
 +                            <textarea name="uhd4kp" from="basetextarea">
-+                                <area>142,24,80,20</area>
++                                <area>126,24,80,20</area>
 +                                <font>basesupersmallblue</font>
 +                                <cutdown>no</cutdown>
 +                                <align>allcenter</align>
@@ -159,7 +222,7 @@
 +                        <showempty>yes</showempty>
 +                        <state name="mpeg2">
 +                            <textarea name="mpeg2" from="basetextarea">
-+                                <area>208,24,80,20</area>
++                                <area>192,24,80,20</area>
 +                                <font>basesupersmallblue</font>
 +                                <cutdown>no</cutdown>
 +                                <align>allcenter</align>
@@ -168,7 +231,7 @@
 +                        </state>
 +                        <state name="avc">
 +                            <textarea name="avc" from="basetextarea">
-+                                <area>208,24,80,20</area>
++                                <area>192,24,80,20</area>
 +                                <font>basesupersmallblue</font>
 +                                <cutdown>no</cutdown>
 +                                <align>allcenter</align>
@@ -177,7 +240,7 @@
 +                        </state>
 +                        <state name="hevc">
 +                            <textarea name="hevc" from="basetextarea">
-+                                <area>208,24,80,20</area>
++                                <area>192,24,80,20</area>
 +                                <font>basesupersmallblue</font>
 +                                <cutdown>no</cutdown>
 +                                <align>allcenter</align>
@@ -189,7 +252,7 @@
                          <state name="no">
                              <textarea name="watchedoff" from="basetextarea">
 -                                <area>215,24,80,20</area>
-+                                <area>281,24,80,20</area>
++                                <area>263,24,80,20</area>
                                  <font>basesupersmall</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -198,7 +261,7 @@
                          <state name="yes">
                              <textarea name="watchedoff" from="basetextarea">
 -                                <area>215,24,80,20</area>
-+                                <area>281,24,80,20</area>
++                                <area>263,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -207,7 +270,7 @@
                          <state name="no">
                              <textarea name="autoexpireoff" from="basetextarea">
 -                                <area>305,24,80,20</area>
-+                                <area>371,24,80,20</area>
++                                <area>346,24,80,20</area>
                                  <font>basesupersmall</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -216,7 +279,7 @@
                          <state name="yes">
                              <textarea name="autoexpire" from="basetextarea">
 -                                <area>305,24,80,20</area>
-+                                <area>371,24,80,20</area>
++                                <area>346,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -225,7 +288,7 @@
                          <state name="no">
                              <textarea name="commflaggedoff" from="basetextarea">
 -                                <area>400,24,90,20</area>
-+                                <area>466,24,90,20</area>
++                                <area>438,24,92,20</area>
                                  <font>basesupersmall</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -234,34 +297,42 @@
                          <state name="yes">
                              <textarea name="commflagged" from="basetextarea">
 -                                <area>400,24,90,20</area>
-+                                <area>466,24,90,20</area>
++                                <area>438,24,92,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
-@@ -418,7 +488,7 @@
+@@ -418,10 +488,10 @@
                          <state name="running">
                             <area>0,0,100%,100%</area>
                              <textarea name="commflagging" from="basetextarea">
 -                                <area>399,24,92,20</area>
-+                                <area>465,24,92,20</area>
++                                <area>438,24,92,20</area>
                                  <font>basesupersmallred</font>
                                  <cutdown>no</cutdown>
-                                 <align>left,vcenter</align>
-@@ -429,7 +499,7 @@
+-                                <align>left,vcenter</align>
++                                <align>allcenter</align>
+                                 <value>COMFLAGGING</value>
+                                 <alphapulse min="130" max="255" change="2"/>
+                             </textarea>
+@@ -429,10 +499,10 @@
                          <state name="queued">
                             <area>0,0,100%,100%</area>
                              <textarea name="commflagging" from="basetextarea">
 -                                <area>399,24,92,20</area>
-+                                <area>465,24,92,20</area>
++                                <area>438,24,92,20</area>
                                  <font>basesupersmallyellow</font>
                                  <cutdown>no</cutdown>
-                                 <align>left,vcenter</align>
+-                                <align>left,vcenter</align>
++                                <align>allcenter</align>
+                                 <value>CFLAGQUEUED</value>
+                                 <alphapulse min="130" max="255" change="2"/>
+                             </textarea>
 @@ -441,7 +511,7 @@
                      <statetype name="bookmark">
                          <state name="no">
                              <textarea name="bookmarkoff" from="basetextarea">
 -                                <area>508,24,90,20</area>
-+                                <area>574,24,90,20</area>
++                                <area>541,24,90,20</area>
                                  <font>basesupersmall</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -270,7 +341,7 @@
                          <state name="yes">
                              <textarea name="bookmark" from="basetextarea">
 -                                <area>508,24,90,20</area>
-+                                <area>574,24,90,20</area>
++                                <area>541,24,90,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -279,7 +350,7 @@
                          <state name="no">
                              <textarea name="cutlistoff" from="basetextarea">
 -                                <area>600,24,80,20</area>
-+                                <area>666,24,80,20</area>
++                                <area>632,24,80,20</area>
                                  <font>basesupersmall</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -288,7 +359,7 @@
                          <state name="yes">
                              <textarea name="cutlist" from="basetextarea">
 -                                <area>600,24,80,20</area>
-+                                <area>666,24,80,20</area>
++                                <area>632,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -297,7 +368,7 @@
                      </statetype>
                      <textarea name="onscreensuboff" from="basetextarea">
 -                        <area>676,24,80,20</area>
-+                        <area>742,24,80,20</area>
++                        <area>707,24,80,20</area>
                          <font>basesupersmall</font>
                          <cutdown>no</cutdown>
                          <align>allcenter</align>
@@ -306,7 +377,7 @@
                      </textarea>
                      <textarea name="subtitleoff" from="basetextarea">
 -                        <area>676,24,80,20</area>
-+                        <area>742,24,80,20</area>
++                        <area>707,24,80,20</area>
                          <font>basesupersmall</font>
                          <cutdown>no</cutdown>
                          <align>allcenter</align>
@@ -315,7 +386,7 @@
                      </textarea>
                      <textarea name="ccoff" from="basetextarea">
 -                        <area>734,24,80,20</area>
-+                        <area>800,24,80,20</area>
++                        <area>761,24,80,20</area>
                          <font>basesupersmall</font>
                          <cutdown>no</cutdown>
                          <align>allcenter</align>
@@ -324,7 +395,7 @@
                          <state name="onscreensub">
                              <textarea name="onscreensub" from="basetextarea">
 -                                <area>676,24,80,20</area>
-+                                <area>742,24,80,20</area>
++                                <area>707,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -333,7 +404,7 @@
                          <state name="subtitles">
                              <textarea name="subtitles" from="basetextarea">
 -                                <area>676,24,80,20</area>
-+                                <area>742,24,80,20</area>
++                                <area>707,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
@@ -342,10 +413,28 @@
                          <state name="cc">
                              <textarea name="ccoff" from="basetextarea">
 -                                <area>734,24,80,20</area>
-+                                <area>800,24,80,20</area>
++                                <area>761,24,80,20</area>
                                  <font>basesupersmallblue</font>
                                  <cutdown>no</cutdown>
                                  <align>allcenter</align>
+@@ -541,7 +611,7 @@
+                                 <area>796,24,92,20</area>
+                                 <font>basesupersmallred</font>
+                                 <cutdown>no</cutdown>
+-                                <align>left,vcenter</align>
++                                <align>right,vcenter</align>
+                                 <value>RECORDING</value>
+                                 <alphapulse min="130" max="255" change="2"/>
+                             </textarea>
+@@ -552,7 +622,7 @@
+                                 <area>796,24,92,20</area>
+                                 <font>basesupersmallred</font>
+                                 <cutdown>no</cutdown>
+-                                <align>left,vcenter</align>
++                                <align>right,vcenter</align>
+                                 <alphapulse min="130" max="255" change="2"/>
+                                 <value>TRANSCODING</value>
+                             </textarea>
 @@ -579,20 +649,20 @@
                          <align>allcenter</align>
                      </textarea>
@@ -610,8 +699,7 @@
 +                            <textarea name="status" from="basetextarea">
 +                                <area>0,0,140,30</area>
 +                                <font>baseextrasmallblue</font>
-                                 <align>right,vcenter</align>
--                                <value>AVCHD</value>
++                                <align>right,vcenter</align>
 +                                <value>MPEG2</value>
 +                            </textarea>
 +                        </state>
@@ -627,7 +715,8 @@
 +                            <textarea name="status" from="basetextarea">
 +                                <area>0,0,140,30</area>
 +                                <font>baseextrasmallblue</font>
-+                                <align>right,vcenter</align>
+                                 <align>right,vcenter</align>
+-                                <value>AVCHD</value>
 +                                <value>UHD4Ki</value>
 +                            </textarea>
 +                        </state>
-- 
cgit v0.12

