Changed: [Confluence] Completely removed the script window (turns out you don't need one)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31293 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

9 files changed, 27 insertions, 291 deletions

diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 44ea33b96e..6a2dd1e48b 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -563,7 +563,7 @@
 					<onup>9015</onup>

 					<ondown>9015</ondown>

 					<itemgap>0</itemgap>

-					<visible>Container(9000).HasFocus(8) + [[Skin.HasSetting(HomeScriptButton1) + !IsEmpty(Skin.String(HomeScriptButton1_label))] | [Skin.HasSetting(HomeScriptButton2) + !IsEmpty(Skin.String(HomeScriptButton2_label))] | [Skin.HasSetting(HomeScriptButton3) + !IsEmpty(Skin.String(HomeScriptButton3_label))] | [Skin.HasSetting(HomeScriptButton4) + !IsEmpty(Skin.String(HomeScriptButton4_label))] | [Skin.HasSetting(HomeScriptButton5) + !IsEmpty(Skin.String(HomeScriptButton5_label))] | [Skin.HasSetting(HomeScriptButton6) + !IsEmpty(Skin.String(HomeScriptButton6_label))]]</visible>

+					<visible>Container(9000).HasFocus(1) + [[Skin.HasSetting(HomeScriptButton1) + !IsEmpty(Skin.String(HomeScriptButton1_label))] | [Skin.HasSetting(HomeScriptButton2) + !IsEmpty(Skin.String(HomeScriptButton2_label))] | [Skin.HasSetting(HomeScriptButton3) + !IsEmpty(Skin.String(HomeScriptButton3_label))] | [Skin.HasSetting(HomeScriptButton4) + !IsEmpty(Skin.String(HomeScriptButton4_label))] | [Skin.HasSetting(HomeScriptButton5) + !IsEmpty(Skin.String(HomeScriptButton5_label))] | [Skin.HasSetting(HomeScriptButton6) + !IsEmpty(Skin.String(HomeScriptButton6_label))]]</visible>

 					<control type="button" id="90151">

 						<description>Button1</description>

 						<include>ButtonHomeSubCommonValues</include>

@@ -781,19 +781,12 @@
 						<width>18</width>

 						<height>18</height>

 						<texture>HomeHasSub.png</texture>

-						<visible>Container(9000).HasFocus(2) | Container(9000).HasFocus(3) | Container(9000).HasFocus(5) | Container(9000).HasFocus(7) | Container(9000).HasFocus(9) | [Container(9000).HasFocus(8) + [[Skin.HasSetting(HomeScriptButton1) + !IsEmpty(Skin.String(HomeScriptButton1_label))] | [Skin.HasSetting(HomeScriptButton2) + !IsEmpty(Skin.String(HomeScriptButton2_label))] | [Skin.HasSetting(HomeScriptButton3) + !IsEmpty(Skin.String(HomeScriptButton3_label))] | [Skin.HasSetting(HomeScriptButton4) + !IsEmpty(Skin.String(HomeScriptButton4_label))] | [Skin.HasSetting(HomeScriptButton5) + !IsEmpty(Skin.String(HomeScriptButton5_label))] | [Skin.HasSetting(HomeScriptButton6) + !IsEmpty(Skin.String(HomeScriptButton6_label))]]] | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)</visible>

+						<visible>Container(9000).HasFocus(2) | Container(9000).HasFocus(3) | Container(9000).HasFocus(5) | Container(9000).HasFocus(7) | Container(9000).HasFocus(9) | [Container(9000).HasFocus(1) + [[Skin.HasSetting(HomeScriptButton1) + !IsEmpty(Skin.String(HomeScriptButton1_label))] | [Skin.HasSetting(HomeScriptButton2) + !IsEmpty(Skin.String(HomeScriptButton2_label))] | [Skin.HasSetting(HomeScriptButton3) + !IsEmpty(Skin.String(HomeScriptButton3_label))] | [Skin.HasSetting(HomeScriptButton4) + !IsEmpty(Skin.String(HomeScriptButton4_label))] | [Skin.HasSetting(HomeScriptButton5) + !IsEmpty(Skin.String(HomeScriptButton5_label))] | [Skin.HasSetting(HomeScriptButton6) + !IsEmpty(Skin.String(HomeScriptButton6_label))]]] | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)</visible>

 						<animation effect="fade" start="0" end="100" time="200">Focus</animation>

 						<animation effect="fade" start="100" end="0" time="200">UnFocus</animation>

 					</control>

 				</focusedlayout>

 				<content>

