Merge branch 'master' of mihanson@knoppmyth.net:LinHES-PKGBUILD

1 files changed, 21 insertions, 61 deletions

diff --git a/abs/core/mythinstall/install-ui.xml b/abs/core/mythinstall/install-ui.xml
index 8cebd11..ef445bb 100755
--- a/abs/core/mythinstall/install-ui.xml
+++ b/abs/core/mythinstall/install-ui.xml
@@ -1,19 +1,6 @@
-<!--
-
-    This is a myth style theme file for mythwelcome
-
-    (c) 2005 by a whole bunch of people associated with MythTV
-
--->
 <mythuitheme>
 
     <window name="welcome_screen">
-
-        <!--
-
-            First, define all the fonts we need on this screen
-
-        -->
        <font name="title" face="Arial">
            <color>#ffff00</color>
            <dropcolor>#000000</dropcolor>
@@ -66,19 +53,14 @@
            <bold>no</bold>
        </font>
 
-       <container name="main_display">
-            <area>0,0,800,600</area>
+        <textarea name="title" from="basetextarea">
+            <area>50,10,700,40</area>
+            <font>title</font>
+            <align>allcenter</align>
+            <value>Welcome to LinHES!</value>
+        </textarea>
 
-            <textarea name="title" draworder="0" align="center">
-                <multiline>no</multiline>
-                <font>title</font>
-                <area>50,40,700,40</area>
-                <value>Welcome to  MythVantage! </value>
-            </textarea>
 
-            <!--
-                time
-            -->
             <textarea name="time_text" draworder="0" align="right">
                 <multiline>no</multiline>
                 <font>time</font>
@@ -86,22 +68,24 @@
                 <value></value>
             </textarea>
 
-            <textarea name="date_text" draworder="0" align="hcenter">
+            <textarea name="date_text" >
                 <multiline>yes</multiline>
-                <font>time</font>
-                <area>20,75,740,100</area>
+                <font>warning</font>
+                <area>20,55,740,100</area>
                 <value></value>
+                <align>allcenter</align>
             </textarea>
 
             <!--
                 current myth status
             -->
 
-            <textarea name="status_text" draworder="1" align="center">
+            <textarea name="status_text">
                 <multiline>yes</multiline>
                 <font>info</font>
-                <area>20,100,760,60</area>
-                <value>MythTV is idle and will shutdown shortly.</value>
+                <area>20,300,760,60</area>
+                <value></value>
+                <align>center</align>
             </textarea>
 
             <!--
@@ -115,60 +99,36 @@
                  <value></value>
             </textarea>
 
-            <textarea name="recording_text" draworder="1" align="hcenter">
+            <textarea name="recording_text">
                 <multiline>yes</multiline>
                 <font>biginfo</font>
                 <area>20,140,760,150</area>
                 <value></value>
+                <align>allcenter</align>
             </textarea>
 
-            <!--
-                next scheduled recording status
-            -->
-
             <textarea name="scheduled_label" draworder="1" align="center">
                 <font>label</font>
                 <area>20,320,760,30</area>
                 <value></value>
             </textarea>
 
-            <textarea name="scheduled_text" draworder="1" align="hcenter">
+            <textarea name="scheduled_text">
                 <multiline>yes</multiline>
                 <font>biginfo</font>
                 <area>20,400,760,120</area>
                 <value></value>
+                <align>allcenter</align>
             </textarea>
 
-            <textarea name="mythvantage_text" draworder="1" align="right">
+            <textarea name="mythvantage_text">
                 <multiline>no</multiline>
                 <font>tinyinfo</font>
-                <area>20,560,760,30</area>
+                <area>20,540,760,30</area>
                 <value></value>
+                <align>right</align>
             </textarea>
-            <!--
-                scheduled recordings conflict warning
-            -->
-
-            <textarea name="conflicts_text" draworder="1" align="center">
-                <font>warning</font>
-                <area>20,490,760,30</area>
-                <value>WARNING: There are conflicting scheduled recordings!</value>
-            </textarea>
-
-            <!--
-                start frontend button
-
-            <textbutton name="startfrontend_button" draworder="1">
-                <position>81,535</position>
-                <font>buttons</font>
-                <image function="on" filename="mw_text_button_on.png"></image>
-                <image function="off" filename="mw_text_button_off.png"></image>
-                <image function="pushed" filename="mw_text_button_pushed.png"></image>
-            </textbutton>
-
-            -->
 
-	   </container>
 
     </window>