Merge pull request #17227 from ronie/estuary-py3

[Estuary] remove support for addons that have not been updated to py3

11 files changed, 5 insertions, 140 deletions

diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po
index c77ee133f7..1804d25b08 100644
--- a/addons/skin.estuary/language/resource.language.en_gb/strings.po
+++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po
@@ -186,11 +186,6 @@ msgctxt "#31033"
 msgid "Your rating"
 msgstr ""
 
-#: /xml/DialogVideoInfo.xml
-msgctxt "#31034"
-msgid "Extended info"
-msgstr ""
-
 #: /xml/DialogPVRChannelManager.xml /xml/DialogPVRChannelsOSD.xml /xml/DialogPVRGuideOSD.xml /xml/Variables.xml /xml/FileBrowser.xml
 msgctxt "#31035"
 msgid "Pages"
@@ -403,11 +398,6 @@ msgctxt "#31089"
 msgid "Available groups"
 msgstr ""
 
-#: /xml/DialogVideoInfo.xml
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr ""
-
 #empty string with id 31091
 
 #: /xml/VideoOSD.xml /xml/Variables.xml
@@ -514,16 +504,11 @@ msgctxt "#31113"
 msgid "Search local library"
 msgstr ""
 
-#: /xml/Custom_1107_SearchDialog.xml /xml/DialogMusicInfo.xml
+#: /xml/Custom_1107_SearchDialog.xml
 msgctxt "#31114"
 msgid "Search YouTube"
 msgstr ""
 
-#: /xml/Custom_1107_SearchDialog.xml
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr ""
-
 #: /xml/Includes_Home.xml
 msgctxt "#31116"
 msgid "Remove this main menu item"
@@ -564,11 +549,6 @@ msgctxt "#31123"
 msgid "Same director"
 msgstr ""
 
-#: /xml/MyPics.xml
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr ""
-
 #: /xml/DialogVideoInfo.xml
 msgctxt "#31125"
 msgid "Press up for actor info"
diff --git a/addons/skin.estuary/media/icons/infodialogs/trailer_search.png b/addons/skin.estuary/media/icons/infodialogs/trailer_search.png
deleted file mode 100644
index 6352e29070..0000000000
--- a/addons/skin.estuary/media/icons/infodialogs/trailer_search.png
+++ /dev/null
diff --git a/addons/skin.estuary/media/icons/infodialogs/youtube.png b/addons/skin.estuary/media/icons/infodialogs/youtube.png
deleted file mode 100644
index 21d410a80e..0000000000
--- a/addons/skin.estuary/media/icons/infodialogs/youtube.png
+++ /dev/null
diff --git a/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml b/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml
index 739484332a..59e36cf45e 100644
--- a/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml
+++ b/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml
@@ -34,12 +34,6 @@
 						<onclick condition="System.hasAddon(plugin.video.youtube)">ActivateWindow(videos,"plugin://plugin.video.youtube/kodion/search/list/",return)</onclick>
 						<onclick condition="!System.hasAddon(plugin.video.youtube)">InstallAddon(plugin.video.youtube)</onclick>
 					</item>
-					<item>
-						<label>$LOCALIZE[31115]</label>
-						<onclick>Dialog.Close(all)</onclick>
-						<onclick condition="System.hasAddon(script.extendedinfo)">RunScript(script.extendedinfo,info=moviedbbrowser,search=True)</onclick>
-						<onclick condition="!System.hasAddon(script.extendedinfo)">InstallAddon(script.extendedinfo)</onclick>
-					</item>
 				</content>
 			</control>
 		</control>
diff --git a/addons/skin.estuary/xml/DialogKeyboard.xml b/addons/skin.estuary/xml/DialogKeyboard.xml
index 6e91601243..ac3edc953b 100644
--- a/addons/skin.estuary/xml/DialogKeyboard.xml
+++ b/addons/skin.estuary/xml/DialogKeyboard.xml
@@ -577,67 +577,6 @@
 					<param name="width" value="350" />
 				</include>
 			</control>