-					<item id="8">

-						<label>247</label>

-						<onclick>ActivateWindow(Scripts)</onclick>

-						<icon>special://skin/backgrounds/scripts.jpg</icon>

-						<thumb>$INFO[Skin.String(Home_Custom_Back_Scripts_Folder)]</thumb>

-						<visible>!Skin.HasSetting(HomeMenuNoScriptsButton)</visible>

-					</item>

 					<item id="6">

 						<label>8</label>

 						<onclick>ActivateWindow(Weather)</onclick>

@@ -817,6 +810,13 @@
 						<thumb>$INFO[Skin.String(Home_Custom_Back_Pictures_Folder)]</thumb>

 						<visible>!Skin.HasSetting(HomeMenuNoPicturesButton)</visible>

 					</item>

+					<item id="3">

+						<label>2</label>

+						<onclick>ActivateWindow(Music)</onclick>

+						<icon>special://skin/backgrounds/music.jpg</icon>

+						<thumb>$INFO[Skin.String(Home_Custom_Back_Music_Folder)]</thumb>

+						<visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible>

+					</item>

 					<item id="2">

 						<label>3</label>

 						<onclick>ActivateWindow(Videos)</onclick>

@@ -845,13 +845,6 @@
 						<thumb>$INFO[Skin.String(Home_Custom_Back_TVShow_Folder)]</thumb>

 						<visible>Skin.HasSetting(HomeMenuNoTVShowsButton) + Library.HasContent(TVShows)</visible>

 					</item>

-					<item id="3">

-						<label>2</label>

-						<onclick>ActivateWindow(Music)</onclick>

-						<icon>special://skin/backgrounds/music.jpg</icon>

-						<thumb>$INFO[Skin.String(Home_Custom_Back_Music_Folder)]</thumb>

-						<visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible>

-					</item>

 					<item id="1">

 						<label>0</label>

 						<onclick>ActivateWindow(Programs)</onclick>

diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml
index fc7a46b57f..74b6025d41 100644
--- a/addons/skin.confluence/720p/MyPrograms.xml
+++ b/addons/skin.confluence/720p/MyPrograms.xml
@@ -1,7 +1,7 @@
 <window id="1">

 	<defaultcontrol always="true">50</defaultcontrol>

 	<allowoverlay>no</allowoverlay>

-	<views>50,51,500</views>

+	<views>50,51,500,503</views>

 	<controls>

 		<include>CommonProgramsBackground</include>

 		<include>CommonMediaPlayingBackground</include>

@@ -25,6 +25,15 @@
 				<include>VisibleFadeEffect</include>

 				<visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(500)</visible>

 			</control>

+			<control type="image">

+				<posx>0</posx>

+				<posy>-5</posy>

+				<width>1280</width>

+				<height>725</height>

+				<texture border="0.5.0.0">ContentPanel4.png</texture>

+				<include>VisibleFadeEffect</include>

+				<visible>Control.IsVisible(503)</visible>

+			</control>

 			<control type="group">

 				<include>VisibleFadeEffect</include>

 				<visible>Control.IsVisible(50)</visible>

@@ -69,6 +78,7 @@
 			<include>CommonRootView</include> <!-- view id = 50 -->

 			<include>FullWidthList</include> <!-- view id = 51 -->

 			<include>ThumbnailView</include> <!-- view id = 500 -->

+			<include>AddonInfoListView1</include> <!-- view id = 503 -->

 		</control>

 		<include>CommonPageCount</include>

 		<include>BehindDialogFadeOut</include>

diff --git a/addons/skin.confluence/720p/MyScripts.xml b/addons/skin.confluence/720p/MyScripts.xml
deleted file mode 100644
index 3f53be63fc..0000000000
--- a/addons/skin.confluence/720p/MyScripts.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<window id="20">

-	<defaultcontrol always="true">50</defaultcontrol>

-	<allowoverlay>no</allowoverlay>

-	<views>50,51,500,503</views>

-	<controls>

-		<include>CommonScriptBackground</include>

-		<include>CommonMediaPlayingBackground</include>

-		<control type="group">

-			<include>Window_OpenClose_Animation</include>		

-			<control type="image">

-				<posx>0</posx>

-				<posy>0</posy>

-				<width>1280</width>

-				<height>720</height>

-				<texture border="20">black-back.png</texture>

-				<include>VisibleFadeEffect</include>

-				<visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(500)</visible>

-			</control>

