From 8d481e9da011746e1e2ed1fda480b6c9d6e97ee8 Mon Sep 17 00:00:00 2001
From: DaVukovic <dvukovic@gmx.de>
Date: Thu, 20 Jun 2019 22:33:52 +0200
Subject: [PATCH] Multiple fixes for weather, playlist and dialogs

---
 720p/DialogMediaSource.xml   |  6 +++---
 720p/Home.xml                | 23 ++++++++++++-----------
 720p/MyWeather.xml           | 26 +++++++++++++-------------
 720p/Settings.xml            | 14 ++++++++++++++
 720p/SmartPlaylistEditor.xml | 21 ++++++++-------------
 720p/SmartPlaylistRule.xml   |  6 +++---
 720p/includes.xml            |  4 ++--
 7 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/720p/DialogMediaSource.xml b/720p/DialogMediaSource.xml
index 33dcb3c..20b5cd3 100644
--- a/720p/DialogMediaSource.xml
+++ b/720p/DialogMediaSource.xml
@@ -69,7 +69,7 @@
 			<onleft>9000</onleft>
 			<onright>9000</onright>
 			<ondown>12</ondown>
-			<pagecontrol>-</pagecontrol>
+			<pagecontrol></pagecontrol>
 			<scrolltime>200</scrolltime>
 			<itemlayout height="40">
 				<control type="image">
@@ -193,7 +193,7 @@
 			<label>1022</label>
 			<textcolor>grey2</textcolor>
 		</control>
-		<control type="button" id="12">
+		<control type="edit" id="12">
 			<description>Name Button</description>
 			<posx>40</posx>
 			<posy>370</posy>
@@ -201,7 +201,7 @@
 			<height>35</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<label>-</label>
+			<label></label>
 			<font>font12</font>
 			<texturefocus border="3">button-focus.png</texturefocus>
 			<texturenofocus border="3">button-nofocus.png</texturenofocus>
diff --git a/720p/Home.xml b/720p/Home.xml
index 167c343..4471b64 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -506,7 +506,7 @@
 				<onright>22</onright>
 				<onup>9000</onup>
 				<ondown>9000</ondown>
-				<pagecontrol>-</pagecontrol>
+				<pagecontrol></pagecontrol>
 				<scrolltime>200</scrolltime>
 				<itemlayout height="57" width="345">
 					<control type="image">
@@ -636,7 +636,8 @@
                                         </item>
                                         <item id="7">
                                                 <label>8</label>
-                                                <onclick>ActivateWindow(Weather)</onclick>
+                                                <onclick condition="!String.IsEmpty(Weather.Plugin)">ActivateWindow(Weather)</onclick>
+                                                <onclick condition="String.IsEmpty(Weather.Plugin)">ActivateWindow(servicesettings,weather)</onclick>
                                                 <icon>special://skin/backgrounds/weather.jpg</icon>
                                                 <thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
                                                 <visible>!Skin.HasSetting(homepageHideWeatherButton) + !IsEmpty(Weather.Plugin)</visible>
@@ -705,9 +706,9 @@
 				<posy>0</posy>
 				<width>50</width>
 				<height>50</height>
-				<label>-</label>
-				<font>-</font>
-				<aligny>-</aligny>
+				<label></label>
+				<font></font>
+				<aligny></aligny>
 				<onclick>XBMC.PlayDVD()</onclick>
 				<texturefocus>home-playmedia.png</texturefocus>
 				<texturenofocus>home-playmedia.png</texturenofocus>
@@ -732,9 +733,9 @@
 				<posy>0</posy>
 				<width>50</width>
 				<height>50</height>
-				<label>-</label>
-				<font>-</font>
-				<aligny>-</aligny>
+				<label></label>
+				<font></font>
+				<aligny></aligny>
 				<onclick>ActivateWindow(Favourites)</onclick>
 				<texturefocus>home-favourites.png</texturefocus>
 				<texturenofocus>home-favourites.png</texturenofocus>
@@ -757,9 +758,9 @@
 				<posy>0</posy>
 				<width>50</width>
 				<height>50</height>
-				<label>-</label>
-				<font>-</font>
-				<aligny>-</aligny>
+				<label></label>
+				<font></font>
+				<aligny></aligny>
 				<onclick>ActivateWindow(ShutdownMenu)</onclick>
 				<texturefocus>home-power.png</texturefocus>
 				<texturenofocus>home-power.png</texturenofocus>
