From bca6bb0c010be50833fd2dafd6527858a796cff5 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Thu, 25 Oct 2018 21:21:03 +0100
Subject: [PATCH] tweaks

---
 1080i/DialogContextMenu.xml        | 27 +++++++++++++++---
 1080i/DialogSeekBar.xml            | 13 ++++++++-
 1080i/Includes.xml                 |  3 +-
 1080i/Includes_hubMenu.xml         |  2 +-
 1080i/Includes_hubOptionsItems.xml | 20 +++++++++++---
 1080i/View_LiveTVChannels.xml      |  8 +++---
 1080i/custom_contextMenu.xml       | 44 ------------------------------
 7 files changed, 58 insertions(+), 59 deletions(-)
 delete mode 100644 1080i/custom_contextMenu.xml

diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml
index ac5e51f..a42a1b9 100644
--- a/1080i/DialogContextMenu.xml
+++ b/1080i/DialogContextMenu.xml
@@ -1,13 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="true">1000</defaultcontrol>
+	<onload condition="!integer.IsGreater(Container(996).NumItems,0)">control.setfocus(9004)</onload>
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
-        <control type="grouplist" id="996">
-            <posx>col-10-begin</posx>
-            <posy>4-row</posy>
+		<control type="grouplist" id="996">
+            <posx>col-6-begin</posx>
+            <posy>7-row</posy>
             <itemgap>0</itemgap>
