Changed: [Confluence] Simplified how the add-on short cut gets set in skin settings (and displayed in the code), Made the short cut setting buttons for scripts and lyrics show the human name instead of the path

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

5 files changed, 63 insertions, 274 deletions

diff --git a/addons/skin.confluence/720p/IncludesHomeHorizontal.xml b/addons/skin.confluence/720p/IncludesHomeHorizontal.xml
index 03dfc547fe..1f797998ea 100644
--- a/addons/skin.confluence/720p/IncludesHomeHorizontal.xml
+++ b/addons/skin.confluence/720p/IncludesHomeHorizontal.xml
@@ -407,7 +407,7 @@
 				<onup>9000</onup>

 				<ondown>9000</ondown>

 				<itemgap>0</itemgap>

-				<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>

+				<visible>Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]</visible>

 				<include>HomeSubMenuPrograms</include> <!-- Buttons for the grouplist -->

 			</control>

 			<control type="grouplist" id="9016">

@@ -621,7 +621,7 @@
 				<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(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>

+				<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) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]] | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)</visible>

 				<animation effect="rotate" start="90" end="90" center="auto" time="0" condition="true">Conditional</animation>

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

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

diff --git a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
index b40168c218..c9aa8fdfdb 100644
--- a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
+++ b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
@@ -199,50 +199,50 @@
 		<control type="button" id="90151">

 			<description>Button1</description>

 			<include>ButtonHomeSubCommonValues</include>

-			<label>$INFO[Skin.String(HomeScriptButton1_label)]</label>

+			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton1))]</label>

 			<onclick>Setfocus(9000)</onclick>

-			<onclick>XBMC.RunScript($INFO[Skin.String(HomeScriptButton1_Path)])</onclick>

-			<visible>Skin.HasSetting(HomeScriptButton1) + !IsEmpty(Skin.String(HomeScriptButton1_label))</visible>

+			<onclick>XBMC.RunScript($INFO[Skin.String(HomeProgramButton1)])</onclick>

+			<visible>!IsEmpty(Skin.String(HomeProgramButton1))</visible>

 		</control>

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

-			<description>Button2</description>

+			<description>Button1</description>

 			<include>ButtonHomeSubCommonValues</include>

-			<label>$INFO[Skin.String(HomeScriptButton2_label)]</label>

+			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton2))]</label>

 			<onclick>Setfocus(9000)</onclick>

-			<onclick>XBMC.RunScript($INFO[Skin.String(HomeScriptButton2_Path)])</onclick>

-			<visible>Skin.HasSetting(HomeScriptButton2) + !IsEmpty(Skin.String(HomeScriptButton2_label))</visible>

+			<onclick>XBMC.RunScript($INFO[Skin.String(HomeProgramButton2)])</onclick>

+			<visible>!IsEmpty(Skin.String(HomeProgramButton2))</visible>

 		</control>

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

-			<description>Button3</description>

+			<description>Button1</description>

 			<include>ButtonHomeSubCommonValues</include>

-			<label>$INFO[Skin.String(HomeScriptButton3_label)]</label>

+			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton3))]</label>

 			<onclick>Setfocus(9000)</onclick>

-			<onclick>XBMC.RunScript($INFO[Skin.String(HomeScriptButton3_Path)])</onclick>

-			<visible>Skin.HasSetting(HomeScriptButton3) + !IsEmpty(Skin.String(HomeScriptButton3_label))</visible>

+			<onclick>XBMC.RunScript($INFO[Skin.String(HomeProgramButton3)])</onclick>

+			<visible>!IsEmpty(Skin.String(HomeProgramButton3))</visible>

 		</control>

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

-			<description>Button4</description>

+			<description>Button1</description>

 			<include>ButtonHomeSubCommonValues</include>

-			<label>$INFO[Skin.String(HomeScriptButton4_label)]</label>

+			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton4))]</label>

 			<onclick>Setfocus(9000)</onclick>