-			<control type="image">

-				<posx>0</posx>

-				<posy>128r</posy>

-				<width>1280</width>

-				<height>128</height>

-				<texture>floor.png</texture>

-				<include>VisibleFadeEffect</include>

-				<visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(500)</visible>

-			</control>

-			<control type="image">

-				<posx>0</posx>

-				<posy>-5</posy>

-				<width>1280</width>

-				<height>725</height>

-				<texture border="0.5.0.0">ContentPanel4.png</texture>

-				<include>VisibleFadeEffect</include>

-				<visible>Control.IsVisible(503)</visible>

-			</control>

-			<control type="group">

-				<include>VisibleFadeEffect</include>

-				<visible>Control.IsVisible(50)</visible>

-				<control type="image">

-					<posx>50</posx>

-					<posy>60</posy>

-					<width>750</width>

-					<height>600</height>

-					<texture border="20">ContentPanel.png</texture>

-				</control>

-				<control type="image">

-					<posx>50</posx>

-					<posy>645</posy>

-					<width>750</width>

-					<height>600</height>

-					<aspectratio aligny="top">keep</aspectratio>

-					<texture diffuse="diffuse_mirror3.png" flipy="true" border="20">ContentPanel.png</texture>

-				</control>

-			</control>

-			<control type="group">

-				<include>VisibleFadeEffect</include>

-				<visible>Control.IsVisible(51) | Control.IsVisible(500)</visible>

-				<control type="image">

-					<posx>75</posx>

-					<posy>60</posy>

-					<width>1130</width>

-					<height>600</height>

-					<texture border="20">ContentPanel.png</texture>

-				</control>

-				<control type="image">

-					<posx>75</posx>

-					<posy>645</posy>

-					<width>1130</width>

-					<height>600</height>

-					<aspectratio aligny="top">keep</aspectratio>

-					<texture diffuse="diffuse_mirror3.png" flipy="true" border="20">ContentPanel.png</texture>

-				</control>

-			</control>

-		</control>

-		<control type="group">

-			<include>Window_OpenClose_Animation</include>		

-			<include>CommonRootView</include> <!-- view id = 50 -->

-			<include>FullWidthList</include> <!-- view id = 51 -->

-			<include>ThumbnailView</include> <!-- view id = 500 -->

-			<include>AddonInfoListView1</include> <!-- view id = 503 -->

-		</control>

-		<include>CommonPageCount</include>

-		<include>BehindDialogFadeOut</include>

-		<include>ScrollOffsetLabel</include>

-		<control type="group">

-			<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">Conditional</animation>

-			<animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">WindowClose</animation>

-			<control type="button" id="8999">

-				<description>Fake button for mouse control</description>

-				<posx>-250</posx>

-				<posy>0</posy>

-				<width>265</width>

-				<height>720</height>

-				<label>-</label>

-				<font>-</font>

-				<texturenofocus>-</texturenofocus>

-				<texturefocus>-</texturefocus>

-				<visible>true</visible>

-			</control>

-			<include>SideBladeLeft</include>

-			<control type="image">

-				<description>LOGO</description>

-				<posx>-230</posx>

-				<posy>50</posy>

-				<width>220</width>

-				<height>80</height>

-				<aspectratio>keep</aspectratio>

-				<texture>Confluence_Logo.png</texture>

-			</control>

-			<control type="group" id="9000">

-				<posx>-250</posx>

-				<posy>130</posy>

-				<include>CommonNowPlaying</include>

-				<control type="button" id="2">

-					<description>View As button</description>

-					<posx>0</posx>

-					<posy>0</posy>

-					<include>ButtonCommonValues</include>

-					<label>-</label>

-					<onleft>50</onleft>

-					<onright>50</onright>

-					<onup>611</onup>

-					<ondown>3</ondown>

-				</control>

-				<control type="button" id="3">

-					<description>Sort by button</description>

-					<posx>0</posx>

-					<posy>40</posy>

-					<include>ButtonCommonValues</include>

-					<label>103</label>

-					<onleft>50</onleft>

-					<onright>4</onright>

-					<onup>2</onup>

-					<ondown>610</ondown>

-				</control>

-				<control type="togglebutton" id="4">

-					<description>Sort asc</description>

-					<posx>220</posx>

-					<posy>53</posy>

-					<label>-</label>

-					<onleft>3</onleft>

-					<onright>50</onright>

-					<onup>2</onup>

-					<ondown>610</ondown>

-				</control>

-				<control type="button" id="610">