+			<onright>9004</onright>
+			<height>17-row</height>
+        </control>
+		<control type="grouplist" id="9004">
+			<animation type="Conditional" condition="!integer.IsGreater(Container(996).NumItems,0)">
+	            <effect type="slide" end="-300" time="0"/>
+	        </animation>
+			<posx>col-14-begin</posx>
+            <posy>7-row</posy>
+            <itemgap>0</itemgap>
+            <width>6-col</width>
+            <height>17-row</height>
+            <itemgap>0</itemgap>
+			<onleft>996</onleft>
+            <include condition="Window.isactive(Videos) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include>
+            <include condition="Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
+            <include condition="window.isactive(pictures)">picturesSideMenu</include>
+            <include condition="window.isactive(addonbrowser)">addonsSideMenu</include>
+			<include condition="window.isactive(games)">gameSideMenu</include>
         </control>
         <control type="button" id="1000">
             <description>Buttons</description>
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
index cafadff..52d05c9 100644
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@@ -3,13 +3,24 @@
     <visible>!window.isactive(videoosd) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [!String.IsEmpty(Player.SeekNumeric) | Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
     <controls>
 		<control type="image">
+			<visible>!String.IsEmpty(player.Art(clearart))</visible>
             <posx>col-15-begin</posx>
             <posy>row-18-begin</posy>
             <width>12-col</width>
             <height>6-col</height>
             <texture>$INFO[player.Art(clearart)]</texture>
             <aspectratio align="right">scale</aspectratio>
-            <colordiffuse>99ffffff</colordiffuse>
+            <colordiffuse>BBffffff</colordiffuse>
+        </control>
+		<control type="image">
+			<visible>!String.IsEmpty(player.Art(clearlogo)) + String.IsEmpty(player.Art(clearart))</visible>
+            <posx>col-14-begin</posx>
+            <posy>row-18-begin</posy>
+            <width>12-col</width>
+            <height>6-col</height>
+            <texture>$INFO[player.Art(clearlogo)]</texture>
+            <aspectratio align="right">keep</aspectratio>
+            <colordiffuse>BBffffff</colordiffuse>
         </control>
         <control type="image">
             <include>dimensionsFullscreen</include>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index ffaf0e3..ef84d19 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -272,7 +272,8 @@
      <!--conditional positioning for progress dialogs (avoid overlaps)-->
     <include name="progressPosition1"><posy>row-2-begin</posy></include>
     <include name="progressPosition2"><posy>row-6-begin</posy></include>
-    <!--mini player window-->
+     
+	<!--mini player window-->
     <include name="miniVideoPlayer">
         <control type="group">
             <visible>!Skin.hassetting(stopVideoOnMenu) + Player.HasVideo + !VideoPlayer.IsFullscreen + !SlideShow.IsActive</visible>
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index dc2b7c3..80cc9b3 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -57,7 +57,7 @@
                 <width>col-5-begin</width>
                 <height>832</height>
                 <orientation>vertical</orientation>
-                <onleft condition="!window.isactive(home)">activateWindow(1104)</onleft>
+                <onleft condition="!window.isactive(home)">activateWindow(contextmenu)</onleft>
                 <onright>9999</onright>
                 <onback>activateWindow(home)</onback>
                 <itemlayout width="col-5-begin" height="2-row">
diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index 1b03111..0304f69 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -19,7 +19,10 @@
             <focusedcolor>textActive</focusedcolor>
             <width>6-col</width>
             <label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
-            <onclick>sendclick(videos,3)</onclick>
+            <onclick condition="window.isactive(videos)">sendclick(videos,3)</onclick>
+			<onclick condition="window.isactive(tvchannels)">sendclick(tvchannels,3)</onclick>
+			<onclick condition="window.isactive(tvrecordings)">sendclick(tvrecordings,3)</onclick>
+			<onclick condition="window.isactive(tvguide)">sendclick(tvguide,3)</onclick>
         </control>
         <control type="togglebutton" id="4">
             <visible>!String.IsEmpty(Container.SortMethod)</visible>
@@ -30,7 +33,10 @@
             <label>31109</label>
             <altlabel>31110</altlabel>
             <width>6-col</width>
-            <onclick>sendclick(videos,4)</onclick>
+            <onclick condition="window.isactive(videos)">sendclick(videos,4)</onclick>
+			<onclick condition="window.isactive(tvchannels)">sendclick(tvchannels,4)</onclick>
+			<onclick condition="window.isactive(tvrecordings)">sendclick(tvrecordings,4)</onclick>
+			<onclick condition="window.isactive(tvguide)">sendclick(tvguide,4)</onclick>
         </control>
         <control type="button" id="509">
             <visible>PVR.HasTVChannels</visible>
@@ -106,7 +112,10 @@
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
-            <onclick>sendclick(music,3)</onclick>
+            <onclick condition="window.isactive(music)">sendclick(music,3)</onclick>
+			<onclick condition="window.isactive(radiochannels)">sendclick(radiochannels,3)</onclick>
+			<onclick condition="window.isactive(radiorecordings)">sendclick(radiorecordings,3)</onclick>
+			<onclick condition="window.isactive(radioguide)">sendclick(radioguide,3)</onclick>
         </control>
         <control type="togglebutton" id="4">
             <visible>!String.IsEmpty(Container.SortMethod)</visible>
@@ -117,7 +126,10 @@
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
-            <onclick>sendclick(music,4)</onclick>
+            <onclick condition="window.isactive(music)">sendclick(music,4)</onclick>
+			<onclick condition="window.isactive(radiochannels)">sendclick(radiochannels,4)</onclick>
+			<onclick condition="window.isactive(radiorecordings)">sendclick(radiorecordings,4)</onclick>
+			<onclick condition="window.isactive(radioguide)">sendclick(radioguide,4)</onclick>
         </control>
         <control type="button" id="509">
             <visible>PVR.HasRadioChannels</visible>
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index d2155e0..9df3a85 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -57,7 +57,7 @@
                     <control type="label">
                         <posx>520</posx>
                         <posy>0</posy>
-                        <width>6-col</width>
+                        <width>7-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -80,7 +80,7 @@
                     <control type="label">
                         <posx>1168</posx>
                         <posy>0</posy>
-                        <width>6-col</width>
+                        <width>7-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -136,7 +136,7 @@
                     <control type="label">
                         <posx>520</posx>
                         <posy>0</posy>
-                        <width>6-col</width>
+                        <width>7-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -159,7 +159,7 @@
                     <control type="label">
                         <posx>1168</posx>
                         <posy>0</posy>
-                        <width>6-col</width>
+                        <width>7-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
diff --git a/1080i/custom_contextMenu.xml b/1080i/custom_contextMenu.xml
deleted file mode 100644
index 01421da..0000000
--- a/1080i/custom_contextMenu.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="1104">
-    <onload>control.setfocus(9002)</onload>
-    <onunload>control.setfocus(9999)</onunload>
-    <include>fadeInOut</include>
-    <controls>
-        <control type="group">
-            <control type="image">
-                <include>dimensionsFullscreen</include>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ccFFFFFF</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <include>dimensionsFullscreen</include>
-                <texture>vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="group" id="9002">
-                <!--menu items-->
-                <control type="grouplist" id="9004">
-                    <posx>col-10-begin</posx>
-                    <posy>8-row</posy>
-                    <itemgap>0</itemgap>
-                    <width>6-col</width>
-                    <height>17-row</height>
-                    <itemgap>0</itemgap>
-                    <include condition="Window.isactive(Videos) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include>
-                    <include condition="Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
-                    <include condition="window.isactive(pictures)">picturesSideMenu</include>
-                    <include condition="window.isactive(addonbrowser)">addonsSideMenu</include>
-					<include condition="window.isactive(games)">gameSideMenu</include>
-                </control>
-            </control>
-        </control>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>WindowID</include>
-            <label>custom_contextMenu.xml</label>
-        </control>
-    </controls>
-</window>
\ No newline at end of file