-			<onclick>XBMC.RunScript($INFO[Skin.String(HomeScriptButton4_Path)])</onclick>

-			<visible>Skin.HasSetting(HomeScriptButton4) + !IsEmpty(Skin.String(HomeScriptButton4_label))</visible>

+			<onclick>XBMC.RunScript($INFO[Skin.String(HomeProgramButton4)])</onclick>

+			<visible>!IsEmpty(Skin.String(HomeProgramButton4))</visible>

 		</control>

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

-			<description>Button5</description>

+			<description>Button1</description>

 			<include>ButtonHomeSubCommonValues</include>

-			<label>$INFO[Skin.String(HomeScriptButton5_label)]</label>

+			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton5))]</label>

 			<onclick>Setfocus(9000)</onclick>

-			<onclick>XBMC.RunScript($INFO[Skin.String(HomeScriptButton5_Path)])</onclick>

-			<visible>Skin.HasSetting(HomeScriptButton5) + !IsEmpty(Skin.String(HomeScriptButton5_label))</visible>

+			<onclick>XBMC.RunScript($INFO[Skin.String(HomeProgramButton5)])</onclick>

+			<visible>!IsEmpty(Skin.String(HomeProgramButton5))</visible>

 		</control>

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

-			<description>Button6</description>

+			<description>Button1</description>

 			<include>ButtonHomeSubCommonValues</include>

-			<label>$INFO[Skin.String(HomeScriptButton6_label)]</label>

+			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton6))]</label>

 			<onclick>Setfocus(9000)</onclick>

-			<onclick>XBMC.RunScript($INFO[Skin.String(HomeScriptButton6_Path)])</onclick>

-			<visible>Skin.HasSetting(HomeScriptButton6) + !IsEmpty(Skin.String(HomeScriptButton6_label))</visible>

+			<onclick>XBMC.RunScript($INFO[Skin.String(HomeProgramButton6)])</onclick>

+			<visible>!IsEmpty(Skin.String(HomeProgramButton6))</visible>

 		</control>

 	</include>

 	<include name="HomeSubMenuMovies">

diff --git a/addons/skin.confluence/720p/IncludesHomeVertical.xml b/addons/skin.confluence/720p/IncludesHomeVertical.xml
index 9d1a078152..61df2d7487 100644
--- a/addons/skin.confluence/720p/IncludesHomeVertical.xml
+++ b/addons/skin.confluence/720p/IncludesHomeVertical.xml
@@ -406,7 +406,7 @@
 					<onup>9015</onup>

 					<ondown>9015</ondown>

 					<itemgap>0</itemgap>

-					<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>

+					<visible>Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]</visible>

 					<include>HomeSubMenuPrograms</include> <!-- Buttons for the grouplist -->

 				</control>

 				<control type="grouplist" id="9016">

@@ -497,7 +497,7 @@
 						<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(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>

+						<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) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]] | 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>

diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
index 3661507e44..855b4b8c30 100644
--- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
+++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
@@ -1355,289 +1355,77 @@
 							<align>left</align>

 							<aligny>center</aligny>

 						</control>

-

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

+						<control type="button" id="401">

 							<width>750</width>

 							<height>40</height>

 							<font>font13</font>

-							<label>$LOCALIZE[31119] [B]1[/B]</label>

+							<label>$LOCALIZE[24000] [B]1[/B]</label>

+							<label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(HomeProgramButton1))][/COLOR]</label2>

 							<textcolor>grey2</textcolor>

 							<focusedcolor>white</focusedcolor>

 							<texturefocus>MenuItemFO.png</texturefocus>

 							<texturenofocus>MenuItemNF.png</texturenofocus>

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

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

+							<onclick>Skin.SetAddon(HomeProgramButton1,xbmc.python.script)</onclick>

 						</control>

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

 							<width>750</width>

 							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton1_label)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetString(HomeScriptButton1_label)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton1)</visible>

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton1_Path)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetAddon(HomeScriptButton1_Path,xbmc.python.script)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton1)</visible>

