From 504d8b127d8fd25c276aa8f31bb707da5af666c0 Mon Sep 17 00:00:00 2001
From: HitcherUK <HitcherUK@gmail.com>
Date: Fri, 7 Oct 2016 17:08:28 +0100
Subject: [PATCH] [skin.confluence] Updated Smart Playlist dialogs

---
 720p/SmartPlaylistEditor.xml | 69 ++++++++++++++----------------------
 720p/SmartPlaylistRule.xml   | 35 +++---------------
 2 files changed, 31 insertions(+), 73 deletions(-)

diff --git a/720p/SmartPlaylistEditor.xml b/720p/SmartPlaylistEditor.xml
index a868416..5028ff3 100644
--- a/720p/SmartPlaylistEditor.xml
+++ b/720p/SmartPlaylistEditor.xml
@@ -3,7 +3,7 @@
 	<defaultcontrol always="true">22</defaultcontrol>
 	<coordinates>
 		<left>240</left>
-		<top>22</top>
+		<top>34</top>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
@@ -12,14 +12,14 @@
 			<include>VisibleFadeEffect</include>
 			<include content="DialogBackgroundCommons">
 				<param name="DialogBackgroundWidth" value="800" />
-				<param name="DialogBackgroundHeight" value="675" />
+				<param name="DialogBackgroundHeight" value="650" />
 				<param name="DialogHeaderWidth" value="720" />
 				<param name="DialogHeaderLabel" value="-" />
 				<param name="DialogHeaderId" value="2" />
 				<param name="CloseButtonLeft" value="710" />
 				<param name="CloseButtonNav" value="22" />
 			</include>
-			<control type="spincontrolex" id="22">
+			<control type="button" id="22">
 				<description>Set Playlist type</description>
 				<left>30</left>
 				<top>70</top>
@@ -34,28 +34,17 @@
 				<onup>9001</onup>
 				<ondown>12</ondown>
 			</control>
-			<control type="label">
-				<description>Name Label</description>
-				<left>30</left>
-				<top>120</top>
-				<width>740</width>
-				<label>21433</label>
-				<font>font12</font>
-				<textcolor>blue</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="edit" id="12">
+			<control type="button" id="12">
 				<description>Name Button</description>
 				<left>30</left>
-				<top>145</top>
+				<top>120</top>
 				<width>740</width>
 				<height>40</height>
 				<textoffsetx>10</textoffsetx>
 				<textwidth>720</textwidth>
 				<font>font13</font>
-				<align>center</align>
 				<texturefocus border="5">button-focus2.png</texturefocus>
-				<label>-</label>
+				<label>21433</label>
 				<onup>22</onup>
 				<onleft>12</onleft>
 				<onright>12</onright>
@@ -64,7 +53,7 @@
 			<control type="label">
 				<description>rules label</description>
 				<left>30</left>
-				<top>200</top>
+				<top>175</top>
 				<width>740</width>
 				<align>left</align>
 				<label>21434</label>
@@ -75,7 +64,7 @@
 			<control type="list" id="10">
 				<description>Rules List Control</description>
 				<left>30</left>
-				<top>225</top>
+				<top>200</top>
 				<width>550</width>
 				<height>135</height>
 				<onup>12</onup>
@@ -132,7 +121,7 @@
 			</control>
 			<control type="group" id="9000">
 				<left>590</left>
-				<top>225</top>
+				<top>200</top>
 				<control type="button" id="13">
 					<description>Add Rule Button</description>
 					<left>0</left>
@@ -182,16 +171,16 @@
 			<control type="label">
 				<description>Name Label</description>
 				<left>30</left>
-				<top>370</top>
+				<top>345</top>
 				<width>740</width>
 				<label>31325</label>
 				<font>font12</font>
 				<textcolor>blue</textcolor>
 				<shadowcolor>black</shadowcolor>
 			</control>
-			<control type="spincontrolex" id="16">
+			<control type="button" id="16">
 				<left>30</left>
-				<top>395</top>
+				<top>370</top>
 				<width>740</width>
 				<height>40</height>
 				<label>21424</label>
@@ -203,9 +192,9 @@
 				<onup>10</onup>
 				<ondown>17</ondown>
 			</control>
-			<control type="spincontrolex" id="17">
+			<control type="button" id="17">
 				<left>30</left>
-				<top>440</top>
+				<top>415</top>
 				<width>740</width>
 				<height>40</height>
 				<label>21427</label>
@@ -217,9 +206,9 @@
 				<onup>16</onup>
 				<ondown>18</ondown>
 			</control>
-			<control type="spincontrolex" id="18">
+			<control type="button" id="18">
 				<left>30</left>