diff --git a/720p/MyWeather.xml b/720p/MyWeather.xml
index 40b521f..79283e0 100644
--- a/720p/MyWeather.xml
+++ b/720p/MyWeather.xml
@@ -7,7 +7,7 @@
 			<include>Window_OpenClose_Right_Panel_Animation</include>
 			<include>ContentPanel</include>
 			<control type="group">
-				<posx>317</posx>
+				<posx>350</posx>
 				<posy>135</posy>
 				<control type="image">
 					<posx>0</posx>
@@ -64,7 +64,7 @@
 				<control type="label">
 					<description>current temp Value</description>
 					<posx>20</posx>
-					<posy>60</posy>
+					<posy>110</posy>
 					<width>210</width>
 					<height>180</height>
 					<font>font35b</font>
@@ -77,7 +77,7 @@
 				<control type="image">
 					<description>current weather icon</description>
 					<posx>230</posx>
-					<posy>60</posy>
+					<posy>110</posy>
 					<width>210</width>
 					<height>180</height>
 					<info>Window.Property(Current.ConditionIcon)</info>
@@ -226,7 +226,7 @@
 			</control>
 			<control type="group">
 				<description>day 0</description>
-				<posx>780</posx>
+				<posx>810</posx>
 				<posy>135</posy>
 				<control type="image">
 					<posx>0</posx>
@@ -325,7 +325,7 @@
 			</control>
 			<control type="group">
 				<description>day 0</description>
-				<posx>780</posx>
+				<posx>810</posx>
 				<posy>263</posy>
 				<control type="image">
 					<posx>0</posx>
@@ -424,7 +424,7 @@
 			</control>
 			<control type="group">
 				<description>day 0</description>
-				<posx>780</posx>
+				<posx>810</posx>
 				<posy>391</posy>
 				<control type="image">
 					<posx>0</posx>
@@ -523,7 +523,7 @@
 			</control>
 			<control type="group">
 				<description>day 3</description>
-				<posx>780</posx>
+				<posx>810</posx>
 				<posy>519</posy>
 				<control type="image">
 					<posx>0</posx>
@@ -631,7 +631,7 @@
 					<description>change location button</description>
 					<posx>0</posx>
 					<posy>0</posy>
-					<font>-</font>
+					<font></font>
 					<textoffsetx>15</textoffsetx>
 					<include>ButtonCommonValues</include>
 					<onleft>99</onleft>
@@ -681,7 +681,7 @@
 					<posx>0</posx>
 					<posy>135</posy>
 					<label>5</label>
-					<onclick>ActivateWindow(MyWeatherSettings)</onclick>
+					<onclick>ActivateWindow(servicesettings,weather)</onclick>
 					<include>ButtonCommonValues</include>
 					<onleft>50</onleft>
 					<onright>50</onright>
@@ -722,14 +722,14 @@
 		</control>
 		<control type="label" id="1">
 			<description>weather location label</description>
-			<posx>50r</posx>
-			<posy>50</posy>
-			<width>1060</width>
+			<posx>350</posx>
+			<posy>210</posy>
+			<width>460</width>
 			<height>30</height>
 			<font>font18</font>
 			<textcolor>white</textcolor>
 			<scroll>false</scroll>
-			<align>right</align>
+			<align>center</align>
 			<aligny>center</aligny>
 			<label>$INFO[Window(Weather).Property(Location)]</label>
 			<include>Window_OpenClose_Animation</include>
diff --git a/720p/Settings.xml b/720p/Settings.xml
index 33944b9..aca3ade 100644
--- a/720p/Settings.xml
+++ b/720p/Settings.xml
@@ -3,6 +3,20 @@
 	<allowoverlay>no</allowoverlay>
 	<controls>
 		<include>CommonBackground</include>
+		<control type="image">
+			<left>40</left>left>
+			<top>135</top>top>
+			<width>1223</width>
+			<height>500</height>height>
+			<texture border="40">DialogBack.png</texture>
+		</control>
+		<control type="image">
+			<left>40</left>
+			<top>135</top>
+			<width>1223</width>
+			<height>500</height>
+			<texture border="40">DialogFront.png</texture>
+		</control>
 		<control type="group">
 			<control type="panel" id="50">
 				<posx>80</posx>
