Skip to content
This repository
Browse code

Merge pull request #1829 from ronie/confluence-weather

[confluence] extended weather
  • Loading branch information...
commit b49cacb36ffab3062595b43d8816efbbd4433a1d 2 parents 0cd0ee4 + 1633594
ronie authored November 23, 2012
42  addons/skin.confluence/720p/MyWeather.xml
@@ -323,7 +323,7 @@
323 323
 					<shadowcolor>black</shadowcolor>
324 324
 				</control>
325 325
 				<control type="group">
326  
-					<visible>StringCompare(Weather.Plugin,weather.weatherplus) + !IsEmpty(Window.Property(36Hour.IsFetched))</visible>
  326
+					<visible>StringCompare(Weather.Plugin,weather.wunderground) + !IsEmpty(Window.Property(36Hour.IsFetched))</visible>
327 327
 					<control type="label">
328 328
 						<description>Sunrise Label</description>
329 329
 						<posx>30</posx>
@@ -333,7 +333,7 @@
333 333
 						<font>font13</font>
334 334
 						<align>left</align>
335 335
 						<aligny>center</aligny>
336  
-						<label>$LOCALIZE[33027] : [COLOR=white]$INFO[Window.Property(Current.Sunrise)][/COLOR]</label>
  336
+						<label>$LOCALIZE[33027] : [COLOR=white]$INFO[Window.Property(Today.Sunrise)][/COLOR]</label>
337 337
 						<textcolor>grey2</textcolor>
338 338
 						<shadowcolor>black</shadowcolor>
339 339
 					</control>
@@ -346,14 +346,14 @@
346 346
 						<font>font13</font>
347 347
 						<align>right</align>
348 348
 						<aligny>center</aligny>
349  
-						<label>$LOCALIZE[33028] : [COLOR=white]$INFO[Window.Property(Current.Sunset)][/COLOR]</label>
  349
+						<label>$LOCALIZE[33028] : [COLOR=white]$INFO[Window.Property(Today.Sunset)][/COLOR]</label>
350 350
 						<textcolor>grey2</textcolor>
351 351
 						<shadowcolor>black</shadowcolor>
352 352
 					</control>
353 353
 				</control>
354 354
 			</control>
355 355
 			<control type="group">
356  
-				<visible>!StringCompare(Weather.Plugin,weather.weatherplus)</visible>
  356
+				<visible>!StringCompare(Weather.Plugin,weather.wunderground)</visible>
357 357
 				<posx>580</posx>
358 358
 				<posy>40</posy>
359 359
 				<control type="image">
@@ -682,7 +682,7 @@
682 682
 				</control>
683 683
 			</control>
684 684
 			<control type="group">
685  
-				<visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible>
  685
+				<visible>StringCompare(Weather.Plugin,weather.wunderground)</visible>
686 686
 				<posx>580</posx>
687 687
 				<posy>40</posy>
688 688
 				<control type="image">
@@ -708,11 +708,11 @@
708 708
 					<texture>GlassTitleBar.png</texture>
709 709
 				</control>
710 710
 				<control type="group" id="50">
711  
-					<include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+10DayForcast</include>
712  
-					<include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+36HourForcast</include>
713  
-					<include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+WeekendForcast</include>
714  
-					<include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+HourlyForcast</include>
715  
-					<include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+MapsVideo</include>
  711
+					<include condition="StringCompare(Weather.Plugin,weather.wunderground)">Weather10DayForcast</include>
  712
+					<include condition="StringCompare(Weather.Plugin,weather.wunderground)">Weather36HourForcast</include>
  713
+					<include condition="StringCompare(Weather.Plugin,weather.wunderground)">WeatherWeekendForcast</include>
  714
+					<include condition="StringCompare(Weather.Plugin,weather.wunderground)">WeatherHourlyForcast</include>
  715
+					<include condition="StringCompare(Weather.Plugin,weather.wunderground)">WeatherMapAlerts</include>
716 716
 				</control>
717 717
 			</control>
718 718
 		</control>
@@ -773,40 +773,40 @@
773 773
 					<textwidth>235</textwidth>
774 774
 					<include>ButtonCommonValues</include>
775 775
 					<label>31904</label>
776  
-					<onclick>ClearProperty(Weather.CurrentView)</onclick>
777  
-					<visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible>
  776
+					<onfocus>ClearProperty(Weather.CurrentView)</onfocus>
  777
+					<visible>StringCompare(Weather.Plugin,weather.wunderground)</visible>
778 778
 				</control>
779 779
 				<control type="button" id="303">
780 780
 					<description>36 hour forcast button</description>
781 781
 					<textwidth>235</textwidth>
782 782
 					<include>ButtonCommonValues</include>
783 783
 					<label>31901</label>
784  
-					<onclick>SetProperty(Weather.CurrentView,36hour)</onclick>
785  
-					<visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible>
  784
+					<onfocus>SetProperty(Weather.CurrentView,36hour)</onfocus>
  785
+					<visible>StringCompare(Weather.Plugin,weather.wunderground)</visible>
786 786
 				</control>
787 787
 				<control type="button" id="304">
788 788
 					<description>Weekend forcast button</description>
789 789
 					<textwidth>235</textwidth>
790 790
 					<include>ButtonCommonValues</include>
791 791
 					<label>31903</label>
792  
-					<onclick>SetProperty(Weather.CurrentView,weekend)</onclick>
793  
-					<visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible>
  792
+					<onfocus>SetProperty(Weather.CurrentView,weekend)</onfocus>
  793
+					<visible>StringCompare(Weather.Plugin,weather.wunderground)</visible>
794 794
 				</control>
795 795
 				<control type="button" id="305">
796 796
 					<description>Hourly forcast button</description>
797 797
 					<textwidth>235</textwidth>
798 798
 					<include>ButtonCommonValues</include>
799 799
 					<label>31902</label>
800  
-					<onclick>SetProperty(Weather.CurrentView,hourly)</onclick>
801  
-					<visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible>
  800
+					<onfocus>SetProperty(Weather.CurrentView,hourly)</onfocus>
  801
+					<visible>StringCompare(Weather.Plugin,weather.wunderground)</visible>
802 802
 				</control>
803 803
 				<control type="button" id="306">
804 804
 					<description>Hourly forcast button</description>
805 805
 					<textwidth>235</textwidth>
806 806
 					<include>ButtonCommonValues</include>
807  
-					<label>31906</label>
808  
-					<onclick>SetProperty(Weather.CurrentView,maps)</onclick>
809  
-					<visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible>
  807
+					<label>31910</label>
  808
