linhes-theme: make the channel scan page delete button more clear

add channelscanner

4 files changed, 455 insertions, 66 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index d45b85e..9db52b4 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.5.1
-pkgrel=4
+pkgrel=6
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -99,9 +99,9 @@ package() {
 }
 md5sums=('2dca856c2a4d1f959473512c94e43b60'
          '3fc2c8838a9e331a2d19c114760a5acb'
-         'b534a456304ed75d0082e04e4fd7a965'
+         '027739567b8dd634a09af7c86276c9e3'
          'd1d54968a2297924673d9653f707df33'
-         'b7ab73f7e445b617b1ea293ca40ef4e4'
+         '25ff929dc4aca3b2a0bd38d9ded5a6b8'
          '26a6db272dee225b9e4dc282f1494e51'
          'b90b745c72a057c78ebd0b6f2c5530b9'
          'a0ea2d3e386c0b483b31aa1a2703f9eb'
@@ -117,7 +117,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
          '384871202030f41148536e2e89bb1801'
          '979cdd540b672e3383b33188ccb247b6'
          '8312aff444945f80a76100696c81cb2e'
-         '81a2706cd36a16a1e0c54d87f3a0857b'
+         '2803a328cd276393964240842da03010'
          '4125880d1739b196a8041ecc3d773ee2'
          '5a8fb2a5f0e657d52be6f0a6a006ce72'
          '274b6f8cb5cd82c5ce28422decd7754b'
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index fb6091f..b113f5f 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,5 +1,5 @@
---- base.xml.orig	2017-12-01 19:19:20.906194024 +0000
-+++ base.xml	2017-12-01 19:13:11.344053140 +0000
+--- base.xml.orig	2018-04-17 14:44:34.438582684 +0000
++++ base.xml	2018-04-17 14:41:40.151269060 +0000
 @@ -3,55 +3,55 @@
  <mythuitheme>
  
@@ -485,7 +485,27 @@
          </statetype>
          <statetype name="background">
              <state name="active" />
-@@ -2186,7 +2199,7 @@
+@@ -1916,6 +1929,9 @@
+                 <group name="select_bar" from="base_spinbox_select_bar_selectedactive_group">
+                     <area>0,0,100%,100%</area>
+                 </group>
++                <textarea name="buttontext">
++                    <font>basesmallyellow</font>
++                </textarea>
+             </state>
+             <state name="selectedinactive" from="active" />
+             <state name="disabled" from="active">
+@@ -1992,6 +2008,9 @@
+                 <group name="select_bar" from="base_selector_select_bar_selectedactive_group">
+                     <area>0,0,100%,100%</area>
+                 </group>
++                <textarea name="buttontext">
++                    <font>basesmallyellow</font>
++                </textarea>
+             </state>
+             <state name="selectedinactive" from="active" />
+             <state name="disabled">
+@@ -2186,7 +2205,7 @@
          </shape>
  
          <shape name="popup-seperator-line" from="base_line">
@@ -494,7 +514,7 @@
          </shape>
  
          <shape name="popup-third-line" from="base_highlight_line">
-@@ -2202,23 +2215,23 @@
+@@ -2202,23 +2221,23 @@
          </shape>
  
          <shape name="popup-arrows-backdrop" from="base_arrows_backdrop">
@@ -523,7 +543,7 @@
                      </textarea>
                      <imagetype name="buttonarrow">
                          <position>560,8</position>
-@@ -2227,7 +2240,8 @@
+@@ -2227,7 +2246,8 @@
                  <state name="selectedactive">
                      <area>0,0,100%,34</area>
                      <textarea name="buttontext">
@@ -533,7 +553,7 @@
                      </textarea>
                      <imagetype name="buttonarrow">
                          <position>560,8</position>
-@@ -2236,7 +2250,7 @@
+@@ -2236,7 +2256,7 @@
                  <state name="selectedinactive">
                      <area>0,0,100%,34</area>
                      <textarea name="buttontext">
@@ -542,7 +562,7 @@
                      </textarea>
                      <imagetype name="buttonarrow">
                          <position>560,8</position>
-@@ -2244,10 +2258,10 @@
+@@ -2244,10 +2264,10 @@
                  </state>
              </statetype>
          <statetype name="upscrollarrow">
@@ -555,7 +575,7 @@
          </statetype>
          </buttonlist>
      </window>
-@@ -2299,7 +2313,7 @@
+@@ -2299,7 +2319,7 @@
          </shape>
  
          <shape name="large-dialogbox-arrows-backdrop" from="base_arrows_backdrop">
@@ -564,7 +584,7 @@
          </shape>
  
          <textarea name="messagearea" from="basetextarea">
-@@ -2332,10 +2346,10 @@
+@@ -2332,10 +2352,10 @@
                  </state>
              </statetype>
              <statetype name="upscrollarrow">
@@ -577,7 +597,7 @@
              </statetype>
          </buttonlist>
      </window>
-@@ -2486,7 +2500,7 @@
+@@ -2486,7 +2506,7 @@
  
          <textarea name="message" from="basetextarea">
              <area>8,8,571,127</area>
@@ -586,7 +606,7 @@
              <align>allcenter</align>
              <multiline>yes</multiline>
              <cutdown>no</cutdown>
-@@ -2501,6 +2515,7 @@
+@@ -2501,6 +2521,7 @@
              <area>338,151,150,35</area>
              <value>OK</value>
          </button>
@@ -594,7 +614,7 @@
      </window>
  
      <!-- Popup search dialog used to search button lists -->
-@@ -2630,12 +2645,12 @@
+@@ -2630,12 +2651,12 @@
  
          <textarea name="message" from="basetextarea">
              <area>10,14,567,36</area>
@@ -609,7 +629,7 @@
          </textedit>
  
          <button name="ok" from="base_button">
-@@ -2708,6 +2723,63 @@
+@@ -2708,6 +2729,63 @@
  
      </window>
  
@@ -673,7 +693,7 @@
      <window name="MythSearchDialog">
          <area>-1,-1,602,488</area>
  
-@@ -2795,10 +2867,10 @@
+@@ -2795,10 +2873,10 @@
                  </state>
              </statetype>
              <statetype name="upscrollarrow">
@@ -686,7 +706,7 @@
              </statetype>
          </buttonlist>
  
-@@ -2819,7 +2891,7 @@
+@@ -2819,7 +2897,7 @@
          <group name="fanart-group" from="base_fanart_group" />
  
          <textarea name="heading" from="base_heading">
@@ -695,7 +715,7 @@
          </textarea>
  
          <shape name="fullpath-backdrop" from="base_backdrop">
-@@ -2836,87 +2908,85 @@
+@@ -2836,87 +2914,85 @@
          </shape>
  
          <shape name="file-browser-preview-backdrop" from="base_backdrop">
@@ -804,7 +824,7 @@
              <statetype name="buttonitem">
                  <state name="active">
                      <area>0,0,599,54</area>
-@@ -3029,52 +3099,53 @@
+@@ -3029,52 +3105,53 @@
          </buttonlist>
  
          <textedit name="location" from="base_textedit">
diff --git a/abs/core/linhes-theme/config-ui.xml.patch b/abs/core/linhes-theme/config-ui.xml.patch
index 0ce47cf..6203f79 100644
--- a/abs/core/linhes-theme/config-ui.xml.patch
+++ b/abs/core/linhes-theme/config-ui.xml.patch
@@ -1,6 +1,68 @@
---- config-ui.xml.orig	2017-12-01 19:19:08.627784142 +0000
-+++ config-ui.xml	2017-12-01 19:10:38.513844323 +0000
-@@ -645,7 +645,7 @@
+--- config-ui.xml.orig	2018-04-17 14:44:54.355990144 +0000
++++ config-ui.xml	2018-04-17 21:15:29.208674746 +0000
+@@ -151,7 +151,7 @@
+         <area>0,0,1280,720</area>
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>Edit Channels</value>
++            <value>Channel Editor</value>
+         </textarea>
+ 
+         <shape name="edit-channels-top-backdrop" from="base_backdrop">
+@@ -261,13 +261,7 @@
+                         <align>right,vcenter</align>
+                     </textarea>
+                 </state>
+-                <state name="selectedinactive" from="selectedactive">
+-                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
+-                        <area>0,0,100%,100%</area>
+-                        <shape name="select_bar_bottom_highlight">
+-                            <area>0,70,100%,2</area>
+-                        </shape>
+-                    </group>
++                <state name="selectedinactive" from="active">
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+@@ -301,7 +295,7 @@
+         </textarea>
+ 
+         <buttonlist name="sorting" from="base_selector">
+-            <area>415,460,580,40</area>
++            <area>415,460,560,40</area>
+         </buttonlist>
+ 
+         <textarea name="sourcelabel" from="sortlabel">
+@@ -310,21 +304,21 @@
+         </textarea>
+ 
+         <buttonlist name="source" from="sorting">
+-            <area>415,515,580,40</area>
++            <area>415,515,560,40</area>
+         </buttonlist>
+ 
+         <button name="delete" from="base_button">
+-            <area>1030,517,150,35</area>
+-            <value>Delete</value>
++            <area>1010,517,200,35</area>
++            <value>Delete Source</value>
+         </button>
+ 
+-        <textarea name="nochannumlabel" from="basetextarea">
+-            <area>450,575,500,60</area>
+-            <value>Hide Channels without channel number.</value>
++        <textarea name="nochannumlabel" from="sortlabel">
++            <area>245,575,425,30</area>
++            <value>Hide Channels Without Channel Number:</value>
+         </textarea>
+ 
+         <checkbox name="nochannum" from="base_checkbox">
+-            <position>410,572</position>
++            <position>685,575</position>
+         </checkbox>
+ 
+         <button name="scan" from="base_button">
+@@ -645,7 +639,7 @@
          <textarea name="helptext" from="basetextarea">
              <area>231,372,818,227</area>
              <multiline>yes</multiline>
@@ -9,7 +71,7 @@
              <align>allcenter</align>
          </textarea>
  
-@@ -734,7 +734,7 @@
+@@ -734,7 +728,7 @@
          <textarea name="helptext" from="basetextarea">
              <area>231,372,818,227</area>
              <multiline>yes</multiline>
@@ -18,7 +80,7 @@
              <align>allcenter</align>
          </textarea>
  
-@@ -901,7 +901,7 @@
+@@ -901,7 +895,7 @@
          <textarea name="helptext" from="basetextarea">
              <area>233,488,814,111</area>
              <multiline>yes</multiline>
@@ -27,7 +89,7 @@
              <align>allcenter</align>
          </textarea>
  
-@@ -1000,7 +1000,7 @@
+@@ -1000,7 +994,7 @@
          <textarea name="helptext" from="basetextarea">
              <area>231,372,818,227</area>
              <multiline>yes</multiline>
@@ -36,7 +98,7 @@
              <align>allcenter</align>
          </textarea>
  
-@@ -1016,4 +1016,369 @@
+@@ -1016,4 +1010,572 @@
  
      </window>
  
@@ -405,4 +467,207 @@
 +        </button>
 +    </window>
 +
++    <window name="channelscanner">
++        <area>0,0,1280,720</area>
++
++        <textarea name="heading" from="base_heading">
++            <value>Channel Scanner</value>
++        </textarea>
++
++        <shape name="status-backdrop" from="base_backdrop">
++            <area>0,37,1280,44</area>
++            <type>box</type>
++        </shape>
++
++        <shape name="status-top-line" from="base_line">
++            <area>0,38,1280,2</area>
++        </shape>
++
++        <shape name="status-bottom-line" from="base_line">
++            <area>0,77,1280,2</area>
++        </shape>
++
++        <shape name="scanner-progress-backdrop" from="base_backdrop">
++            <area>645,92,615,592</area>
++        </shape>
++
++        <shape name="scanner-progress-backdrop-line" from="base_backdrop_line">
++            <area>646,93,613,590</area>
++        </shape>
++
++        <shape name="scanner-progress-top-line" from="base_highlight_line">
++            <area>647,94,611,2</area>
++        </shape>
++
++        <shape name="scanner-progress-bottom-line" from="base_highlight_line">
++            <area>647,680,611,2</area>
++        </shape>
++
++        <shape name="scanner-progress-left-line" from="base_highlight_vertical_line">
++            <area>647,96,2,584</area>
++        </shape>
++
++        <shape name="scanner-progress-right-line" from="base_highlight_vertical_line">
++            <area>1256,96,2,584</area>
++        </shape>
++
++        <shape name="scanner-channels-backdrop" from="base_backdrop">
++            <area>20,92,615,592</area>
++        </shape>
++
++        <shape name="scanner-channels-backdrop-line" from="base_backdrop_line">
++            <area>21,93,613,590</area>
++        </shape>
++
++        <shape name="scanner-channels-top-line" from="base_highlight_line">
++            <area>22,94,611,2</area>
++        </shape>
++
++        <shape name="scanner-channels-bottom-line" from="base_highlight_line">
++            <area>22,680,611,2</area>
++        </shape>
++
++        <shape name="scanner-channels-left-line" from="base_highlight_vertical_line">
++            <area>22,96,2,584</area>
++        </shape>
++
++        <shape name="scanner-channels-right-line" from="base_highlight_vertical_line">
++            <area>631,96,2,584</area>
++        </shape>
++
++        <shape name="scanner-channels-arrows-backdrop" from="base_arrows_backdrop">
++            <area>1207,684,50,10</area>
++        </shape>
++
++        <textarea name="status">
++            <area>265,39,460,40</area>
++            <font>basesmall</font>
++            <align>right,vcenter</align>
++            <template>%1</template>
++        </textarea>
++
++        <textarea name="signallock" from="status">
++            <area>735,39,300,40</area>
++            <align>left,vcenter</align>
++            <template>[%1]</template>
++        </textarea>
++
++        <textarea name="scanprogresstext" from="status">
++            <area>945,39,300,40</area>
++            <template>Channels%1</template>
++        </textarea>
++
++        <textarea name="progress_label">
++            <area>60,190,535,30</area>
++            <font>basesmall</font>
++            <align>left,vcenter</align>
++            <value>Scan Progress</value>
++        </textarea>
++
++        <textarea name="progresstext" from="progress_label">
++            <area>60,240,535,30</area>
++            <font>basesmall</font>
++            <align>allcenter</align>
++        </textarea>
++
++        <progressbar name="scanprogress" from="baseprogressbar">
++            <position>60,225</position>
++        </progressbar>
++
++        <group name="noisegroup" depends="signalnoise">
++            <area>60,300,535,200</area>
++            <textarea name="signalnoise_label">
++                <area>0,0,100%,30</area>
++                <align>left,vcenter</align>
++                <font>basesmall</font>
++                <value>Signal/Noise</value>
++            </textarea>
++            <textarea name="signalnoisetext">
++                <area>0,50,100%,30</area>
++                <font>basesmall</font>
++                <align>allcenter</align>
++            </textarea>
++            <progressbar name="signalnoise" from="smallprogressbar">
++                <position>0,35</position>
++            </progressbar>
++        </group>
++
++        <group name="strengthgroup" depends="signalstrength">
++            <area>60,400,535,200</area>
++            <textarea name="signalstrength_label">
++                <area>0,0,100%,30</area>
++                <align>left,vcenter</align>
++                <font>basesmall</font>
++                <value>Signal Strength</value>
++            </textarea>
++            <textarea name="signalstrengthtext">
++                <area>0,50,100%,30</area>
++                <font>basesmall</font>
++                <align>allcenter</align>
++            </textarea>
++            <progressbar name="signalstrength" from="smallprogressbar">
++                <position>0,35</position>
++            </progressbar>
++        </group>
++
++        <group name="rotatorgroup" depends="rotorprogress">
++            <area>60,500,535,200</area>
++            <textarea name="rotorprogress_label">
++                <area>0,0,100%,30</area>
++                <align>left,vcenter</align>
++                <font>basesmall</font>
++                <value>Rotor Movement</value>
++            </textarea>
++            <textarea name="rotatorprogresstext">
++                <area>0,50,100%,30</area>
++                <font>basesmall</font>
++                <align>allcenter</align>
++            </textarea>
++            <progressbar name="rotorprogress" from="smallprogressbar">
++                <position>0,35</position>
++            </progressbar>
++        </group>
++
++        <buttonlist name="log" from="base_list">
++            <area>653,100,599,578</area>
++            <statetype name="buttonitem">
++                <state name="active">
++                    <area>0,0,599,54</area>
++                    <textarea name="buttontext">
++                        <area>0,0,100%,100%</area>
++                        <font>basesmaller</font>
++                        <multiline>yes</multiline>
++                        <align>allcenter</align>
++                    </textarea>
++                </state>
++                <state name="selectedactive" from="active">
++                    <area>0,0,599,112</area>
++                    <group name="select_bar" from="base_select_bar_selectedactive_group">
++                        <area>0,0,100%,100%</area>
++                        <shape name="select_bar_bottom_highlight">
++                            <area>0,110,100%,2</area>
++                        </shape>
++                    </group>
++                    <textarea name="buttontext">
++                        <font>basesmalleryellow</font>
++                    </textarea>
++                </state>
++                <state name="selectedinactive" from="selectedactive">
++                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
++                        <area>0,0,100%,100%</area>
++                        <shape name="select_bar_bottom_highlight">
++                            <area>0,110,100%,2</area>
++                        </shape>
++                    </group>
++                </state>
++            </statetype>
++            <statetype name="upscrollarrow">
++                <position>561,585</position>
++            </statetype>
++            <statetype name="downscrollarrow">
++                <position>581,585</position>
++            </statetype>
++        </buttonlist>
++    </window>
++
  </mythuitheme>
diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch
index e3a9f7d..2a336ef 100644
--- a/abs/core/linhes-theme/video-ui.xml.patch
+++ b/abs/core/linhes-theme/video-ui.xml.patch
@@ -1,8 +1,54 @@
---- video-ui.xml.orig	2016-12-13 20:43:30.600314830 +0000
-+++ video-ui.xml	2017-10-26 19:57:07.944986189 +0000
-@@ -171,6 +171,7 @@
+--- video-ui.xml.orig	2018-04-17 14:44:43.827360598 +0000
++++ video-ui.xml	2018-04-17 14:47:36.544853593 +0000
+@@ -58,8 +58,8 @@
+         <textarea name="label" from="basetextarea">
+             <area>10,4,543,70</area>
+             <align>allcenter</align>
+-            <font>baselargedarkyellow</font>
+-            <value>Cast Members</value>
++            <font>baselarge</font>
++            <value>Cast</value>
+         </textarea>
+ 
+         <buttonlist name="cast" from="base_button_list">
+@@ -98,10 +98,10 @@
+                 </state>
+             </statetype>
+         <statetype name="upscrollarrow">
+-            <position>0,368</position>
++            <position>507,368</position>
+         </statetype>
+         <statetype name="downscrollarrow">
+-            <position>20,368</position>
++            <position>527,368</position>
+         </statetype>
+         </buttonlist>
+ 
+@@ -154,7 +154,7 @@
+         </shape>
+ 
+         <shape name="full-plot-seperator-first-line" from="base_line">
+-            <area>23,45,517,2</area>
++            <area>23,74,517,2</area>
+         </shape>
+ 
+         <shape name="full-plot-seperator-second-line" from="base_line">
+@@ -162,15 +162,16 @@
+         </shape>
+ 
+         <textarea name="label" from="basetextarea">
+-            <area>24,4,515,41</area>
++            <area>10,4,543,70</area>
+             <align>allcenter</align>
+-            <font>basesmalldarkyellow</font>
+-            <value>Full Plot</value>
++            <font>baselarge</font>
++            <value>Plot</value>
+         </textarea>
+ 
          <textarea name="description" from="basetextarea">
-             <area>24,51,515,393</area>
+-            <area>24,51,515,393</area>
++            <area>24,78,515,358</area>
              <multiline>yes</multiline>
 +            <scroll direction="up" rate="20" startdelay="5"/>
              <font>basesmall</font>
@@ -144,16 +190,19 @@
          </statetype>
  
          <textarea name="dirlbl" from="basetextarea">
-             <area>44,453,132,40</area>
+-            <area>44,453,132,40</area>
 -            <font>basesmall</font>
++            <area>44,453,122,40</area>
 +            <font>basesmallblue</font>
              <align>left,vcenter</align>
-             <value>Directed By:</value>
+-            <value>Directed By:</value>
++            <value>Director:</value>
          </textarea>
  
          <textarea name="director" from="basetextarea">
-             <area>186,453,611,40</area>
+-            <area>186,453,611,40</area>
 -            <font>basesmallblue</font>
++            <area>176,453,621,40</area>
 +            <font>basesmall</font>
              <align>left,vcenter</align>
          </textarea>
@@ -528,16 +577,19 @@
          </statetype>
  
          <textarea name="dirlbl" from="basetextarea">
-             <area>44,448,132,34</area>
+-            <area>44,448,132,34</area>
 -            <font>basesmall</font>
++            <area>44,448,122,34</area>
 +            <font>basesmallblue</font>
              <align>left,vcenter</align>
-             <value>Directed By:</value>
+-            <value>Directed By:</value>
++            <value>Director:</value>
          </textarea>
  
          <textarea name="director" from="basetextarea">
-             <area>186,448,621,34</area>
+-            <area>186,448,621,34</area>
 -            <font>basesmallblue</font>
++            <area>176,448,631,34</area>
 +            <font>basesmall</font>
              <align>left,vcenter</align>
          </textarea>
@@ -862,18 +914,22 @@
                      <area>-165,3,158,24</area>
                      <font>basesmallred</font>
                      <cutdown>no</cutdown>
-@@ -1887,210 +1951,210 @@
+@@ -1886,211 +1950,211 @@
+         </statetype>
          
          <textarea name="dirlbl" from="basetextarea">
-             <area>40,444,132,42</area>
+-            <area>40,444,132,42</area>
 -            <font>basesmall</font>
++            <area>40,444,102,42</area>
 +            <font>basesmallblue</font>
              <align>left,vcenter</align>
-             <value>Directed By:</value>
+-            <value>Directed By:</value>
++            <value>Director:</value>
          </textarea>
  
          <textarea name="director" from="basetextarea">
-             <area>187,444,407,42</area>
+-            <area>187,444,407,42</area>
++            <area>152,444,441,42</area>
 +            <font>basesmall</font>
 +            <align>left,vcenter</align>
 +        </textarea>
@@ -1225,7 +1281,23 @@
      </window>
      
      <window name="edit_metadata">
-@@ -2947,82 +3011,84 @@
+@@ -2367,13 +2431,13 @@
+         </textedit>
+ 
+         <textarea name="director_text" from="basetextarea">
+-            <area>40,126,124,36</area>
++            <area>40,126,114,36</area>
+             <value>Director:</value>
+             <align>right,vcenter</align>
+         </textarea>
+ 
+         <textedit name="director_edit" from="base_textedit">
+-            <area>177,126,366,36</area>
++            <area>167,126,366,36</area>
+         </textedit>
+ 
+         <textarea name="tagline_text" from="basetextarea">
+@@ -2947,83 +3011,85 @@
              <multiline>no</multiline>
              <font>basesmalldarkyellow</font>
              <align>allcenter</align>
@@ -1234,7 +1306,8 @@
          </textarea>
  
          <textarea name="description" from="basetextarea">
-             <area>23,54,527,214</area>
+-            <area>23,54,527,214</area>
++            <area>23,60,527,202</area>
              <multiline>yes</multiline>
              <font>basesmaller</font>
 +            <scroll direction="up" rate="20" startdelay="5"/>
@@ -1242,7 +1315,7 @@
  
          <textarea name="cast" from="basetextarea">
 -            <area>23,275,527,48</area>
-+            <area>25,275,527,43</area>
++            <area>25,279,527,38</area>
              <multiline>yes</multiline>
 -            <font>basesmaller</font>
 +            <font>baseextrasmall</font>
@@ -1250,17 +1323,20 @@
          </textarea>
  
          <textarea name="dirlbl" from="basetextarea">
-             <area>23,325,112,24</area>
+-            <area>23,325,112,24</area>
 -            <font>basesmaller</font>
+-            <value>Directed by:</value>
+-            <align>left,vcenter</align>
++            <area>23,325,82,24</area>
 +            <font>basesmallerblue</font>
-             <value>Directed by:</value>
-             <align>left,vcenter</align>
++            <value>Director:</value>
++            <align>right,vcenter</align>
          </textarea>
  
          <textarea name="director" from="basetextarea">
 -            <area>145,326,405,24</area>
 -            <font>basesmallerblue</font>
-+            <area>145,325,405,24</area>
++            <area>115,325,435,24</area>
 +            <font>basesmaller</font>
              <align>left,vcenter</align>
          </textarea>
@@ -1268,16 +1344,17 @@
          <textarea name="yearlbl" from="basetextarea">
 -            <area>23,354,46,24</area>
 -            <font>basesmaller</font>
-+            <area>23,354,47,24</area>
+-            <align>left,vcenter</align>
++            <area>23,354,82,24</area>
 +            <font>basesmallerblue</font>
-             <align>left,vcenter</align>
++            <align>right,vcenter</align>
              <value>Year:</value>
          </textarea>
  
          <textarea name="year" from="basetextarea">
 -            <area>79,356,80,24</area>
 -            <font>basesmallerblue</font>
-+            <area>79,354,80,24</area>
++            <area>115,354,150,24</area>
 +            <font>basesmaller</font>
          </textarea>
  
@@ -1298,36 +1375,63 @@
          </textarea>
  
         <textarea name="seasonlbl" from="basetextarea">
-             <area>88,382,90,20</area>
+-            <area>88,382,90,20</area>
 -            <font>baseextrasmall</font>
-+            <font>baseextrasmallblue</font>
++            <area>23,380,82,24</area>
++            <font>basesmallerblue</font>
              <value>Season:</value>
              <align>right,vcenter</align>
          </textarea>
  
          <textarea name="season" from="basetextarea">
-             <area>188,382,110,20</area>
+-            <area>188,382,110,20</area>
 -            <font>baseextrasmallblue</font>
-+            <font>baseextrasmall</font>
-             <align>vcenter</align>
+-            <align>vcenter</align>
++            <area>115,380,150,24</area>
++            <font>basesmaller</font>
++            <align>left,vcenter</align>
          </textarea>
  
          <textarea name="episodelbl" from="basetextarea">
-             <area>331,382,94,20</area>
+-            <area>331,382,94,20</area>
 -            <font>baseextrasmall</font>
-+            <font>baseextrasmallblue</font>
++            <area>331,380,94,24</area>
++            <font>basesmallerblue</font>
              <align>right,vcenter</align>
              <value>Episode:</value>
          </textarea>
  
          <textarea name="episode" from="basetextarea">
-             <area>435,382,110,20</area>
+-            <area>435,382,110,20</area>
 -            <font>baseextrasmallblue</font>
-+            <font>baseextrasmall</font>
-             <align>vcenter</align>
+-            <align>vcenter</align>
++            <area>435,380,110,24</area>
++            <font>basesmaller</font>
++            <align>left,vcenter</align>
          </textarea>
  
-@@ -3200,12 +3266,13 @@
+         <imagetype name="coverart">
+@@ -3050,6 +3116,9 @@
+                     <group name="select_bar" from="base_button_select_bar_selected_group">
+                         <area>0,0,100%,100%</area>
+                     </group>
++                    <textarea name="buttontext">
++                        <font>basesmallyellow</font>
++                    </textarea>
+                 </state>
+                 <state name="pushed" from="active">
+                     <group name="select_bar" from="base_button_select_bar_pushed_group">
+@@ -3080,6 +3149,9 @@
+                     <group name="select_bar" from="base_button_select_bar_selected_group">
+                         <area>0,0,100%,100%</area>
+                     </group>
++                    <textarea name="buttontext">
++                        <font>basesmallyellow</font>
++                    </textarea>
+                 </state>
+                 <state name="pushed" from="active">
+                     <group name="select_bar" from="base_button_select_bar_pushed_group">
+@@ -3200,12 +3272,13 @@
          </buttonlist>
  
          <checkbox name="altcheck" from="base_checkbox">
@@ -1343,7 +1447,7 @@
              <value>Enable Alternate Player:</value>
          </textarea>
  
-@@ -3221,19 +3288,19 @@
+@@ -3221,19 +3294,19 @@
  
          <textarea name="helptext" from="basetextarea">
              <area>239,551,802,61</area>
@@ -1368,7 +1472,7 @@
          </button>
  
      </window>
-@@ -3313,7 +3380,7 @@
+@@ -3313,7 +3386,7 @@
              <position>390,175</position>
          </checkbox>
  
@@ -1377,7 +1481,7 @@
              <area>245,259,175,40</area>
              <value>Trailers to Play:</value>
              <align>right,vcenter</align>
-@@ -3345,21 +3412,21 @@
+@@ -3345,21 +3418,21 @@
  
          <textarea name="helptext" from="basetextarea">
              <area>239,523,802,76</area>