The branch, frodo-skins-staging has been updated
via 50ebe74997d88106fb7717602d50a20117c5d3fc (commit)
from b80406b3c2b16b280498a7383d736ae28e0dd820 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=50ebe74997d88106fb7717602d50a20117c5d3fc
commit 50ebe74997d88106fb7717602d50a20117c5d3fc
Author: Martijn Kaijser <[email protected]>
Date: Sun Aug 18 10:42:26 2013 +0200
[skin.avalon] 1.3.7
diff --git a/skin.avalon/1080i/Includes.xml b/skin.avalon/1080i/Includes.xml
index 072abec..1c45f38 100644
--- a/skin.avalon/1080i/Includes.xml
+++ b/skin.avalon/1080i/Includes.xml
@@ -23,7 +23,7 @@
<align>right</align>
<font>Light40</font>
<textcolor>midgrey</textcolor>
- <label>Avalon 1.3.4</label>
+ <label>Avalon 1.3.7</label>
<include>animation_visible_hidden</include>
<include>animation_fade</include>
</control>
diff --git a/skin.avalon/1080i/MyVideoNav.xml b/skin.avalon/1080i/MyVideoNav.xml
index 172bc10..350a163 100644
--- a/skin.avalon/1080i/MyVideoNav.xml
+++ b/skin.avalon/1080i/MyVideoNav.xml
@@ -27,11 +27,12 @@
<!--Fanart-->
<control type="group">
- <include>animation_visible_hidden</include>
<include>animation_hoverslide</include>
<control type="group"> <!--Movie & TV-Shows-->
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
<control type="image"> <!--Seasons, Episodes
(hidden delay)-->
- <visible>Container.Content(episodes) |
Container.Content(seasons)</visible>
+ <visible>Container.Content(episodes) |
Container.Content(seasons)</visible>
+ <animation time="600"
effect="fade">Visible</animation>
<animation effect="fade" delay="1000"
time="0" start="100" end="100" reversible="false">Hidden</animation>
<posx>0</posx>
<posy>129</posy>
@@ -42,7 +43,8 @@
<fadetime>400</fadetime>
</control>
<control type="image"> <!--Movies, TV-Shows
(hidden delay)-->
- <visible>Container.Content(movies) |
Container.Content(tvshows)</visible>
+ <visible>Container.Content(movies) |
Container.Content(tvshows)</visible>
+ <animation time="600"
effect="fade">Visible</animation>
<animation effect="fade" delay="1000"
time="0" start="100" end="100" reversible="false">Hidden</animation>
<posx>0</posx>
<posy>129</posy>
@@ -55,16 +57,20 @@
</control>
<control type="image"> <!--Video Genres-->
<visible>Container.Content(genres)</visible>
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
+ <include>animation_visible_hidden</include>
<posx>0</posx>
<posy>129</posy>
<width>1200</width>
<height>590</height>
- <texture background="true"
fallback="special://skin/backgrounds/videos.png"
diffuse="views/view_50_matte.png">genres_fanart/$INFO[ListItem.Label].jpg</texture>
+ <!--texture background="true"
fallback="special://skin/backgrounds/videos.png"
diffuse="views/view_50_matte.png">genres_fanart/$INFO[ListItem.Label].jpg</texture-->
+ <texture background="true"
diffuse="views/view_50_matte.png">special://skin/backgrounds/videos.png</texture>
<aspectratio scalediffuse="false"
align="center" aligny="center">scale</aspectratio>
<fadetime>400</fadetime>
</control>
<control type="image"> <!--Video Addons-->
<visible>substring(Container.FolderPath,addons://sources/video/) |
substring(Container.FolderPath,plugin://plugin.video)</visible>
+ <include>animation_visible_hidden</include>
<posx>0</posx>
<posy>129</posy>
<width>1200</width>
@@ -75,7 +81,8 @@
</control>
<control type="image"> <!--Other Video-->
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
- <visible>[Window.IsActive(videolibrary) |
Window.IsActive(videofiles) | Window.IsActive(videolibrary)] +
[!Container.Content(movies) + !Container.Content(tvshows) +
!Container.Content(seasons) + !Container.Content(episodes) +
!Container.Content(genres)]</visible>
+ <visible>!Container.Content(movies) +
!Container.Content(tvshows) + !Container.Content(seasons) +
!Container.Content(episodes) + !Container.Content(genres)</visible>
+ <include>animation_visible_hidden</include>
<posx>0</posx>
<posy>129</posy>
<width>1200</width>
diff --git a/skin.avalon/1080i/View_50_List.xml
b/skin.avalon/1080i/View_50_List.xml
index 2788d5b..9a94e8d 100644
--- a/skin.avalon/1080i/View_50_List.xml
+++ b/skin.avalon/1080i/View_50_List.xml
@@ -1,126 +1,184 @@
<!--Avalon-->
<includes>
<include name="View_50_List">
-
- <!--Icons-->
- <control type="group">
- <visible>Control.IsVisible(50)</visible>
- <include>animation_visible_hidden</include>
- <include>animation_hoverslide</include>
-
- <control type="image"> <!--Episode-->
- <visible>Container.Content(episodes)</visible>
+
+ <!--Poster,Cover,Thumb-->
+ <control type="group">
+ <control type="group"> <!--Movie & TV-Shows-->
+ <visible>Control.IsVisible(50)</visible>
+ <visible>Window.IsVisible(videolibrary) |
Window.IsVisible(videoplaylist)</visible>
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
<include>animation_visible_hidden</include>
- <posx>125</posx>
- <posy>810</posy>
- <width>410</width>
- <height>230</height>
- <fadetime>200</fadetime>
- <texture background="true"
diffuse="episode_matte.png">$INFO[ListItem.Icon]</texture>
- <aspectratio align="center"
aligny="center">stretch</aspectratio>
- </control>
- <control type="group"> <!--Panel Poster, Cover, Thumb
-->
- <control type="image"><!--Panel-->
- <visible>!Container.Content(episodes) +
!Container.Content(genres)</visible>
+ <include>animation_hoverslide</include>
+
+ <!--No Poster,Cover,Thumb-->
+ <visible>!Container.Content(genres) +
!Container.Content(years)</visible>
+
+ <control type="image"> <!--Background Panel-->
+ <animation effect="slide" start="0"
end="500" tween="cubic" easing="inout" time="700"
condition="Container.Content(episodes)">Conditional</animation>
<posx>0</posx>
<posy>100</posy>
<width>1920</width>
<height>650</height>
<texture>views/view_50_panel_cover.png</texture>
- <animation effect="slide" start="500"
end="0" tween="cubic" easing="inout" time="700" >Visible</animation>
- <animation effect="slide" start="0"
end="500" tween="cubic" easing="inout" time="700" >Hidden</animation>
- </control>
- </control>
- <control type="group"> <!--Video Poster--->
- <control type="image"> <!--Poster-->
- <visible>Container.Content(movies) |
Container.Content(tvshows) | Container.Content(seasons)</visible>
- <posx>770</posx>
- <posy>170</posy>
- <width>320</width>
- <height>450</height>
- <fadetime>200</fadetime>
- <texture background="true"
fallback="poster_default.png"
diffuse="poster_matte.png">$INFO[ListItem.Icon]</texture>
- <animation effect="fade" delay="700"
time="500">Visible</animation>
- <animation effect="slide" start="0"
end="500" tween="cubic" easing="inout" time="700" >Hidden</animation>
- </control>
- <control type="image"> <!--Poster Refection-->
- <visible>Container.Content(movies) |
Container.Content(tvshows) | Container.Content(seasons)</visible>
- <posx>770</posx>
- <posy>620</posy>
- <width>320</width>
- <height>450</height>
- <fadetime>200</fadetime>
- <texture background="true"
fallback="poster_default.png" flipy="true"
diffuse="poster_matte_reflect.png">$INFO[ListItem.Icon]</texture>
- <animation effect="fade" delay="700"
time="500" >Visible</animation>
- <animation effect="slide" start="0"
end="500" tween="cubic" easing="inout" time="700" >Hidden</animation>
- </control>
- <control type="image"> <!--HD Flags-->
-
<visible>Container.Content(movies)</visible>
- <posx>770</posx>
- <posy>170</posy>
- <width>100</width>
- <height>100</height>
- <fadetime>200</fadetime>
-
<texture>$INFO[ListItem.VideoResolution,flags/,.png]</texture>
- <animation effect="fade" delay="700"
time="500" >Visible</animation>
- <animation effect="slide" start="0"
end="500" tween="cubic" easing="inout" time="700" >Hidden</animation>
</control>
- <control type="image"> <!--5Star Rating-->
-
<visible>Container.Content(movies)</visible>
- <posx>850</posx>
- <posy>650</posy>
- <width>160</width>
- <height>27</height>
- <colordiffuse>aaFFFFFF</colordiffuse>
- <texture
fallback="rating/5stars/NA.png">$INFO[ListItem.Rating,rating/5stars/,.png]</texture>
- <animation effect="fade" delay="700"
time="500" >Visible</animation>
- <animation effect="slide" start="0"
end="500" tween="cubic" easing="inout" time="700" >Hidden</animation>
- </control>
- </control>
- <control type="group"> <!--Music Cover--->
- <control type="image"> <!--Cover-->
- <visible>Container.Content(songs) |
Container.Content(artists) | Container.Content(albums)</visible>
+ <control type="image"> <!--Episode Thumb-->
+
<visible>Container.Content(episodes)</visible>
<include>animation_visible_hidden</include>
+ <posx>125</posx>
+ <posy>810</posy>
+ <width>410</width>
+ <height>230</height>
+ <fadetime>200</fadetime>
+ <texture background="true"
diffuse="episode_matte.png">$INFO[ListItem.Icon]</texture>
+ <aspectratio align="center"
aligny="center">stretch</aspectratio>
+ </control>
+ <control type="group"> <!--Movie Poster-->
+ <visible>!Container.Content(actors) +
!Container.Content(directors)</visible>
+ <control type="image"> <!--Poster-->
+
<visible>!Container.Content(episodes)</visible> <!--Slide when hidden all
other(no Episode)-->
+ <animation effect="fade"
delay="700" time="500">Visible</animation>
+ <animation effect="slide"
start="0" end="500" tween="cubic" easing="inout" time="700">Hidden</animation>
+ <posx>770</posx>
+ <posy>170</posy>
+ <width>320</width>
+ <height>450</height>
+ <fadetime>200</fadetime>
+ <texture background="true"
fallback="poster_default.png"
diffuse="poster_matte.png">$INFO[ListItem.Icon]</texture>
+ </control>
+ <control type="image"> <!--Poster
Refection-->
+
<visible>!Container.Content(episodes)</visible>
+ <animation effect="fade"
delay="700" time="500">Visible</animation> <!--Slide when hidden all
other(no Episode)-->
+ <animation effect="slide"
start="0" end="500" tween="cubic" easing="inout" time="700">Hidden</animation>
+ <posx>770</posx>
+ <posy>620</posy>
+ <width>320</width>
+ <height>450</height>
+ <fadetime>200</fadetime>
+ <texture background="true"
fallback="poster_default.png" flipy="true"
diffuse="poster_matte_reflect.png">$INFO[ListItem.Icon]</texture>
+ </control>
+ <control type="image"> <!--HD Flags-->
+
<visible>Container.Content(movies)</visible>
+
<include>animation_visible_hidden</include>
+ <posx>770</posx>
+ <posy>170</posy>
+ <width>100</width>
+ <height>100</height>
+ <fadetime>200</fadetime>
+
<texture>$INFO[ListItem.VideoResolution,flags/,.png]</texture>
+ </control>
+ <control type="image"> <!--5Star
Rating-->
+
<visible>Container.Content(movies)</visible>
+
<include>animation_visible_hidden</include>
+ <posx>850</posx>
+ <posy>650</posy>
+ <width>160</width>
+ <height>27</height>
+
<colordiffuse>aaFFFFFF</colordiffuse>
+ <texture
fallback="rating/5stars/NA.png">$INFO[ListItem.Rating,rating/5stars/,.png]</texture>
+ </control>
+ </control>
+ <control type="image"> <!--Actor/Directors
Icon-->
+ <visible>Container.Content(actors) |
Container.Content(directors)</visible>
<posx>750</posx>
<posy>210</posy>
<width>345</width>
<height>345</height>
<fadetime>200</fadetime>
<texture background="true"
fallback="cover_default.png"
diffuse="cover_matte.png">$INFO[ListItem.Icon]</texture>
- <aspectratio align="center"
aligny="center">stretch</aspectratio>
+ <aspectratio align="center"
aligny="center">keep</aspectratio>
+ </control>
+ </control>
+ <control type="group"> <!--Video Addons-->
+ <visible>Control.IsVisible(50)</visible>
+
<visible>substring(Container.FolderPath,addons://sources/video/) |
substring(Container.FolderPath,plugin://plugin.video)</visible>
+ <include>animation_visible_hidden</include>
+ <include>animation_hoverslide</include>
+
+ <control type="image"> <!--Background Panel-->
+ <posx>0</posx>
+ <posy>100</posy>
+ <width>1920</width>
+ <height>650</height>
+
<texture>views/view_50_panel_cover.png</texture>
</control>
- <control type="image"> <!--Cover Reflection-->
- <visible>Container.Content(songs) |
Container.Content(artists) | Container.Content(albums)</visible>
-
<include>animation_visible_hidden</include>
+ <control type="image"> <!--Video Addons
Icon-->
<posx>750</posx>
- <posy>555</posy>
+ <posy>210</posy>
<width>345</width>
<height>345</height>
- <fadetime>200</fadetime>
- <texture background="true"
fallback="cover_default.png" flipy="true"
diffuse="cover_matte_reflect.png">$INFO[ListItem.Icon]</texture>
- <aspectratio align="center"
aligny="center">stretch</aspectratio>
+ <fadetime>200</fadetime>
+ <texture background="true"
fallback="cover_default.png"
diffuse="cover_matte.png">$INFO[ListItem.Icon]</texture>
+ <aspectratio align="center"
aligny="center">keep</aspectratio>
+ </control>
+ </control>
+ <control type="group"> <!--Music-->
+ <visible>Control.IsVisible(50)</visible>
+ <visible>Window.IsVisible(musiclibrary) |
Window.IsActive(musicfiles) | Window.IsVisible(musicplaylist)</visible>
+ <include>animation_hoverslide</include>
+
+ <control type="image"> <!--Background Panel-->
+ <posx>0</posx>
+ <posy>100</posy>
+ <width>1920</width>
+ <height>650</height>
+
<texture>views/view_50_panel_cover.png</texture>
+ </control>
+ <control type="group"> <!--Music Cover-->
+ <control type="image"> <!--Cover-->
+ <posx>750</posx>
+ <posy>210</posy>
+ <width>345</width>
+ <height>345</height>
+ <fadetime>200</fadetime>
+ <texture background="true"
fallback="cover_default.png"
diffuse="cover_matte.png">$INFO[ListItem.Icon]</texture>
+ <aspectratio align="center"
aligny="center">stretch</aspectratio>
+ </control>
+ <control type="image"> <!--Cover
Reflection-->
+ <posx>750</posx>
+ <posy>555</posy>
+ <width>345</width>
+ <height>345</height>
+ <fadetime>200</fadetime>
+ <texture background="true"
fallback="cover_default.png" flipy="true"
diffuse="cover_matte_reflect.png">$INFO[ListItem.Icon]</texture>
+ <aspectratio align="center"
aligny="center">stretch</aspectratio>
+ </control>
</control>
</control>
- <control type="image"> <!--Others-->
- <visible>!Container.Content(movies) +
!Container.Content(tvshows) + !Container.Content(seasons) +
!Container.Content(episodes) + !Container.Content(songs) +
!Container.Content(artists) + !Container.Content(albums) +
!Container.Content(genres)</visible>
+ <control type="group"> <!--Others-->
+ <visible>Control.IsVisible(50)</visible>
+ <visible>!Window.IsVisible(videolibrary) +
!Window.IsVisible(videoplaylist)</visible>
+ <visible>!Window.IsVisible(musiclibrary) +
!Window.IsActive(musicfiles) +!Window.IsVisible(musicplaylist)</visible>
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
<include>animation_visible_hidden</include>
- <posx>750</posx>
- <posy>210</posy>
- <width>345</width>
- <height>345</height>
- <fadetime>200</fadetime>
- <texture background="true"
fallback="cover_default.png"
diffuse="cover_matte.png">$INFO[ListItem.Icon]</texture>
- <aspectratio align="center"
aligny="center">keep</aspectratio>
- </control>
- </control>
-
+ <include>animation_hoverslide</include>
+
+ <control type="image"> <!--Background Panel-->
+ <posx>0</posx>
+ <posy>100</posy>
+ <width>1920</width>
+ <height>650</height>
+
<texture>views/view_50_panel_cover.png</texture>
+ </control>
+ <control type="image"> <!--Others Icon-->
+ <posx>750</posx>
+ <posy>210</posy>
+ <width>345</width>
+ <height>345</height>
+ <fadetime>200</fadetime>
+ <texture background="true"
fallback="cover_default.png"
diffuse="cover_matte.png">$INFO[ListItem.Icon]</texture>
+ <aspectratio align="center"
aligny="center">keep</aspectratio>
+ </control>
+ </control>
+ </control>
+
<!--Panels-->
<control type="group">
<visible>Control.IsVisible(50)</visible>
<include>animation_visible_hidden</include>
<include>animation_hoverslide</include>
-
- <control type="image"> <!--Panel Info-->
+
+ <control type="image"> <!--Panel Info (RSS)-->
<posx>0</posx>
<posy>609</posy>
<width>1920</width>
@@ -134,9 +192,9 @@
<height>650</height>
<texture>views/view_50_panel_list.png</texture>
</control>
-
+
</control>
-
+
<!--List 50-->
<control type="list" id="50">
<include>animation_hoverslide</include>
@@ -152,7 +210,7 @@
<pagecontrol>60</pagecontrol>
<focusposition>0</focusposition>
<scrolltime>200</scrolltime>
-
+
<itemlayout width="650" height="60">
<control type="label"> <!--No Albums-->
<visible>!Container.Content(albums)</visible>
@@ -249,24 +307,26 @@
</control>
</focusedlayout>
</control>
-
+
<!--Infos-->
<control type="group">
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
<visible>Control.IsVisible(50)</visible>
<include>MovieInfos</include>
<include>TVShowInfos</include>
<include>AlbumsInfos</include>
<include>SongsInfos</include>
</control>
-
+
<!--Flags Video-->
<control type="group">
<visible>Control.IsVisible(50)</visible>
- <visible>[Container.Content(movies) |
Container.Content(episodes)] + !ListItem.IsFolder</visible>
+ <visible>[Container.Content(movies) |
Container.Content(episodes)] + !ListItem.IsFolder</visible>
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
<include>animation_fade</include>
<posx>1470</posx>
<posy>806</posy>
-
+
<control type="image"> <!--Video Resolution-->
<posx>0</posx>
<posy>0</posy>
@@ -296,11 +356,12 @@
<!--Flags Audio-->
<control type="group">
<visible>Control.IsVisible(50)</visible>
- <visible>[Container.Content(movies) |
Container.Content(episodes)] + !ListItem.IsFolder</visible>
+ <visible>[Container.Content(movies) |
Container.Content(episodes)] + !ListItem.IsFolder</visible>
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
<include>animation_fade</include>
<posx>1700</posx>
<posy>806</posy>
-
+
<control type="image"> <!--Audio Codec-->
<posx>0</posx>
<posy>0</posy>
@@ -319,24 +380,13 @@
</control>
</control>
- <!--Show Info-->
- <!--control type="label">
- <posx>800</posx>
- <posy>0</posy>
- <width>1000</width>
- <height>100</height>
- <font>Reg32</font>
- <textcolor>white</textcolor>
- <label>$INFO[Container.FolderPath]</label>
- </control-->
-
<!--Scrollbar-->
<control type="group">
<visible>Control.IsVisible(50)</visible>
<visible>IntegerGreaterThan(Container(50).NumItems,30)</visible>
<visible>!Container.Content(songs)</visible>
<include>animation_hoverslide</include>
-
+
<control type="scrollbar" id="60"> <!--Scrollbar
ID60-->
<posx>1840</posx>
<posy>192</posy>
@@ -369,6 +419,6 @@
<animation effect="fade" start="100" end="0"
time="400" delay="100">Hidden</animation>
</control>
</control>
-
+
</include>
</includes>
diff --git a/skin.avalon/addon.xml b/skin.avalon/addon.xml
index f15fec7..5e9ff4a 100644
--- a/skin.avalon/addon.xml
+++ b/skin.avalon/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="skin.avalon"
- version="1.3.4"
+ version="1.3.7"
name="Avalon"
provider-name="reazorFX">
<requires>
-----------------------------------------------------------------------
Summary of changes:
skin.avalon/1080i/Includes.xml | 2 +-
skin.avalon/1080i/MyVideoNav.xml | 17 ++-
skin.avalon/1080i/View_50_List.xml | 282 +++++++++++++++++++++---------------
skin.avalon/addon.xml | 2 +-
4 files changed, 180 insertions(+), 123 deletions(-)
hooks/post-receive
--
Skins
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
