weather update

This commit is contained in:
Chris Bevan 2016-02-09 21:24:24 +00:00
parent 52861ecf4a
commit 48ec36a22c
10 changed files with 269 additions and 116 deletions

View File

@ -195,11 +195,6 @@
<size>72</size>
<style/>
</font>
<font>
<name>symbolWeather</name>
<filename>weather.ttf</filename>
<size>80</size>
</font>
<!-- Required for system -->
<font>
<name>font13</name>

View File

@ -134,6 +134,13 @@
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
</item>
<item id="9">
<visible>!isempty(Window(Weather).Property(WeatherProvider))</visible>
<label>31197</label>
<label2></label2>
<thumb>-</thumb>
<onclick>ActivateWindow(weather)</onclick>
</item>
<item id="7">
<label>5</label>
<label2></label2>

View File

@ -282,103 +282,4 @@
<value condition="stringcompare(skin.string(currentAddonSourceSlot),audio7)">$INFO[Skin.String(customMusicAddon7Name)]</value>
<value condition="stringcompare(skin.string(currentAddonSourceSlot),audio8)">$INFO[Skin.String(customMusicAddon8Name)]</value>
</variable>
<!--weather icons-->
<variable name="weatherIcon">
<value condition="stringcompare(ListItem.Property(fanartCode),0)"></value>
<!--Rain/Lightning-->
<value condition="stringcompare(ListItem.Property(fanartCode),1)"></value>
<!--Windy/Rain-->
<value condition="stringcompare(ListItem.Property(fanartCode),2)"></value>
<!--Windy/Rain-->
<value condition="stringcompare(ListItem.Property(fanartCode),3)"></value>
<!--Rain/Lightning-->
<value condition="stringcompare(ListItem.Property(fanartCode),4)"></value>
<!--Rain/Lightning-->
<value condition="stringcompare(ListItem.Property(fanartCode),5)"></value>
<!--Cloudy/Snow-Rain Mix-->
<value condition="stringcompare(ListItem.Property(fanartCode),6)"></value>
<!--Hail-->
<value condition="stringcompare(ListItem.Property(fanartCode),7)"></value>
<!--Icy/Clouds Rain-Snow-->
<value condition="stringcompare(ListItem.Property(fanartCode),8)"></value>
<!--Icy/Haze Rain-->
<value condition="stringcompare(ListItem.Property(fanartCode),9)"></value>
<!--Haze/Rain-->
<value condition="stringcompare(ListItem.Property(fanartCode),10)"></value>
<!--Icy/Rain-->
<value condition="stringcompare(ListItem.Property(fanartCode),11)"></value>
<!--Light Rain-->
<value condition="stringcompare(ListItem.Property(fanartCode),12)"></value>
<!--Moderate Rain-->
<value condition="stringcompare(ListItem.Property(fanartCode),13)"></value>
<!--Cloudy/Flurries-->
<value condition="stringcompare(ListItem.Property(fanartCode),14)"></value>
<!--Cloudy/Flurries-->
<value condition="stringcompare(ListItem.Property(fanartCode),15)"></value>
<!--Cloudy/Flurries-->
<value condition="stringcompare(ListItem.Property(fanartCode),16)"></value>
<!--Cloudy/Flurries-->
<value condition="stringcompare(ListItem.Property(fanartCode),17)"></value>
<!--Rain/Lightning-->
<value condition="stringcompare(ListItem.Property(fanartCode),18)"></value>
<!--Rain/Lightning-->
<value condition="stringcompare(ListItem.Property(fanartCode),19)"></value>
<!--Dust-->
<value condition="stringcompare(ListItem.Property(fanartCode),20)"></value>
<!--Fog-->
<value condition="stringcompare(ListItem.Property(fanartCode),21)"></value>
<!--Haze-->
<value condition="stringcompare(ListItem.Property(fanartCode),22)"></value>
<!--Smoke-->
<value condition="stringcompare(ListItem.Property(fanartCode),23)"></value>
<!--Windy-->
<value condition="stringcompare(ListItem.Property(fanartCode),24)"></value>
<!--Windy-->
<value condition="stringcompare(ListItem.Property(fanartCode),25)"></value>
<!--Windy-->
<value condition="stringcompare(ListItem.Property(fanartCode),26)"></value>
<!--Mostly Cloudy-->
<value condition="stringcompare(ListItem.Property(fanartCode),27)"></value>
<!--Mostly Cloudy/Night-->
<value condition="stringcompare(ListItem.Property(fanartCode),28)"></value>
<!--Mostly Cloudy/Sunny-->
<value condition="stringcompare(ListItem.Property(fanartCode),29)"></value>
<!--Partly Cloudy/Night-->
<value condition="stringcompare(ListItem.Property(fanartCode),30)"></value>
<!--Partly Cloudy/Day-->
<value condition="stringcompare(ListItem.Property(fanartCode),31)"></value>
<!--Clear/Night-->
<value condition="stringcompare(ListItem.Property(fanartCode),32)"></value>
<!--Clear/Day-->
<value condition="stringcompare(ListItem.Property(fanartCode),33)"></value>
<!--Hazy/Night-->
<value condition="stringcompare(ListItem.Property(fanartCode),34)"></value>
<!--Hazy/Day-->
<value condition="stringcompare(ListItem.Property(fanartCode),35)"></value>
<!--Rain/Lightning-->
<value condition="stringcompare(ListItem.Property(fanartCode),36)"></value>
<!--Hot!-->
<value condition="stringcompare(ListItem.Property(fanartCode),37)"></value>
<!--Lightning/Day-->
<value condition="stringcompare(ListItem.Property(fanartCode),38)"></value>
<!--Lightning-->
<value condition="stringcompare(ListItem.Property(fanartCode),39)"></value>
<!--Rain/Day-->
<value condition="stringcompare(ListItem.Property(fanartCode),40)"></value>
<!--Rain-->
<value condition="stringcompare(ListItem.Property(fanartCode),41)"></value>
<!--Snow-->
<value condition="stringcompare(ListItem.Property(fanartCode),42)"></value>
<!--Snow-->
<value condition="stringcompare(ListItem.Property(fanartCode),43)"></value>
<!--Snow-->
<value condition="stringcompare(ListItem.Property(fanartCode),44)"></value>
<!--Partly Cloudy/Day-->
<value condition="stringcompare(ListItem.Property(fanartCode),45)"></value>
<!--Rain/Night-->
<value condition="stringcompare(ListItem.Property(fanartCode),46)"></value>
<!--Snow-->
<value condition="stringcompare(ListItem.Property(fanartCode),47)"></value>
<!--Thunder Showers/Night-->
</variable>
</includes>

