diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2015-10-20 15:30:02 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2015-10-20 15:30:02 +0200 |
| commit | e1dc9f777dbe130dc0bb9d2e9e8195801798e924 (patch) | |
| tree | a4d45d3c3a8b623e08ad8a857d2184de8f798cac /addons/skin.confluence | |
| parent | 4d0775e38e06d03d3e9e49b109290e028142306f (diff) | |
| parent | ef055954d521abd51337d5ba57ff6854deb063d8 (diff) | |
Merge pull request #8263 from ronie/confluence-weatherfanart
[Confluence] update weatherfanart support for jarvis
Diffstat (limited to 'addons/skin.confluence')
| -rw-r--r-- | addons/skin.confluence/720p/MyWeather.xml | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index c25bba8710..d265c9bb3b 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -9,12 +9,12 @@ <depth>DepthBackground</depth> <include>BackgroundDimensions</include> <aspectratio>scale</aspectratio> - <imagepath background="true">$INFO[Skin.String(WeatherFanartDir)]$INFO[Window(Weather).Property(Current.FanartCode)]</imagepath> + <imagepath background="true">resource://resource.images.weatherfanart.multi/$INFO[Window(Weather).Property(Current.FanartCode)]</imagepath> <timeperimage>10000</timeperimage> <randomize>true</randomize> <fadetime>1000</fadetime> <include>VisibleFadeEffect</include> - <visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible> + <visible>System.HasAddon(resource.images.weatherfanart.multi)</visible> <animation effect="fade" time="150">WindowClose</animation> </control> <include name="CommonWindowHeader"> @@ -553,16 +553,6 @@ <include>ButtonCommonValues</include> <label>103</label> </control> - <control type="button" id="5"> - <description>Custom Weather Script Button</description> - <label>$INFO[Skin.String(WeatherScript_Label)]</label> - <onclick>SetFocus(50)</onclick> - <onclick>RunScript($INFO[Skin.String(WeatherScript_Path)])</onclick> - <onclick>SetFocus(50)</onclick> - <textwidth>235</textwidth> - <include>ButtonCommonValues</include> - <visible>Skin.HasSetting(WeatherScript_Enable) + !IsEmpty(Skin.String(WeatherScript_Label))</visible> - </control> <control type="button" id="4"> <description>Settings button</description> <label>5</label> @@ -570,19 +560,6 @@ <textwidth>235</textwidth> <include>ButtonCommonValues</include> </control> - <control type="radiobutton" id="250"> - <description>Fanart Toggle</description> - <include>ButtonCommonValues</include> - <label>31307</label> - <onclick>Skin.ToggleSetting(ShowWeatherFanart)</onclick> - <selected>!Skin.HasSetting(ShowWeatherFanart)</selected> - </control> - <control type="button" id="251"> - <include>ButtonCommonValues</include> - <label>31317</label> - <onclick>Skin.SetPath(WeatherFanartDir)</onclick> - <enable>Skin.HasSetting(ShowWeatherFanart)</enable> - </control> <include>CommonNowPlaying_Controls</include> </control> </control> |