Merge pull request #8 from ronie/3.0.7

[skin.confluence] v3.0.7
This commit is contained in:
ronie 2016-04-03 22:44:11 +02:00
commit 872ec1c51f
34 changed files with 87 additions and 83 deletions

View File

@ -26,7 +26,7 @@
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_addons" />
<param name="Label" value="$LOCALIZE[24001]" />
</include>

View File

@ -11,7 +11,7 @@
<control type="group">
<include>VisibleFadeEffect</include>
<visible>!Window.isVisible(AddonSettings) + !Window.IsActive(TextViewer)</visible>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="920" />
<param name="DialogBackgroundHeight" value="639" />
<param name="DialogHeaderWidth" value="840" />

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="800" />
<param name="DialogBackgroundHeight" value="600" />
<param name="DialogHeaderWidth" value="720" />

View File

@ -7,7 +7,7 @@
<include>dialogeffect</include>
<depth>DepthDialog+</depth>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="650" />
<param name="DialogBackgroundHeight" value="260" />
<param name="DialogHeaderWidth" value="570" />

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="1120" />
<param name="DialogBackgroundHeight" value="590" />
<param name="DialogHeaderWidth" value="1020" />

View File

@ -11,7 +11,7 @@
<control type="group">
<include>VisibleFadeEffect</include>
<visible>!Window.IsVisible(numericinput)</visible>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="860" />
<param name="DialogBackgroundHeight" value="430" />
<param name="DialogHeaderWidth" value="780" />

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="800" />
<param name="DialogBackgroundHeight" value="500" />
<param name="DialogHeaderWidth" value="720" />

View File

@ -179,7 +179,7 @@
<texture>$VAR[MusicInfoListThumb]</texture>
<aspectratio>keep</aspectratio>
</control>
<include name="MusicInfoPanel" condition="Container.Content(Artists) | Container.Content(Albums)">
<include content="MusicInfoPanel" condition="Container.Content(Artists) | Container.Content(Albums)">
<param name="panel-left" value="340"/>
<param name="panel-width" value="900"/>
<param name="item-width" value="450"/>

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="1120" />
<param name="DialogBackgroundHeight" value="570" />
<param name="DialogHeaderWidth" value="1020" />

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="865" />
<param name="DialogBackgroundHeight" value="605" />
<param name="DialogHeaderWidth" value="785" />

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="830" />
<param name="DialogBackgroundHeight" value="660" />
<param name="DialogHeaderWidth" value="750" />

View File

@ -11,7 +11,7 @@
<animation effect="fade" start="100" end="0" time="150" condition="Window.Is(contentsettings) + Window.IsActive(AddonSettings)">Conditional</animation>
<animation effect="fade" start="100" end="0" time="300" condition="[Window.Is(osdaudiosettings) | Window.Is(osdvideosettings)] + [Window.IsVisible(SliderDialog) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(FileBrowser)]">Conditional</animation>
<animation effect="fade" start="100" end="0" time="400" condition="Window.Is(osdaudiodspsettings) + Window.IsVisible(SliderDialog)">Conditional</animation>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="800" />
<param name="DialogBackgroundHeight" value="458" />
<param name="DialogHeaderWidth" value="720" />

View File

@ -182,7 +182,7 @@
<visible>Control.IsVisible(570)</visible>
</control>
</control>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_events" />
<param name="Label" value="$LOCALIZE[14111]" />
</include>

View File

@ -444,7 +444,7 @@
<texture>icon_home.png</texture>
</control>
</control>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_system" />
<param name="Label" value="$LOCALIZE[7]" />
</include>

View File

@ -38,7 +38,7 @@
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_music" />
<param name="Label" value="$LOCALIZE[10516]" />
</include>

View File

@ -396,7 +396,7 @@
</focusedlayout>
</control>
</control>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_music" />
<param name="Label" value="$LOCALIZE[10503]" />
</include>

View File

@ -44,7 +44,7 @@
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_pictures" />
<param name="Label" value="$LOCALIZE[1]" />
</include>

View File

@ -24,11 +24,11 @@
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<include name="CommonWindowHeader" condition="Window.IsActive(videoplaylist)">
<include content="CommonWindowHeader" condition="Window.IsActive(videoplaylist)">
<param name="Icon" value="icon_video" />
<param name="Label" value="$LOCALIZE[10522]" />
</include>
<include name="CommonWindowHeader" condition="Window.IsActive(musicplaylist)">
<include content="CommonWindowHeader" condition="Window.IsActive(musicplaylist)">
<param name="Icon" value="icon_music" />
<param name="Label" value="$LOCALIZE[10517]" />
</include>

View File

@ -28,7 +28,7 @@
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_addons" />
<param name="Label" value="$LOCALIZE[0]" />
</include>

View File

@ -44,7 +44,7 @@
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_video" />
<param name="Label" value="$LOCALIZE[3]" />
</include>

View File

@ -17,7 +17,7 @@
<visible>System.HasAddon(resource.images.weatherfanart.multi)</visible>
<animation effect="fade" time="150">WindowClose</animation>
</control>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_weather" />
<param name="Label" value="$LOCALIZE[8]" />
</include>