-					<description>Fake Button to fix Player Controls Navigation</description>

-					<onup>3</onup>

-					<ondown>603</ondown>

-					<visible>false</visible>

-				</control>

-				<control type="group">

-					<posx>0</posx>

-					<posy>260</posy>

-					<include>CommonNowPlaying_Controls</include>

-				</control>

-				<control type="button" id="611">

-					<description>Fake Button to fix Player Controls Navigation</description>

-					<onup>608</onup>

-					<ondown>2</ondown>

-					<visible>false</visible>

-				</control>

-			</control>

-		</control>

-		<control type="group">

-			<posx>60</posx>

-			<posy>0</posy>

-			<animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation>

-			<animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>

-			<control type="image">

-				<posx>0</posx>

-				<posy>0</posy>

-				<width>250</width>

-				<height>35</height>

-				<texture border="0,0,32,0">header.png</texture>

-			</control>

-			<control type="label">

-				<include>WindowTitleCommons</include>

-				<posx>220</posx>

-				<label>$LOCALIZE[10020]</label>

-			</control>

-		</control>

-		<include>WindowTitleHomeButton</include>

-		<include>Clock</include>

-	</controls>

-</window>

diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
index 44684e0062..28304a0006 100644
--- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
+++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
@@ -138,7 +138,7 @@
 						<onclick>-</onclick>

 					</item>

 					<item id="4">

-						<label>31116</label>

+						<label>24000</label>

 						<label2>31200</label2>

 						<onclick>-</onclick>

 					</item>

@@ -528,19 +528,6 @@
 						<texturefocus>MenuItemFO.png</texturefocus>

 						<texturenofocus>MenuItemNF.png</texturenofocus>

 					</control>

-					<control type="radiobutton" id="211">

-						<description>Hide Scripts Button</description>

-						<width>750</width>

-						<height>40</height>

-						<font>font13</font>

-						<textcolor>grey2</textcolor>

-						<focusedcolor>white</focusedcolor>

-						<label>$LOCALIZE[31111] - $LOCALIZE[247]</label>

-						<onclick>Skin.ToggleSetting(HomeMenuNoScriptsButton)</onclick>

-						<selected>Skin.HasSetting(HomeMenuNoScriptsButton)</selected>

-						<texturefocus>MenuItemFO.png</texturefocus>

-						<texturenofocus>MenuItemNF.png</texturenofocus>

-					</control>

 					<control type="radiobutton" id="212">

 						<description>Hide Weather Button</description>

 						<width>750</width>

@@ -744,12 +731,6 @@
 								<icon>special://skin/backgrounds/weather.jpg</icon>

 								<thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>

 							</item>

-							<item id="6">

-								<label>247</label>

-								<onclick>-</onclick>

-								<icon>special://skin/backgrounds/scripts.jpg</icon>

-								<thumb>$INFO[Skin.String(Home_Custom_Back_Scripts_Folder)]</thumb>

-							</item>

 							<item id="7">

 								<label>13000</label>

 								<onclick>-</onclick>

@@ -1075,66 +1056,6 @@
 							</control>

 						</control>

 						<control type="group">

-							<visible>Container(9003).HasFocus(6)</visible>

-							<control type="button" id="300">

-								<description>Single Image button</description>

-								<posx>5</posx>

-								<posy>0</posy>

-								<width>180</width>

-								<height>40</height>

-								<label>31113</label>

-								<font>font12_title</font>

-								<textcolor>grey2</textcolor>

-								<focusedcolor>white</focusedcolor>

-								<align>center</align>

-								<texturenofocus border="5">button-nofocus.png</texturenofocus>

-								<texturefocus border="5">button-focus.png</texturefocus>

-								<onclick>Skin.SetImage(Home_Custom_Back_Scripts_Folder)</onclick>

-								<onleft>302</onleft>

-								<onright>301</onright>

-								<onup>304</onup>

-								<ondown>304</ondown>

-							</control>

-							<control type="button" id="301">

-								<description>Multi Image button</description>

-								<posx>190</posx>

-								<posy>0</posy>

-								<width>180</width>

-								<height>40</height>

-								<label>31114</label>

-								<font>font12_title</font>

-								<textcolor>grey2</textcolor>

-								<focusedcolor>white</focusedcolor>

-								<align>center</align>

-								<texturenofocus border="5">button-nofocus.png</texturenofocus>

-								<texturefocus border="5">button-focus.png</texturefocus>

