Changed : [Confluence] clicking the play disc button on home now always opens a small dialog with the options Play, Eject/Load, Cancel. (helps users with no physical eject button on their pc's, or slackers)

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

3 files changed, 57 insertions, 89 deletions

diff --git a/skin/Confluence/720p/Home.xml b/skin/Confluence/720p/Home.xml
index 717ac39e69..e6a0f31e77 100644
--- a/skin/Confluence/720p/Home.xml
+++ b/skin/Confluence/720p/Home.xml
@@ -954,24 +954,6 @@
 					<label>16004</label>

 					<font>-</font>

 					<aligny>-</aligny>

-					<onclick>XBMC.PlayDVD()</onclick>

-					<texturefocus>home-playmedia-FO.png</texturefocus>

-					<texturenofocus>home-playmedia.png</texturenofocus>

-					<onleft>9000</onleft>

-					<onright>21</onright>

-					<onup>9000</onup>

-					<ondown>9000</ondown>

-					<visible>System.HasMediaDVD</visible>

-				</control>

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

-					<description>Play Disc Media push button</description>

-					<posx>0</posx>

-					<posy>0</posy>

-					<width>43</width>

-					<height>43</height>

-					<label>16004</label>

-					<font>-</font>

-					<aligny>-</aligny>

 					<onclick>ActivateWindow(1113)</onclick>

 					<texturefocus>home-playmedia-FO.png</texturefocus>

 					<texturenofocus>home-playmedia.png</texturenofocus>

@@ -979,7 +961,6 @@
 					<onright>21</onright>

 					<onup>9000</onup>

 					<ondown>9000</ondown>

-					<visible>!System.HasMediaDVD</visible>

 				</control>

 			</control>

 		</control>

diff --git a/skin/Confluence/720p/custom_DiscDialog_1113.xml b/skin/Confluence/720p/custom_DiscDialog_1113.xml
index 4fdd5b5323..ac3bdd1d23 100644
--- a/skin/Confluence/720p/custom_DiscDialog_1113.xml
+++ b/skin/Confluence/720p/custom_DiscDialog_1113.xml
@@ -1,88 +1,76 @@
 <window id="1113" type="dialog">

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

+	<defaultcontrol always="true">9000</defaultcontrol>

+	<include>dialogeffect</include>

+	<coordinates>

+		<system>1</system>

+		<posx>55</posx>

+		<posy>570</posy>

+	</coordinates>

 	<controls>

-		<control type="group">

-			<posx>570</posx>

-			<posy>215</posy>

-			<include>Window_OpenClose_Animation</include>

-			<control type="image">

-				<posx>0</posx>

-				<posy>0</posy>

-				<width>600</width>

-				<height>290</height>

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

-			</control>

-			<control type="image">

-				<posx>20</posx>

+		<control type="image">

+			<posx>0</posx>

+			<posy>0</posy>

+			<width>200</width>

+			<height>150</height>

+			<texture border="20">OverlayDialogBackground.png</texture>

+		</control>

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

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

+				<description>Play Button</description>

+				<posx>10</posx>

 				<posy>10</posy>

-				<width>560</width>

-				<height>90</height>

-				<aspectratio>stretch</aspectratio>

-				<texture>GlassTitleBar.png</texture>

-			</control>

-			<control type="label">

-				<description>header label</description>

-				<posx>50</posx>

-				<posy>18</posy>

-				<width>500</width>

-				<height>30</height>

-				<font>font13_title</font>

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

-				<align>center</align>

-				<aligny>center</aligny>

-				<textcolor>white</textcolor>

-				<shadowcolor>black</shadowcolor>

-			</control>

-			<control type="textbox">

-				<description>Description</description>

-				<posx>50</posx>

-				<posy>80</posy>

-				<width>500</width>

-				<height>190</height>

-				<font>font13caps</font>

-				<label>31420</label>

+				<width>180</width>

+				<height>40</height>

+				<label>208</label>

+				<font>font13</font>

 				<align>center</align>

 				<textcolor>grey2</textcolor>

-				<shadowcolor>black</shadowcolor>

+				<focusedcolor>white</focusedcolor>

+				<onclick>XBMC.PlayDVD()</onclick>

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

+				<texturenofocus>-</texturenofocus>

+				<onleft>Dialog.Close(1113)</onleft>

+				<onright>1</onright>

+				<onup>3</onup>

+				<ondown>2</ondown>

 			</control>

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

-				<description>Eject button</description>

-				<posx>75</posx>

-				<posy>230</posy>

-				<width>200</width>

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

+				<description>Eject Button</description>

+				<posx>10</posx>

+				<posy>50</posy>

+				<width>180</width>

 				<height>40</height>

-				<label>31306</label>

-				<font>font12_title</font>

-				<textcolor>white</textcolor>

-				<focusedcolor>white</focusedcolor>

+				<label>13391</label>

+				<font>font13</font>

 				<align>center</align>

+				<textcolor>grey2</textcolor>

+				<focusedcolor>white</focusedcolor>

 				<onclick>EjectTray()</onclick>

-				<onclick>Dialog.Close(1113)</onclick>

-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>

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

-				<onleft>101</onleft>

-				<onright>101</onright>

-				<onup>100</onup>

-				<ondown>100</ondown>

+				<texturenofocus>-</texturenofocus>

+				<onleft>Dialog.Close(1113)2</onleft>

+				<onright>2</onright>

+				<onup>1</onup>

+				<ondown>3</ondown>

 			</control>

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

-				<description>Cancel button</description>

-				<posx>325</posx>

-				<posy>230</posy>

-				<width>200</width>

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

+				<description>Cancel Button</description>

+				<posx>10</posx>

+				<posy>90</posy>

+				<width>180</width>

 				<height>40</height>

 				<label>222</label>

-				<font>font12_title</font>

-				<textcolor>white</textcolor>

-				<focusedcolor>white</focusedcolor>

+				<font>font13</font>

 				<align>center</align>

+				<textcolor>grey2</textcolor>

+				<focusedcolor>white</focusedcolor>

 				<onclick>Dialog.Close(1113)</onclick>

-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>

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

-				<onleft>100</onleft>

-				<onright>100</onright>

-				<onup>101</onup>

-				<ondown>101</ondown>

+				<texturenofocus>-</texturenofocus>

+				<onleft>Dialog.Close(1113)</onleft>

+				<onright>3</onright>

+				<onup>2</onup>

+				<ondown>1</ondown>

 			</control>

 		</control>

 	</controls>

diff --git a/skin/Confluence/language/English/strings.xml b/skin/Confluence/language/English/strings.xml
index 1e396040db..ee3096f959 100644
--- a/skin/Confluence/language/English/strings.xml
+++ b/skin/Confluence/language/English/strings.xml
@@ -148,6 +148,5 @@
   <string id="31406">[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock</string>

   <string id="31407">[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds</string>
 

-  <string id="31420">[B][COLOR=white]XBMC has not detected a Disc.[/COLOR][/B][CR][CR]Please Insert a disc into your drive and try again or Cancel</string>

   <string id="31421">Select your XBMC user Profile[CR]to login and continue</string>

 </strings>