From 756f9427814f373792da7abc974db8f543812be2 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Sat, 4 Jun 2016 14:11:25 +0100
Subject: [PATCH] videofile nodefix

---
 1080i/MyVideoNav.xml      |  2 +-
 1080i/View_Episodes.xml   |  8 ++++----
 1080i/View_Movies.xml     |  2 +-
 1080i/View_Seasons.xml    | 38 --------------------------------------
 1080i/View_TVShows.xml    | 28 +++++++++++++++++++++++++---
 1080i/View_VideoFiles.xml |  2 +-
 changelog.txt             | 19 ++-----------------
 7 files changed, 34 insertions(+), 65 deletions(-)

diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 0319b97..3dd4947 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -102,7 +102,7 @@
         <include>DebugGrid</include>
         <control type="label">
             <include>WindowID</include>
-            <label>MyVideoNav.xml</label>
+            <label>MyVideoNav.xml $INFO[container.folderpath]</label>
         </control>
     </controls>
 </window>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index cce7899..ff559c2 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -4,7 +4,7 @@
 
         <!--fanart-->
         <control type="group">
-            <visible>!isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
+            <visible>Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
             <posy>0</posy>
             <posx>-966</posx>
             <control type="image">
@@ -38,7 +38,7 @@
 
         <!--overlay-->
         <control type="image">
-            <visible>!isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
+            <visible>Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
             <posx>949</posx>
             <posy>0</posy>
             <width>972</width>
@@ -54,7 +54,7 @@
         <control type="group">
             <posx>col-13-begin</posx>
             <posy>row-5-begin</posy>
-            <visible>!isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
+            <visible>Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
             <control type="label">
                 <posx>24</posx>
                 <posy>0</posy>
@@ -71,7 +71,7 @@
         <control type="group">
             <!--tvhsow library-sourced episode list-->
             <control type="panel" id="52">
-                <visible>!isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
+                <visible>Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
                 <posx>col-13-begin</posx>
                 <posy>row-8-begin</posy>
                 <width>12-col</width>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 77aafd6..423cb02 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -21,7 +21,7 @@
                 <include>kenBurnsey</include>
             </control>
             <control type="panel" id="50">
-                <visible>Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
+                <visible>Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + Substring(container.folderpath,videodb://) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
                 <posx>78</posx>
                 <posy>row-5-begin</posy>
                 <width>1800</width>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 0837c9e..b905e22 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -167,44 +167,6 @@
                                 <textcolor>textActive</textcolor>
                                 <label>$VAR[itemDetail]</label>
                             </control>
-                            <control type="grouplist">
-                                <posx>42</posx>
-                                <posy>9-row</posy>
-                                <width>4-col-gutter</width>
-                                <orientation>horizontal</orientation>
-                                <control type="label">
-                                    <width>24</width>
-                                    <height>2-row</height>
-                                    <aligny>center</aligny>
-                                    <font>symbol</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label></label>
-                                </control>
-                                <control type="label">
-                                    <width>1-col</width>
-                                    <height>2-row</height>
-                                    <aligny>center</aligny>
-                                    <font>smallStrong</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label>$LOCALIZE[31185]</label>
-                                </control>
-                                <control type="label">
-                                    <width>24</width>
-                                    <height>2-row</height>
-                                    <aligny>center</aligny>
-                                    <font>symbol</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label></label>
-                                </control>
-                                <control type="label">
-                                    <width>1-col</width>
-                                    <height>2-row</height>
-                                    <aligny>center</aligny>
-                                    <font>smallStrong</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label>$LOCALIZE[31184]</label>
-                                </control>
-                            </control>
                         </control>
                     </focusedlayout>
                 </control>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 0298467..a766c6f 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -21,7 +21,7 @@
                 <include>kenBurnsey</include>
             </control>
             <control type="panel" id="50">
-                <visible>Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + !container.content(files)</visible>
+                <visible>Substring(container.folderpath,videodb://) + Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + !container.content(files)</visible>
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <width>1800</width>
@@ -63,13 +63,24 @@
                         <posy>268</posy>
                         <width>384</width>
                         <height>1-row</height>
-                        <align>center</align>
                         <aligny>center</aligny>
                         <font>thumbTitle</font>
                         <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>ff333333</shadowcolor>
                     </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>268</posy>
+                        <width>384</width>
+                        <height>1-row</height>
+                        <align>right</align>
+                        <aligny>center</aligny>
+                        <font>thumbTitle</font>
+                        <textcolor>textDisabled</textcolor>
+                        <label>$INFO[ListItem.Property(TotalEpisodes)] $LOCALIZE[31189]</label>
+                        <shadowcolor>ff333333</shadowcolor>
+                    </control>
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -114,13 +125,24 @@
                             <posy>268</posy>
                             <width>384</width>
                             <height>1-row</height>
-                            <align>center</align>
                             <aligny>center</aligny>
                             <font>thumbTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>ff333333</shadowcolor>
                         </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>268</posy>
+                            <width>384</width>
+                            <height>1-row</height>
+                            <align>right</align>
+                            <aligny>center</aligny>
+                            <font>thumbTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.Property(TotalEpisodes)] $LOCALIZE[31189]</label>
+                            <shadowcolor>ff333333</shadowcolor>
+                        </control>
                     </control>
                 </focusedlayout>
             </control>
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index 2074e07..091f04e 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -2,7 +2,7 @@
 <includes>
     <include name="videofiles">
         <control type="panel" id="50">
-            <visible>container.content(files) | StringCompare(container.foldername,files) | Substring(container.folderpath,special://videoplaylists)</visible>
+            <visible>!isempty(container.folderpath) + !Substring(container.folderpath,videodb://) | container.content(files) | StringCompare(container.foldername,files) | Substring(container.folderpath,special://videoplaylists)</visible>
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
             <width>24-col</width>
diff --git a/changelog.txt b/changelog.txt
index b0b8f55..be44215 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -46,28 +46,13 @@
 
 Update music library not working
 
-Photo section needs revision (incl. Onback)
-
-PVR item info rework
-
-PVR Channel selection as part of dialogfullscreeninfo
+Photo section needs revision
 
 Improve handling of new users (bring through images from homescreen etc)
 
-Check back on dialog keyboard (ok on laptop: not on openelec??)
-
-Photos section needs work
-
-Optimise settings: use skin helper: on startup: Ask whether to change:
-show parent folder items: system.getbool(showparentdiritems)
-start PVR minimised: false
-
 PVR Recording schedule (integrate with recordings)
 
-Complete DialogAudioDSPManager.xml and DialogAudioDSPSettings.xml
-
-Add MyVideoPlaylist.xml
-
+Complete DialogAudioDSPManager.xml and DialogAudioDSPSettings.xmls