+					<onfocus>SetProperty(Weather.CurrentView,map)</onfocus>
  809
+					<visible>StringCompare(Weather.Plugin,weather.wunderground)</visible>
810 810
 				</control>
811 811
 				<control type="label" id="201">
812 812
 					<width>250</width>
10  addons/skin.confluence/720p/includes.xml
@@ -11,11 +11,11 @@
11 11
 	<include file="IncludesHomeRecentlyAdded.xml" />
12 12
 	<include file="IncludesHomeMenuItems.xml" />
13 13
 	<include file="IncludesBackgroundBuilding.xml" />
14  
-	<include file="weather+\10DayForecast.xml" />
15  
-	<include file="weather+\36HourForecast.xml" />
16  
-	<include file="weather+\WeekendForecast.xml" />
17  
-	<include file="weather+\HourlyForecast.xml" />
18  
-	<include file="weather+\MapsVideo.xml" />
  14
+	<include file="weather\10DayForecast.xml" />
  15
+	<include file="weather\36HourForecast.xml" />
  16
+	<include file="weather\WeekendForecast.xml" />
  17
+	<include file="weather\HourlyForecast.xml" />
  18
+	<include file="weather\MapAlerts.xml" />
19 19
 
20 20
 	<constant name="FanartCrossfadeTime">500</constant>
21 21
 	<constant name="IconCrossfadeTime">400</constant>
