[estuary] misc fixes

12 files changed, 61 insertions, 81 deletions

diff --git a/addons/skin.estuary/1080i/DialogVideoInfo.xml b/addons/skin.estuary/1080i/DialogVideoInfo.xml
index 4aa7bf927c..22887aa764 100644
--- a/addons/skin.estuary/1080i/DialogVideoInfo.xml
+++ b/addons/skin.estuary/1080i/DialogVideoInfo.xml
@@ -28,7 +28,7 @@
 					<texture fallback="DefaultVideo.png">$VAR[InfoDialogPosterVar]</texture>
 				</control>
 				<control type="group">
-					<visible>String.IsEqual(ListItem.DBType,episode)</visible>
+					<visible>String.IsEqual(ListItem.DBType,episode) | String.IsEqual(ListItem.DBType,video)</visible>
 					<visible>!String.IsEmpty(ListItem.Thumb) + !String.IsEqual(ListItem.Thumb,ListItem.Art(poster))</visible>
 					<control type="image">
 						<left>4</left>
@@ -261,7 +261,7 @@
 								<top>0</top>
 								<width>264</width>
 								<height>317</height>
-								<texture>DefaultActor.png</texture>
+								<texture>DefaultActorSolid.png</texture>
 								<aspectratio aligny="center">scale</aspectratio>
 								<bordertexture border="20">overlays/shadow.png</bordertexture>
 								<bordersize>20</bordersize>
@@ -271,7 +271,7 @@
 								<left>20</left>
 								<width>224</width>
 								<height>277</height>
-								<texture fallback="DefaultActorSolid.png" background="true">$INFO[ListItem.Thumb]</texture>
+								<texture background="true">$INFO[ListItem.Thumb]</texture>
 								<aspectratio aligny="center">scale</aspectratio>
 							</control>
 							<control type="image">
@@ -323,7 +323,7 @@
 								<left>20</left>
 								<width>224</width>
 								<height>277</height>
-								<texture fallback="DefaultActorSolid.png" background="true">$INFO[ListItem.Thumb]</texture>
+								<texture background="true">$INFO[ListItem.Thumb]</texture>
 								<aspectratio aligny="center">scale</aspectratio>
 							</control>
 							<control type="image">
@@ -411,7 +411,7 @@
 					</include>
 					<control type="group" id="400">
 						<width>262</width>
-						<visible>Control.IsEnabled(7) | !IsEmpty(ListItem.UserRating)</visible>
+						<visible>Control.IsEnabled(7) | !String.IsEmpty(ListItem.UserRating)</visible>
 						<control type="button" id="7">
 							<include content="VideoInfoButtonsCommon">
 								<param name="icon" value="" />
@@ -420,7 +420,7 @@
 							<onleft>440</onleft>
 							<onright>101</onright>
 							<onup>140</onup>
-							<enable>IsEmpty(Container.PluginName)</enable>
+							<enable>String.IsEmpty(Container.PluginName)</enable>
 							<ondown condition="Integer.IsEqual(Container(5000).CurrentItem,1)">SetFocus(50,0)</ondown>
 							<ondown condition="Integer.IsEqual(Container(5000).CurrentItem,2)">SetFocus(50,1)</ondown>
 							<ondown condition="Integer.IsEqual(Container(5000).CurrentItem,3)">SetFocus(50,2)</ondown>
diff --git a/addons/skin.estuary/1080i/Font.xml b/addons/skin.estuary/1080i/Font.xml
index b20618f7b0..6529039472 100644
--- a/addons/skin.estuary/1080i/Font.xml
+++ b/addons/skin.estuary/1080i/Font.xml
@@ -95,9 +95,9 @@
 			<size>120</size>
 		</font>
 		<font>
-			<name>Mono30</name>
+			<name>Mono28</name>
 			<filename>AnonymousPro.ttf</filename>
-			<size>30</size>
+			<size>28</size>
 		</font>
 	</fontset>
 	<fontset id="Arial" idloc="31053">
diff --git a/addons/skin.estuary/1080i/Home.xml b/addons/skin.estuary/1080i/Home.xml
index 919df2e523..fc551aee5a 100644
--- a/addons/skin.estuary/1080i/Home.xml
+++ b/addons/skin.estuary/1080i/Home.xml
@@ -824,6 +824,7 @@
 							<control type="grouplist">
 								<top>215</top>
 								<left>540</left>
+								<width>1330</width>
 								<orientation>horizontal</orientation>
 								<align>justify</align>
 								<itemgap>-50</itemgap>