-				<top>485</top>
+				<top>460</top>
 				<width>550</width>
 				<height>40</height>
 				<label>21429</label>
@@ -231,28 +220,22 @@
 				<onup>17</onup>
 				<ondown>23</ondown>
 			</control>
-			<control type="togglebutton" id="19">
+			<control type="button" id="19">
 				<left>590</left>
-				<top>485</top>
+				<top>460</top>
 				<width>180</width>
 				<height>40</height>
-				<font>font12_title</font>
-				<align>center</align>
-				<aligny>center</aligny>
+				<font>font13</font>
+				<texturefocus border="5">button-focus2.png</texturefocus>
 				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<alttexturenofocus border="5">button-nofocus.png</alttexturenofocus>
-				<alttexturefocus border="5">button-focus.png</alttexturefocus>
-				<label>21431</label>
-				<altlabel>21430</altlabel>
 				<onright>18</onright>
 				<onleft>18</onleft>
 				<onup>17</onup>
 				<ondown>24</ondown>
 			</control>
-			<control type="spincontrolex" id="23">
+			<control type="button" id="23">
 				<left>30</left>
-				<top>530</top>
+				<top>505</top>
 				<width>550</width>
 				<height>40</height>
 				<label>21458</label>
@@ -266,10 +249,10 @@
 			</control>
 			<control type="radiobutton" id="24">
 				<left>590</left>
-				<top>530</top>
+				<top>505</top>
 				<width>180</width>
 				<height>40</height>
-				<font>font12_title</font>
+				<font>font13</font>
 				<align>center</align>
 				<aligny>center</aligny>
 				<texturenofocus border="5">button-nofocus.png</texturenofocus>
@@ -284,7 +267,7 @@
 				<control type="button" id="20">
 					<description>Ok Button</description>
 					<left>195</left>
-					<top>605</top>
+					<top>580</top>
 					<width>200</width>
 					<height>40</height>
 					<align>center</align>
@@ -299,7 +282,7 @@
 				<control type="button" id="21">
 					<description>Cancel Button</description>
 					<left>405</left>
-					<top>605</top>
+					<top>580</top>
 					<width>200</width>
 					<height>40</height>
 					<align>center</align>
diff --git a/720p/SmartPlaylistRule.xml b/720p/SmartPlaylistRule.xml
index 435c181..10cab77 100644
--- a/720p/SmartPlaylistRule.xml
+++ b/720p/SmartPlaylistRule.xml
@@ -30,13 +30,13 @@
 			<label>21422</label>
 		</control>
 		<control type="group" id="9001">
-			<control type="spincontrolex" id="15">
+			<control type="button" id="15">
 				<description>Rule Field</description>
 				<left>30</left>
 				<top>100</top>
 				<width>365</width>
 				<height>40</height>
-				<font>-</font>
+				<font>font13</font>
 				<texturefocus border="3">button-focus2.png</texturefocus>
 				<texturenofocus border="3">button-nofocus.png</texturenofocus>
 				<onright>16</onright>
@@ -44,26 +44,13 @@
 				<onup>9000</onup>
 				<ondown>17</ondown>
 			</control>
-			<control type="label">
-				<description>Rule Field label</description>
-				<left>35</left>
-				<top>100</top>
-				<width>300</width>
-				<height>40</height>
-				<font>font13</font>
-				<label>$INFO[Control.GetLabel(15)]</label>
-				<align>left</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="spincontrolex" id="16">
+			<control type="button" id="16">
 				<description>Rule operator</description>
 				<left>405</left>
 				<top>100</top>
 				<width>365</width>
 				<height>40</height>
-				<font>-</font>
+				<font>font13</font>
 				<texturefocus border="3">button-focus2.png</texturefocus>
 				<texturenofocus border="3">button-nofocus.png</texturenofocus>
 				<onright>15</onright>
@@ -71,19 +58,6 @@
 				<onup>9000</onup>
 				<ondown>17</ondown>
 			</control>
-			<control type="label">
-				<description>Rule Field label</description>
-				<left>410</left>
-				<top>100</top>
-				<width>300</width>
-				<height>40</height>
-				<font>font13</font>
-				<label>$INFO[Control.GetLabel(16)]</label>
-				<align>left</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
 		</control>
 		<control type="edit" id="17">
 			<description>Value Button</description>
@@ -97,6 +71,7 @@
 			<texturefocus border="3">button-focus2.png</texturefocus>
 			<texturenofocus border="3">button-nofocus.png</texturenofocus>
 			<label>-</label>
+			<hinttext>16028</hinttext>
 			<onup>9001</onup>
 			<onleft>20</onleft>
 			<onright>20</onright>