-			<control type="panel" id="9010">
-				<centerleft>50%</centerleft>
-				<bottom>490</bottom>
-				<width>1500</width>
-				<height>200</height>
-				<scrolltime tween="cubic" easing="out">500</scrolltime>
-				<orientation>vertical</orientation>
-				<onleft>9010</onleft>
-				<onright>9010</onright>
-				<onup>noop</onup>
-				<ondown>105</ondown>
-				<visible>!Control.IsVisible(313)</visible>
-				<itemlayout width="500" height="60">
-					<control type="image">
-						<left>10</left>
-						<top>0</top>
-						<width>480</width>
-						<height>50</height>
-						<texture colordiffuse="dialog_tint">colors/white.png</texture>
-					</control>
-					<control type="label">
-						<textoffsetx>30</textoffsetx>
-						<top>0</top>
-						<width>500</width>
-						<height>50</height>
-						<label>$INFO[ListItem.Label]</label>
-						<font>font12</font>
-						<shadowcolor>text_shadow</shadowcolor>
-						<aligny>center</aligny>
-					</control>
-				</itemlayout>
-				<focusedlayout width="500" height="60">
-					<control type="group">
-						<control type="image">
-							<left>10</left>
-							<top>0</top>
-							<width>480</width>
-							<height>50</height>
-							<texture colordiffuse="dialog_tint">colors/white.png</texture>
-						</control>
-						<control type="image">
-							<left>10</left>
-							<width>480</width>
-							<height>50</height>
-							<texture colordiffuse="button_focus">colors/grey.png</texture>
-							<include>Animation_FocusTextureFade</include>
-						</control>
-						<control type="label">
-							<textoffsetx>30</textoffsetx>
-							<top>0</top>
-							<width>500</width>
-							<height>50</height>
-							<label>$INFO[ListItem.Label]</label>
-							<font>font12</font>
-							<shadowcolor>text_shadow</shadowcolor>
-							<aligny>center</aligny>
-						</control>
-					</control>
-				</focusedlayout>
-				<content>$VAR[AutoCompletionContentVar]</content>
-			</control>
 			<control type="label" id="313">
 				<centerleft>50%</centerleft>
 				<top>290</top>
diff --git a/addons/skin.estuary/xml/DialogMusicInfo.xml b/addons/skin.estuary/xml/DialogMusicInfo.xml
index f0576826a0..613bb2de71 100644
--- a/addons/skin.estuary/xml/DialogMusicInfo.xml
+++ b/addons/skin.estuary/xml/DialogMusicInfo.xml
@@ -417,16 +417,6 @@
 						<onclick>ActivateWindow(1104)</onclick>
 						<visible>String.IsEqual(ListItem.DBType,artist) | String.IsEqual(ListItem.DBType,album)</visible>
 					</control>
-					<control type="radiobutton" id="440">
-						<label>$LOCALIZE[31114]</label>
-						<include content="VideoInfoButtonsCommon">
-							<param name="icon" value="icons/infodialogs/youtube.png" />
-						</include>
-						<onclick>Action(close)</onclick>
-						<visible>System.hasAddon(script.extendedinfo)</visible>
-						<onclick condition="!String.IsEqual(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Album])</onclick>
-						<onclick condition="String.IsEqual(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Title])</onclick>
-					</control>
 					<include content="InfoDialogButton">
 						<param name="id" value="6" />
 						<param name="icon" value="icons/infodialogs/update.png" />
diff --git a/addons/skin.estuary/xml/DialogPVRInfo.xml b/addons/skin.estuary/xml/DialogPVRInfo.xml
index 9f73bca982..4b463048b0 100644
--- a/addons/skin.estuary/xml/DialogPVRInfo.xml
+++ b/addons/skin.estuary/xml/DialogPVRInfo.xml
@@ -113,15 +113,6 @@
 						<param name="label" value="$LOCALIZE[19003]" />
 						<param name="visible" value="Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo)" />
 					</include>
