Merge branch 'testing'

4 files changed, 250 insertions, 34 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 0420f3e..d45b85e 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=linhes-theme
-pkgver=8.5
+pkgver=8.5.1
 pkgrel=4
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
@@ -112,15 +112,15 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
          '643e7d548587b8742ed5accb6d736257'
          'dd1e013e806efc26049ea89637a51f83'
          '9fe3371a8b964a7028126405cfaa330b'
-         '537e12f58ae8da81176d8b982ac9c783'
+         '958d25f7b932c923cf9f8376063eeb57'
          'a0b6733e4a6734a3c24e8dc3b0c14e74'
          '384871202030f41148536e2e89bb1801'
-         '4d01487b534e45c631734501ec0da501'
+         '979cdd540b672e3383b33188ccb247b6'
          '8312aff444945f80a76100696c81cb2e'
          '81a2706cd36a16a1e0c54d87f3a0857b'
          '4125880d1739b196a8041ecc3d773ee2'
          '5a8fb2a5f0e657d52be6f0a6a006ce72'
-         '36952501471b05395e4f061557447b2f'
+         '274b6f8cb5cd82c5ce28422decd7754b'
          'bfc32b9fa5dca3d46dd6f365ecb449b5'
          '326a71eb795b322a9ea26f116d890c87'
          '8fcd0acc11f4db33a9442949fb1a293d'
diff --git a/abs/core/linhes-theme/install-ui.xml b/abs/core/linhes-theme/install-ui.xml
index 4e5f139..823b0dc 100644
--- a/abs/core/linhes-theme/install-ui.xml
+++ b/abs/core/linhes-theme/install-ui.xml
@@ -122,4 +122,67 @@
 
     </window>
 
+    <window name="questionnotice_screen">
+
+        <textarea name="title" from="base_heading">
+            <value></value>
+        </textarea>
+
+        <shape name="questionnotice-backdrop" from="base_backdrop">
+            <area>115,36,1050,649</area>
+        </shape>
+
+        <shape name="questionnotice-backdrop-line" from="base_backdrop_line">
+            <area>116,37,1048,647</area>
+        </shape>
+
+        <shape name="questionnotice-top-line" from="base_highlight_line">
+            <area>117,38,1046,2</area>
+        </shape>
+
+        <shape name="questionnotice-bottom-line" from="base_highlight_line">
+            <area>117,681,1046,2</area>
+        </shape>
+
+        <shape name="questionnotice-left-line" from="base_highlight_vertical_line">
+            <area>117,40,2,641</area>
+        </shape>
+
+        <shape name="questionnotice-right-line" from="base_highlight_vertical_line">
+            <area>1161,40,2,641</area>
+        </shape>
+
+        <shape name="questionnotice-bottom-seperator-line" from="base_line">
+            <area>138,620,1004,2</area>
+        </shape>
+
+        <textarea name="notice_text" from="basetextarea">
+            <multiline>yes</multiline>
+            <area>138,58,1004,562</area>
+            <font>baselarge</font>
+            <value></value>
+            <align>top,hcenter</align>
+        </textarea>
+
+        <textarea name="question_text" from="notice_text">
+            <align>allcenter</align>
+        </textarea>
+
+        <button name="yes_button" from="base_button">
+            <area>233,632,350,40</area>
+            <value></value>
+        </button>
+
+        <button name="no_button" from="base_button">
+            <area>697,632,350,40</area>
+            <value></value>
+        </button>
+
+        <button name="ok_button" from="base_button">
+            <area>465,632,350,40</area>
+            <value>OK</value>
+        </button>
+
+    </window>
+
 </mythuitheme>
diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch
index 77969dc..e70625a 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	2016-11-16 20:12:29.390254787 +0000
-+++ recordings-ui.xml	2016-12-23 02:34:31.313887659 +0000
+--- recordings-ui.xml.orig	2017-12-19 19:51:38.610985722 +0000
++++ recordings-ui.xml	2017-12-19 19:51:28.052356436 +0000
 @@ -105,19 +105,11 @@
          </shape>
  
@@ -30,7 +30,15 @@
                          <multiline>yes</multiline>
                      </textarea>
                  </state>
-@@ -232,16 +225,16 @@
+@@ -218,6 +211,7 @@
+                    </textarea>
+                     <textarea name="shortstartdate" from="titlesubtitle">
+                         <area>720,0,80,30</area>
++                        <cutdown>no</cutdown>
+                         <align>right,vcenter</align>
+                     </textarea>
+                     <textarea name="filesize_str" from="base_text_font_state_extrasmall">
+@@ -232,16 +226,17 @@
                      <area>0,0,898,64</area>
                      <textarea name="titlesubtitle" from="base_text_font_state_small">
                          <area>8,2,694,24</area>
@@ -41,6 +49,7 @@
                      <textarea name="shortstartdate" from="titlesubtitle">
 -                        <area>720,3,80,24</area>
 +                        <area>720,2,80,24</area>