View File

@ -1,7 +1,241 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<onload>action(back)</onload>
<defaultcontrol always="true">3</defaultcontrol>
<include>fadeInOut</include>
<controls>
<!--removed: not used-->
<!--background-->
<include>globalBackground</include>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>resource://resource.images.weatherfanart.single/$INFO[Window.Property(Current.FanartCode),,.jpg]</texture>
<colordiffuse>33ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
<include>kenBurnsey</include>
<fadetime>1500</fadetime>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>vignette.png</texture>
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--Folder titles-->
<control type="group">
<posx>0</posx>
<posy>0</posy>
<!--source title-->
<control type="label">
<posx>col-1-begin</posx>
<posy>row-1-begin</posy>
<width>14-col</width>
<font>pageTitle</font>
<label>Weather</label>
<textcolor>textActive</textcolor>
</control>
<!--source subtitle-->
<control type="label">
<posx>col-1-begin</posx>
<posy>96</posy>
<width>auto</width>
<font>pageSubTitle</font>
<label>$LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)]</label>
<textcolor>textActive</textcolor>
</control>
<!--dateTime-->
<include>dateTime</include>
</control>
<control type="group">
<posx>col-1-begin</posx>
<posy>row-5-begin</posy>
<!--today-->
<control type="group">
<posx>0</posx>
<posy>2-row</posy>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>24-col</width>
<height>2-row</height>
<font>veryLarge</font>
<label>[COLOR $INFO[skin.string(highlightColor)]]$LOCALIZE[31200][/COLOR] $INFO[Window.Property(Location)]</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<animation type="Conditional" condition="isempty(Window.Property(location))" loop="false" reversible="true">
<effect type="rotatey" end="180" center="auto" tween="back" easing="out" time="2000"/>
<effect type="fade" start="100" end="30" time="800"/>
</animation>
</control>
<control type="group">
<animation type="Conditional" condition="isempty(Window.Property(location))" loop="false" reversible="true">
<effect type="rotatey" end="180" center="auto" tween="back" easing="out" time="3500"/>
<effect type="fade" start="100" end="30" time="800"/>
</animation>
<control type="image">
<posx>-12</posx>
<posy>3-row</posy>
<width>3-col</width>
<height>3-col</height>
<aspectratio>stretch</aspectratio>
<texture border="0">resource://resource.images.weathericons.outline/$INFO[Window.Property(current.FanartCode),,.png]</texture>
</control>
<control type="label">
<posx>3-col</posx>
<posy>4-row</posy>
<width>21-col</width>
<height>2-row</height>
<font>largeStrong</font>
<label>$LOCALIZE[31026]: $INFO[Window.Property(Day0.Outlook)]</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>3-col</posx>
<posy>6-row</posy>
<width>21-col</width>
<height>2-row</height>
<font>large</font>
<label>$LOCALIZE[31027] $INFO[Window.Property(Current.Temperature)]$INFO[System.TemperatureUnits] ($LOCALIZE[31028] $INFO[Window.Property(Current.FeelsLike)]$INFO[System.TemperatureUnits]), $INFO[Window.Property(current.condition)].</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>3-col</posx>
<posy>8-row</posy>
<width>12-col</width>
<height>2-row</height>
<font>regular</font>
<label>$LOCALIZE[13508]: [B]$INFO[Window.Property(Day0.HighTemp)]$INFO[System.TemperatureUnits][/B] $LOCALIZE[418]: [B]$INFO[Window.Property(Day0.LowTemp)]$INFO[System.TemperatureUnits][/B] $LOCALIZE[31030]: [B]$INFO[Window.Property(Current.Humidity)][/B]</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>3-col</posx>
<posy>336</posy>
<width>12-col</width>
<height>2-row</height>
<font>regular</font>
<label>Wind $INFO[Window.Property(Current.wind)]</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
</control>
</control>
<!--remaining forecast begins-->
<control type="group">
<animation type="Conditional" condition="isempty(Window.Property(location))" loop="false" reversible="true">
<effect type="slide" start="0,0" end="0,400" time="1500" tween="back" easing="out"/>
<effect type="fade" start="100" end="0" time="300"/>
</animation>
<control type="panel" id="9000">
<posx>0</posx>
<posy>18-row</posy>
<width>24-col</width>
<height>24-row</height>
<itemlayout width="6-col" height="4-row">
<control type="image">
<posx>-12</posx>
<posy>-24</posy>
<width>2-col</width>
<height>2-col</height>
<aspectratio>stretch</aspectratio>
<texture border="0">resource://resource.images.weathericons.outline/$INFO[listitem.property(fanartCode),,.png]</texture>
</control>
<control type="label">
<posx>2-col</posx>
<posy>-24</posy>
<width>6-col-gutter</width>
<height>2-row</height>
<font>dialogTitle</font>
<label>$INFO[ListItem.Label]</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>2-col</posx>
<posy>18</posy>
<width>4-col</width>
<height>2-row</height>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<autoscroll delay="3000" time="1000" repeat="3000"/>
<label>$INFO[ListItem.Property(Outlook)]</label>
</control>
<control type="label">
<posx>2-col</posx>
<posy>76</posy>
<width>6-col-gutter</width>
<height>1-row</height>
<font>itemSubTitle</font>
<textcolor>textActive</textcolor>
<label>$LOCALIZE[13508] [B]$INFO[ListItem.Property(HighTemp)] $INFO[ListItem.Property(TempUnits)][/B] $LOCALIZE[418] [B]$INFO[ListItem.Property(LowTemp)] $INFO[ListItem.Property(TempUnits)][/B]</label>
</control>
</itemlayout>
<focusedlayout/>
<content>
<item id="2">
<description>Day 1</description>
<label>$INFO[Window.Property(Day1.Title)]</label>
<property name="fanartCode">$INFO[Window.Property(Day1.fanartCode)]</property>
<property name="HighTemp">$INFO[Window.Property(Day1.HighTemp)]</property>
<property name="LowTemp">$INFO[Window.Property(Day1.LowTemp)]</property>
<property name="Outlook">$INFO[Window.Property(Day1.Outlook)]</property>
<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
<onclick>noop</onclick>
</item>
<item id="3">
<description>Day 2</description>
<label>$INFO[Window.Property(Day2.Title)]</label>
<property name="fanartCode">$INFO[Window.Property(Day2.fanartCode)]</property>
<property name="HighTemp">$INFO[Window.Property(Day2.HighTemp)]</property>
<property name="LowTemp">$INFO[Window.Property(Day2.LowTemp)]</property>
<property name="Outlook">$INFO[Window.Property(Day2.Outlook)]</property>
<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
<onclick>noop</onclick>
</item>
<item id="4">
<description>Day 3</description>
<label>$INFO[Window.Property(Day3.Title)]</label>
<property name="fanartCode">$INFO[Window.Property(Day3.fanartCode)]</property>
<property name="HighTemp">$INFO[Window.Property(Day3.HighTemp)]</property>
<property name="LowTemp">$INFO[Window.Property(Day3.LowTemp)]</property>
<property name="Outlook">$INFO[Window.Property(Day3.Outlook)]</property>
<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
<onclick>noop</onclick>
</item>
<item id="5">
<description>Day 4</description>
<label>$INFO[Window.Property(Day4.Title)]</label>
<property name="fanartCode">$INFO[Window.Property(Day4.fanartCode)]</property>
<property name="HighTemp">$INFO[Window.Property(Day4.HighTemp)]</property>
<property name="LowTemp">$INFO[Window.Property(Day4.LowTemp)]</property>
<property name="Outlook">$INFO[Window.Property(Day4.Outlook)]</property>
<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
<onclick>noop</onclick>
</item>
</content>
</control>
<!--panel ends-->
</control>
</control>
<!--location control-->
<control type="spincontrolex" id="3">
<description>change location button</description>
<left>-100</left>
<top>-100</top>
<width>6-col</width>
<onright>action(select)</onright>
<onleft>action(select)</onleft>
</control>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">
<include>WindowID</include>
<label>MyWeather.xml</label>
</control>
</controls>
</window>
</window>

