Merge pull request #10442 from ronie/estuary-fixes

[Estuary] bugfixes

12 files changed, 56 insertions, 18 deletions

diff --git a/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml b/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml
index f9b3b2a184..30d85e9f8e 100644
--- a/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml
+++ b/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml
@@ -132,11 +132,11 @@
 							<property name="path">addons://sources/executable/</property>
 						</item>
 						<item id="4">
-							<label>$LOCALIZE[1043]</label>
-							<onclick>ActivateWindow(programs,androidapps://,return)</onclick>
+							<label>$LOCALIZE[20244]</label>
+							<onclick>ActivateWindow(programs,androidapp://sources/apps/,return)</onclick>
 							<thumb>icons/settings/android.png</thumb>
 							<property name="id">android</property>
-							<property name="path">androidapps://</property>
+							<property name="path">androidapp://sources/apps/</property>
 							<visible>System.Platform.Android</visible>
 						</item>
 						<item id="5">
@@ -267,7 +267,7 @@
 				<include content="AddonLauncherPanel" condition="System.Platform.Android">
 					<param name="container_id" value="506" />
 					<param name="visible" value="Container(9000).HasFocus(4)" />
-					<param name="container_path" value="androidapps://" />
+					<param name="container_path" value="androidapp://sources/apps/" />
 					<param name="container_target" value="programs" />
 				</include>
 				<include content="AddonLauncherPanel">
diff --git a/addons/skin.estuary/1080i/DialogAddonSettings.xml b/addons/skin.estuary/1080i/DialogAddonSettings.xml
index 7da9e614c5..a101b8ed3b 100644
--- a/addons/skin.estuary/1080i/DialogAddonSettings.xml
+++ b/addons/skin.estuary/1080i/DialogAddonSettings.xml
@@ -47,7 +47,7 @@
 			<width>1060</width>
 			<height>680</height>
 			<onup>2</onup>
-			<ondown>2</ondown>
+			<ondown>9001</ondown>
 			<onleft>9</onleft>
 			<onright>9001</onright>
 		</control>
diff --git a/addons/skin.estuary/1080i/DialogSlider.xml b/addons/skin.estuary/1080i/DialogSlider.xml
index 96046d7c90..188ff3c7da 100644
--- a/addons/skin.estuary/1080i/DialogSlider.xml
+++ b/addons/skin.estuary/1080i/DialogSlider.xml
@@ -19,7 +19,7 @@
 			<description>Dialog header</description>
 			<left>40</left>
 			<top>10</top>
-			<width>230</width>
+			<width>550</width>
 			<height>20</height>
 			<aligny>center</aligny>
 			<font>font14</font>
diff --git a/addons/skin.estuary/1080i/Home.xml b/addons/skin.estuary/1080i/Home.xml
index ae72570b09..9a04ed6abf 100644
--- a/addons/skin.estuary/1080i/Home.xml
+++ b/addons/skin.estuary/1080i/Home.xml
@@ -93,7 +93,7 @@
 							<param name="item7_label" value="$LOCALIZE[31074]" />
 							<param name="item8_onclick" value="UpdateLibrary(video)" />
 							<param name="item8_icon" value="updatelibrary.png" />
-							<param name="item8_label" value="$LOCALIZE[653]" />
+							<param name="item8_label" value="$VAR[VideoLibraryScanLabel]" />
 						</include>
 						<include content="WidgetListMovies">
 							<param name="content_path" value="special://skin/playlists/inprogress_movies.xsp"/>
@@ -187,7 +187,7 @@
 							<param name="item7_label" value="$LOCALIZE[31074]" />
 							<param name="item8_onclick" value="UpdateLibrary(video)" />
 							<param name="item8_icon" value="updatelibrary.png" />
-							<param name="item8_label" value="$LOCALIZE[653]" />
+							<param name="item8_label" value="$VAR[VideoLibraryScanLabel]" />
 						</include>
 						<include content="WidgetListEpisodes">
 							<param name="content_path" value="videodb://inprogresstvshows"/>
@@ -283,7 +283,7 @@
 							<param name="item7_label" value="$LOCALIZE[31074]" />
 							<param name="item8_onclick" value="UpdateLibrary(music)" />
 							<param name="item8_icon" value="updatelibrary.png" />
-							<param name="item8_label" value="$LOCALIZE[653]" />
+							<param name="item8_label" value="$VAR[MusicLibraryScanLabel]" />
 							<param name="item8_vis" value="Library.HasContent(music)" />
 						</include>
 						<include content="WidgetListSquare">
diff --git a/addons/skin.estuary/1080i/Includes_MediaMenu.xml b/addons/skin.estuary/1080i/Includes_MediaMenu.xml
index b9e66a746c..802b47e717 100644
--- a/addons/skin.estuary/1080i/Includes_MediaMenu.xml
+++ b/addons/skin.estuary/1080i/Includes_MediaMenu.xml
@@ -56,7 +56,11 @@
 				<height>100%</height>
 				<onleft>9000</onleft>
 				<onup>9000</onup>
-				<onright>50</onright>
+				<onright condition="!Window.IsActive(MyPVRGuide.xml)">50</onright>
+				<onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(10)">10</onright>
+				<onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(11)">11</onright>
+				<onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(12)">12</onright>
+				<onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(13)">13</onright>
 				<ondown>14100</ondown>
 				<onback>50</onback>
 				<defaultcontrol>6054</defaultcontrol>
@@ -86,7 +90,11 @@
 						<left>5</left>
 						<height>95</height>
 						<onleft>6056</onleft>
-						<onright>50</onright>
+						<onright condition="!Window.IsActive(MyPVRGuide.xml)">50</onright>
+						<onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(10)">10</onright>
+						<onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(11)">11</onright>
+						<onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(12)">12</onright>
+						<onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(13)">13</onright>
 						<onup>14100</onup>
 						<ondown>6054</ondown>
 						<width>1000</width>
diff --git a/addons/skin.estuary/1080i/MusicVisualisation.xml b/addons/skin.estuary/1080i/MusicVisualisation.xml
index 985b338129..27254ea8d1 100644
--- a/addons/skin.estuary/1080i/MusicVisualisation.xml
+++ b/addons/skin.estuary/1080i/MusicVisualisation.xml
@@ -129,9 +129,9 @@
 				<control type="image">
 					<left>280</left>
 					<top>1022</top>
-					<width>130</width>
+					<width>256</width>
 					<height>65</height>
-					<texture>flags/starrating/rating$INFO[MusicPlayer.UserRating].png</texture>
+					<texture>flags/starrating/$INFO[MusicPlayer.UserRating].png</texture>
 					<aspectratio>keep</aspectratio>
 				</control>
 			</control>
diff --git a/addons/skin.estuary/1080i/MyMusicNav.xml b/addons/skin.estuary/1080i/MyMusicNav.xml
index df636b4b01..a7a139ff27 100644
--- a/addons/skin.estuary/1080i/MyMusicNav.xml
+++ b/addons/skin.estuary/1080i/MyMusicNav.xml
@@ -41,6 +41,7 @@
 					<height>388</height>
 					<font>font12</font>
 					<label>$INFO[ListItem.Property(artist_description)]$INFO[ListItem.Property(album_description),[CR]]</label>
+					<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(autoscroll)</autoscroll>
 				</control>
 				<control type="textbox">
 					<right>130</right>
@@ -51,6 +52,7 @@
 					<font>font24_title</font>
 					<label>$LOCALIZE[19055]</label>
 					<visible>String.IsEmpty(Listitem.Property(artist_description)) + String.IsEmpty(Listitem.Property(album_description)) + !ListItem.IsParentFolder</visible>
+					<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(autoscroll)</autoscroll>
 				</control>
 				<control type="image">
 					<right>113</right>
diff --git a/addons/skin.estuary/1080i/MyPVRRecordings.xml b/addons/skin.estuary/1080i/MyPVRRecordings.xml
index 52a2229ce7..06d90d0e92 100644
--- a/addons/skin.estuary/1080i/MyPVRRecordings.xml
+++ b/addons/skin.estuary/1080i/MyPVRRecordings.xml
@@ -200,6 +200,7 @@
 						<align>justify</align>
 						<label>$INFO[ListItem.Plot]</label>
 						<font>font12</font>
+						<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(autoscroll)</autoscroll>
 					</control>
 				</control>
 				<control type="image">
diff --git a/addons/skin.estuary/1080i/MyPics.xml b/addons/skin.estuary/1080i/MyPics.xml
index 1c86222426..eda680ebba 100644
--- a/addons/skin.estuary/1080i/MyPics.xml
+++ b/addons/skin.estuary/1080i/MyPics.xml
@@ -245,7 +245,9 @@
 				<param name="breadcrumbs_label" value="$LOCALIZE[1213]" />
 				<param name="breadcrumbs_icon" value="icons/settings/pictures.png" />
 			</include>
-			<include>BottomBar</include>
+			<include content="BottomBar">
+				<param name="info_visible" value="true" />
+			</include>
 		</control>
 	</controls>
 </window>
diff --git a/addons/skin.estuary/1080i/MyVideoNav.xml b/addons/skin.estuary/1080i/MyVideoNav.xml
index 60b93ac3d4..5960eb3aad 100644
--- a/addons/skin.estuary/1080i/MyVideoNav.xml
+++ b/addons/skin.estuary/1080i/MyVideoNav.xml
@@ -60,6 +60,7 @@
 					<font>font12</font>
 					<visible>Control.IsVisible(54)</visible>
 					<label>$INFO[ListItem.Plot]</label>
+					<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(autoscroll)</autoscroll>
 				</control>
 				<control type="textbox">
 					<right>130</right>
@@ -69,6 +70,7 @@
 					<font>font12</font>
 					<visible>!Control.IsVisible(54)</visible>
 					<label>$INFO[ListItem.Tagline,[B],[/B][CR]]$INFO[ListItem.Plot]</label>
+					<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(autoscroll)</autoscroll>
 				</control>
 				<control type="textbox">
 					<right>130</right>
@@ -220,6 +222,7 @@
 						<include>MediaMenuItemsCommon</include>
 						<label>$LOCALIZE[653]</label>
 						<onclick>UpdateLibrary(video)</onclick>
+						<visible>!Container.Content(addons)</visible>
 						<altlabel>$LOCALIZE[13353]</altlabel>
 						<usealttexture>library.isscanningvideo</usealttexture>
 					</control>
diff --git a/addons/skin.estuary/1080i/SmartPlaylistEditor.xml b/addons/skin.estuary/1080i/SmartPlaylistEditor.xml
index 74097b4adb..8e8133de8f 100644
--- a/addons/skin.estuary/1080i/SmartPlaylistEditor.xml
+++ b/addons/skin.estuary/1080i/SmartPlaylistEditor.xml
@@ -110,18 +110,32 @@
 				<height>435</height>
 				<onleft>500</onleft>
 				<onright>500</onright>
-				<ondown>9001</ondown>
+				<ondown>13</ondown>
 				<onup>9001</onup>
 				<include content="DefaultSimpleListLayout">
 					<param name="width" value="600" />
 					<param name="list_id" value="10" />
 				</include>
 			</control>
+			<control type="button" id="13">
+				<description>Add rule Button</description>
+				<left>650</left>
+				<top>555</top>
+				<width>300</width>
+				<height>90</height>
+				<include>SettingsItemCommon</include>
+				<align>center</align>
+				<label>$LOCALIZE[15019]</label>
+				<onleft>500</onleft>
+				<onright>500</onright>
+				<ondown>9001</ondown>
+				<onup>10</onup>
+			</control>
 			<control type="textbox">
 				<left>680</left>
-				<top>570</top>
+				<top>640</top>
 				<width>540</width>
-				<height>248</height>
+				<height>188</height>
 				<aligny>top</aligny>
 				<label>$LOCALIZE[31043]</label>
 				<textcolor>grey</textcolor>
diff --git a/addons/skin.estuary/1080i/Variables.xml b/addons/skin.estuary/1080i/Variables.xml
index a7bd9278dd..27b134edc2 100644
--- a/addons/skin.estuary/1080i/Variables.xml
+++ b/addons/skin.estuary/1080i/Variables.xml
@@ -19,7 +19,7 @@
 		<value>$INFO[Player.Time]$INFO[Player.Title, - ]</value>
 	</variable>
 	<variable name="AutoCompletionContentVar">
-		<value condition="System.HasAddon(plugin.program.autocompletion) | !System.HasHiddenInput">plugin://plugin.program.autocompletion?info=autocomplete&amp;&amp;id=$INFO[Control.GetLabel(312).index(1)]&amp;&amp;limit=9</value>
+		<value condition="System.HasAddon(plugin.program.autocompletion) + !System.HasHiddenInput">plugin://plugin.program.autocompletion?info=autocomplete&amp;&amp;id=$INFO[Control.GetLabel(312).index(1)]&amp;&amp;limit=9</value>
 	</variable>
 	<variable name="PlaylistLabel2Var">
 		<value condition="Window.IsActive(musicplaylist)">$INFO[ListItem.Duration]</value>
@@ -411,4 +411,12 @@
 	<variable name="AddonNewsVar">
 		<value condition="!String.IsEmpty(ListItem.AddonNews)">$LOCALIZE[31136]</value>
 	</variable>
+	<variable name="VideoLibraryScanLabel">
+		<value condition="Library.IsScanningVideo">$LOCALIZE[13353]</value>
+		<value>$LOCALIZE[653]</value>
+	</variable>
+	<variable name="MusicLibraryScanLabel">
+		<value condition="Library.IsScanningMusic">$LOCALIZE[13353]</value>
+		<value>$LOCALIZE[653]</value>
+	</variable>
 </includes>