-						</control>

-

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

-							<width>750</width>

-							<height>40</height>

-							<font>font13</font>

-							<label>$LOCALIZE[31119] [B]2[/B]</label>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

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

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

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton2_label)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetString(HomeScriptButton2_label)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton2)</visible>

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton2_Path)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetAddon(HomeScriptButton2_Path,xbmc.python.script)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton2)</visible>

-						</control>

-

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

-							<width>750</width>

-							<height>40</height>

 							<font>font13</font>

-							<label>$LOCALIZE[31119] [B]3[/B]</label>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

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

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

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton3_label)][/COLOR]</label2>

+							<label>$LOCALIZE[24000] [B]2[/B]</label>

+							<label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(HomeProgramButton2))][/COLOR]</label2>

 							<textcolor>grey2</textcolor>

 							<focusedcolor>white</focusedcolor>

 							<texturefocus>MenuItemFO.png</texturefocus>

 							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetString(HomeScriptButton3_label)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton3)</visible>

+							<onclick>Skin.SetAddon(HomeProgramButton2,xbmc.python.script)</onclick>

 						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton3_Path)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetAddon(HomeScriptButton3_Path,xbmc.python.script)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton3)</visible>

-						</control>

-

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

+						<control type="button" id="403">

 							<width>750</width>

 							<height>40</height>

 							<font>font13</font>

-							<label>$LOCALIZE[31119] [B]4[/B]</label>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

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

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

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton4_label)][/COLOR]</label2>

+							<label>$LOCALIZE[24000] [B]3[/B]</label>

+							<label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(HomeProgramButton3))][/COLOR]</label2>

 							<textcolor>grey2</textcolor>

 							<focusedcolor>white</focusedcolor>

 							<texturefocus>MenuItemFO.png</texturefocus>

 							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetString(HomeScriptButton4_label)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton4)</visible>

+							<onclick>Skin.SetAddon(HomeProgramButton3,xbmc.python.script)</onclick>

 						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton4_Path)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetAddon(HomeScriptButton4_Path,xbmc.python.script)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton4)</visible>

-						</control>

-

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

+						<control type="button" id="404">

 							<width>750</width>

 							<height>40</height>

 							<font>font13</font>

-							<label>$LOCALIZE[31119] [B]5[/B]</label>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

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

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

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton5_label)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetString(HomeScriptButton5_label)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton5)</visible>

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton5_Path)][/COLOR]</label2>

+							<label>$LOCALIZE[24000] [B]4[/B]</label>

+							<label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(HomeProgramButton4))][/COLOR]</label2>

 							<textcolor>grey2</textcolor>

 							<focusedcolor>white</focusedcolor>

 							<texturefocus>MenuItemFO.png</texturefocus>

 							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetAddon(HomeScriptButton5_Path,xbmc.python.script)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton5)</visible>

+							<onclick>Skin.SetAddon(HomeProgramButton4,xbmc.python.script)</onclick>

 						</control>

-

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

+						<control type="button" id="405">

 							<width>750</width>

 							<height>40</height>

 							<font>font13</font>

-							<label>$LOCALIZE[31119] [B]6[/B]</label>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

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

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

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton6_label)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetString(HomeScriptButton6_label)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton6)</visible>

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(HomeScriptButton6_Path)][/COLOR]</label2>

+							<label>$LOCALIZE[24000] [B]5[/B]</label>

+							<label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(HomeProgramButton5))][/COLOR]</label2>

 							<textcolor>grey2</textcolor>

 							<focusedcolor>white</focusedcolor>

 							<texturefocus>MenuItemFO.png</texturefocus>

 							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetAddon(HomeScriptButton6_Path,xbmc.python.script)</onclick>

-							<visible>Skin.HasSetting(HomeScriptButton6)</visible>

-						</control>

-

-						<control type="label" id="419">

-							<width>750</width>

-							<height>45</height>