@@ -1062,7 +1063,7 @@
 								<font>font14</font>
 								<label>$INFO[ListItem.Label]</label>
 								<shadowcolor>text_shadow</shadowcolor>
-								<visible>IsEmpty(ListItem.Label2)</visible>
+								<visible>String.IsEmpty(ListItem.Label2)</visible>
 							</control>
 							<control type="label">
 								<left>74</left>
diff --git a/addons/skin.estuary/1080i/Includes.xml b/addons/skin.estuary/1080i/Includes.xml
index 4dc43ed594..835afff5dc 100644
--- a/addons/skin.estuary/1080i/Includes.xml
+++ b/addons/skin.estuary/1080i/Includes.xml
@@ -698,35 +698,6 @@
 			</control>
 		</definition>
 	</include>
-	<include name="UpDownArrowsHome">
-		<control type="group">
-			<visible>Control.IsVisible($PARAM[container_id])</visible>
-			<animation effect="fade" start="0" end="100" delay="1000" time="200">Visible</animation>
-			<animation effect="fade" start="0" end="100" time="0">Hidden</animation>
-			<control type="image">
-				<left>1860</left>
-				<top>950</top>
-				<width>36</width>
-				<height>18</height>
-				<texture colordiffuse="button_focus">overlays/arrowdown.png</texture>
-				<animation effect="fade" time="200">VisibleChange</animation>
-				<animation effect="slide" start="150" end="0" delay="640" time="320" tween="cubic">WindowOpen</animation>
-				<animation effect="zoom" start="100,100" end="100,0" center="0,890" time="200">WindowClose</animation>
-				<visible>Container($PARAM[container_id]).HasNext</visible>
-			</control>
-			<control type="image">
-				<left>1860</left>
-				<top>94</top>
-				<width>36</width>
-				<height>18</height>
-				<texture colordiffuse="button_focus" flipy="true">overlays/arrowdown.png</texture>
-				<animation effect="fade" time="200">VisibleChange</animation>
-				<animation effect="slide" start="150" end="0" delay="640" time="320" tween="cubic">WindowOpen</animation>
-				<animation effect="zoom" start="100,100" end="100,0" center="0,180" time="200">WindowClose</animation>
-				<visible>Container($PARAM[container_id]).HasPrevious</visible>
-			</control>
-		</control>
-	</include>
 	<include name="LeftRightArrows">
 		<param name="left_posx">445</param>
 		<param name="right_posx">1843</param>
diff --git a/addons/skin.estuary/1080i/Includes_Buttons.xml b/addons/skin.estuary/1080i/Includes_Buttons.xml
index 38303986d3..ccf929c77a 100644
--- a/addons/skin.estuary/1080i/Includes_Buttons.xml
+++ b/addons/skin.estuary/1080i/Includes_Buttons.xml
@@ -76,16 +76,6 @@
 		<textcolor>button_focus</textcolor>
 		<shadowcolor>black</shadowcolor>
 	</include>
-	<include name="DefaultBorderedSettingButton">
-		<height>100</height>
-		<aligny>center</aligny>
-		<textcolor>white</textcolor>
-		<textoffsetx>40</textoffsetx>
-		<invalidcolor>invalid</invalidcolor>
-		<selectedcolor>selected</selectedcolor>
-		<texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus>
-		<texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus>
-	</include>
 	<include name="DefaultDialogButton">
 		<param name="width">300</param>
 		<param name="height">90</param>
diff --git a/addons/skin.estuary/1080i/MyMusicNav.xml b/addons/skin.estuary/1080i/MyMusicNav.xml
index a7a139ff27..53a5e4efbc 100644
--- a/addons/skin.estuary/1080i/MyMusicNav.xml
+++ b/addons/skin.estuary/1080i/MyMusicNav.xml
@@ -79,7 +79,7 @@
 						<include>MediaMenuItemsCommon</include>
 						<label>$LOCALIZE[653]</label>
 						<onclick>UpdateLibrary(music)</onclick>
-						<visible>!Container.Content(addons)</visible>
+						<visible>!Container.Content(addons)+ String.IsEmpty(Container.PluginName)</visible>
 						<altlabel>$LOCALIZE[13353]</altlabel>
 						<usealttexture>library.isscanningmusic</usealttexture>
 					</control>