++                        <cutdown>no</cutdown>
                          <align>right,vcenter</align>
                      </textarea>
                      <textarea name="filesize_str" from="base_text_font_state_extrasmall">
@@ -51,7 +60,7 @@
                          <cutdown>no</cutdown>
                          <align>right,vcenter</align>
                      </textarea>
-@@ -579,20 +572,20 @@
+@@ -579,20 +574,20 @@
                          <align>allcenter</align>
                      </textarea>
                      <textarea name="s00e00" from="base_text_font_state_extrasmall">
@@ -75,7 +84,7 @@
                          <font state="normal">baseextrasmall</font>
                          <align>right,vcenter</align>
                      </textarea>
-@@ -606,57 +599,48 @@
+@@ -606,57 +601,48 @@
              </statetype>
          </buttonlist>
  
@@ -145,7 +154,7 @@
              <font>basesupersmallyellow</font>
              <align>allcenter</align>
              <template>Disk space:  %1</template>
-@@ -688,7 +672,7 @@
+@@ -688,7 +674,7 @@
          <textarea name="norecordings">
              <area>350,87,906,351</area>
              <font>basemedium</font>
diff --git a/abs/core/linhes-theme/status-ui.xml.patch b/abs/core/linhes-theme/status-ui.xml.patch
index 9c26d77..400f14c 100644
--- a/abs/core/linhes-theme/status-ui.xml.patch
+++ b/abs/core/linhes-theme/status-ui.xml.patch
@@ -1,53 +1,197 @@
---- status-ui.xml.orig	2017-01-12 02:25:29.328323754 +0000
-+++ status-ui.xml	2017-01-12 02:19:35.527174739 +0000
-@@ -212,9 +212,9 @@
+--- status-ui.xml.orig	2018-01-03 21:51:16.028700351 +0000
++++ status-ui.xml	2018-01-03 21:21:37.423911248 +0000
+@@ -170,100 +170,140 @@
+     </window>
  
-         <textarea name="title">
-             <area>4,4,552,64</area>
+     <window name="standbymode">
+-        <area>-1,-1,568,320</area>
++        <area>0,0,1280,720</area>
+ 
+-        <animation trigger="AboutToShow">
+-            <section>
+-                <alpha start="0" end="255" easingcurve="OutQuart"/>
+-                <zoom start="0" end="100" easingcurve="OutQuart"/>
+-            </section>
+-        </animation>
+-
+-        <animation trigger="AboutToHide">
+-            <section>
+-                <alpha start="255" end="0" easingcurve="InQuart"/>
+-                <zoom start="100" end="0" easingcurve="InQuart"/>
+-            </section>
+-        </animation>
++        <textarea name="heading" from="base_heading">
++            <value>Standby</value>
++        </textarea>
+ 
+         <shape name="standbymode-backdrop" from="base_backdrop">
+-            <area>0,0,568,320</area>
++            <area>20,36,1240,649</area>
+         </shape>
+ 
+         <shape name="standbymode-backdrop-line" from="base_backdrop_line">
+-            <area>1,1,566,318</area>
++            <area>21,37,1238,647</area>
+         </shape>
+ 
+         <shape name="standbymode-top-line" from="base_highlight_line">
+-            <area>2,2,564,2</area>
++            <area>22,38,1236,2</area>
+         </shape>
+ 
+         <shape name="standbymode-bottom-line" from="base_highlight_line">
+-            <area>2,316,564,2</area>
++            <area>22,681,1236,2</area>
+         </shape>
+ 
+         <shape name="standbymode-left-line" from="base_highlight_vertical_line">
+-            <area>2,4,2,312</area>
++            <area>22,40,2,641</area>
+         </shape>
+ 
+         <shape name="standbymode-right-line" from="base_highlight_vertical_line">
+-            <area>564,4,2,312</area>
++            <area>1256,40,2,641</area>
+         </shape>
+ 
+-        <textarea name="title">
+-            <area>4,4,552,64</area>
 -            <font>basemedium</font>
-+            <font>basemediumyellow</font>
-             <align>allcenter</align>
+-            <align>allcenter</align>
 -            <value>MythTV is in standby mode!</value>
-+            <value>MythTV is in Standby Mode</value>
-         </textarea>
+-        </textarea>
++        <shape name="standbymode-status-seperator-line" from="base_line">
++            <area>43,100,1194,2</area>
++        </shape>
++
++        <shape name="standbymode-recording-status-seperator-line" from="base_line">
++            <area>43,318,1194,2</area>
++        </shape>
++
++        <shape name="standbymode-scheduled-recording-status-seperator-line" from="base_line">
++            <area>43,536,1194,2</area>
++        </shape>
  
          <statetype name="backendstatus">