-					<include content="InfoDialogButton">
-						<param name="width" value="275" />
-						<param name="id" value="440" />
-						<param name="icon" value="icons/infodialogs/youtube.png" />
-						<param name="label" value="$LOCALIZE[31114]" />
-						<param name="onclick_1" value="Action(close)" />
-						<param name="onclick_2" value="RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Title])" />
-						<param name="visible" value="System.hasAddon(script.extendedinfo)" />
-					</include>
 				</control>
 			</control>
 			<include content="InfoDialogTopBarInfo">
diff --git a/addons/skin.estuary/xml/DialogVideoInfo.xml b/addons/skin.estuary/xml/DialogVideoInfo.xml
index 47dd90f8e6..7fb97cd9c9 100644
--- a/addons/skin.estuary/xml/DialogVideoInfo.xml
+++ b/addons/skin.estuary/xml/DialogVideoInfo.xml
@@ -9,7 +9,6 @@
 			<height>1080</height>
 			<centerleft>50%</centerleft>
 			<width>1920</width>
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">Conditional</animation>
 			<control type="group">
 				<top>150</top>
 				<left>66</left>
@@ -286,8 +285,6 @@
 					<height>370</height>
 					<onleft>50</onleft>
 					<onright>50</onright>
-					<onup condition="System.hasAddon(script.extendedinfo) + Control.HasFocus(50) + !String.IsEqual(ListItem.DBType,set)">RunScript(script.extendedinfo,info=extendedactorinfo,name=$INFO[Container(50).ListItem.Label])</onup>
-					<onup condition="!System.hasAddon(script.extendedinfo) + !String.IsEqual(ListItem.DBType,set)">InstallAddon(script.extendedinfo)</onup>
 					<ondown>140</ondown>
 					<scrolltime>200</scrolltime>
 					<orientation>horizontal</orientation>
@@ -521,14 +518,6 @@
 						<param name="visible" value="!String.IsEmpty(ListItem.Trailer) + ![String.StartsWith(Container.FolderPath,plugin://) + String.Contains(Container.FolderPath,trailer)]" />
 					</include>
 					<include content="InfoDialogButton">
-						<param name="id" value="440" />
-						<param name="icon" value="icons/infodialogs/trailer_search.png" />
-						<param name="label" value="$LOCALIZE[31090]" />
-						<param name="onclick_1" value="Action(close)" />
-						<param name="onclick_2" value="RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Title] $INFO[ListItem.Year])" />
-						<param name="visible" value="System.hasAddon(script.extendedinfo) + String.IsEqual(ListItem.DBType,movie) + !Control.IsVisible(11)" />
-					</include>
-					<include content="InfoDialogButton">
 						<param name="id" value="441" />
 						<param name="icon" value="icons/infodialogs/cinema.png" />
 						<param name="onclick_1" value="Dialog.Close(MovieInformation)" />
@@ -573,13 +562,6 @@
 						</control>
 					</control>
 					<include content="InfoDialogButton">
-						<param name="id" value="101" />
-						<param name="icon" value="icons/infodialogs/info.png" />
-						<param name="label" value="$LOCALIZE[31034]" />
-						<param name="onclick_1" value="RunScript(script.extendedinfo,info=openinfodialog)" />
-						<param name="visible" value="System.hasAddon(script.extendedinfo) + [String.IsEqual(ListItem.DbType,movie) | String.IsEqual(ListItem.DbType,tvshow) | String.IsEqual(ListItem.DbType,season) | String.IsEqual(ListItem.DbType,episode)]" />
-					</include>
-					<include content="InfoDialogButton">
 						<param name="id" value="102" />
 						<param name="icon" value="icons/infodialogs/image.png" />
 						<param name="label" value="$LOCALIZE[31028]" />
@@ -655,7 +637,6 @@
 			<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
 			<centerleft>50%</centerleft>
 			<width>1920</width>
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">Conditional</animation>
 			<bottom>0</bottom>
 			<height>70</height>
 			<include>MediaFlags</include>
diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml
index 3a5b2426c6..15edd1720c 100644
--- a/addons/skin.estuary/xml/Includes.xml
+++ b/addons/skin.estuary/xml/Includes.xml
@@ -34,7 +34,7 @@
 	<constant name="dialogbuttons_itemgap">-20</constant>
 	<constant name="list_y_offset">0</constant>
 	<constant name="list_item_height">80</constant>
-	<expression name="infodialog_active">Window.IsActive(musicinformation) | Window.IsActive(songinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)</expression>
+	<expression name="infodialog_active">Window.IsActive(musicinformation) | Window.IsActive(songinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo)</expression>
 	<expression name="sidebar_visible">ControlGroup(9000).HasFocus | Control.HasFocus(6130) | Control.HasFocus(6131)</expression>
 	<include name="CommonScrollbars">
 		<control type="group">
diff --git a/addons/skin.estuary/xml/MyPics.xml b/addons/skin.estuary/xml/MyPics.xml
index f5edb426d6..ba8ef9b7b7 100644
--- a/addons/skin.estuary/xml/MyPics.xml
+++ b/addons/skin.estuary/xml/MyPics.xml
@@ -225,13 +225,6 @@
 						<label>$LOCALIZE[13319]</label>
 						<include>MediaMenuItemsCommon</include>
 					</control>
-					<control type="button" id="622">
-						<include>MediaMenuItemsCommon</include>
-						<label>$LOCALIZE[31124]</label>
-						<onclick condition="System.HasAddon(script.maps.browser)">RunScript(script.maps.browser,folder=$INFO[Container.FolderPath])</onclick>
-						<onclick condition="!System.HasAddon(script.maps.browser)">InstallAddon(script.maps.browser)</onclick>
-						<visible>Container.Content(images) + String.IsEmpty(Container.PluginName)</visible>
-					</control>
 					<control type="button" id="624">
 						<include>MediaMenuItemsCommon</include>
 						<label>$LOCALIZE[10140]</label>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index b09ae08f43..8fd481166d 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -5,9 +5,6 @@
 		<value condition="ListItem.HasTimer | ListItem.HasTimerSchedule">windows/pvr/timer.png</value>
 		<value condition="ListItem.HasArchive">windows/pvr/archive.png</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>
-	</variable>
 	<variable name="InfoListPathVar">
 		<value condition="String.IsEmpty(Container.PluginName)">$INFO[ListItem.FolderPath]</value>
 		<value></value>
@@ -323,13 +320,13 @@
 	</variable>
 	<variable name="AddonsFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)"></value>
-		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo)">$INFO[Window(home).Property(infobackground)]</value>
 		<value condition="!String.IsEmpty(Container.ListItem.Art(fanart))">$INFO[Container.ListItem.Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value>
 	</variable>
 	<variable name="HomeFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)"></value>
-		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo)">$INFO[Window(home).Property(infobackground)]</value>
 		<value condition="!String.IsEmpty(Container.ListItem.Art(fanart))">$INFO[Container.ListItem.Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItem.Property(FanartCode))">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container.ListItem.Property(FanartCode)]$INFO[Skin.String(WeatherFanart.ext)]</value>
 		<value condition="!String.IsEmpty(Skin.String(HomeFanart.path)) + Control.HasFocus(804)">$INFO[Skin.String(HomeFanart.path)]power$INFO[Skin.String(HomeFanart.ext)]</value>
@@ -340,7 +337,7 @@
 	</variable>
 	<variable name="MediaFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)"></value>
-		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo)">$INFO[Window(home).Property(infobackground)]</value>
 		<value condition="Container.Content(genres) + Window.IsActive(videos)">$INFO[Skin.String(MovieGenreFanart.path)]$INFO[ListItem.Label]$INFO[Skin.String(MovieGenreFanart.ext)]</value>
 		<value condition="Window.IsActive(pictures) + String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.FolderPath]</value>
 		<value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>