View File

@ -41,7 +41,7 @@
<posy>11-row</posy>
<width>24-col</width>
<height>2-row</height>
<font>largeStrong</font>
<font>large</font>
<textcolor>textActive</textcolor>
<shadowcolor>background</shadowcolor>
<label>[B]$INFO[container.foldername][/B] [COLOR $INFO[skin.string(highlightColor)]]$INFO[listitem.genre][/COLOR]</label>

View File

@ -3,6 +3,8 @@
<requires>
<import addon="xbmc.gui" version="5.10.0"/>
<import addon="script.skin.helper.service" version="1.0.0"/>
<import addon="resource.images.weathericons.outline" version="0.0.5"/>
<import addon="resource.images.weatherfanart.single" version="0.0.6"/>
</requires>
<extension point="xbmc.gui.skin" debugging="false">
<res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />

View File

@ -38,7 +38,7 @@ Advanced launcher home link
Complete DialogAudioDSPManager.xml and DialogAudioDSPSettings.xml
Global search results needs a review
Global search results simplify
Fullscreen music view - add star rating selector + Radio art / RDS support
@ -56,5 +56,3 @@ PVR Recording scheduler (integrate with recordings)
Check extra button to dialogAddonInfo.xml actually works (auto update)
(use skin helper?) on startup: add check for parent folder items and warn user to turn off: system.getbool(showparentdiritems)
Explore Touchscreen controls for tablets (file seeking etc)

Binary file not shown.

View File

@ -1,4 +0,0 @@
Sourced from: http://erikflowers.github.io/weather-icons/
Weather Icons licensed under SIL OFL 1.1 — Code licensed under MIT License — Documentation licensed under CC BY 3.0

View File

@ -129,10 +129,26 @@ msgctxt "#31025"
msgid "Settings"
msgstr ""
msgctxt "#31026"
msgid "Outlook"
msgstr ""
msgctxt "#31027"
msgid "Currently"
msgstr ""
msgctxt "#31028"
msgid "feels like"
msgstr ""
msgctxt "#31029"
msgid "Current playlist"
msgstr ""
msgctxt "#31030"
msgid "Humidity"
msgstr ""
msgctxt "#31031"
msgid "Content:"
msgstr ""
@ -581,6 +597,10 @@ msgctxt "#31199"
msgid "Artists in"
msgstr ""
msgctxt "#31200"
msgid "Today"
msgstr ""
msgctxt "#31201"
msgid "Record Show"
msgstr ""
@ -626,7 +646,7 @@ msgid "<Smart playlist name>"
msgstr ""
msgctxt "#31212"
msgid "5 Day Forecast"
msgid "From"
msgstr ""
msgctxt "#31213"