437  addons/skin.confluence/720p/weather+/MapsVideo.xml
... ...
@@ -1,437 +0,0 @@
1  
-<includes>
2  
-	<include name="Weather+MapsVideo">
3  
-		<control type="group">
4  
-			<visible>StringCompare(Window.Property(Weather.CurrentView),maps)</visible>
5  
-			<include>VisibleFadeEffect</include>
6  
-			<control type="label">
7  
-				<description>header label</description>
8  
-				<posx>20</posx>
9  
-				<posy>13</posy>
10  
-				<width>610</width>
11  
-				<height>30</height>
12  
-				<font>font13_title</font>
13  
-				<label>31906</label>
14  
-				<align>center</align>
15  
-				<aligny>center</aligny>
16  
-				<textcolor>white</textcolor>
17  
-				<shadowcolor>black</shadowcolor>
18  
-			</control>
19  
-			<control type="group">
20  
-				<posx>20</posx>
21  
-				<posy>50</posy>
22  
-				<include>VisibleFadeEffect</include>
23  
-			</control>
24  
-			<control type="label">
25  
-				<posx>45</posx>
26  
-				<posy>50</posy>
27  
-				<width>560</width>
28  
-				<height>20</height>
29  
-				<font>font12_title</font>
30  
-				<textcolor>grey</textcolor>
31  
-				<align>center</align>
32  
-				<aligny>center</aligny>
33  
-				<label>$INFO[Window.Property(Weather.CurrentMap)]</label>
34  
-			</control>
35  
-			<control type="image">
36  
-				<description>Background image</description>
37  
-				<posx>40</posx>
38  
-				<posy>75</posy>
39  
-				<width>570</width>
40  
-				<height>365</height>
41  
-				<texture border="5">button-nofocus.png</texture>
42  
-			</control>
43  
-			<control type="group">
44  
-				<visible>StringCompare(Window.Property(MapPath),weather.com plus/loading)</visible>
45  
-				<control type="multiimage">
46  
-					<description>Empty Maps image</description>
47  
-					<posx>45</posx>
48  
-					<posy>80</posy>
49  
-					<width>560</width>
50  
-					<height>350</height>
51  
-					<imagepath fallback="special://skin/backgrounds/weather.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</imagepath>
52  
-					<timeperimage>500</timeperimage>
53  
-					<pauseatend>1000</pauseatend>
54  
-					<fadetime>0</fadetime>
55  
-					<randomize>false</randomize>
56  
-					<loop>yes</loop>
57  
-					<aspectratio>scale</aspectratio>
58  
-					<aligny>center</aligny>
59  
-				</control>
60  
-				<control type="label">
61  
-					<posx>45</posx>
62  
-					<posy>200</posy>
63  
-					<width>560</width>
64  
-					<height>30</height>
65  
-					<font>font13</font>
66  
-					<textcolor>black</textcolor>
67  
-					<align>center</align>
68  
-					<aligny>center</aligny>
69  
-					<label>[B]$LOCALIZE[31909][/B]</label>
70  
-				</control>
71  
-			</control>
72  
-			<control type="multiimage">
73  
-				<description>maps multiimage</description>
74  
-				<posx>45</posx>
75  
-				<posy>80</posy>
76  
-				<width>560</width>
77  
-				<height>350</height>
78  
-				<imagepath>$INFO[Window.Property(MapPath)]</imagepath>
79  
-				<timeperimage>500</timeperimage>
80  
-				<pauseatend>1000</pauseatend>
81  
-				<fadetime>0</fadetime>
82  
-				<randomize>false</randomize>
83  
-				<loop>yes</loop>
84  
-				<aspectratio>keep</aspectratio>
85  
-				<aligny>center</aligny>
86  
-			</control>
87  
-			<control type="image">
88  
-				<description>legend image</description>
89  
-				<posx>45</posx>
90  
-				<posy>80</posy>
91  
-				<width>560</width>
92  
-				<height>50</height>
93  
-				<texture>$INFO[Window.Property(LegendPath)]</texture>
94  
-				<aspectratio aligny="top">keep</aspectratio>
95  
-			</control>
96  
-			<control type="list" id="53">
97  
-				<posx>30</posx>
98  
-				<posy>445</posy>
99  
-				<width>585</width>
100  
-				<height>160</height>
101  
-				<onleft>9000</onleft>
102  
-				<onright>63</onright>
103  
-				<onup>53</onup>
104  
-				<ondown>53</ondown>
105  
-				<viewtype label="$LOCALIZE[4]">list</viewtype>
106  
-				<pagecontrol>63</pagecontrol>
107  
-				<scrolltime>200</scrolltime>
108  
-				<itemlayout height="40" width="585">
109  
-					<control type="image">
110  
-						<posx>0</posx>
111  
-						<posy>0</posy>
112  
-						<width>585</width>
113  
-						<height>41</height>
114  
-						<texture border="0,2,0,2">MenuItemNF.png</texture>
115  
-					</control>
116  
-					<control type="image">
117  
-						<posx>0</posx>
118  
-						<posy>5</posy>
119  
-						<width>30</width>
120  
-						<height>30</height>
121  
-						<texture>$INFO[ListItem.Icon]</texture>
122  
-					</control>
123  
-					<control type="label">
124  
-						<posx>40</posx>
125  
-						<posy>0</posy>
126  
-						<width>540</width>
127  
-						<height>40</height>
128  
-						<font>font12</font>
129  
-						<textcolor>grey2</textcolor>
130  
-						<selectedcolor>selected</selectedcolor>
131  
-						<align>left</align>
132  
-						<aligny>center</aligny>
133  
-						<label>$INFO[ListItem.Label]</label>
134  
-					</control>
135  
-				</itemlayout>
136  
-				<focusedlayout height="40" width="585">
137  
-					<control type="image">
138  
-						<posx>0</posx>
139  
-						<posy>0</posy>
140  
-						<width>585</width>
141  
-						<height>41</height>
142  
-						<texture border="0,2,0,2">MenuItemNF.png</texture>
143  
-						<visible>!Control.HasFocus(53)</visible>
144  
-						<include>VisibleFadeEffect</include>
145  
-					</control>
146  
-					<control type="image">
147  
-						<posx>0</posx>
148  
-						<posy>0</posy>
149  
-						<width>585</width>
150  
-						<height>41</height>
151  
-						<texture border="0,2,0,2">MenuItemFO.png</texture>
152  
-						<visible>Control.HasFocus(53)</visible>
153  
-						<include>VisibleFadeEffect</include>
154  
-					</control>
155  
-					<control type="image">
156  
-						<posx>0</posx>
157  
-						<posy>5</posy>
158  
-						<width>30</width>
159  
-						<height>30</height>
160  
-						<texture>$INFO[ListItem.Icon]</texture>
161  
-					</control>
162  
-					<control type="label">
163  
-						<posx>40</posx>
164  
-						<posy>0</posy>
165  
-						<width>540</width>
166  
-						<height>40</height>
167  
-						<font>font12</font>
168  
-						<textcolor>white</textcolor>
169  
-						<selectedcolor>selected</selectedcolor>
170  
-						<align>left</align>
171  
-						<aligny>center</aligny>
172  
-						<label>$INFO[ListItem.Label]</label>
173  
-					</control>
174  
-				</focusedlayout>
175  
-				<content>
176  
-					<item>
177  
-						<label>$INFO[Window.Property(Video.1.title)]</label>
178  
-						<icon>icon-video.png</icon>
179  
-						<onclick>PlayMedia($INFO[Window.Property(Video.1)],noresume)</onclick>
180  
-						<visible>!IsEmpty(Window.Property(Video.1))</visible>
181  
-					</item>
182  
-					<item>
183  
-						<label>$INFO[Window.Property(Video.2.title)]</label>
184  
-						<icon>icon-video.png</icon>
185  
-						<onclick>PlayMedia($INFO[Window.Property(Video.2)],noresume)</onclick>
186  
-						<visible>!IsEmpty(Window.Property(Video.2))</visible>
187  
-					</item>
188  
-					<item>
189  
-						<label>$INFO[Window.Property(Video.3.title)]</label>
190  
-						<icon>icon-video.png</icon>
191  
-						<onclick>PlayMedia($INFO[Window.Property(Video.3)],noresume)</onclick>
192  
-						<visible>!IsEmpty(Window.Property(Video.3))</visible>
193  
-					</item>
194  
-					<item>
195  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.1)]</label>
196  
-						<icon>icon-weather.png</icon>
197  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.1)])</onclick>
198  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.1)]</onclick>
199  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.1))</visible>
200  
-					</item>
201  
-					<item>
202  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.2)]</label>
203  
-						<icon>icon-weather.png</icon>
204  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.2)])</onclick>
205  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.2)]</onclick>
206  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.2))</visible>
207  
-					</item>
208  
-					<item>
209  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.3)]</label>
210  
-						<icon>icon-weather.png</icon>
211  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.3)])</onclick>
212  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.3)]</onclick>
213  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.3))</visible>
214  
-					</item>
215  
-					<item>
216  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.4)]</label>
217  
-						<icon>icon-weather.png</icon>
218  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.4)])</onclick>
219  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.4)]</onclick>
220  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.4))</visible>
221  
-					</item>
222  
-					<item>
223  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.5)]</label>
224  
-						<icon>icon-weather.png</icon>
225  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.5)])</onclick>
226  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.5)]</onclick>
227  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.5))</visible>
228  
-					</item>
229  
-					<item>
230  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.6)]</label>
231  
-						<icon>icon-weather.png</icon>
232  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.6)])</onclick>
233  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.6)]</onclick>
234  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.6))</visible>
235  
-					</item>
236  
-					<item>
237  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.7)]</label>
238  
-						<icon>icon-weather.png</icon>
239  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.7)])</onclick>
240  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.7)]</onclick>
241  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.7))</visible>
242  
-					</item>
243  
-					<item>
244  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.8)]</label>
245  
-						<icon>icon-weather.png</icon>
246  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.8)])</onclick>
247  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.8)]</onclick>
248  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.8))</visible>
249  
-					</item>
250  
-					<item>
251  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.9)]</label>
252  
-						<icon>icon-weather.png</icon>
253  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.9)])</onclick>
254  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.9)]</onclick>
255  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.9))</visible>
256  
-					</item>
257  
-					<item>
258  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.10)]</label>
259  
-						<icon>icon-weather.png</icon>
260  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.10)])</onclick>
261  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.10)]</onclick>
262  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.10))</visible>
263  
-					</item>
264  
-					<item>
265  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.11)]</label>
266  
-						<icon>icon-weather.png</icon>
267  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.11)])</onclick>
268  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.11)]</onclick>
269  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.11))</visible>
270  
-					</item>
271  
-					<item>
272  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.12)]</label>
273  
-						<icon>icon-weather.png</icon>
274  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.12)])</onclick>
275  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.12)]</onclick>
276  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.12))</visible>
277  
-					</item>
278  
-					<item>
279  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.13)]</label>
280  
-						<icon>icon-weather.png</icon>
281  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.13)])</onclick>
282  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.13)]</onclick>
283  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.13))</visible>
284  
-					</item>
285  
-					<item>
286  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.14)]</label>
287  
-						<icon>icon-weather.png</icon>
288  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.14)])</onclick>
289  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.14)]</onclick>
290  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.14))</visible>
291  
-					</item>
292  
-					<item>
293  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.15)]</label>
294  
-						<icon>icon-weather.png</icon>
295  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.15)])</onclick>
296  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.15)]</onclick>
297  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.15))</visible>
298  
-					</item>
299  
-					<item>
300  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.16)]</label>
301  
-						<icon>icon-weather.png</icon>
302  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.16)])</onclick>
303  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.16)]</onclick>
304  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.16))</visible>
305  
-					</item>
306  
-					<item>
307  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.17)]</label>
308  
-						<icon>icon-weather.png</icon>
309  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.17)])</onclick>
310  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.17)]</onclick>
311  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.17))</visible>
312  
-					</item>
313  
-					<item>
314  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.18)]</label>
315  
-						<icon>icon-weather.png</icon>
316  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.18)])</onclick>
317  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.18)]</onclick>
318  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.18))</visible>
319  
-					</item>
320  
-					<item>
321  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.19)]</label>
322  
-						<icon>icon-weather.png</icon>
323  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.19)])</onclick>
324  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.19)]</onclick>
325  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.19))</visible>
326  
-					</item>
327  
-					<item>
328  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.20)]</label>
329  
-						<icon>icon-weather.png</icon>
330  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.20)])</onclick>
331  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.20)]</onclick>
332  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.20))</visible>
333  
-					</item>
334  
-					<item>
335  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.21)]</label>
336  
-						<icon>icon-weather.png</icon>
337  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.21)])</onclick>
338  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.21)]</onclick>
339  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.21))</visible>
340  
-					</item>
341  
-					<item>
342  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.22)]</label>
343  
-						<icon>icon-weather.png</icon>
344  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.22)])</onclick>
345  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.22)]</onclick>
346  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.22))</visible>
347  
-					</item>
348  
-					<item>
349  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.23)]</label>
350  
-						<icon>icon-weather.png</icon>
351  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.23)])</onclick>
352  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.23)]</onclick>
353  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.23))</visible>
354  
-					</item>
355  
-					<item>
356  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.24)]</label>
357  
-						<icon>icon-weather.png</icon>
358  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.24)])</onclick>
359  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.24)]</onclick>
360  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.24))</visible>
361  
-					</item>
362  
-					<item>
363  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.25)]</label>
364  
-						<icon>icon-weather.png</icon>
365  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.25)])</onclick>
366  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.25)]</onclick>
367  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.25))</visible>
368  
-					</item>
369  
-					<item>
370  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.26)]</label>
371  
-						<icon>icon-weather.png</icon>
372  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.26)])</onclick>
373  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.26)]</onclick>
374  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.26))</visible>
375  
-					</item>
376  
-					<item>
377  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.27)]</label>
378  
-						<icon>icon-weather.png</icon>
379  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.27)])</onclick>
380  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.27)]</onclick>
381  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.27))</visible>
382  
-					</item>
383  
-					<item>
384  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.28)]</label>
385  
-						<icon>icon-weather.png</icon>
386  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.28)])</onclick>
387  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.28)]</onclick>
388  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.28))</visible>
389  
-					</item>
390  
-					<item>
391  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.29)]</label>
392  
-						<icon>icon-weather.png</icon>
393  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.29)])</onclick>
394  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.29)]</onclick>
395  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.29))</visible>
396  
-					</item>
397  
-					<item>
398  
-						<label>$INFO[Window.Property(MapList.1.MapLabel.30)]</label>
399  
-						<icon>icon-weather.png</icon>
400  
-						<onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.30)])</onclick>
401  
-						<onclick>$INFO[Window.Property(MapList.1.MapOnclick.30)]</onclick>
402  
-						<visible>!IsEmpty(Window.Property(MapList.1.MapLabel.30))</visible>
403  
-					</item>
404  
-				</content>
405  
-			</control>
406  
-			<control type="scrollbar" id="63">
407  
-				<posx>610</posx>
408  
-				<posy>445</posy>
409  
-				<width>25</width>
410  
-				<height>160</height>
411  
-				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
412  
-				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
413  
-				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
414  
-				<textureslidernib>ScrollBarNib.png</textureslidernib>
415  
-				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
416  
-				<onleft>53</onleft>
417  
-				<onright>9000</onright>
418  
-				<showonepage>true</showonepage>
419  
-				<orientation>vertical</orientation>
420  
-				<visible>Control.IsVisible(50)</visible>
421  
-			</control>
422  
-			<control type="label">
423  
-				<animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
424  
-				<description>number of files/pages</description>
425  
-				<posx>660</posx>
426  
-				<posy>627</posy>
427  
-				<width>570</width>
428  
-				<font>font12</font>
429  
-				<align>right</align>
430  
-				<scroll>true</scroll>
431  
-				<textcolor>grey</textcolor>
432  
-				<shadowcolor>black</shadowcolor>
433  
-				<label>([COLOR=blue]$INFO[Container(53).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(53).CurrentPage]/$INFO[Container(53).NumPages][/COLOR])</label>
434  
-			</control>
435  
-		</control>
436  
-	</include>
437  
-</includes>
24  ...s/skin.confluence/720p/weather+/10DayForecast.xml → ...ns/skin.confluence/720p/weather/10DayForecast.xml
... ...
@@ -1,5 +1,5 @@
1 1
 <includes>
