From 973c1347b40fb67dce35436c70b5073e9e1fece8 Mon Sep 17 00:00:00 2001
From: jezz_x <jezz_x@svn>
Date: Wed, 14 Apr 2010 04:56:51 +0000
Subject: Changed : [Confluence] Addon Browser Uses Addons background (I'm open
 to a new image) and gave the ability to set custom ones in skin settings
 Changed : [Confluence] Labels 31109 and 31110 in English/strings.xml to more
 common terms since addons aren't on home screen.  Translators take note

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29271 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
---
 skin/Confluence/720p/AddonBrowser.xml            |  2 +-
 skin/Confluence/720p/custom_SkinSetting_1111.xml | 66 ++++++++++++++++++++++++
 skin/Confluence/720p/includes.xml                | 12 +++++
 skin/Confluence/language/English/strings.xml     |  4 +-
 4 files changed, 81 insertions(+), 3 deletions(-)

(limited to 'skin')

diff --git a/skin/Confluence/720p/AddonBrowser.xml b/skin/Confluence/720p/AddonBrowser.xml
index e8ab3f5256..d668136c75 100644
--- a/skin/Confluence/720p/AddonBrowser.xml
+++ b/skin/Confluence/720p/AddonBrowser.xml
@@ -3,7 +3,7 @@
 	<allowoverlay>no</allowoverlay>
 	<views>50,51,500</views>
 	<controls>
-		<include>CommonScriptBackground</include>
+		<include>CommonAddonsBackground</include>
 		<include>CommonMediaPlayingBackground</include>
 		<control type="group">
 			<include>Window_OpenClose_Animation</include>		
diff --git a/skin/Confluence/720p/custom_SkinSetting_1111.xml b/skin/Confluence/720p/custom_SkinSetting_1111.xml
index 63328cb680..b52170b128 100644
--- a/skin/Confluence/720p/custom_SkinSetting_1111.xml
+++ b/skin/Confluence/720p/custom_SkinSetting_1111.xml
@@ -728,6 +728,12 @@
 								<icon>special://skin/backgrounds/settings.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_Settings_Folder)]</thumb>
 							</item>
+							<item id="8">
+								<label>24001</label>
+								<onclick>-</onclick>
+								<icon>special://skin/backgrounds/Addons.jpg</icon>
+								<thumb>$INFO[Skin.String(Home_Custom_Back_Addons_Folder)]</thumb>
+							</item>
 						</content>
 					</control>
 					<control type="image">
@@ -1160,6 +1166,66 @@
 								<ondown>304</ondown>
 							</control>
 						</control>
+						<control type="group">
+							<visible>Container(9003).HasFocus(8)</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_Addons_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_Addons_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_Addons_Folder)</onclick>
+								<onleft>301</onleft>
+								<onright>300</onright>
+								<onup>304</onup>
+								<ondown>304</ondown>
+							</control>
+						</control>
 						<control type="group">
 							<visible>Container(9003).HasFocus(10)</visible>
 							<control type="button" id="300">
diff --git a/skin/Confluence/720p/includes.xml b/skin/Confluence/720p/includes.xml
index f4a91184cd..6fafa7acaa 100644
--- a/skin/Confluence/720p/includes.xml
+++ b/skin/Confluence/720p/includes.xml
@@ -153,6 +153,18 @@
 			<fadetime>1000</fadetime>
 		</control>
 	</include>
+	<include name="CommonAddonsBackground">
+		<control type="multiimage">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1280</width>
+			<height>720</height>
+			<imagepath fallback="special://skin/backgrounds/addons.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Addons_Folder)]</imagepath>
+			<timeperimage>10000</timeperimage>
+			<randomize>true</randomize>
+			<fadetime>1000</fadetime>
+		</control>
+	</include>
 	<include name="BehindDialogFadeOut">
 		<control type="image">
 			<posx>0</posx>
diff --git a/skin/Confluence/language/English/strings.xml b/skin/Confluence/language/English/strings.xml
index 25745c749a..7bdb580a7e 100644
--- a/skin/Confluence/language/English/strings.xml
+++ b/skin/Confluence/language/English/strings.xml
@@ -58,8 +58,8 @@
   <string id="31106">Miscellaneous options</string>
   <string id="31107"></string>
   <string id="31108">Hide Main Menu Buttons</string>
-  <string id="31109">Home screen backgrounds</string>
-  <string id="31110">Edit Background for Home Button</string>
+  <string id="31109">Media backgrounds</string>
+  <string id="31110">Edit Background for Media Type</string>
   <string id="31111">Hide</string>
   <string id="31112">Options</string>
   <string id="31113">Single Image</string>
-- 
cgit v1.2.3