View File

@ -249,7 +249,7 @@
</control>
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_system" />
<param name="Label" value="$LOCALIZE[5]" />
</include>

View File

@ -279,7 +279,7 @@
<include>CommonNowPlaying</include>
</control>
<include>MainWindowMouseButtons</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_system" />
<param name="Label" value="$LOCALIZE[5]" />
<param name="ShowLabel2" value="true" />

View File

@ -379,7 +379,7 @@
</control>
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_system" />
<param name="Label" value="$LOCALIZE[13200]" />
</include>

View File

@ -368,7 +368,7 @@
</control>
<include>CommonNowPlaying</include>
<include>MainWindowMouseButtons</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_system" />
<param name="Label" value="$LOCALIZE[130]" />
</include>

View File

@ -11,7 +11,7 @@
<texture>floor.png</texture>
<include>VisibleFadeEffect</include>
</control>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" value="icon_system" />
<param name="Label" value="$LOCALIZE[20077]" />
</include>

View File

@ -10,7 +10,7 @@
<control type="group">
<visible>!Window.IsVisible(smartplaylistrule)</visible>
<include>VisibleFadeEffect</include>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="800" />
<param name="DialogBackgroundHeight" value="675" />
<param name="DialogHeaderWidth" value="720" />

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="800" />
<param name="DialogBackgroundHeight" value="280" />
<param name="DialogHeaderWidth" value="720" />

View File

@ -292,67 +292,67 @@
<onclick>noop</onclick>
<visible>!Weather.IsFetched</visible>
</item>
<include name="WeatherDefaultItem">
<include content="WeatherDefaultItem">
<param name="item_id" value="0" />
</include>
<include name="WeatherDefaultItem">
<include content="WeatherDefaultItem">
<param name="item_id" value="1" />
</include>
<include name="WeatherDefaultItem">
<include content="WeatherDefaultItem">
<param name="item_id" value="2" />
</include>
<include name="WeatherDefaultItem">
<include content="WeatherDefaultItem">
<param name="item_id" value="3" />
</include>
<include name="WeatherDefaultItem">
<include content="WeatherDefaultItem">
<param name="item_id" value="4" />
</include>
<include name="WeatherDefaultItem">
<include content="WeatherDefaultItem">
<param name="item_id" value="5" />
</include>
<include name="WeatherDefaultItem">
<include content="WeatherDefaultItem">
<param name="item_id" value="6" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="1" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="2" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="3" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="4" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="5" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="6" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="7" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="8" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="9" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="10" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="11" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="12" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="13" />
</include>
<include name="WeatherDailyItem">
<include content="WeatherDailyItem">
<param name="item_id" value="14" />
</include>
</content>
@ -1007,76 +1007,76 @@
<onclick>noop</onclick>
<visible>String.IsEmpty(Window.Property(Hourly.IsFetched))</visible>
</item>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="1" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="2" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="3" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="4" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="5" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="6" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="7" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="8" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="9" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="10" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="11" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="12" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="13" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="14" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="15" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="16" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="17" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="18" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="19" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="20" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="21" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="22" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="23" />
</include>
<include name="WeatherHourlyItem">
<include content="WeatherHourlyItem">
<param name="item_id" value="24" />
</include>
</content>
@ -1251,19 +1251,19 @@
</control>
</focusedlayout>
<content>
<include name="WeatherMapItem">
<include content="WeatherMapItem">
<param name="item_id" value="1" />
</include>
<include name="WeatherMapItem">
<include content="WeatherMapItem">
<param name="item_id" value="2" />
</include>
<include name="WeatherMapItem">
<include content="WeatherMapItem">
<param name="item_id" value="3" />
</include>
<include name="WeatherMapItem">
<include content="WeatherMapItem">
<param name="item_id" value="4" />
</include>
<include name="WeatherMapItem">
<include content="WeatherMapItem">
<param name="item_id" value="5" />
</include>
</content>

View File

@ -1392,7 +1392,7 @@
<font>font13</font>
<focusedcolor>black</focusedcolor>
</include>
<include name="CommonWindowHeader">
<include content="CommonWindowHeader">
<param name="Icon" default="icon_home" />
<param name="Label" default="" />
<param name="ShowLabel2" default="False" />

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="800" />
<param name="DialogBackgroundHeight" value="420" />
<param name="DialogHeaderWidth" value="720" />

View File

@ -7,7 +7,7 @@
</coordinates>
<include>dialogeffect</include>
<controls>
<include name="DialogBackgroundCommons">
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="800" />
<param name="DialogBackgroundHeight" value="420" />
<param name="DialogHeaderWidth" value="720" />

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="skin.confluence"
version="3.0.6"
version="3.0.7"
name="Confluence"
provider-name="Jezz_X, Team Kodi">
<requires>

View File

@ -1,3 +1,7 @@
[B]3.0.7[/B]
- Updated include calls
[B]3.0.6[/B]
- Added game controller support