diff options
| author | ronie <ronie@poedel.net> | 2012-11-22 00:20:21 +0100 |
|---|---|---|
| committer | ronie <ronie@poedel.net> | 2012-11-23 21:39:35 +0100 |
| commit | 16335943337ac5f2627b31e9df336c2b5aba9a68 (patch) | |
| tree | 54b1531a65a18127c9f9ebf6726fec77aeee1079 /addons | |
| parent | 3cab055c9f19bbed2dfb29498e087fc41da6ca1a (diff) | |
[confluence] extended weather
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.confluence/720p/MyWeather.xml | 42 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/includes.xml | 10 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/weather+/MapsVideo.xml | 437 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/weather/10DayForecast.xml (renamed from addons/skin.confluence/720p/weather+/10DayForecast.xml) | 24 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/weather/36HourForecast.xml (renamed from addons/skin.confluence/720p/weather+/36HourForecast.xml) | 97 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/weather/HourlyForecast.xml (renamed from addons/skin.confluence/720p/weather+/HourlyForecast.xml) | 28 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/weather/MapAlerts.xml | 100 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/weather/WeekendForecast.xml (renamed from addons/skin.confluence/720p/weather+/WeekendForecast.xml) | 45 | ||||
| -rw-r--r-- | addons/skin.confluence/language/English/strings.po | 10 |
9 files changed, 203 insertions, 590 deletions
diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index ae95bbe020..1b7f02d76a 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -323,7 +323,7 @@ <shadowcolor>black</shadowcolor> </control> <control type="group"> - <visible>StringCompare(Weather.Plugin,weather.weatherplus) + !IsEmpty(Window.Property(36Hour.IsFetched))</visible> + <visible>StringCompare(Weather.Plugin,weather.wunderground) + !IsEmpty(Window.Property(36Hour.IsFetched))</visible> <control type="label"> <description>Sunrise Label</description> <posx>30</posx> @@ -333,7 +333,7 @@ <font>font13</font> <align>left</align> <aligny>center</aligny> - <label>$LOCALIZE[33027] : [COLOR=white]$INFO[Window.Property(Current.Sunrise)][/COLOR]</label> + <label>$LOCALIZE[33027] : [COLOR=white]$INFO[Window.Property(Today.Sunrise)][/COLOR]</label> <textcolor>grey2</textcolor> <shadowcolor>black</shadowcolor> </control> @@ -346,14 +346,14 @@ <font>font13</font> <align>right</align> <aligny>center</aligny> - <label>$LOCALIZE[33028] : [COLOR=white]$INFO[Window.Property(Current.Sunset)][/COLOR]</label> + <label>$LOCALIZE[33028] : [COLOR=white]$INFO[Window.Property(Today.Sunset)][/COLOR]</label> <textcolor>grey2</textcolor> <shadowcolor>black</shadowcolor> </control> </control> </control> <control type="group"> - <visible>!StringCompare(Weather.Plugin,weather.weatherplus)</visible> + <visible>!StringCompare(Weather.Plugin,weather.wunderground)</visible> <posx>580</posx> <posy>40</posy> <control type="image"> @@ -682,7 +682,7 @@ </control> </control> <control type="group"> - <visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible> + <visible>StringCompare(Weather.Plugin,weather.wunderground)</visible> <posx>580</posx> <posy>40</posy> <control type="image"> @@ -708,11 +708,11 @@ <texture>GlassTitleBar.png</texture> </control> <control type="group" id="50"> - <include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+10DayForcast</include> - <include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+36HourForcast</include> - <include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+WeekendForcast</include> - <include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+HourlyForcast</include> - <include condition="StringCompare(Weather.Plugin,weather.weatherplus)">Weather+MapsVideo</include> + <include condition="StringCompare(Weather.Plugin,weather.wunderground)">Weather10DayForcast</include> + <include condition="StringCompare(Weather.Plugin,weather.wunderground)">Weather36HourForcast</include> + <include condition="StringCompare(Weather.Plugin,weather.wunderground)">WeatherWeekendForcast</include> + <include condition="StringCompare(Weather.Plugin,weather.wunderground)">WeatherHourlyForcast</include> + <include condition="StringCompare(Weather.Plugin,weather.wunderground)">WeatherMapAlerts</include> </control> </control> </control> @@ -773,40 +773,40 @@ <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>31904</label> - <onclick>ClearProperty(Weather.CurrentView)</onclick> - <visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible> + <onfocus>ClearProperty(Weather.CurrentView)</onfocus> + <visible>StringCompare(Weather.Plugin,weather.wunderground)</visible> </control> <control type="button" id="303"> <description>36 hour forcast button</description> <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>31901</label> - <onclick>SetProperty(Weather.CurrentView,36hour)</onclick> - <visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible> + <onfocus>SetProperty(Weather.CurrentView,36hour)</onfocus> + <visible>StringCompare(Weather.Plugin,weather.wunderground)</visible> </control> <control type="button" id="304"> <description>Weekend forcast button</description> <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>31903</label> - <onclick>SetProperty(Weather.CurrentView,weekend)</onclick> - <visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible> + <onfocus>SetProperty(Weather.CurrentView,weekend)</onfocus> + <visible>StringCompare(Weather.Plugin,weather.wunderground)</visible> </control> <control type="button" id="305"> <description>Hourly forcast button</description> <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>31902</label> - <onclick>SetProperty(Weather.CurrentView,hourly)</onclick> - <visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible> + <onfocus>SetProperty(Weather.CurrentView,hourly)</onfocus> + <visible>StringCompare(Weather.Plugin,weather.wunderground)</visible> </control> <control type="button" id="306"> <description>Hourly forcast button</description> <textwidth>235</textwidth> <include>ButtonCommonValues</include> - <label>31906</label> - <onclick>SetProperty(Weather.CurrentView,maps)</onclick> - <visible>StringCompare(Weather.Plugin,weather.weatherplus)</visible> + <label>31910</label> + <onfocus>SetProperty(Weather.CurrentView,map)</onfocus> + <visible>StringCompare(Weather.Plugin,weather.wunderground)</visible> </control> <control type="label" id="201"> <width>250</width> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index f54ec22c28..b7e15f70a3 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -11,11 +11,11 @@ <include file="IncludesHomeRecentlyAdded.xml" /> <include file="IncludesHomeMenuItems.xml" /> <include file="IncludesBackgroundBuilding.xml" /> - <include file="weather+\10DayForecast.xml" /> - <include file="weather+\36HourForecast.xml" /> - <include file="weather+\WeekendForecast.xml" /> - <include file="weather+\HourlyForecast.xml" /> - <include file="weather+\MapsVideo.xml" /> + <include file="weather\10DayForecast.xml" /> + <include file="weather\36HourForecast.xml" /> + <include file="weather\WeekendForecast.xml" /> + <include file="weather\HourlyForecast.xml" /> + <include file="weather\MapAlerts.xml" /> <constant name="FanartCrossfadeTime">500</constant> <constant name="IconCrossfadeTime">400</constant> diff --git a/addons/skin.confluence/720p/weather+/MapsVideo.xml b/addons/skin.confluence/720p/weather+/MapsVideo.xml deleted file mode 100644 index 8f4b62f518..0000000000 --- a/addons/skin.confluence/720p/weather+/MapsVideo.xml +++ /dev/null @@ -1,437 +0,0 @@ -<includes> - <include name="Weather+MapsVideo"> - <control type="group"> - <visible>StringCompare(Window.Property(Weather.CurrentView),maps)</visible> - <include>VisibleFadeEffect</include> - <control type="label"> - <description>header label</description> - <posx>20</posx> - <posy>13</posy> - <width>610</width> - <height>30</height> - <font>font13_title</font> - <label>31906</label> - <align>center</align> - <aligny>center</aligny> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="group"> - <posx>20</posx> - <posy>50</posy> - <include>VisibleFadeEffect</include> - </control> - <control type="label"> - <posx>45</posx> - <posy>50</posy> - <width>560</width> - <height>20</height> - <font>font12_title</font> - <textcolor>grey</textcolor> - <align>center</align> - <aligny>center</aligny> - <label>$INFO[Window.Property(Weather.CurrentMap)]</label> - </control> - <control type="image"> - <description>Background image</description> - <posx>40</posx> - <posy>75</posy> - <width>570</width> - <height>365</height> - <texture border="5">button-nofocus.png</texture> - </control> - <control type="group"> - <visible>StringCompare(Window.Property(MapPath),weather.com plus/loading)</visible> - <control type="multiimage"> - <description>Empty Maps image</description> - <posx>45</posx> - <posy>80</posy> - <width>560</width> - <height>350</height> - <imagepath fallback="special://skin/backgrounds/weather.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</imagepath> - <timeperimage>500</timeperimage> - <pauseatend>1000</pauseatend> - <fadetime>0</fadetime> - <randomize>false</randomize> - <loop>yes</loop> - <aspectratio>scale</aspectratio> - <aligny>center</aligny> - </control> - <control type="label"> - <posx>45</posx> - <posy>200</posy> - <width>560</width> - <height>30</height> - <font>font13</font> - <textcolor>black</textcolor> - <align>center</align> - <aligny>center</aligny> - <label>[B]$LOCALIZE[31909][/B]</label> - </control> - </control> - <control type="multiimage"> - <description>maps multiimage</description> - <posx>45</posx> - <posy>80</posy> - <width>560</width> - <height>350</height> - <imagepath>$INFO[Window.Property(MapPath)]</imagepath> - <timeperimage>500</timeperimage> - <pauseatend>1000</pauseatend> - <fadetime>0</fadetime> - <randomize>false</randomize> - <loop>yes</loop> - <aspectratio>keep</aspectratio> - <aligny>center</aligny> - </control> - <control type="image"> - <description>legend image</description> - <posx>45</posx> - <posy>80</posy> - <width>560</width> - <height>50</height> - <texture>$INFO[Window.Property(LegendPath)]</texture> - <aspectratio aligny="top">keep</aspectratio> - </control> - <control type="list" id="53"> - <posx>30</posx> - <posy>445</posy> - <width>585</width> - <height>160</height> - <onleft>9000</onleft> - <onright>63</onright> - <onup>53</onup> - <ondown>53</ondown> - <viewtype label="$LOCALIZE[4]">list</viewtype> - <pagecontrol>63</pagecontrol> - <scrolltime>200</scrolltime> - <itemlayout height="40" width="585"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>585</width> - <height>41</height> - <texture border="0,2,0,2">MenuItemNF.png</texture> - </control> - <control type="image"> - <posx>0</posx> - <posy>5</posy> - <width>30</width> - <height>30</height> - <texture>$INFO[ListItem.Icon]</texture> - </control> - <control type="label"> - <posx>40</posx> - <posy>0</posy> - <width>540</width> - <height>40</height> - <font>font12</font> - <textcolor>grey2</textcolor> - <selectedcolor>selected</selectedcolor> - <align>left</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - </control> - </itemlayout> - <focusedlayout height="40" width="585"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>585</width> - <height>41</height> - <texture border="0,2,0,2">MenuItemNF.png</texture> - <visible>!Control.HasFocus(53)</visible> - <include>VisibleFadeEffect</include> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>585</width> - <height>41</height> - <texture border="0,2,0,2">MenuItemFO.png</texture> - <visible>Control.HasFocus(53)</visible> - <include>VisibleFadeEffect</include> - </control> - <control type="image"> - <posx>0</posx> - <posy>5</posy> - <width>30</width> - <height>30</height> - <texture>$INFO[ListItem.Icon]</texture> - </control> - <control type="label"> - <posx>40</posx> - <posy>0</posy> - <width>540</width> - <height>40</height> - <font>font12</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>left</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - </control> - </focusedlayout> - <content> - <item> - <label>$INFO[Window.Property(Video.1.title)]</label> - <icon>icon-video.png</icon> - <onclick>PlayMedia($INFO[Window.Property(Video.1)],noresume)</onclick> - <visible>!IsEmpty(Window.Property(Video.1))</visible> - </item> - <item> - <label>$INFO[Window.Property(Video.2.title)]</label> - <icon>icon-video.png</icon> - <onclick>PlayMedia($INFO[Window.Property(Video.2)],noresume)</onclick> - <visible>!IsEmpty(Window.Property(Video.2))</visible> - </item> - <item> - <label>$INFO[Window.Property(Video.3.title)]</label> - <icon>icon-video.png</icon> - <onclick>PlayMedia($INFO[Window.Property(Video.3)],noresume)</onclick> - <visible>!IsEmpty(Window.Property(Video.3))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.1)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.1)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.1)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.1))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.2)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.2)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.2)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.2))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.3)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.3)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.3)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.3))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.4)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.4)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.4)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.4))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.5)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.5)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.5)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.5))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.6)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.6)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.6)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.6))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.7)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.7)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.7)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.7))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.8)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.8)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.8)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.8))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.9)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.9)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.9)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.9))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.10)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.10)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.10)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.10))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.11)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.11)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.11)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.11))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.12)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.12)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.12)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.12))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.13)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.13)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.13)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.13))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.14)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.14)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.14)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.14))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.15)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.15)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.15)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.15))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.16)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.16)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.16)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.16))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.17)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.17)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.17)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.17))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.18)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.18)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.18)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.18))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.19)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.19)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.19)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.19))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.20)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.20)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.20)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.20))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.21)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.21)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.21)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.21))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.22)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.22)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.22)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.22))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.23)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.23)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.23)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.23))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.24)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.24)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.24)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.24))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.25)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.25)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.25)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.25))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.26)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.26)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.26)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.26))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.27)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.27)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.27)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.27))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.28)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.28)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.28)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.28))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.29)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.29)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.29)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.29))</visible> - </item> - <item> - <label>$INFO[Window.Property(MapList.1.MapLabel.30)]</label> - <icon>icon-weather.png</icon> - <onclick>SetProperty(Weather.CurrentMap,$INFO[Window.Property(MapList.1.MapLabel.30)])</onclick> - <onclick>$INFO[Window.Property(MapList.1.MapOnclick.30)]</onclick> - <visible>!IsEmpty(Window.Property(MapList.1.MapLabel.30))</visible> - </item> - </content> - </control> - <control type="scrollbar" id="63"> - <posx>610</posx> - <posy>445</posy> - <width>25</width> - <height>160</height> - <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground> - <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar> - <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus> - <textureslidernib>ScrollBarNib.png</textureslidernib> - <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus> - <onleft>53</onleft> - <onright>9000</onright> - <showonepage>true</showonepage> - <orientation>vertical</orientation> - <visible>Control.IsVisible(50)</visible> - </control> - <control type="label"> - <animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation> - <description>number of files/pages</description> - <posx>660</posx> - <posy>627</posy> - <width>570</width> - <font>font12</font> - <align>right</align> - <scroll>true</scroll> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> - <label>([COLOR=blue]$INFO[Container(53).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(53).CurrentPage]/$INFO[Container(53).NumPages][/COLOR])</label> - </control> - </control> - </include> -</includes> diff --git a/addons/skin.confluence/720p/weather+/10DayForecast.xml b/addons/skin.confluence/720p/weather/10DayForecast.xml index 13e83658e9..a3e76952ac 100644 --- a/addons/skin.confluence/720p/weather+/10DayForecast.xml +++ b/addons/skin.confluence/720p/weather/10DayForecast.xml @@ -1,5 +1,5 @@ <includes> - <include name="Weather+10DayForcast"> + <include name="Weather10DayForcast"> <control type="group"> <visible>IsEmpty(Window.Property(Weather.CurrentView))</visible> <include>VisibleFadeEffect</include> @@ -151,7 +151,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.1.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.1.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.1.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -159,7 +159,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.2.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.2.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.2.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -167,7 +167,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.3.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.3.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.3.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -175,7 +175,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.4.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.4.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.4.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -183,7 +183,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.5.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.5.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.5.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -191,7 +191,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.6.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.6.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.6.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -199,7 +199,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.7.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.7.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.7.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -207,7 +207,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.8.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.8.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.8.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -215,7 +215,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.9.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.9.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.9.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -223,7 +223,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Daily.10.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.10.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Daily.10.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -262,4 +262,4 @@ </control> </control> </include> -</includes>
\ No newline at end of file +</includes> diff --git a/addons/skin.confluence/720p/weather+/36HourForecast.xml b/addons/skin.confluence/720p/weather/36HourForecast.xml index e9f7a8e5c1..92881020aa 100644 --- a/addons/skin.confluence/720p/weather+/36HourForecast.xml +++ b/addons/skin.confluence/720p/weather/36HourForecast.xml @@ -1,8 +1,19 @@ <includes> - <include name="Weather+36HourForcast"> + <include name="Weather36HourForcast"> <control type="group"> <visible>StringCompare(Window.Property(Weather.CurrentView),36hour)</visible> <include>VisibleFadeEffect</include> + <control type="button" id="997"> + <description>Hidden Button for focus</description> + <posx>-600</posx> + <posy>-20</posy> + <width>1</width> + <height>1</height> + <texturenofocus>-</texturenofocus> + <texturefocus>-</texturefocus> + <onleft>9000</onleft> + <onright>9000</onright> + </control> <control type="label"> <description>header label</description> <posx>20</posx> @@ -65,19 +76,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$INFO[Window.Property(36Hour.1.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.1.Temperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label> - </control> - <control type="label"> - <posx>590</posx> - <posy>35</posy> - <width>390</width> - <height>20</height> - <font>font12</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>right</align> - <aligny>center</aligny> - <label>[COLOR=grey2]$INFO[Window.Property(36Hour.1.DaylightTitle)][/COLOR] $INFO[Window.Property(36Hour.1.DaylightTime)]</label> + <label>[COLOR=grey2]$INFO[Window.Property(36Hour.1.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.1.Temperature),[B] ,[/B]]</label> </control> <control type="label"> <posx>590</posx> @@ -89,19 +88,7 @@ <selectedcolor>selected</selectedcolor> <align>right</align> <aligny>center</aligny> - <label>$INFO[Window.Property(36Hour.1.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,%[/B]]</label> - </control> - <control type="label"> - <posx>590</posx> - <posy>85</posy> - <width>390</width> - <height>20</height> - <font>font12</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[Window.Property(36Hour.1.Outlook),[COLOR=grey2]$LOCALIZE[33030] :[/COLOR]]</label> + <label>$INFO[Window.Property(36Hour.1.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label> </control> <control type="textbox"> <posx>0</posx> @@ -154,19 +141,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$INFO[Window.Property(36Hour.2.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.2.Temperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label> - </control> - <control type="label"> - <posx>590</posx> - <posy>35</posy> - <width>390</width> - <height>20</height> - <font>font12</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>right</align> - <aligny>center</aligny> - <label>[COLOR=grey2]$INFO[Window.Property(36Hour.2.DaylightTitle)][/COLOR] $INFO[Window.Property(36Hour.2.DaylightTime)]</label> + <label>[COLOR=grey2]$INFO[Window.Property(36Hour.2.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.2.Temperature),[B] ,[/B]]</label> </control> <control type="label"> <posx>590</posx> @@ -178,19 +153,7 @@ <selectedcolor>selected</selectedcolor> <align>right</align> <aligny>center</aligny> - <label>$INFO[Window.Property(36Hour.2.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,%[/B]]</label> - </control> - <control type="label"> - <posx>590</posx> - <posy>85</posy> - <width>390</width> - <height>20</height> - <font>font12</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[Window.Property(36Hour.2.Outlook),[COLOR=grey2]$LOCALIZE[33030] :[/COLOR]]</label> + <label>$INFO[Window.Property(36Hour.2.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label> </control> <control type="textbox"> <posx>0</posx> @@ -243,19 +206,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$INFO[Window.Property(36Hour.3.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.3.Temperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label> - </control> - <control type="label"> - <posx>590</posx> - <posy>35</posy> - <width>390</width> - <height>20</height> - <font>font12</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>right</align> - <aligny>center</aligny> - <label>[COLOR=grey2]$INFO[Window.Property(36Hour.3.DaylightTitle)][/COLOR] $INFO[Window.Property(36Hour.3.DaylightTime)]</label> + <label>[COLOR=grey2]$INFO[Window.Property(36Hour.3.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.3.Temperature),[B] ,[/B]]</label> </control> <control type="label"> <posx>590</posx> @@ -267,19 +218,7 @@ <selectedcolor>selected</selectedcolor> <align>right</align> <aligny>center</aligny> - <label>$INFO[Window.Property(36Hour.3.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,%[/B]]</label> - </control> - <control type="label"> - <posx>590</posx> - <posy>85</posy> - <width>390</width> - <height>20</height> - <font>font12</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[Window.Property(36Hour.3.Outlook),[COLOR=grey2]$LOCALIZE[33030] :[/COLOR]]</label> + <label>$INFO[Window.Property(36Hour.3.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label> </control> <control type="textbox"> <posx>0</posx> diff --git a/addons/skin.confluence/720p/weather+/HourlyForecast.xml b/addons/skin.confluence/720p/weather/HourlyForecast.xml index 75adf970f3..b2b367f5cd 100644 --- a/addons/skin.confluence/720p/weather+/HourlyForecast.xml +++ b/addons/skin.confluence/720p/weather/HourlyForecast.xml @@ -1,5 +1,5 @@ <includes> - <include name="Weather+HourlyForcast"> + <include name="WeatherHourlyForcast"> <control type="group"> <visible>StringCompare(Window.Property(Weather.CurrentView),hourly)</visible> <include>VisibleFadeEffect</include> @@ -151,7 +151,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.1.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.1.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.1.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -159,7 +159,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.2.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.2.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.2.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -167,7 +167,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.3.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.3.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.3.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -175,7 +175,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.4.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.4.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.4.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -183,7 +183,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.5.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.5.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.5.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -191,7 +191,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.6.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.6.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.6.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -199,7 +199,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.7.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.7.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.7.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -207,7 +207,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.8.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.8.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.8.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -215,7 +215,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.9.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.9.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.9.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -223,7 +223,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.10.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.10.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.10.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -231,7 +231,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.11.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.11.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.11.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -239,7 +239,7 @@ </item> <item> <label>[B]$INFO[Window.Property(Hourly.12.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.12.ShortDate)][/COLOR]</label> - <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> + <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> <thumb>$INFO[Window.Property(Hourly.12.OutlookIcon)]</thumb> <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> <onclick>-</onclick> @@ -278,4 +278,4 @@ </control> </control> </include> -</includes>
\ No newline at end of file +</includes> diff --git a/addons/skin.confluence/720p/weather/MapAlerts.xml b/addons/skin.confluence/720p/weather/MapAlerts.xml new file mode 100644 index 0000000000..7a3a22c175 --- /dev/null +++ b/addons/skin.confluence/720p/weather/MapAlerts.xml @@ -0,0 +1,100 @@ +<includes> + <include name="WeatherMapAlerts"> + <control type="group"> + <visible>StringCompare(Window.Property(Weather.CurrentView),map)</visible> + <include>VisibleFadeEffect</include> + <control type="button" id="999"> + <description>Hidden Button for focus</description> + <posx>-600</posx> + <posy>-20</posy> + <width>1</width> + <height>1</height> + <texturenofocus>-</texturenofocus> + <texturefocus>-</texturefocus> + <onleft>9000</onleft> + <onright>9000</onright> + </control> + <control type="label"> + <description>header label</description> + <posx>20</posx> + <posy>13</posy> + <width>610</width> + <height>30</height> + <font>font13_title</font> + <label>31910</label> + <align>center</align> + <aligny>center</aligny> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + </control> + <control type="image"> + <description>Background image</description> + <posx>40</posx> + <posy>75</posy> + <width>570</width> + <height>325</height> + <texture border="5">button-nofocus.png</texture> + </control> + <control type="multiimage"> + <description>map multiimage</description> + <posx>45</posx> + <posy>80</posy> + <width>560</width> + <height>315</height> + <imagepath>$INFO[Window.Property(MapPath)]</imagepath> + <timeperimage>500</timeperimage> + <pauseatend>1000</pauseatend> + <fadetime>0</fadetime> + <randomize>false</randomize> + <loop>yes</loop> + <aspectratio>keep</aspectratio> + <aligny>center</aligny> + </control> + <control type="image"> + <posx>0</posx> + <posy>410</posy> + <width>650</width> + <height>4</height> + <texture>separator.png</texture> + </control> + <control type="label"> + <posx>40</posx> + <posy>430</posy> + <width>570</width> + <height>30</height> + <font>font13_title</font> + <textcolor>blue</textcolor> + <align>center</align> + <aligny>center</aligny> + <label>$LOCALIZE[33050]</label> + </control> + <control type="group"> + <visible>!StringCompare(Window.Property(Alerts.Count),0)</visible> + <control type="textbox"> + <posx>40</posx> + <posy>470</posy> + <width>570</width> + <height>100</height> + <font>font12</font> + <textcolor>white</textcolor> + <selectedcolor>selected</selectedcolor> + <align>center</align> + <label>$INFO[Window.Property(Alerts)]</label> + <autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll> + </control> + </control> + <control type="label"> + <posx>40</posx> + <posy>500</posy> + <width>570</width> + <height>30</height> + <font>font13_title</font> + <textcolor>white</textcolor> + <align>center</align> + <aligny>center</aligny> + <label>$LOCALIZE[19055]</label> + <visible>StringCompare(Window.Property(Alerts.Count),0)</visible> + </control> + </control> + </include> +</includes> diff --git a/addons/skin.confluence/720p/weather+/WeekendForecast.xml b/addons/skin.confluence/720p/weather/WeekendForecast.xml index 4ed3dfdba7..6b0b282bef 100644 --- a/addons/skin.confluence/720p/weather+/WeekendForecast.xml +++ b/addons/skin.confluence/720p/weather/WeekendForecast.xml @@ -1,8 +1,19 @@ <includes> - <include name="Weather+WeekendForcast"> + <include name="WeatherWeekendForcast"> <control type="group"> <visible>StringCompare(Window.Property(Weather.CurrentView),weekend)</visible> <include>VisibleFadeEffect</include> + <control type="button" id="998"> + <description>Hidden Button for focus</description> + <posx>-600</posx> + <posy>-20</posy> + <width>1</width> + <height>1</height> + <texturenofocus>-</texturenofocus> + <texturefocus>-</texturefocus> + <onleft>9000</onleft> + <onright>9000</onright> + </control> <control type="label"> <description>header label</description> <posx>20</posx> @@ -45,7 +56,7 @@ <textcolor>blue</textcolor> <align>center</align> <aligny>center</aligny> - <label>$LOCALIZE[16]</label> + <label>$INFO[Window.Property(Weekend.2.LongDay)] - $INFO[Window.Property(Weekend.2.ShortDate)]</label> </control> <control type="image"> <posx>10</posx> @@ -65,7 +76,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.2.HighTemperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label> + <label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.2.HighTemperature),[B] ,[/B]]</label> </control> <control type="label"> <posx>140</posx> @@ -77,7 +88,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.2.LowTemperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label> + <label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.2.LowTemperature),[B] ,[/B]]</label> </control> <control type="textbox"> <posx>240</posx> @@ -87,11 +98,11 @@ <font>font12</font> <textcolor>white</textcolor> <align>right</align> - <label>$INFO[Window.Property(Weekend.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Weekend.2.UV),[COLOR=grey2]$LOCALIZE[403] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Weekend.2.Wind),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Weekend.2.Sunrise),[COLOR=grey2]$LOCALIZE[33027] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Weekend.2.Sunset),[COLOR=grey2]$LOCALIZE[33028] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Weekend.2.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,%[/B]]</label> + <label>$INFO[Window.Property(Weekend.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.ShortWindDirection),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label> </control> <control type="label"> <posx>0</posx> - <posy>180</posy> + <posy>170</posy> <width>590</width> <height>20</height> <font>font12</font> @@ -99,18 +110,18 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[Window.Property(Weekend.2.Outlook),[COLOR=grey2]$LOCALIZE[33030] :[/COLOR]]</label> + <label>$INFO[Window.Property(Weekend.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]]</label> </control> <control type="textbox"> <posx>0</posx> - <posy>200</posy> + <posy>210</posy> <width>590</width> <height>70</height> <font>font12</font> <textcolor>white</textcolor> <selectedcolor>selected</selectedcolor> <align>center</align> - <label>$INFO[Window.Property(Weekend.2.Forecast),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]]</label> + <label>$INFO[Window.Property(Weekend.2.LongOutlookDay),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label> </control> <control type="image"> <posx>0</posx> @@ -132,7 +143,7 @@ <textcolor>blue</textcolor> <align>center</align> <aligny>center</aligny> - <label>$LOCALIZE[17]</label> + <label>$INFO[Window.Property(Weekend.3.LongDay)] - $INFO[Window.Property(Weekend.3.ShortDate)]</label> </control> <control type="image"> <posx>10</posx> @@ -152,7 +163,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.3.HighTemperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label> + <label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.3.HighTemperature),[B] ,[/B]]</label> </control> <control type="label"> <posx>140</posx> @@ -164,7 +175,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.3.LowTemperature),[B] ,[/B]]$INFO[System.TemperatureUnits]</label> + <label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.3.LowTemperature),[B] ,[/B]]</label> </control> <control type="textbox"> <posx>240</posx> @@ -174,11 +185,11 @@ <font>font12</font> <textcolor>white</textcolor> <align>right</align> - <label>$INFO[Window.Property(Weekend.3.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,%[/B]][CR]$INFO[Window.Property(Weekend.3.UV),[COLOR=grey2]$LOCALIZE[403] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Weekend.3.Wind),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Weekend.3.Sunrise),[COLOR=grey2]$LOCALIZE[33027] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Weekend.3.Sunset),[COLOR=grey2]$LOCALIZE[33028] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Weekend.3.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,%[/B]]</label> + <label>$INFO[Window.Property(Weekend.3.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.3.ShortWindDirection),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.3.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label> </control> <control type="label"> <posx>0</posx> - <posy>180</posy> + <posy>170</posy> <width>590</width> <height>20</height> <font>font12</font> @@ -186,18 +197,18 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[Window.Property(Weekend.3.Outlook),[COLOR=grey2]$LOCALIZE[33030] :[/COLOR]]</label> + <label>$INFO[Window.Property(Weekend.3.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]]</label> </control> <control type="textbox"> <posx>0</posx> - <posy>200</posy> + <posy>210</posy> <width>590</width> <height>70</height> <font>font12</font> <textcolor>white</textcolor> <selectedcolor>selected</selectedcolor> <align>center</align> - <label>$INFO[Window.Property(Weekend.3.Forecast),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]]</label> + <label>$INFO[Window.Property(Weekend.3.LongOutlookDay),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label> </control> </control> </control> diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/English/strings.po index 9cc41882b0..3ea45e8181 100644 --- a/addons/skin.confluence/language/English/strings.po +++ b/addons/skin.confluence/language/English/strings.po @@ -608,11 +608,7 @@ msgctxt "#31905" msgid "Forecast" msgstr "" -msgctxt "#31906" -msgid "Maps & Video" -msgstr "" - -#empty string with id 31907 +#empty string with id 31906 to 31907 msgctxt "#31908" msgid "Chance of Precipitation" @@ -621,3 +617,7 @@ msgstr "" msgctxt "#31909" msgid "Fetching forecast info..." msgstr "" + +msgctxt "#31910" +msgid "Map & Alerts" +msgstr "" |