@@ -110,7 +110,7 @@
 						<label>$LOCALIZE[31117]</label>
 						<onclick condition="System.HasAddon(plugin.library.node.editor)">ActivateWindow(programs,plugin://plugin.library.node.editor/?ltype=music,return)</onclick>
 						<onclick condition="!System.HasAddon(plugin.library.node.editor)">InstallAddon(plugin.library.node.editor)</onclick>
-						<visible>IsEmpty(Container.FolderPath) + String.IsEmpty(Container.PluginName)</visible>
+						<visible>String.IsEmpty(Container.FolderPath) + String.IsEmpty(Container.PluginName)</visible>
 					</control>
 					<include>MediaMenuNowPlaying</include>
 				</control>
diff --git a/addons/skin.estuary/1080i/MyPVRGuide.xml b/addons/skin.estuary/1080i/MyPVRGuide.xml
index 862393e23c..95eb172f4e 100644
--- a/addons/skin.estuary/1080i/MyPVRGuide.xml
+++ b/addons/skin.estuary/1080i/MyPVRGuide.xml
@@ -164,6 +164,7 @@
 					<onright>10</onright>
 					<orientation>vertical</orientation>
 					<texturesliderbackground colordiffuse="22FFFFFF">colors/white.png</texturesliderbackground>
+					<animation effect="fade" start="100" end="40" time="0" condition="!system.getbool(input.enablemouse)">Conditional</animation>
 				</control>
 				<control type="group">
 					<top>540</top>
diff --git a/addons/skin.estuary/1080i/MyVideoNav.xml b/addons/skin.estuary/1080i/MyVideoNav.xml
index 5960eb3aad..d632a53591 100644
--- a/addons/skin.estuary/1080i/MyVideoNav.xml
+++ b/addons/skin.estuary/1080i/MyVideoNav.xml
@@ -213,7 +213,7 @@
 						<description>Unlock Shares</description>
 						<include>MediaMenuItemsCommon</include>
 						<label>$LOCALIZE[20336]</label>
-						<onclick>xbmc.mastermode</onclick>
+						<onclick>mastermode</onclick>
 						<selected>system.ismaster</selected>
 						<visible>system.haslocks</visible>
 					</control>
@@ -222,7 +222,7 @@
 						<include>MediaMenuItemsCommon</include>
 						<label>$LOCALIZE[653]</label>
 						<onclick>UpdateLibrary(video)</onclick>
-						<visible>!Container.Content(addons)</visible>
+						<visible>!Container.Content(addons)+ String.IsEmpty(Container.PluginName)</visible>
 						<altlabel>$LOCALIZE[13353]</altlabel>
 						<usealttexture>library.isscanningvideo</usealttexture>
 					</control>
diff --git a/addons/skin.estuary/1080i/Settings.xml b/addons/skin.estuary/1080i/Settings.xml
index 589819a8e7..820d39c281 100644
--- a/addons/skin.estuary/1080i/Settings.xml
+++ b/addons/skin.estuary/1080i/Settings.xml
@@ -150,6 +150,21 @@
 					<onclick>ActivateWindow(systeminfo)</onclick>
 					<icon>icons/settings/sysinfo.png</icon>
 				</item>
+				<item>
+					<label>$LOCALIZE[31067]</label>
+					<onclick>ActivateWindow(eventlog)</onclick>
+					<icon>icons/settings/eventlog.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[10003]</label>
+					<onclick>ActivateWindow(filemanager)</onclick>
+					<icon>icons/settings/filemanager.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[24001]</label>
+					<onclick>ActivateWindow(addonbrowser)</onclick>
+					<icon>icons/settings/addons.png</icon>
+				</item>
 			</content>
 		</control>
 		<include content="TopBar">
diff --git a/addons/skin.estuary/1080i/SettingsSystemInfo.xml b/addons/skin.estuary/1080i/SettingsSystemInfo.xml
index 27bc021915..453055faa0 100644
--- a/addons/skin.estuary/1080i/SettingsSystemInfo.xml
+++ b/addons/skin.estuary/1080i/SettingsSystemInfo.xml
@@ -92,56 +92,62 @@
 			<control type="grouplist">
 				<left>480</left>
 				<top>105</top>
+				<height>500</height>
 				<orientation>vertical</orientation>
 				<control type="label" id="2">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="3">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="4">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="5">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="6">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="7">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="8">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="9">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="10">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
 				</control>
 				<control type="label" id="11">
-					<height>45</height>
+					<height>41</height>
 					<width>1220</width>
-					<font>Mono30</font>
+					<font>Mono28</font>
+				</control>
+				<control type="label" id="12">
+					<height>41</height>
+					<width>1220</width>
+					<font>Mono28</font>
 				</control>
 			</control>
 			<control type="grouplist">
diff --git a/addons/skin.estuary/1080i/Variables.xml b/addons/skin.estuary/1080i/Variables.xml
index 5f2d077c2d..f51ce97202 100644
--- a/addons/skin.estuary/1080i/Variables.xml
+++ b/addons/skin.estuary/1080i/Variables.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-	<variable name="TVTimerRadioButtonTexture">
-		<value condition="!String.IsEqual(ListItem.Comment,$LOCALIZE[305])">buttons/radio-button-on.png</value>
-		<value>buttons/radio-button-off.png</value>
-	</variable>
 	<variable name="PVRStatusImageVar">
 		<value condition="ListItem.IsRecording">windows/pvr/record.png</value>
 		<value condition="ListItem.HasTimer + !ListItem.IsRecording + !ListItem.HasTimerSchedule">windows/pvr/timer.png</value>
@@ -118,7 +114,7 @@
 		<value>$INFO[ListItem.Art(fanart)]</value>
 	</variable>
 	<variable name="ListBoxInfoVar">
-		<value condition="Stringcompare(Container.FolderPath,addons://outdated/) + !IsEmpty(ListItem.Addonnews)">$INFO[ListItem.Addonnews]</value>
+		<value condition="String.IsEqual(Container.FolderPath,addons://outdated/) + !String.IsEmpty(ListItem.Addonnews)">$INFO[ListItem.Addonnews]</value>
 		<value condition="Container.Content(addons)">$INFO[ListItem.AddonDescription]</value>
 		<value condition="Container.Content(albums)">$INFO[ListItem.Property(album_description)]</value>
 		<value condition="Container.Content(mixed) | Container.Content(videos)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Plot]</value>
@@ -249,8 +245,8 @@
 		<value>$INFO[ListItem.Label]$INFO[ListItem.Year, ([COLOR grey],[/COLOR])]</value>
 	</variable>
 	<variable name="VideoInfoSubLabelVar">
-		<value condition="Stringcompare(ListItem.DBType,episode)">$INFO[ListItem.Season]$INFO[ListItem.Episode,[COLOR grey]x[/COLOR],: ]$INFO[ListItem.TVShowTitle]</value>
-		<value condition="Stringcompare(ListItem.DBType,movie)">$INFO[ListItem.Tagline]</value>
+		<value condition="String.IsEqual(ListItem.DBType,episode)">$INFO[ListItem.Season]$INFO[ListItem.Episode,[COLOR grey]x[/COLOR],: ]$INFO[ListItem.TVShowTitle]</value>
+		<value condition="String.IsEqual(ListItem.DBType,movie)">$INFO[ListItem.Tagline]</value>
 		<value>$INFO[ListItem.Genre]</value>
 	</variable>
 	<variable name="OSDSubLabelVar">
@@ -340,8 +336,8 @@
 		<value>$LOCALIZE[19021] / $LOCALIZE[19019] / $INFO[Control.GetLabel(29)]</value>
 	</variable>
 	<variable name="BreadcrumbsPVRGuideVar">
-		<value condition="Window.IsActive(TVGuide)">$LOCALIZE[19020] / $LOCALIZE[19069] / $INFO[Control.GetLabel(29)] - $INFO[Control.GetLabel(30)]</value>
-		<value>$LOCALIZE[19021] / $LOCALIZE[19069] / $INFO[Control.GetLabel(29)] - $INFO[Control.GetLabel(30)]</value>
+		<value condition="Window.IsActive(TVGuide)">$LOCALIZE[19020] / $INFO[Control.GetLabel(29)] - $INFO[Control.GetLabel(30)]</value>
+		<value>$LOCALIZE[19021] / $INFO[Control.GetLabel(29)] - $INFO[Control.GetLabel(30)]</value>
 	</variable>
 	<variable name="BreadcrumbsPVRRecordingsVar">
 		<value condition="Window.IsActive(TVRecordings)">$LOCALIZE[19020] / $LOCALIZE[19017]$INFO[Control.GetLabel(30), / ]</value>
diff --git a/addons/skin.estuary/media/icons/settings/eventlog.png b/addons/skin.estuary/media/icons/settings/eventlog.png
new file mode 100644
index 0000000000..0376aea72f
--- /dev/null
+++ b/addons/skin.estuary/media/icons/settings/eventlog.png