-							<font>font13_title</font>

-							<label>31122</label>

-							<textcolor>blue</textcolor>

-							<shadowcolor>black</shadowcolor>

-							<align>left</align>

-							<aligny>center</aligny>

+							<onclick>Skin.SetAddon(HomeProgramButton5,xbmc.python.script)</onclick>

 						</control>

-

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

+						<control type="button" id="406">

 							<width>750</width>

 							<height>40</height>

 							<font>font13</font>

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

+							<label>$LOCALIZE[24000] [B]6[/B]</label>

+							<label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(HomeProgramButton6))][/COLOR]</label2>

 							<textcolor>grey2</textcolor>

 							<focusedcolor>white</focusedcolor>

 							<texturefocus>MenuItemFO.png</texturefocus>

 							<texturenofocus>MenuItemNF.png</texturenofocus>

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

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

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(WeatherScript_Label)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetString(WeatherScript_Label)</onclick>

-							<visible>Skin.HasSetting(WeatherScript_Enable)</visible>

-						</control>

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

-							<width>750</width>

-							<height>40</height>

-							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(WeatherScript_Path)][/COLOR]</label2>

-							<textcolor>grey2</textcolor>

-							<focusedcolor>white</focusedcolor>

-							<texturefocus>MenuItemFO.png</texturefocus>

-							<texturenofocus>MenuItemNF.png</texturenofocus>

-							<onclick>Skin.SetAddon(WeatherScript_Path,xbmc.python.script)</onclick>

-							<visible>Skin.HasSetting(WeatherScript_Enable)</visible>

+							<onclick>Skin.SetAddon(HomeProgramButton6,xbmc.python.script)</onclick>

 						</control>

 

 						<control type="label" id="423">

@@ -1650,13 +1438,12 @@
 							<align>left</align>

 							<aligny>center</aligny>

 						</control>

-

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

 							<width>750</width>

 							<height>35</height>

 							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(LyricScript_Path)][/COLOR]</label2>

+							<label>$LOCALIZE[31132]</label>

+							<label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(LyricScript_Path))][/COLOR]</label2>

 							<textcolor>grey2</textcolor>

 							<focusedcolor>white</focusedcolor>

 							<texturefocus>MenuItemFO.png</texturefocus>

@@ -1674,13 +1461,12 @@
 							<align>left</align>

 							<aligny>center</aligny>

 						</control>

-

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

 							<width>750</width>

 							<height>35</height>

 							<font>font12</font>

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

-							<label2>[COLOR=selected]$INFO[Skin.String(SubtitleScript_Path)][/COLOR]</label2>

+							<label>$LOCALIZE[31133]</label>

+							<label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(SubtitleScript_Path))][/COLOR]</label2>

 							<textcolor>grey2</textcolor>

 							<focusedcolor>white</focusedcolor>

 							<texturefocus>MenuItemFO.png</texturefocus>

diff --git a/addons/skin.confluence/language/English/strings.xml b/addons/skin.confluence/language/English/strings.xml
index 1a0170e96b..41de1edba0 100644
--- a/addons/skin.confluence/language/English/strings.xml
+++ b/addons/skin.confluence/language/English/strings.xml
@@ -69,20 +69,23 @@
   <string id="31116"></string>

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

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

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

+  <string id="31119"></string>  <!-- blanked 2010-11-12 -->

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

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

+  <string id="31121"></string>  <!-- blanked 2010-11-12 -->

   <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 ADD-ON</string>

+  <string id="31126"></string>  <!-- blanked 2010-11-12 -->

+  <string id="31127"></string>  <!-- blanked 2010-11-12 -->

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

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

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

+  <string id="31129"></string>  <!-- blanked 2010-11-12 -->

+  <string id="31130"></string>  <!-- blanked 2010-11-12 -->

+  

   <string id="31131">Use Horizontal Home Menu</string>

+  <string id="31132">Lyrics Add-on</string>

+  <string id="31133">Subtitle Add-on</string>

 

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

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