-@@ -230,7 +230,7 @@
-                 <textarea name="status">
-                     <area>4,248,552,64</area>
-                     <font>basemediumgreen</font>
+-            <area>4,4,560,312</area>
++            <area>40,40,1200,60</area>
+             <state name="idle">
+-                <area>0,0,560,312</area>
+-                <shape name="icon">
+-                    <area>74,64,412,184</area>
+-                    <type>roundbox</type>
+-                    <fill color="#80d400" />
+-                    <cornerradius>5</cornerradius>
+-                </shape>
+-                <textarea name="status">
+-                    <area>4,248,552,64</area>
+-                    <font>basemediumgreen</font>
 -                    <value>Backend is idle!</value>
++                <area>0,0,1200,60</area>
++                <textarea name="status" from="basetextarea">
++                    <area>0,0,1200,60</area>
++                    <font>baseextralarge</font>
 +                    <value>Backend is Idle</value>
                      <align>allcenter</align>
-                     <multiline>true</multiline>
+-                    <multiline>true</multiline>
                  </textarea>
-@@ -241,16 +241,16 @@
-                 </shape>
+             </state>
+             <state name="recording" from="idle">
+-                <shape name="icon">
+-                    <fill color="#d93636" />
+-                </shape>
                  <textarea name="status">
-                     <font>basemediumred</font>
+-                    <font>basemediumred</font>
 -                    <value>Backend is recording!</value>
 +                    <value>Backend is Recording</value>
                  </textarea>
              </state>
              <state name="shuttingdown" from="idle">
-                 <shape name="icon">
+-                <shape name="icon">
 -                    <fill color="#d9d900" />
-+                    <fill color="#d97616" />
-                 </shape>
+-                </shape>
                  <textarea name="status">
 -                    <font>basemediumyellow</font>
 -                    <value>Shutting Down!</value>
-+                    <font>basemediumorange</font>
 +                    <value>MythTV is Shutting Down</value>
                  </textarea>
              </state>
              <state name="offline" from="idle">
-@@ -259,7 +259,7 @@
-                 </shape>
+-                <shape name="icon">
+-                    <fill color="#d93636" />
+-                </shape>
                  <textarea name="status">
-                     <font>basemediumred</font>
+-                    <font>basemediumred</font>
 -                    <value>Backend is offline!</value>
 +                    <value>Backend is Offline</value>
                  </textarea>
              </state>
          </statetype>
+ 
++        <textarea name="currentrecordingheading" from="basetextarea">
++            <area>40,110,1200,30</area>
++            <font>basemediumlargerdarkyellow</font>
++            <align>allcenter</align>
++            <value>Currently Recording</value>
++        </textarea>
++        <textarea name="nothingrecording" depends="!currentrecording">
++            <area>40,144,1200,170</area>
++            <font>basesmall</font>
++            <align>hcenter,top</align>
++            <value>Nothing is Recording</value>
++        </textarea>
++        <buttonlist name="currentrecording">
++            <area>40,144,1200,170</area>
++            <layout>vertical</layout>
++            <spacing>4</spacing>
++            <scrollstyle>free</scrollstyle>
++            <arrange>stack</arrange>
++            <wrapstyle>items</wrapstyle>
++            <buttonarea>0,0,100%,100%</buttonarea>
++            <statetype name="buttonitem">
++                <state name="active">
++                    <textarea name="shorttimedate" from="basetextarea">
++                        <area>0,1,400,24</area>
++                        <align>right,vcenter</align>
++                    </textarea>
++                    <textarea name="channame" from="shorttimedate">
++                        <area>405,1,180,24</area>
++                        <align>allcenter</align>
++                    </textarea>
++                    <textarea name="titlesubtitle" from="shorttimedate">
++                        <area>590,1,610,24</area>
++                        <align>left,vcenter</align>
++                    </textarea>
++                </state>
++                <state name="selectedactive" from="active"/>
++                <state name="selectedinactive" from="selectedactive" />
++            </statetype>
++        </buttonlist>
++
++        <textarea name="nextrecordingheading" from="currentrecordingheading">
++            <area>40,328,1200,30</area>
++            <value>Upcoming Recordings</value>
++        </textarea>
++        <textarea name="nothingscheduled" depends="!nextrecording" from="nothingrecording">
++            <area>40,362,1200,170</area>
++            <value>No Recordings Are Scheduled</value>
++        </textarea>
++        <buttonlist name="nextrecording" from="currentrecording">
++            <area>40,362,1200,170</area>
++        </buttonlist>
++
++        <textarea name="conflictsheading" from="nextrecordingheading">
++            <area>40,546,1200,30</area>
++            <value>Recording Conflicts</value>
++        </textarea>
++        <textarea name="nothingconflicted" depends="!conflicts" from="nothingrecording">
++            <area>40,580,1200,91</area>
++            <value>No Conflicts</value>
++        </textarea>
++        <buttonlist name="conflicts" from="currentrecording">
++            <area>40,580,1200,91</area>
++        </buttonlist>
++
+     </window>
+ 
+ </mythuitheme>