2  
-	<include name="Weather+10DayForcast">
  2
+	<include name="Weather10DayForcast">
3 3
 		<control type="group">
4 4
 			<visible>IsEmpty(Window.Property(Weather.CurrentView))</visible>
5 5
 			<include>VisibleFadeEffect</include>
@@ -151,7 +151,7 @@
151 151
 					</item>
152 152
 					<item>
153 153
 						<label>[B]$INFO[Window.Property(Daily.1.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.1.ShortDate)][/COLOR]</label>
154  
-						<label2>$INFO[Window.Property(Daily.1.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.1.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.1.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  154
+						<label2>$INFO[Window.Property(Daily.1.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.1.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.1.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
155 155
 						<thumb>$INFO[Window.Property(Daily.1.OutlookIcon)]</thumb>
156 156
 						<icon>$INFO[Window.Property(Daily.1.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.1.WindSpeed)] $INFO[Window.Property(Daily.1.WindDirection)]</icon>
157 157
 						<onclick>-</onclick>
@@ -159,7 +159,7 @@
159 159
 					</item>
160 160
 					<item>
161 161
 						<label>[B]$INFO[Window.Property(Daily.2.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.2.ShortDate)][/COLOR]</label>
162  
-						<label2>$INFO[Window.Property(Daily.2.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.2.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.2.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  162
+						<label2>$INFO[Window.Property(Daily.2.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.2.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.2.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
163 163
 						<thumb>$INFO[Window.Property(Daily.2.OutlookIcon)]</thumb>
164 164
 						<icon>$INFO[Window.Property(Daily.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.2.WindSpeed)] $INFO[Window.Property(Daily.2.WindDirection)]</icon>
165 165
 						<onclick>-</onclick>
@@ -167,7 +167,7 @@
167 167
 					</item>
168 168
 					<item>
169 169
 						<label>[B]$INFO[Window.Property(Daily.3.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.3.ShortDate)][/COLOR]</label>
170  
-						<label2>$INFO[Window.Property(Daily.3.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.3.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.3.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  170
+						<label2>$INFO[Window.Property(Daily.3.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.3.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.3.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
171 171
 						<thumb>$INFO[Window.Property(Daily.3.OutlookIcon)]</thumb>
172 172
 						<icon>$INFO[Window.Property(Daily.3.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.3.WindSpeed)] $INFO[Window.Property(Daily.3.WindDirection)]</icon>
173 173
 						<onclick>-</onclick>
@@ -175,7 +175,7 @@
175 175
 					</item>
176 176
 					<item>
177 177
 						<label>[B]$INFO[Window.Property(Daily.4.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.4.ShortDate)][/COLOR]</label>
178  
-						<label2>$INFO[Window.Property(Daily.4.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.4.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.4.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  178
+						<label2>$INFO[Window.Property(Daily.4.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.4.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.4.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
179 179
 						<thumb>$INFO[Window.Property(Daily.4.OutlookIcon)]</thumb>
180 180
 						<icon>$INFO[Window.Property(Daily.4.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.4.WindSpeed)] $INFO[Window.Property(Daily.4.WindDirection)]</icon>
181 181
 						<onclick>-</onclick>
@@ -183,7 +183,7 @@
183 183
 					</item>
184 184
 					<item>
185 185
 						<label>[B]$INFO[Window.Property(Daily.5.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.5.ShortDate)][/COLOR]</label>
186  
-						<label2>$INFO[Window.Property(Daily.5.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.5.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.5.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  186
+						<label2>$INFO[Window.Property(Daily.5.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.5.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.5.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
187 187
 						<thumb>$INFO[Window.Property(Daily.5.OutlookIcon)]</thumb>
188 188
 						<icon>$INFO[Window.Property(Daily.5.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.5.WindSpeed)] $INFO[Window.Property(Daily.5.WindDirection)]</icon>
189 189
 						<onclick>-</onclick>
@@ -191,7 +191,7 @@
191 191
 					</item>
192 192
 					<item>
193 193
 						<label>[B]$INFO[Window.Property(Daily.6.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.6.ShortDate)][/COLOR]</label>
194  
-						<label2>$INFO[Window.Property(Daily.6.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.6.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.6.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  194
+						<label2>$INFO[Window.Property(Daily.6.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.6.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.6.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
195 195
 						<thumb>$INFO[Window.Property(Daily.6.OutlookIcon)]</thumb>
196 196
 						<icon>$INFO[Window.Property(Daily.6.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.6.WindSpeed)] $INFO[Window.Property(Daily.6.WindDirection)]</icon>
197 197
 						<onclick>-</onclick>
@@ -199,7 +199,7 @@
199 199
 					</item>
200 200
 					<item>
201 201
 						<label>[B]$INFO[Window.Property(Daily.7.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.7.ShortDate)][/COLOR]</label>
202  
-						<label2>$INFO[Window.Property(Daily.7.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.7.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.7.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  202
+						<label2>$INFO[Window.Property(Daily.7.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.7.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.7.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
203 203
 						<thumb>$INFO[Window.Property(Daily.7.OutlookIcon)]</thumb>
204 204
 						<icon>$INFO[Window.Property(Daily.7.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.7.WindSpeed)] $INFO[Window.Property(Daily.7.WindDirection)]</icon>
205 205
 						<onclick>-</onclick>
@@ -207,7 +207,7 @@
207 207
 					</item>
208 208
 					<item>
209 209
 						<label>[B]$INFO[Window.Property(Daily.8.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.8.ShortDate)][/COLOR]</label>
210  
-						<label2>$INFO[Window.Property(Daily.8.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.8.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.8.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  210
+						<label2>$INFO[Window.Property(Daily.8.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.8.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.8.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
211 211
 						<thumb>$INFO[Window.Property(Daily.8.OutlookIcon)]</thumb>
212 212
 						<icon>$INFO[Window.Property(Daily.8.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.8.WindSpeed)] $INFO[Window.Property(Daily.8.WindDirection)]</icon>
213 213
 						<onclick>-</onclick>
@@ -215,7 +215,7 @@
215 215
 					</item>
216 216
 					<item>
217 217
 						<label>[B]$INFO[Window.Property(Daily.9.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.9.ShortDate)][/COLOR]</label>
218  
-						<label2>$INFO[Window.Property(Daily.9.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.9.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.9.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  218
+						<label2>$INFO[Window.Property(Daily.9.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.9.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.9.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
219 219
 						<thumb>$INFO[Window.Property(Daily.9.OutlookIcon)]</thumb>
220 220
 						<icon>$INFO[Window.Property(Daily.9.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.9.WindSpeed)] $INFO[Window.Property(Daily.9.WindDirection)]</icon>
221 221
 						<onclick>-</onclick>
@@ -223,7 +223,7 @@
223 223
 					</item>
224 224
 					<item>
225 225
 						<label>[B]$INFO[Window.Property(Daily.10.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.10.ShortDate)][/COLOR]</label>
226  
-						<label2>$INFO[Window.Property(Daily.10.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Daily.10.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Daily.10.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  226
+						<label2>$INFO[Window.Property(Daily.10.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.10.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.10.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
227 227
 						<thumb>$INFO[Window.Property(Daily.10.OutlookIcon)]</thumb>
228 228
 						<icon>$INFO[Window.Property(Daily.10.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.10.WindSpeed)] $INFO[Window.Property(Daily.10.WindDirection)]</icon>
229 229
 						<onclick>-</onclick>
@@ -262,4 +262,4 @@
262 262
 			</control>
263 263
 		</control>
264 264
 	</include>
265  
-</includes>
  265
+</includes>
97  .../skin.confluence/720p/weather+/36HourForecast.xml → ...s/skin.confluence/720p/weather/36HourForecast.xml
... ...
@@ -1,8 +1,19 @@
1 1
 <includes>
2  
-	<include name="Weather+36HourForcast">
  2
+	<include name="Weather36HourForcast">
3 3
 		<control type="group">
4 4
 			<visible>StringCompare(Window.Property(Weather.CurrentView),36hour)</visible>
5 5
 			<include>VisibleFadeEffect</include>
  6
+			<control type="button" id="997">
  7
+				<description>Hidden Button for focus</description>
  8
+				<posx>-600</posx>
  9
+				<posy>-20</posy>
  10
+				<width>1</width>
  11
+				<height>1</height>
  12
+				<texturenofocus>-</texturenofocus>
  13
+				<texturefocus>-</texturefocus>
  14
+				<onleft>9000</onleft>
  15
+				<onright>9000</onright>
  16
+			</control>
6 17
 			<control type="label">
7 18
 				<description>header label</description>
8 19
 				<posx>20</posx>
@@ -65,19 +76,7 @@
65 76
 						<selectedcolor>selected</selectedcolor>
66 77
 						<align>center</align>
67 78
 						<aligny>center</aligny>
68  
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.1.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.1.Temperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label>
69  
-					</control>
70  
-					<control type="label">
71  
-						<posx>590</posx>
72  
-						<posy>35</posy>
73  
-						<width>390</width>
74  
-						<height>20</height>
75  
-						<font>font12</font>
76  
-						<textcolor>white</textcolor>
77  
-						<selectedcolor>selected</selectedcolor>
78  
-						<align>right</align>
79  
-						<aligny>center</aligny>
80  
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.1.DaylightTitle)][/COLOR] $INFO[Window.Property(36Hour.1.DaylightTime)]</label>
  79
+						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.1.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.1.Temperature),[B] ,[/B]]</label>
81 80
 					</control>
82 81
 					<control type="label">
83 82
 						<posx>590</posx>
@@ -89,19 +88,7 @@
89 88
 						<selectedcolor>selected</selectedcolor>
90 89
 						<align>right</align>
91 90
 						<aligny>center</aligny>
92  
-						<label>$INFO[Window.Property(36Hour.1.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,%[/B]]</label>
93  
-					</control>
94  
-					<control type="label">
95  
-						<posx>590</posx>
96  
-						<posy>85</posy>
97  
-						<width>390</width>
98  
-						<height>20</height>
99  
-						<font>font12</font>
100  
-						<textcolor>white</textcolor>
101  
-						<selectedcolor>selected</selectedcolor>
102  
-						<align>right</align>
103  
-						<aligny>center</aligny>
104  
-						<label>$INFO[Window.Property(36Hour.1.Outlook),[COLOR=grey2]$LOCALIZE[33030] :[/COLOR]]</label>
  91
+						<label>$INFO[Window.Property(36Hour.1.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label>
105 92
 					</control>
106 93
 					<control type="textbox">
107 94
 						<posx>0</posx>
@@ -154,19 +141,7 @@
154 141
 						<selectedcolor>selected</selectedcolor>
155 142
 						<align>center</align>
156 143
 						<aligny>center</aligny>
157  
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.2.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.2.Temperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label>
158  
-					</control>
159  
-					<control type="label">
160  
-						<posx>590</posx>
161  
-						<posy>35</posy>
162  
-						<width>390</width>
163  
-						<height>20</height>
164  
-						<font>font12</font>
165  
-						<textcolor>white</textcolor>
166  
-						<selectedcolor>selected</selectedcolor>
167  
-						<align>right</align>
168  
-						<aligny>center</aligny>
169  
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.2.DaylightTitle)][/COLOR] $INFO[Window.Property(36Hour.2.DaylightTime)]</label>
  144
+						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.2.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.2.Temperature),[B] ,[/B]]</label>
170 145
 					</control>
171 146
 					<control type="label">
172 147
 						<posx>590</posx>
@@ -178,19 +153,7 @@
178 153
 						<selectedcolor>selected</selectedcolor>
179 154
 						<align>right</align>
180 155
 						<aligny>center</aligny>
181  
-						<label>$INFO[Window.Property(36Hour.2.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,%[/B]]</label>
182  
-					</control>
183  
-					<control type="label">
184  
-						<posx>590</posx>
185  
-						<posy>85</posy>
186  
-						<width>390</width>
187  
-						<height>20</height>
188  
-						<font>font12</font>
189  
-						<textcolor>white</textcolor>
190  
-						<selectedcolor>selected</selectedcolor>
191  
-						<align>right</align>
192  
-						<aligny>center</aligny>
193  
-						<label>$INFO[Window.Property(36Hour.2.Outlook),[COLOR=grey2]$LOCALIZE[33030] :[/COLOR]]</label>
  156
+						<label>$INFO[Window.Property(36Hour.2.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label>
194 157
 					</control>
195 158
 					<control type="textbox">
196 159
 						<posx>0</posx>
@@ -243,19 +206,7 @@
243 206
 						<selectedcolor>selected</selectedcolor>
244 207
 						<align>center</align>
245 208
 						<aligny>center</aligny>
246  
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.3.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.3.Temperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label>
247  
-					</control>
248  
-					<control type="label">
249  
-						<posx>590</posx>
250  
-						<posy>35</posy>
251  
-						<width>390</width>
252  
-						<height>20</height>
253  
-						<font>font12</font>
254  
-						<textcolor>white</textcolor>
255  
-						<selectedcolor>selected</selectedcolor>
256  
-						<align>right</align>
257  
-						<aligny>center</aligny>
258  
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.3.DaylightTitle)][/COLOR] $INFO[Window.Property(36Hour.3.DaylightTime)]</label>
  209
+						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.3.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.3.Temperature),[B] ,[/B]]</label>
259 210
 					</control>
260 211
 					<control type="label">
261 212
 						<posx>590</posx>
@@ -267,19 +218,7 @@
267 218
 						<selectedcolor>selected</selectedcolor>
268 219
 						<align>right</align>
269 220
 						<aligny>center</aligny>
270  
-						<label>$INFO[Window.Property(36Hour.3.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,%[/B]]</label>
271  
-					</control>
272  
-					<control type="label">
273  
-						<posx>590</posx>
274  
-						<posy>85</posy>
275  
-						<width>390</width>
276  
-						<height>20</height>
277  
-						<font>font12</font>
278  
-						<textcolor>white</textcolor>
279  
-						<selectedcolor>selected</selectedcolor>
280  
-						<align>right</align>
281  
-						<aligny>center</aligny>
282  
-						<label>$INFO[Window.Property(36Hour.3.Outlook),[COLOR=grey2]$LOCALIZE[33030] :[/COLOR]]</label>
  221
+						<label>$INFO[Window.Property(36Hour.3.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label>
283 222
 					</control>
284 223
 					<control type="textbox">
285 224
 						<posx>0</posx>
28  .../skin.confluence/720p/weather+/HourlyForecast.xml → ...s/skin.confluence/720p/weather/HourlyForecast.xml
... ...
@@ -1,5 +1,5 @@
1 1
 <includes>
2  
-	<include name="Weather+HourlyForcast">
  2
+	<include name="WeatherHourlyForcast">
3 3
 		<control type="group">
4 4
 			<visible>StringCompare(Window.Property(Weather.CurrentView),hourly)</visible>
5 5
 			<include>VisibleFadeEffect</include>
@@ -151,7 +151,7 @@
151 151
 					</item>
152 152
 					<item>
153 153
 						<label>[B]$INFO[Window.Property(Hourly.1.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.1.ShortDate)][/COLOR]</label>
154  
-						<label2>$INFO[Window.Property(Hourly.1.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.1.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.1.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.1.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  154
+						<label2>$INFO[Window.Property(Hourly.1.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.1.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.1.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.1.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
155 155
 						<thumb>$INFO[Window.Property(Hourly.1.OutlookIcon)]</thumb>
156 156
 						<icon>$INFO[Window.Property(Hourly.1.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.1.WindSpeed)] $INFO[Window.Property(Hourly.1.WindDirection)]</icon>
157 157
 						<onclick>-</onclick>
@@ -159,7 +159,7 @@
159 159
 					</item>
160 160
 					<item>
161 161
 						<label>[B]$INFO[Window.Property(Hourly.2.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.2.ShortDate)][/COLOR]</label>
162  
-						<label2>$INFO[Window.Property(Hourly.2.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.2.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.2.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  162
+						<label2>$INFO[Window.Property(Hourly.2.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.2.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.2.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
163 163
 						<thumb>$INFO[Window.Property(Hourly.2.OutlookIcon)]</thumb>
164 164
 						<icon>$INFO[Window.Property(Hourly.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.2.WindSpeed)] $INFO[Window.Property(Hourly.2.WindDirection)]</icon>
165 165
 						<onclick>-</onclick>
@@ -167,7 +167,7 @@
167 167
 					</item>
168 168
 					<item>
169 169
 						<label>[B]$INFO[Window.Property(Hourly.3.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.3.ShortDate)][/COLOR]</label>
170  
-						<label2>$INFO[Window.Property(Hourly.3.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.3.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.3.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.3.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  170
+						<label2>$INFO[Window.Property(Hourly.3.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.3.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.3.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.3.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
171 171
 						<thumb>$INFO[Window.Property(Hourly.3.OutlookIcon)]</thumb>
172 172
 						<icon>$INFO[Window.Property(Hourly.3.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.3.WindSpeed)] $INFO[Window.Property(Hourly.3.WindDirection)]</icon>
173 173
 						<onclick>-</onclick>
@@ -175,7 +175,7 @@
175 175
 					</item>
176 176
 					<item>
177 177
 						<label>[B]$INFO[Window.Property(Hourly.4.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.4.ShortDate)][/COLOR]</label>
178  
-						<label2>$INFO[Window.Property(Hourly.4.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.4.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.4.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.4.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  178
+						<label2>$INFO[Window.Property(Hourly.4.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.4.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.4.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.4.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
179 179
 						<thumb>$INFO[Window.Property(Hourly.4.OutlookIcon)]</thumb>
180 180
 						<icon>$INFO[Window.Property(Hourly.4.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.4.WindSpeed)] $INFO[Window.Property(Hourly.4.WindDirection)]</icon>
181 181
 						<onclick>-</onclick>
@@ -183,7 +183,7 @@
183 183
 					</item>
184 184
 					<item>
185 185
 						<label>[B]$INFO[Window.Property(Hourly.5.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.5.ShortDate)][/COLOR]</label>
186  
-						<label2>$INFO[Window.Property(Hourly.5.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.5.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.5.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.5.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  186
+						<label2>$INFO[Window.Property(Hourly.5.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.5.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.5.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.5.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
187 187
 						<thumb>$INFO[Window.Property(Hourly.5.OutlookIcon)]</thumb>
188 188
 						<icon>$INFO[Window.Property(Hourly.5.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.5.WindSpeed)] $INFO[Window.Property(Hourly.5.WindDirection)]</icon>
189 189
 						<onclick>-</onclick>
@@ -191,7 +191,7 @@
191 191
 					</item>
192 192
 					<item>
193 193
 						<label>[B]$INFO[Window.Property(Hourly.6.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.6.ShortDate)][/COLOR]</label>
194  
-						<label2>$INFO[Window.Property(Hourly.6.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.6.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.6.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.6.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  194
+						<label2>$INFO[Window.Property(Hourly.6.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.6.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.6.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.6.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
195 195
 						<thumb>$INFO[Window.Property(Hourly.6.OutlookIcon)]</thumb>
196 196
 						<icon>$INFO[Window.Property(Hourly.6.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.6.WindSpeed)] $INFO[Window.Property(Hourly.6.WindDirection)]</icon>
197 197
 						<onclick>-</onclick>
@@ -199,7 +199,7 @@
199 199
 					</item>
200 200
 					<item>
201 201
 						<label>[B]$INFO[Window.Property(Hourly.7.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.7.ShortDate)][/COLOR]</label>
202  
-						<label2>$INFO[Window.Property(Hourly.7.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.7.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.7.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.7.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  202
+						<label2>$INFO[Window.Property(Hourly.7.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.7.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.7.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.7.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
203 203
 						<thumb>$INFO[Window.Property(Hourly.7.OutlookIcon)]</thumb>
204 204
 						<icon>$INFO[Window.Property(Hourly.7.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.7.WindSpeed)] $INFO[Window.Property(Hourly.7.WindDirection)]</icon>
205 205
 						<onclick>-</onclick>
@@ -207,7 +207,7 @@
207 207
 					</item>
208 208
 					<item>
209 209
 						<label>[B]$INFO[Window.Property(Hourly.8.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.8.ShortDate)][/COLOR]</label>
210  
-						<label2>$INFO[Window.Property(Hourly.8.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.8.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.8.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.8.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  210
+						<label2>$INFO[Window.Property(Hourly.8.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.8.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.8.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.8.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
211 211
 						<thumb>$INFO[Window.Property(Hourly.8.OutlookIcon)]</thumb>
212 212
 						<icon>$INFO[Window.Property(Hourly.8.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.8.WindSpeed)] $INFO[Window.Property(Hourly.8.WindDirection)]</icon>
213 213
 						<onclick>-</onclick>
@@ -215,7 +215,7 @@
215 215
 					</item>
216 216
 					<item>
217 217
 						<label>[B]$INFO[Window.Property(Hourly.9.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.9.ShortDate)][/COLOR]</label>
218  
-						<label2>$INFO[Window.Property(Hourly.9.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.9.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.9.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.9.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  218
+						<label2>$INFO[Window.Property(Hourly.9.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.9.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.9.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.9.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
219 219
 						<thumb>$INFO[Window.Property(Hourly.9.OutlookIcon)]</thumb>
220 220
 						<icon>$INFO[Window.Property(Hourly.9.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.9.WindSpeed)] $INFO[Window.Property(Hourly.9.WindDirection)]</icon>
221 221
 						<onclick>-</onclick>
@@ -223,7 +223,7 @@
223 223
 					</item>
224 224
 					<item>
225 225
 						<label>[B]$INFO[Window.Property(Hourly.10.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.10.ShortDate)][/COLOR]</label>
226  
-						<label2>$INFO[Window.Property(Hourly.10.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.10.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.10.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.10.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  226
+						<label2>$INFO[Window.Property(Hourly.10.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.10.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.10.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.10.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
227 227
 						<thumb>$INFO[Window.Property(Hourly.10.OutlookIcon)]</thumb>
228 228
 						<icon>$INFO[Window.Property(Hourly.10.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.10.WindSpeed)] $INFO[Window.Property(Hourly.10.WindDirection)]</icon>
229 229
 						<onclick>-</onclick>
@@ -231,7 +231,7 @@
231 231
 					</item>
232 232
 					<item>
233 233
 						<label>[B]$INFO[Window.Property(Hourly.11.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.11.ShortDate)][/COLOR]</label>
234  
-						<label2>$INFO[Window.Property(Hourly.11.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.11.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.11.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.11.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  234
+						<label2>$INFO[Window.Property(Hourly.11.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.11.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.11.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.11.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
235 235
 						<thumb>$INFO[Window.Property(Hourly.11.OutlookIcon)]</thumb>
236 236
 						<icon>$INFO[Window.Property(Hourly.11.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.11.WindSpeed)] $INFO[Window.Property(Hourly.11.WindDirection)]</icon>
237 237
 						<onclick>-</onclick>
@@ -239,7 +239,7 @@
239 239
 					</item>
240 240
 					<item>
241 241
 						<label>[B]$INFO[Window.Property(Hourly.12.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.12.ShortDate)][/COLOR]</label>
242  
-						<label2>$INFO[Window.Property(Hourly.12.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits]  $INFO[Window.Property(Hourly.12.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]]$INFO[System.TemperatureUnits][CR]$INFO[Window.Property(Hourly.12.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Hourly.12.Precipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,%[/B]]</label2>
  242
+						<label2>$INFO[Window.Property(Hourly.12.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.12.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.12.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.12.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
243 243
 						<thumb>$INFO[Window.Property(Hourly.12.OutlookIcon)]</thumb>
244 244
 						<icon>$INFO[Window.Property(Hourly.12.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.12.WindSpeed)] $INFO[Window.Property(Hourly.12.WindDirection)]</icon>
245 245
 						<onclick>-</onclick>
@@ -278,4 +278,4 @@
278 278
 			</control>
279 279
 		</control>
280 280
 	</include>
281  
-</includes>
  281
+</includes>
100  addons/skin.confluence/720p/weather/MapAlerts.xml
... ...
@@ -0,0 +1,100 @@
  1
+<includes>
  2
+	<include name="WeatherMapAlerts">
  3
+		<control type="group">
  4
+			<visible>StringCompare(Window.Property(Weather.CurrentView),map)</visible>
  5
+			<include>VisibleFadeEffect</include>
  6
+			<control type="button" id="999">
  7
+				<description>Hidden Button for focus</description>
  8
+				<posx>-600</posx>
  9
+				<posy>-20</posy>
  10
+				<width>1</width>
  11
+				<height>1</height>
  12
+				<texturenofocus>-</texturenofocus>
  13
+				<texturefocus>-</texturefocus>
  14
+				<onleft>9000</onleft>
  15
+				<onright>9000</onright>
  16
+			</control>
  17
+			<control type="label">
  18
+				<description>header label</description>
  19
+				<posx>20</posx>
  20
+				<posy>13</posy>
  21
+				<width>610</width>
  22
+				<height>30</height>
  23
+				<font>font13_title</font>
  24
+				<label>31910</label>
  25
+				<align>center</align>
  26
+				<aligny>center</aligny>
  27
+				<textcolor>white</textcolor>
  28
+				<shadowcolor>black</shadowcolor>
  29
+			</control>
  30
+			<control type="image">
  31
+				<description>Background image</description>
  32
+				<posx>40</posx>
  33
+				<posy>75</posy>
  34
+				<width>570</width>
  35
+				<height>325</height>
  36
+				<texture border="5">button-nofocus.png</texture>
  37
+			</control>
  38
+			<control type="multiimage">
  39
+				<description>map multiimage</description>
  40
+				<posx>45</posx>
  41
+				<posy>80</posy>
  42
+				<width>560</width>
  43
+				<height>315</height>
  44
+				<imagepath>$INFO[Window.Property(MapPath)]</imagepath>
  45
+				<timeperimage>500</timeperimage>
  46
+				<pauseatend>1000</pauseatend>
  47
+				<fadetime>0</fadetime>
  48
+				<randomize>false</randomize>
  49
+				<loop>yes</loop>
  50
+				<aspectratio>keep</aspectratio>
  51
+				<aligny>center</aligny>
  52
+			</control>
  53
+			<control type="image">
  54
+				<posx>0</posx>
  55
+				<posy>410</posy>
  56
+				<width>650</width>
  57
+				<height>4</height>
  58
+				<texture>separator.png</texture>
  59
+			</control>
  60
+			<control type="label">
  61
+				<posx>40</posx>
  62
+				<posy>430</posy>
  63
+				<width>570</width>
  64
+				<height>30</height>
  65
+				<font>font13_title</font>
  66
+				<textcolor>blue</textcolor>
  67
+				<align>center</align>
  68
+				<aligny>center</aligny>
  69
+				<label>$LOCALIZE[33050]</label>
  70
+			</control>
  71
+			<control type="group">
  72
+				<visible>!StringCompare(Window.Property(Alerts.Count),0)</visible>
  73
+				<control type="textbox">
  74
+					<posx>40</posx>
  75
+					<posy>470</posy>
  76
+					<width>570</width>
  77
+					<height>100</height>
  78
+					<font>font12</font>
  79
+					<textcolor>white</textcolor>
  80
+					<selectedcolor>selected</selectedcolor>
  81
+					<align>center</align>
  82
+					<label>$INFO[Window.Property(Alerts)]</label>
  83
+					<autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
  84
+				</control>
  85
+			</control>
  86
+			<control type="label">
  87
+				<posx>40</posx>
  88
+				<posy>500</posy>
  89
+				<width>570</width>
  90
+				<height>30</height>
  91
+				<font>font13_title</font>