diff --git a/720p/SmartPlaylistEditor.xml b/720p/SmartPlaylistEditor.xml
index 317623f..71c0806 100644
--- a/720p/SmartPlaylistEditor.xml
+++ b/720p/SmartPlaylistEditor.xml
@@ -2,7 +2,6 @@
 	<defaultcontrol always="true">22</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<coordinates>
-		<system>1</system>
 		<posx>240</posx>
 		<posy>70</posy>
 	</coordinates>
@@ -52,7 +51,7 @@
 				<height>2</height>
 				<texture>separator.png</texture>
 			</control>
-			<control type="spincontrolex" id="22">
+			<control type="button" id="22">
 				<description>Set Playlist type</description>
 				<posx>40</posx>
 				<posy>85</posy>
@@ -88,7 +87,7 @@
 				<aligny>center</aligny>
 				<texturefocus border="3">button-focus.png</texturefocus>
 				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<label>-</label>
+				<label></label>
 				<colordiffuse>FFFFFFFF</colordiffuse>
 				<onup>22</onup>
 				<onleft>12</onleft>
@@ -213,8 +212,7 @@
 					<ondown>16</ondown>
 				</control>
 			</control>
-
-			<control type="spincontrolex" id="16">
+			<control type="button" id="16">
 				<posx>40</posx>
 				<posy>365</posy>
 				<width>720</width>
@@ -228,8 +226,7 @@
 				<onup>10</onup>
 				<ondown>17</ondown>
 			</control>
-
-			<control type="spincontrolex" id="17">
+			<control type="button" id="17">
 				<posx>40</posx>
 				<posy>405</posy>
 				<width>720</width>
@@ -243,8 +240,7 @@
 				<onup>16</onup>
 				<ondown>18</ondown>
 			</control>
-
-			<control type="spincontrolex" id="18">
+			<control type="button" id="18">
 				<posx>40</posx>
 				<posy>445</posy>
 				<width>565</width>
@@ -258,8 +254,7 @@
 				<onup>17</onup>
 				<ondown>9001</ondown>
 			</control>
-
-			<control type="togglebutton" id="19">
+			<control type="button" id="19">
 				<posx>610</posx>
 				<posy>445</posy>
 				<width>150</width>
@@ -269,10 +264,10 @@
 				<aligny>center</aligny>
 				<texturefocus border="3">button-focus.png</texturefocus>
 				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<alttexturefocus>button-focus.png</alttexturefocus>
+				<!--alttexturefocus>button-focus.png</alttexturefocus>
 				<alttexturenofocus>button-nofocus.png</alttexturenofocus>
 				<label>21431</label>
-				<altlabel>21430</altlabel>
+				<altlabel>21430</altlabel -->
 				<onright>18</onright>
 				<onleft>18</onleft>
 				<onup>17</onup>
diff --git a/720p/SmartPlaylistRule.xml b/720p/SmartPlaylistRule.xml
index a0345ad..fb2fde0 100644
--- a/720p/SmartPlaylistRule.xml
+++ b/720p/SmartPlaylistRule.xml
@@ -61,7 +61,7 @@
 			<label>21422</label>
 		</control>
 		<control type="group" id="9001">
-			<control type="spincontrolex" id="15">
+			<control type="button" id="15">
 				<description>Rule Field</description>
 				<posx>40</posx>
 				<posy>125</posy>
@@ -75,7 +75,7 @@
 				<onup>9000</onup>
 				<ondown>17</ondown>
 			</control>
-			<control type="spincontrolex" id="16">
+			<control type="button" id="16">
 				<description>Rule operator</description>
 				<posx>405</posx>
 				<posy>125</posy>
@@ -102,7 +102,7 @@
 			<aligny>center</aligny>
 			<texturefocus border="3">button-focus.png</texturefocus>
 			<texturenofocus border="3">button-nofocus.png</texturenofocus>
-			<label>-</label>
+			<label></label>
 			<onup>9001</onup>
 			<onleft>20</onleft>
 			<onright>20</onright>
diff --git a/720p/includes.xml b/720p/includes.xml
index b6b3f5f..e5bd2c6 100644
--- a/720p/includes.xml
+++ b/720p/includes.xml
@@ -105,8 +105,8 @@
 	<include name="WindowCloseButtonCommons">
 		<width>30</width>
 		<height>30</height>
-		<label>-</label>
-		<font>-</font>
+		<label></label>
+		<font></font>
 		<onclick>PreviousMenu</onclick>
 		<texturefocus>close-windowFO.png</texturefocus>
 		<texturenofocus>close-window.png</texturenofocus>