-								<onclick>Skin.SetPath(Home_Custom_Back_Scripts_Folder)</onclick>

-								<onleft>300</onleft>

-								<onright>302</onright>

-								<onup>304</onup>

-								<ondown>304</ondown>

-							</control>

-							<control type="button" id="302">

-								<description>Default Image button</description>

-								<posx>375</posx>

-								<posy>0</posy>

-								<width>180</width>

-								<height>40</height>

-								<label>571</label>

-								<font>font12_title</font>

-								<textcolor>grey2</textcolor>

-								<focusedcolor>white</focusedcolor>

-								<align>center</align>

-								<texturenofocus border="5">button-nofocus.png</texturenofocus>

-								<texturefocus border="5">button-focus.png</texturefocus>

-								<onclick>Skin.Reset(Home_Custom_Back_Scripts_Folder)</onclick>

-								<onleft>301</onleft>

-								<onright>300</onright>

-								<onup>304</onup>

-								<ondown>304</ondown>

-							</control>

-						</control>

-						<control type="group">

 							<visible>Container(9003).HasFocus(7)</visible>

 							<control type="button" id="300">

 								<description>Single Image button</description>

diff --git a/addons/skin.confluence/backgrounds/programs.jpg b/addons/skin.confluence/backgrounds/programs.jpg
index 74d9d0aec4..3b097bbfb8 100644
--- a/addons/skin.confluence/backgrounds/programs.jpg
+++ b/addons/skin.confluence/backgrounds/programs.jpg
diff --git a/addons/skin.confluence/backgrounds/scripts.jpg b/addons/skin.confluence/backgrounds/scripts.jpg
deleted file mode 100644
index 3b097bbfb8..0000000000
--- a/addons/skin.confluence/backgrounds/scripts.jpg
+++ /dev/null
diff --git a/addons/skin.confluence/language/English/strings.xml b/addons/skin.confluence/language/English/strings.xml
index 5466223263..7384d572f6 100644
--- a/addons/skin.confluence/language/English/strings.xml
+++ b/addons/skin.confluence/language/English/strings.xml
@@ -66,22 +66,22 @@
   <string id="31113">Single Image</string>

   <string id="31114">Multi Image</string>

   <string id="31115">Customizer</string>

-  <string id="31116">Addon Scripts</string>

+  <string id="31116"></string>

   <string id="31117">Show Recently added Videos</string>

-  <string id="31118">Home Page Submenu</string>

-  <string id="31119">Enable Custom Script Button</string>

+  <string id="31118">Home Page Programs Submenu</string>

+  <string id="31119">Enable Custom Add-on Button</string>

   <string id="31120">BUTTON LABEL</string>

-  <string id="31121">PATH TO SCRIPT</string>

+  <string id="31121">PATH TO ADD-ON</string>

   <string id="31122">Weather Page</string>

   <string id="31123">Use "Posters" instead of "Banners" for TV Shows</string>

   <string id="31124">Show Background "Now Playing" Video</string>

   <string id="31125">Show Background "Now Playing" Visualization</string>

 

   <string id="31126">Enable Lyrics in Music OSD</string>

-  <string id="31127">PATH TO LYRICS SCRIPT</string>

+  <string id="31127">PATH TO LYRICS ADD-ON</string>

   <string id="31128">XBMC Lyrics</string>

   <string id="31129">Enable Subtitle Download in Video OSD</string>

-  <string id="31130">PATH TO SUBTITLE SCRIPT</string>

+  <string id="31130">PATH TO SUBTITLE ADD-ON</string>

 

   <string id="31140">Music OSD</string>

   <string id="31141">Video OSD</string>

diff --git a/addons/skin.confluence/media/DefaultScript.png b/addons/skin.confluence/media/DefaultScript.png
deleted file mode 100644
index f8a6b08247..0000000000
--- a/addons/skin.confluence/media/DefaultScript.png
+++ /dev/null
diff --git a/addons/skin.confluence/media/Makefile b/addons/skin.confluence/media/Makefile
index f1adb536e5..fdc54284a2 100644
--- a/addons/skin.confluence/media/Makefile
+++ b/addons/skin.confluence/media/Makefile
@@ -92,7 +92,6 @@ IMAGES= \
 	DefaultRecentlyAddedEpisodes.png \
 	DefaultRecentlyAddedMovies.png \
 	DefaultRecentlyAddedMusicVideos.png \
-	DefaultScript.png \
 	DefaultTVShows.png \
 	DefaultVideo.png \
 	DefaultVideoCover.png \