linhes-theme: video-ui.xml: fix Director alignment in Edit Details

2 files changed, 155 insertions, 22 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 6c0d18f..d062f9a 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
-pkgver=8.6.0
-pkgrel=4
+pkgver=8.6.1
+pkgrel=1
 pkgdesc="Default LinHES MythTV theme"
 arch=('x86_64')
 license=('GPL2')
@@ -120,7 +120,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
          '384871202030f41148536e2e89bb1801'
          '8efbd524cef4dd3f5fbe5b7d5ad854f0'
          '8312aff444945f80a76100696c81cb2e'
-         'f1e0b73f5118c0a6f8c75e47beefdcdc'
+         'f62b200729eb9a69e3929f20f51d3d35'
          '4125880d1739b196a8041ecc3d773ee2'
          '5a8fb2a5f0e657d52be6f0a6a006ce72'
          '274b6f8cb5cd82c5ce28422decd7754b'
diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch
index 5f56372..ef00618 100644
--- a/abs/core/linhes-theme/video-ui.xml.patch
+++ b/abs/core/linhes-theme/video-ui.xml.patch
@@ -1,5 +1,5 @@
 --- video-ui.xml.orig	2018-04-17 14:44:43.827360598 +0000
-+++ video-ui.xml	2019-03-09 13:31:34.326974622 +0000
++++ video-ui.xml	2019-04-21 23:09:21.959330647 +0000
 @@ -58,8 +58,8 @@
          <textarea name="label" from="basetextarea">
              <area>10,4,543,70</area>
@@ -105,7 +105,7 @@
              <font>basesmall</font>
              <align>allcenter</align>
 -            <value>No videos in library, or no files found.  If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Change."</value>
-+            <value>No videos available. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
++            <value>No videos available. If you have configured a video storage group or directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
          </textarea>
  
          <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -489,7 +489,7 @@
              <font>basesmall</font>
              <align>allcenter</align>
 -            <value>No videos in library, or no files found.  If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
-+            <value>No videos available. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
++            <value>No videos available. If you have configured a video storage group or directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
          </textarea>
          
          <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -876,7 +876,7 @@
              <font>basesmall</font>
              <align>allcenter</align>
 -            <value>No videos in library, or no files found.  If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
-+            <value>No videos available. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
++            <value>No videos available. If you have configured a video storage group or directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
          </textarea>
  
          <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -1223,7 +1223,7 @@
              <font>basesmall</font>
              <align>allcenter</align>
 -            <value>No videos in library, or no files found.  If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Change."</value>
-+            <value>No videos available. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
++            <value>No videos available. If you have configured a video storage group or directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
          </textarea>
  
          <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -1281,29 +1281,162 @@
      </window>
      
      <window name="edit_metadata">
-@@ -2367,13 +2431,13 @@
-         </textedit>
+@@ -2247,7 +2311,7 @@
+         <group name="fanart-group" from="base_fanart_group" />
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>Metadata Editor</value>
++            <value>Edit Details</value>
+         </textarea>
  
-         <textarea name="director_text" from="basetextarea">
--            <area>40,126,124,36</area>
-+            <area>40,126,114,36</area>
-             <value>Director:</value>
+         <shape name="video-metadata-top-backdrop" from="base_backdrop">
+@@ -2345,15 +2409,15 @@
+             <mask>images/masks/edit_metadata_coverart_mask.png</mask>
+             <preserveaspect>false</preserveaspect>
+         </imagetype>
+-        
++
+         <textarea name="title_text" from="basetextarea">
+             <area>40,46,124,36</area>
+             <value>Title:</value>
              <align>right,vcenter</align>
          </textarea>
+-        
++
+         <textedit name="title_edit" from="base_textedit">
+-            <area>177,46,366,36</area>
++            <area>177,46,885,36</area>
+         </textedit>
  
-         <textedit name="director_edit" from="base_textedit">
--            <area>177,126,366,36</area>
-+            <area>167,126,366,36</area>
+         <textarea name="subtitle_text" from="basetextarea">
+@@ -2376,6 +2440,26 @@
+             <area>177,126,366,36</area>
          </textedit>
  
++        <textarea name="rating_text" from="basetextarea">
++            <area>556,86,124,36</area>
++            <value>Rating:</value>
++            <align>right,vcenter</align>
++        </textarea>
++
++        <textedit name="rating_edit" from="base_textedit">
++            <area>696,86,366,36</area>
++        </textedit>
++
++        <textarea name="inetref_text" from="basetextarea">
++            <area>556,126,124,36</area>
++            <value>Video #:</value>
++            <align>right,vcenter</align>
++        </textarea>
++
++        <textedit name="inetref_edit" from="base_textedit">
++            <area>696,126,366,36</area>
++        </textedit>
++
          <textarea name="tagline_text" from="basetextarea">
-@@ -2418,7 +2482,7 @@
+             <area>40,166,124,36</area>
+             <value>Tagline:</value>
+@@ -2406,26 +2490,6 @@
+             <area>177,246,885,36</area>
+         </textedit>
  
-         <textarea name="inetref_text" from="basetextarea">
-             <area>556,86,124,36</area>
+-        <textarea name="rating_text" from="basetextarea">
+-            <area>556,46,124,36</area>
+-            <value>Rating:</value>
+-            <align>right,vcenter</align>
+-        </textarea>
+-
+-        <textedit name="rating_edit" from="base_textedit">
+-            <area>696,46,366,36</area>
+-        </textedit>
+-
+-        <textarea name="inetref_text" from="basetextarea">
+-            <area>556,86,124,36</area>
 -            <value>TMDB:</value>
-+            <value>Video #:</value>
-             <align>right,vcenter</align>
+-            <align>right,vcenter</align>
+-        </textarea>
+-
+-        <textedit name="inetref_edit" from="base_textedit">
+-            <area>696,86,366,36</area>
+-        </textedit>
+-
+         <textarea name="season_text" from="basetextarea">
+             <area>48,327,132,40</area>
+             <value>Season:</value>
+@@ -2519,13 +2583,13 @@
+         <textarea name="coverart_text" from="basetextarea">
+             <area>636,325,416,40</area>
+             <font>basesmaller</font>
+-            <value>/path/to/the/thing.jpg</value>
++            <value>No Image</value>
+             <align>vcenter</align>
+         </textarea>
+ 
+         <button name="net_coverart_button" from="base_button">
+             <area>1084,327,150,36</area>
+-            <value>Find OnNet</value>
++            <value>Find Online</value>
+         </button>
+ 
+         <textarea name="banner_text_label" from="basetextarea">
+@@ -2541,15 +2605,15 @@
+         <textarea name="banner_text" from="basetextarea">
+             <area>636,375,416,40</area>
+             <font>basesmaller</font>
+-            <value>/path/to/the/thing.jpg</value>
++            <value>No Image</value>
+             <align>vcenter</align>
+         </textarea>
+ 
+         <button name="net_banner_button" from="base_button">
+             <area>1084,377,150,36</area>
+-            <value>Find OnNet</value>
++            <value>Find Online</value>
+         </button>
+-        
++
+         <textarea name="browse_text" from="basetextarea">
+             <area>452,425,130,40</area>
+             <value>Browseable:</value>
+@@ -2573,13 +2637,13 @@
+         <textarea name="fanart_text" from="basetextarea">
+             <area>636,475,416,40</area>
+             <font>basesmaller</font>
+-            <value>/path/to/the/thing.jpg</value>
++            <value>No Image</value>
+             <align>vcenter</align>
+         </textarea>
+ 
+         <button name="net_fanart_button" from="base_button">
+             <area>1084,477,150,36</area>
+-            <value>Find OnNet</value>
++            <value>Find Online</value>
+         </button>
+ 
+         <textarea name="screenshot_text_label" from="basetextarea">
+@@ -2595,13 +2659,13 @@
+         <textarea name="screenshot_text" from="basetextarea">
+             <area>636,525,416,40</area>
+             <font>basesmaller</font>
+-            <value>/path/to/the/thing.jpg</value>
++            <value>No Image</value>
+             <align>vcenter</align>
+         </textarea>
+         
+         <button name="net_screenshot_button" from="base_button">
+             <area>1084,527,150,36</area>
+-            <value>Find OnNet</value>
++            <value>Find Online</value>
+         </button>
+ 
+         <textarea name="trailer_text_label" from="basetextarea">
+@@ -2617,7 +2681,7 @@
+         <textarea name="trailer_text" from="basetextarea">
+             <area>636,575,416,40</area>
+             <font>basesmaller</font>
+-            <value>/path/to/the/thing.jpg</value>
++            <value>No Image</value>
+             <align>vcenter</align>
          </textarea>
  
 @@ -2947,83 +3011,85 @@