The branch, frodo-skins-staging has been updated
via a26ac7acf8ece1db3296bf6cf238790e4bce549d (commit)
from 238f8d0197b853fe27e64e5a716b996cf9c4ebe8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=a26ac7acf8ece1db3296bf6cf238790e4bce549d
commit a26ac7acf8ece1db3296bf6cf238790e4bce549d
Author: M. Kaijser <[email protected]>
Date: Thu Aug 15 08:16:45 2013 +0200
[skin.avalon] 1.3.3
diff --git a/skin.avalon/1080i/DialogFullScreenInfo.xml
b/skin.avalon/1080i/DialogFullScreenInfo.xml
index 59c1723..ae36bab 100644
--- a/skin.avalon/1080i/DialogFullScreenInfo.xml
+++ b/skin.avalon/1080i/DialogFullScreenInfo.xml
@@ -1,19 +1,78 @@
<!--Avalon-->
<window type="dialog" id="142">
- <defaultcontrol always="true">603</defaultcontrol>
+ <defaultcontrol always="true">103</defaultcontrol>
<controls>
-
- <control type="group">
-
+
+ <!--OSD Panel-->
+ <control type="group">
<visible>!Window.IsActive(filebrowser)</visible>
<visible>!Window.IsActive(videoosd)</visible>
-
+
<include>animation_visible_hidden</include>
<include>animation_fade</include>
-
- <include>OSDPanel</include>
-
+
+ <include>OSDPanel</include>
+ </control>
+
+ <!--Buttons-->
+ <control type="group" id="1000">
+ <visible>!Window.IsActive(filebrowser)</visible>
+ <visible>!Window.IsActive(videoosd)</visible>
+
+ <include>animation_visible_hidden</include>
+ <include>animation_fade</include>
+
+ <control type="grouplist" id="10">
+ <posx>1565</posx>
+ <posy>956</posy>
+ <width>1000</width>
+ <height>60</height>
+ <itemgap>0</itemgap>
+ <onup>-</onup>
+ <ondown>-</ondown>
+ <onleft>200</onleft>
+ <onright>-</onright>
+ <orientation>horizontal</orientation>
+
+ <control type="togglebutton" id="102">
<!--Info-->
+ <width>60</width>
+ <height>60</height>
+ <label></label>
+ <altlabel></altlabel>
+ <font>-</font>
+
<texturefocus>osd/InfoFO.png</texturefocus>
+
<texturenofocus>osd/InfoNF.png</texturenofocus>
+ <usealttexture></usealttexture>
+
<alttexturefocus>osd/InfoSelFO.png</alttexturefocus>
+
<alttexturenofocus>osd/InfoSelNF.png</alttexturenofocus>
+
<onclick>Skin.ToggleSetting(DialogFullSreenAddInfo)</onclick>
+
<selected>Skin.HasSetting(DialogFullSreenAddInfo)</selected>
+ </control>
+ <control type="button" id="103">
<!--Close-->
+ <width>60</width>
+ <height>60</height>
+ <label>13396</label>
+ <font>-</font>
+
<texturefocus>osd/CloseFO.png</texturefocus>
+
<texturenofocus>osd/CloseNF.png</texturenofocus>
+ <onclick>Close</onclick>
+ </control>
+ </control>
</control>
+ <!--Info Panel-->
+ <control type="group">
+
<visible>Skin.HasSetting(DialogFullSreenAddInfo)</visible>
+
+ <visible>!Window.IsActive(filebrowser)</visible>
+ <visible>!Window.IsActive(videoosd)</visible>
+
+ <include>animation_visible_hidden</include>
+ <include>animation_fade</include>
+
+
+ <include>OSDInfoPanel</include>
+ </control>
+
</controls>
</window>
\ No newline at end of file
diff --git a/skin.avalon/1080i/DialogSeekbar.xml
b/skin.avalon/1080i/DialogSeekbar.xml
index 6a193c0..abd043c 100644
--- a/skin.avalon/1080i/DialogSeekbar.xml
+++ b/skin.avalon/1080i/DialogSeekbar.xml
@@ -6,16 +6,15 @@
<controls>
- <control type="group">
-
+ <!--OSD Panel-->
+ <control type="group">
<include>animation_visible_hidden</include>
<include>animation_fade</include>
<visible>!Window.IsActive(filebrowser)</visible>
<visible>!Window.IsActive(videoosd)</visible>
- <include>OSDPanel</include>
-
+ <include>OSDPanel</include>
</control>
</controls>
diff --git a/skin.avalon/1080i/Includes.xml b/skin.avalon/1080i/Includes.xml
index 43c90e7..ad73d1e 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.1</label>
+ <label>Avalon 1.3.3</label>
<include>animation_visible_hidden</include>
<include>animation_fade</include>
</control>
@@ -114,6 +114,14 @@
<ondown>9005</ondown>
</include>
+ <!-- Variables -->
+
+ <!--$VAR[example]-->
+ <variable name="example">
+ <value condition="SubString(ListItem.FileNameAndPath,.3D.) |
SubString(ListItem.FileNameAndPath,-3D.)">flags/other/3d-default.png</value>
+ <value
condition="IntegerGreaterThan(ListItem.VideoResolution,719)">flags/defs/hd.png</value>
+ <value
condition="!IsEmpty(ListItem.VideoResolution)">flags/defs/sd.png</value>
+ </variable>
<!--Header Home-->
<include name="HeaderHome">
@@ -1151,8 +1159,9 @@
<selectedcolor>eewhite</selectedcolor>
</include>
- <!--OSD Panel-->
- <include name="OSDPanel">
+ <!--OSD-->
+ <include name="OSDPanel"> <!--OSD Panel-->
+
<!--Panel-->
<control type="image">
<posx>210</posx>
@@ -1308,8 +1317,7 @@
<aspectratio align="top"
aligny="top">keep</aspectratio>
<visible>!VideoPlayer.Content(Movies)</visible>
</control>
- <control type="image"><!--Movie-->
- <description>Movie cover image</description>
+ <control type="image"><!--Movie-->
<posx>290</posx>
<posy>775</posy>
<width>155</width>
@@ -1339,8 +1347,8 @@
<width>900</width>
<align>left</align>
<font>Light35</font>
- <textcolor>mainblue</textcolor>
- <label>$INFO[VideoPlayer.Genre] â¢
$INFO[VideoPlayer.Year]</label>
+ <textcolor>mainblue</textcolor>
+ <label>$INFO[VideoPlayer.Genre]</label>
<scroll>false</scroll>
</control>
@@ -1381,6 +1389,67 @@
<scroll>false</scroll>
</control>
+ <!--Flags-->
+ <control type="group"><!--Flags Video-->
+ <visible>!Window.IsActive(VideoOSD)</visible>
+ <visible>VideoPlayer.Content(movies) |
VideoPlayer.Content(episodes)</visible>
+ <animation effect="fade" start="0" end="100" time="300"
tween="sine" delay="300" easing="in">WindowOpen</animation>
+ <animation effect="fade" start="0" end="100" time="300"
tween="sine" delay="500" easing="in">Visible</animation>
+ <animation effect="fade" start="100" end="0" time="300"
tween="sine" delay="500" easing="out">Hidden</animation>
+ <posx>550</posx>
+ <posy>963</posy>
+
+ <control type="image"> <!--Video Resolution-->
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>188</width><!--212-->
+ <height>40</height><!--45-->
+ <colordiffuse>darkgrey</colordiffuse>
+ <texture
fallback="flags/resolution/default.png">$INFO[VideoPlayer.VideoResolution,flags/resolution/,.png]</texture>
+ </control>
+ <control type="image"> <!--VideoCode-->
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>188</width><!--212-->
+ <height>40</height><!--45-->
+ <colordiffuse>darkgrey</colordiffuse>
+ <texture
fallback="flags/videocodec/default.png">$INFO[VideoPlayer.VideoCodec,flags/videocodec/,.png]</texture>
+ </control>
+ <control type="image"> <!--Aspectration-->
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>188</width><!--212-->
+ <height>40</height><!--45-->
+ <colordiffuse>darkgrey</colordiffuse>
+ <texture
fallback="flags/aspectration/default.png">$INFO[VideoPlayer.VideoAspect,flags/aspectration/,.png]</texture>
+ </control>
+ </control>
+ <control type="group"><!--Flags Audio-->
+ <visible>!Window.IsActive(VideoOSD)</visible>
+ <visible>VideoPlayer.Content(movies) |
VideoPlayer.Content(episodes)</visible>
+ <animation effect="fade" start="0" end="100" time="300"
tween="sine" delay="300" easing="in">WindowOpen</animation>
+ <animation effect="fade" start="0" end="100" time="300"
tween="sine" delay="500" easing="in">Visible</animation>
+ <animation effect="fade" start="100" end="0" time="300"
tween="sine" delay="500" easing="out">Hidden</animation>
+ <posx>780</posx><!-- +230 more-->
+ <posy>963</posy>
+
+ <control type="image"> <!--Audio Codec-->
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>110</width><!--124-->
+ <height>40</height><!--45-->
+ <colordiffuse>darkgrey</colordiffuse>
+ <texture
fallback="flags/audiocodec/default.png">$INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png]</texture>
+ </control>
+ <control type="image"> <!--Audio Channels-->
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>110</width><!--212-->
+ <height>40</height><!--45-->
+ <colordiffuse>darkgrey</colordiffuse>
+ <texture
fallback="flags/audiochannels/default.png">$INFO[VideoPlayer.AudioChannels,flags/audiochannels/,.png]</texture>
+ </control>
+ </control>
<!--Time-->
<control type="label"><!--Left Play Time-->
@@ -1401,15 +1470,33 @@
<textcolor>midgrey</textcolor>
<label>- $INFO[Player.TimeRemaining]</label>
</control>
- <control type="label"><!--End Time-->
- <posx>550</posx>
+ <control type="label"><!--End Time DialogFullscreenInfo-->
+ <visible>Window.IsActive(DialogFullscreenInfo.xml) +
!Window.IsActive(VideoOSD.xml)</visible>
+ <animation effect="fade" start="0" end="100" time="300"
tween="sine" delay="300" easing="in">WindowOpen</animation>
+ <animation effect="fade" start="0" end="100" time="300"
tween="sine" delay="500" easing="in">Visible</animation>
+ <animation effect="fade" start="100" end="0" time="300"
tween="sine" delay="500" easing="out">Hidden</animation>
+ <animation effect="slide" start="0" end="160" time="0"
condition="Window.IsActive(DialogSeekbar.xml)">Conditional</animation>
+ <posx>1500</posx>
<posy>955</posy>
<width>300</width>
- <align>left</align>
+ <align>right</align>
<font>Light32</font>
<textcolor>darkgrey</textcolor>
<label>$LOCALIZE[31000] $INFO[Player.FinishTime]</label>
- </control>
+ </control>
+ <control type="label"><!--End Time DialogSeekbar-->
+ <visible>Window.IsActive(DialogSeekbar.xml) +
!Window.IsActive(VideoOSD.xml)</visible>
+ <animation effect="fade" start="0" end="100" time="300"
tween="sine" delay="300" easing="in">WindowOpen</animation>
+ <animation effect="fade" start="0" end="100" time="300"
tween="sine" delay="500" easing="in">Visible</animation>
+ <animation effect="fade" start="100" end="0" time="300"
tween="sine" delay="500" easing="out">Hidden</animation>
+ <posx>1660</posx>
+ <posy>955</posy>
+ <width>300</width>
+ <align>right</align>
+ <font>Light32</font>
+ <textcolor>darkgrey</textcolor>
+ <label>$LOCALIZE[31000] $INFO[Player.FinishTime]</label>
+ </control>
<control type="grouplist"><!--Clock-->
<posx>1400</posx>
@@ -1466,5 +1553,233 @@
</control>
</include>
+ <include name="OSDInfoPanel"> <!--OSD Info Panel-->
+
+ <!--No Info-->
+ <control type="group">
+ <visible>IsEmpty(VideoPlayer.Plot)</visible>
+ <control type="label">
+ <posx>550</posx>
+ <posy>820</posy>
+ <width>700</width>
+ <font>Light32</font>
+ <align>left</align>
+ <label>No Info</label>
+ <textcolor>red</textcolor>
+ <scroll>false</scroll>
+ </control>
+ </control>
+
+ <!--Info Stuff-->
+ <control type="group">
+ <visible>!IsEmpty(VideoPlayer.Plot)</visible>
+
+ <!--Panel-->
+ <control type="image">
+ <posx>235</posx>
+ <posy>90</posy>
+ <width>1500</width>
+ <height>650</height>
+ <texture
border="39">dialogs/default/bg-black.png</texture>
+ </control>
+ <!--Info-->
+ <control type="grouplist">
+ <animation effect="fade" start="0" end="100"
time="300" tween="sine" delay="300" easing="in">WindowOpen</animation>
+ <animation effect="fade" start="0" end="100"
time="300" tween="sine" delay="500" easing="in">Visible</animation>
+ <animation effect="fade" start="100" end="0"
time="300" tween="sine" delay="500" easing="out">Hidden</animation>
+ <posx>350</posx>
+ <posy>170</posy>
+ <width>1050</width>
+ <height>700</height>
+ <orientation>vertical</orientation>
+ <control type="group"><!--Year: Movies-->
+ <width>700</width>
+ <height>40</height>
+ <visible>VideoPlayer.Content(Movies) +
!IsEmpty(VideoPlayer.Year)</visible>
+ <control type="image">
+ <posx>0</posx>
+ <posy>5</posy>
+ <width>49</width>
+ <height>49</height>
+
<texture>dialogs/videoinfo/premiered-icon.png</texture>
+ <scroll>false</scroll>
+ </control>
+ <control type="label">
+ <posx>65</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <font>Light32</font>
+ <align>left</align>
+
<label>$INFO[VideoPlayer.Year]</label>
+ <textcolor>aawhite</textcolor>
+ <scroll>false</scroll>
+ </control>
+ </control>
+ <control type="group"><!--Premiered: TV-Shows,
Episodes-->
+ <width>700</width>
+ <height>40</height>
+ <visible>[VideoPlayer.Content(TVShows)
| VideoPlayer.Content(episodes)] + !IsEmpty(VideoPlayer.Premiered)</visible>
+ <control type="image">
+ <posx>0</posx>
+ <posy>5</posy>
+ <width>49</width>
+ <height>49</height>
+
<texture>dialogs/videoinfo/premiered-icon.png</texture>
+ <scroll>false</scroll>
+ </control>
+ <control type="label">
+ <posx>65</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <font>Light32</font>
+ <align>left</align>
+
<label>$INFO[VideoPlayer.Premiered]</label>
+ <textcolor>aawhite</textcolor>
+ <scroll>false</scroll>
+ </control>
+ </control>
+ <control type="group"><!--Genre: Movies-->
+ <width>700</width>
+ <height>40</height>
+ <visible>VideoPlayer.Content(Movies) +
!IsEmpty(VideoPlayer.Genre)</visible>
+ <control type="image">
+ <posx>0</posx>
+ <posy>5</posy>
+ <width>49</width>
+ <height>49</height>
+
<texture>dialogs/videoinfo/genre-icon.png</texture>
+ <scroll>false</scroll>
+ </control>
+ <control type="label">
+ <posx>65</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <font>Light32</font>
+ <align>left</align>
+
<label>$INFO[VideoPlayer.Genre]</label>
+ <textcolor>aawhite</textcolor>
+ <scroll>false</scroll>
+ </control>
+ </control>
+ <control type="group"><!--Director: Movies,
Episodes-->
+ <width>700</width>
+ <height>40</height>
+ <visible>[VideoPlayer.Content(Movies) |
VideoPlayer.Content(episodes)] + !IsEmpty(VideoPlayer.Director)</visible>
+ <control type="image">
+ <posx>0</posx>
+ <posy>5</posy>
+ <width>49</width>
+ <height>49</height>
+
<texture>dialogs/videoinfo/director-icon.png</texture>
+ <scroll>false</scroll>
+ </control>
+ <control type="label">
+ <posx>65</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <font>Light32</font>
+ <align>left</align>
+
<label>$INFO[VideoPlayer.Director]</label>
+ <textcolor>aawhite</textcolor>
+ <scroll>false</scroll>
+ </control>
+ </control>
+ <control type="group"><!--Writer: Movies,
Episodes-->
+ <width>700</width>
+ <height>40</height>
+ <visible>[VideoPlayer.Content(Movies) |
VideoPlayer.Content(episodes)] + !IsEmpty(VideoPlayer.Writer)</visible>
+ <control type="image">
+ <posx>0</posx>
+ <posy>5</posy>
+ <width>49</width>
+ <height>49</height>
+
<texture>dialogs/videoinfo/writer-icon.png</texture>
+ <scroll>false</scroll>
+ </control>
+ <control type="label">
+ <posx>65</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <font>Light32</font>i
+ <align>left</align>
+
<label>$INFO[VideoPlayer.Writer]</label>
+ <textcolor>aawhite</textcolor>
+ <scroll>false</scroll>
+ </control>
+ </control>
+ <control type="group"><!--Studio: TV-Shows-->
+ <width>700</width>
+ <height>40</height>
+ <visible>VideoPlayer.Content(episodes)]
+ !IsEmpty(VideoPlayer.Studio)</visible>
+ <control type="image">
+ <posx>0</posx>
+ <posy>5</posy>
+ <width>49</width>
+ <height>49</height>
+
<texture>dialogs/videoinfo/tvstudio-icon.png</texture>
+ <scroll>false</scroll>
+ </control>
+ <control type="label">
+ <posx>65</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <font>Light32</font>
+ <align>left</align>
+
<label>$INFO[VideoPlayer.Studio,$LOCALIZE[572]: ,]</label>
+ <textcolor>aawhite</textcolor>
+ <scroll>false</scroll>
+ </control>
+ </control>
+ </control>
+
+ <!--Rating-->
+ <control type="group">
+ <animation effect="fade" start="0" end="100"
time="300" tween="sine" delay="300" easing="in">WindowOpen</animation>
+ <animation effect="fade" start="0" end="100"
time="300" tween="sine" delay="500" easing="in">Visible</animation>
+ <animation effect="fade" start="100" end="0"
time="300" tween="sine" delay="500" easing="out">Hidden</animation>
+ <posx>1590</posx>
+ <posy>305</posy>
+ <control type="image"> <!--10Star Rating-->
+ <posx>-310</posx>
+ <posy>15</posy>
+ <width>280</width><!--315-->
+ <height>24</height><!--27-->
+ <colordiffuse>aaFFFFFF</colordiffuse>
+ <texture
fallback="rating/10stars/NA.png">$INFO[VideoPlayer.Rating,rating/10stars/,.png]</texture>
+ </control>
+ <control type="label"> <!--Rating Label-->
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>250</width>
+ <label>$INFO[VideoPlayer.Rating]</label>
+ <font>Reg45</font>
+ <textcolor>mainblue</textcolor>
+ <scroll>false</scroll>
+ </control>
+ </control>
+
+ <!-- Plot -->
+ <control type="group">
+ <animation effect="fade" start="0" end="100"
time="300" tween="sine" delay="300" easing="in">WindowOpen</animation>
+ <animation effect="fade" start="0" end="100"
time="300" tween="sine" delay="500" easing="in">Visible</animation>
+ <animation effect="fade" start="100" end="0"
time="300" tween="sine" delay="500" easing="out">Hidden</animation>
+ <posx>350</posx>
+ <posy>390</posy>
+ <width>1200</width>
+ <height>60</height>
+ <control type="textbox">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>1300</width>
+ <height>270</height>
+ <label>$INFO[VideoPlayer.Plot]</label>
+ <textcolor>bbwhite</textcolor>
+ <align>justify</align>
+ <font>Light32</font>
+ </control>
+ </control>
+ </control>
+
+ </include>
</includes>
\ No newline at end of file
diff --git a/skin.avalon/1080i/IncludesNowPlaying.xml
b/skin.avalon/1080i/IncludesNowPlaying.xml
index 71117b5..3752b2e 100644
--- a/skin.avalon/1080i/IncludesNowPlaying.xml
+++ b/skin.avalon/1080i/IncludesNowPlaying.xml
@@ -4,11 +4,9 @@
<!--NowPlayingMusic-->
<include name="NowPlayingMusic">
<control type="group">
-
<visible>Player.HasAudio</visible>
<visible>!Container.Content(episodes)</visible>
-
<animation time="1000"
effect="fade">Visible</animation>
<animation time="100" effect="fade">Hidden</animation>
<include>animation_fade</include>
@@ -16,7 +14,6 @@
<!--Cover-->
<control type="group">
<posx>50</posx>
-
<control type="image">
<posx>0</posx>
<posy>875</posy>
@@ -26,7 +23,6 @@
<texture background="true"
fallback="cover_default.png"
diffuse="cover_matte_cdart.png">$INFO[MusicPlayer.Cover]</texture>
<aspectratio align="center"
aligny="top">stretch</aspectratio>
</control>
-
<control type="image">
<posx>0</posx>
<posy>1015</posy>
@@ -36,10 +32,8 @@
<texture background="true"
fallback="cover_default.png" flipy="true"
diffuse="covermatte_reflect_light.png">$INFO[MusicPlayer.Cover]</texture>
<aspectratio align="center"
aligny="top">stretch</aspectratio>
</control>
-
</control>
-
<!--Now Playing-->
<control type="label">
<posx>230</posx>
@@ -48,26 +42,22 @@
<align>left</align>
<font>Reg28</font>
<textcolor>mainblue</textcolor>
- <label>Now Playing</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <label>Now Playing</label>
</control>
-
<!--Title-->
<control type="label">
<posx>230</posx>
<posy>920</posy>
- <width>300</width>
+ <width>450</width>
<align>left</align>
<font>Reg30</font>
<textcolor>aawhite</textcolor>
- <label>[B]$INFO[MusicPlayer.Title][/B]</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <label>[B]$INFO[MusicPlayer.Title][/B]</label>
+ <scroll>true</scroll>
+ <scrollspeed>30</scrollspeed>
</control>
-
<!--Play Time-->
<control type="label">
<posx>310</posx>
@@ -117,7 +107,6 @@
<!--Cover-->
<control type="group">
<posx>50</posx>
-
<control type="image">
<posx>0</posx>
<posy>875</posy>
@@ -127,7 +116,6 @@
<texture background="true"
fallback="cover_default.png"
diffuse="cover_matte_cdart.png">$INFO[MusicPlayer.Cover]</texture>
<aspectratio align="center"
aligny="top">stretch</aspectratio>
</control>
-
<control type="image">
<posx>0</posx>
<posy>1015</posy>
@@ -137,10 +125,8 @@
<texture background="true"
fallback="cover_default.png" flipy="true"
diffuse="covermatte_reflect_light.png">$INFO[MusicPlayer.Cover]</texture>
<aspectratio align="center"
aligny="top">stretch</aspectratio>
</control>
-
</control>
-
<!--Now Playing-->
<control type="label">
<posx>230</posx>
@@ -149,26 +135,22 @@
<align>left</align>
<font>Reg28</font>
<textcolor>mainblue</textcolor>
- <label>Now Playing</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <label>Now Playing</label>
</control>
-
<!--Title-->
<control type="label">
<posx>230</posx>
<posy>920</posy>
- <width>300</width>
+ <width>450</width>
<align>left</align>
<font>Reg30</font>
<textcolor>aawhite</textcolor>
<label>[B]$INFO[MusicPlayer.Title][/B]</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <scroll>true</scroll>
+ <scrollspeed>30</scrollspeed>
</control>
-
<!--Play Time-->
<control type="label">
<posx>310</posx>
@@ -218,7 +200,6 @@
<!--Cover-->
<control type="group">
<posx>50</posx>
-
<control type="image">
<posx>0</posx>
<posy>875</posy>
@@ -228,7 +209,6 @@
<texture background="true"
fallback="cover_default.png"
diffuse="cover_matte_cdart.png">$INFO[MusicPlayer.Cover]</texture>
<aspectratio align="center"
aligny="top">stretch</aspectratio>
</control>
-
<control type="image">
<posx>0</posx>
<posy>1015</posy>
@@ -238,7 +218,6 @@
<texture background="true"
fallback="cover_default.png" flipy="true"
diffuse="covermatte_reflect_light.png">$INFO[MusicPlayer.Cover]</texture>
<aspectratio align="center"
aligny="top">stretch</aspectratio>
</control>
-
</control>
<!--Now Playing-->
@@ -249,22 +228,20 @@
<align>left</align>
<font>Reg28</font>
<textcolor>mainblue</textcolor>
- <label>Now Playing</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <label>Now Playing</label>
</control>
<!--Title-->
<control type="label">
<posx>230</posx>
<posy>920</posy>
- <width>300</width>
+ <width>450</width>
<align>left</align>
<font>Reg30</font>
<textcolor>aawhite</textcolor>
<label>[B]$INFO[MusicPlayer.Title][/B]</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <scroll>true</scroll>
+ <scrollspeed>30</scrollspeed>
</control>
<!--Play Time-->
@@ -310,7 +287,6 @@
<visible>Player.HasVideo</visible>
<visible>!Container.Content(episodes)</visible>
-
<animation effect="slide" start="-800" end="0"
delay="1000" time="500">WindowOpen</animation>
<animation effect="slide" start="0" end="-800"
tween="cubic" easing="inout" time="0">WindowClose</animation>
@@ -342,17 +318,14 @@
<align>left</align>
<font>Reg28</font>
<textcolor>mainblue</textcolor>
- <label>Now Playing</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <label>Now Playing</label>
</control>
-
<!--Title-->
<control type="label">
<posx>260</posx>
<posy>923</posy>
- <width>350</width>
+ <width>400</width>
<align>left</align>
<font>Reg28</font>
<textcolor>aawhite</textcolor>
@@ -361,7 +334,6 @@
<scrollspeed>30</scrollspeed>
</control>
-
<!--Play Time-->
<control type="label">
<posx>340</posx>
@@ -437,17 +409,14 @@
<align>left</align>
<font>Reg28</font>
<textcolor>mainblue</textcolor>
- <label>Now Playing</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <label>Now Playing</label>
</control>
-
<!--Title-->
<control type="label">
<posx>260</posx>
<posy>923</posy>
- <width>350</width>
+ <width>400</width>
<align>left</align>
<font>Reg28</font>
<textcolor>aawhite</textcolor>
@@ -532,16 +501,14 @@
<align>left</align>
<font>Reg28</font>
<textcolor>mainblue</textcolor>
- <label>Now Playing</label>
- <scroll>false</scroll>
- <!--<scrollspeed>30</scrollspeed>-->
+ <label>Now Playing</label>
</control>
<!--Title-->
<control type="label">
<posx>260</posx>
<posy>923</posy>
- <width>350</width>
+ <width>400</width>
<align>left</align>
<font>Reg28</font>
<textcolor>aawhite</textcolor>
diff --git a/skin.avalon/1080i/VideoOSD.xml b/skin.avalon/1080i/VideoOSD.xml
index e50ed56..dc375be 100644
--- a/skin.avalon/1080i/VideoOSD.xml
+++ b/skin.avalon/1080i/VideoOSD.xml
@@ -1,110 +1,204 @@
<!--Avalon-->
<window id="2901">
- <defaultcontrol always="true">1</defaultcontrol>
+ <defaultcontrol always="true">101</defaultcontrol>
<allowoverlay>yes</allowoverlay>
-
+
<controls>
-
- <!--Panel-->
+
+ <!--OSD Panel-->
<control type="group">
-
<visible>!Window.IsActive(filebrowser)</visible>
<visible>!Window.IsActive(sliderdialog)</visible>
-
+
<include>animation_visible_hidden</include>
<include>animation_fade</include>
-
+
<include>OSDPanel</include>
-
</control>
-
+
<!--Buttons-->
- <control type="group" id="2902">
+ <control type="group" id="1000">
+ <visible>!Window.IsActive(filebrowser)</visible>
+ <visible>!Window.IsActive(sliderdialog)</visible>
+
<include>animation_visible_hidden</include>
- <include>animation_fade</include>
- <visible>!Window.IsVisible(sliderdialog)</visible>
- <visible>!Window.IsActive(filebrowser)</visible>
+ <include>animation_fade</include>
- <!--control type="togglebutton" id="1">
- <description>Play/Pause</description>
- <posx>320</posx>
- <posy>956</posy>
- <width>164</width>
- <height>60</height>
- <label></label>
- <altlabel></altlabel>
- <font>-</font>
- <texturefocus>osd/PauseFO.png</texturefocus>
- <texturenofocus>osd/PauseNF.png</texturenofocus>
- <usealttexture>Player.Paused |
Player.Forwarding | Player.Rewinding</usealttexture>
-
<alttexturefocus>osd/PlayFO.png</alttexturefocus>
-
<alttexturenofocus>osd/PlayNF.png</alttexturenofocus>
- <onclick>PlayerControl(Play)</onclick>
- <onleft>-</onleft>
- <onright>5</onright>
- </control-->
- <control type="button" id="1">
<!--Audio Settings-->
- <description>Audio Settings</description>
- <posx>1505</posx>
- <posy>955</posy>
- <width>60</width>
+ <control type="image"> <!--Arrow OSD-->
+ <animation effect="fade" start="100" end="20"
tween="sine" easing="inout" time="1200" pulse="true" reversible="false"
condition="true">Conditional</animation>
+ <animation time="600" effect="fade"
delay="600">Visible</animation>
+ <animation time="200"
effect="fade">Hidden</animation>
+ <posx>1400</posx>
+ <posy>953</posy>
+ <width>20</width>
<height>60</height>
- <label>13396</label>
- <font>-</font>
- <texturefocus>osd/AudioFO.png</texturefocus>
- <texturenofocus>osd/AudioNF.png</texturenofocus>
- <onclick>ActivateWindow(124)</onclick>
- <onleft>-</onleft>
- <onright>2</onright>
- </control>
- <control type="button" id="2">
<!--Video Settings-->
- <description>Video Settings</description>
- <posx>1565</posx>
+ <aspectratio>keep</aspectratio>
+ <texture>osd/arrow.png</texture>
+ <visible>!ControlGroup(20).HasFocus()</visible>
+ </control>
+ <control type="label"> <!--Label OSD-->
+ <visible>!ControlGroup(20).HasFocus()</visible>
+ <animation time="600" effect="fade"
delay="600">Visible</animation>
+ <animation time="200"
effect="fade">Hidden</animation>
+ <posx>1430</posx>
<posy>955</posy>
- <width>60</width>
- <height>60</height>
- <label>13395</label>
+ <width>300</width>
<align>left</align>
- <font>-</font>
- <texturefocus>osd/VideoFO.png</texturefocus>
- <texturenofocus>osd/VideoNF.png</texturenofocus>
- <onclick>ActivateWindow(123)</onclick>
- <onleft>1</onleft>
- <onright>3</onright>
+ <font>Light32</font>
+ <textcolor>darkgrey</textcolor>
+ <label>OSD</label>
+ </control>
+
+ <control type="grouplist" id="10"> <!--Settings-->
+ <posx>1505</posx>
+ <posy>956</posy>
+ <width>1000</width>
+ <height>60</height>
+ <itemgap>0</itemgap>
+ <onup>-</onup>
+ <ondown>-</ondown>
+ <onleft>200</onleft>
+ <onright>-</onright>
+ <orientation>horizontal</orientation>
+
+ <control type="button" id="101">
<!--Audio Settings-->
+ <width>60</width>
+ <height>60</height>
+ <label>13396</label>
+ <font>-</font>
+
<texturefocus>osd/AudioFO.png</texturefocus>
+
<texturenofocus>osd/AudioNF.png</texturenofocus>
+ <onclick>ActivateWindow(124)</onclick>
+ </control>
+ <control type="button" id="102">
<!--Video Settings-->
+ <description>Video
Settings</description>
+ <width>60</width>
+ <height>60</height>
+ <label>13395</label>
+ <align>left</align>
+ <font>-</font>
+
<texturefocus>osd/VideoFO.png</texturefocus>
+
<texturenofocus>osd/VideoNF.png</texturenofocus>
+ <onclick>ActivateWindow(123)</onclick>
+ </control>
+ <control type="button" id="103">
<!--Subtitles Empty-->
+ <description>Subtitles</description>
+ <width>60</width>
+ <height>60</height>
+ <label>287</label>
+ <font>-</font>
+
<texturefocus>osd/SubtitlesFO.png</texturefocus>
+
<texturenofocus>osd/SubtitlesNF.png</texturenofocus>
+ <onclick>Close</onclick>
+
<onclick>XBMC.RunScript(script.xbmc.subtitles)</onclick>
+
<visible>IsEmpty(Skin.String(SubtitlesPath))</visible>
+ </control>
+ <control type="button" id="104">
<!--Subtitles No Empty-->
+ <description>Subtitles</description>
+ <width>60</width>
+ <height>60</height>
+ <label>287</label>
+ <font>-</font>
+
<texturefocus>osd/SubtitlesFO.png</texturefocus>
+
<texturenofocus>osd/SubtitlesNF.png</texturenofocus>
+ <onclick>Close</onclick>
+
<onclick>XBMC.RunScript($INFO[Skin.String(SubtitlesPath)])</onclick>
+
<visible>!IsEmpty(Skin.String(SubtitlesPath))</visible>
+ </control>
</control>
- <control type="button" id="3">
<!--Subtitles Empty-->
- <description>Subtitles</description>
- <posx>1625</posx>
- <posy>955</posy>
- <width>60</width>
+ <control type="grouplist" id="20"> <!--OSD-->
+ <posx>757</posx>
+ <posy>956</posy>
+ <width>1000</width>
<height>60</height>
- <label>287</label>
- <font>-</font>
- <texturefocus>osd/SubtitlesFO.png</texturefocus>
-
<texturenofocus>osd/SubtitlesNF.png</texturenofocus>
- <onclick>Close</onclick>
-
<onclick>XBMC.RunScript(script.xbmc.subtitles)</onclick>
-
<visible>IsEmpty(Skin.String(SubtitlesPath))</visible>
- <onleft>2</onleft>
- <onright>-</onright>
+ <itemgap>0</itemgap>
+ <onup>-</onup>
+ <ondown>-</ondown>
+ <onleft>-</onleft>
+ <onright>101</onright>
+ <orientation>horizontal</orientation>
+
+ <control type="button" id="200">
<!--Hidden Button-->
+
<visible>!ControlGroup(20).HasFocus()</visible>
+ <width>0</width>
+ <height>0</height>
+ <label></label>
+ <font>-</font>
+ <texturefocus>-</texturefocus>
+ <texturenofocus>-</texturenofocus>
+ <onfocus>SetFocus(206)</onfocus>
+ </control>
+ <control type="button" id="201">
<!--Skip Back-->
+
<visible>ControlGroup(20).HasFocus()</visible>
+
<include>animation_visible_hidden</include>
+ <width>60</width>
+ <height>60</height>
+ <label>210</label>
+ <font>-</font>
+
<texturefocus>osd/PrevTrackFO.png</texturefocus>
+
<texturenofocus>osd/PrevTrackNF.png</texturenofocus>
+
<onclick>PlayerControl(Previous)</onclick>
+ </control>
+ <control type="button" id="202">
<!--RR-->
+
<visible>ControlGroup(20).HasFocus()</visible>
+
<include>animation_visible_hidden</include>
+ <width>60</width>
+ <height>60</height>
+ <label>31036</label>
+ <font>-</font>
+
<texturefocus>osd/RewindFO.png</texturefocus>
+
<texturenofocus>osd/RewindNF.png</texturenofocus>
+
<onclick>PlayerControl(Rewind)</onclick>
+ </control>
+ <control type="togglebutton" id="203">
<!--Play Pause-->
+
<visible>ControlGroup(20).HasFocus()</visible>
+
<include>animation_visible_hidden</include>
+ <width>164</width>
+ <height>60</height>
+ <label></label>
+ <altlabel></altlabel>
+ <font>-</font>
+
<texturefocus>osd/PauseFO.png</texturefocus>
+
<texturenofocus>osd/PauseNF.png</texturenofocus>
+ <usealttexture>Player.Paused |
Player.Forwarding | Player.Rewinding</usealttexture>
+
<alttexturefocus>osd/PlayFO.png</alttexturefocus>
+
<alttexturenofocus>osd/PlayNF.png</alttexturenofocus>
+ <onclick>PlayerControl(Play)</onclick>
+ </control>
+ <control type="button" id="204">
<!--Stop-->
+
<visible>ControlGroup(20).HasFocus()</visible>
+
<include>animation_visible_hidden</include>
+ <width>60</width>
+ <height>60</height>
+ <label></label>
+ <font>-</font>
+
<texturefocus>osd/StopFO.png</texturefocus>
+
<texturenofocus>osd/StopNF.png</texturenofocus>
+ <onclick>PlayerControl(Stop)</onclick>
+ </control>
+ <control type="button" id="205">
<!--FF-->
+
<visible>ControlGroup(20).HasFocus()</visible>
+
<include>animation_visible_hidden</include>
+ <width>60</width>
+ <height>60</height>
+ <label></label>
+ <font>-</font>
+
<texturefocus>osd/ForwardFO.png</texturefocus>
+
<texturenofocus>osd/ForwardNF.png</texturenofocus>
+
<onclick>PlayerControl(Forward)</onclick>
+ </control>
+ <control type="button" id="206">
<!--Next-->
+
<visible>ControlGroup(20).HasFocus()</visible>
+
<include>animation_visible_hidden</include>
+ <width>60</width>
+ <height>60</height>
+ <label>209</label>
+ <font>-</font>
+
<texturefocus>osd/NextTrackFO.png</texturefocus>
+
<texturenofocus>osd/NextTrackNF.png</texturenofocus>
+ <onclick>PlayerControl(Next)</onclick>
+ </control>
</control>
- <control type="button" id="3">
<!--Subtitles No Empty-->
- <description>Subtitles</description>
- <posx>1625</posx>
- <posy>955</posy>
- <width>60</width>
- <height>60</height>
- <label>287</label>
- <font>-</font>
- <texturefocus>osd/SubtitlesFO.png</texturefocus>
-
<texturenofocus>osd/SubtitlesNF.png</texturenofocus>
- <onclick>Close</onclick>
-
<onclick>XBMC.RunScript($INFO[Skin.String(SubtitlesPath)])</onclick>
-
<visible>!IsEmpty(Skin.String(SubtitlesPath))</visible>
- <onleft>2</onleft>
- <onright>-</onright>
- </control>
-
</control>
</controls>
diff --git a/skin.avalon/addon.xml b/skin.avalon/addon.xml
index d694273..c2eceb0 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.1"
+ version="1.3.3"
name="Avalon"
provider-name="reazorFX">
<requires>
diff --git a/skin.avalon/backgrounds/movies.png
b/skin.avalon/backgrounds/movies.png
index a9006cc..f8db733 100644
Binary files a/skin.avalon/backgrounds/movies.png and
b/skin.avalon/backgrounds/movies.png differ
diff --git a/skin.avalon/backgrounds/tvshows.png
b/skin.avalon/backgrounds/tvshows.png
index c0496f8..d8c57ca 100644
Binary files a/skin.avalon/backgrounds/tvshows.png and
b/skin.avalon/backgrounds/tvshows.png differ
diff --git a/skin.avalon/backgrounds/videos.png
b/skin.avalon/backgrounds/videos.png
index ed69542..57fe2cf 100644
Binary files a/skin.avalon/backgrounds/videos.png and
b/skin.avalon/backgrounds/videos.png differ
-----------------------------------------------------------------------
Summary of changes:
skin.avalon/1080i/DialogFullScreenInfo.xml | 75 ++-
skin.avalon/1080i/DialogSeekbar.xml | 7 +-
skin.avalon/1080i/Includes.xml | 337 +++++++-
skin.avalon/1080i/IncludesNowPlaying.xml | 71 +-
skin.avalon/1080i/VideoOSD.xml | 268 ++++--
skin.avalon/addon.xml | 2 +-
skin.avalon/backgrounds/movies.png | Bin 1967013 -> 2077881
bytes
skin.avalon/backgrounds/tvshows.png | Bin 2495491 -> 2452364
bytes
skin.avalon/backgrounds/videos.png | Bin 1871405 -> 1836937
bytes
skin.avalon/language/English/strings.po | 1001 ++++++++++++++++++++
skin.avalon/language/English/strings.xml | 280 ------
skin.avalon/language/German/strings.po | 983 +++++++++++++++++++
skin.avalon/language/German/strings.xml | 282 ------
.../media/dialogs/videoinfo/tvstudio-icon.png | Bin 0 -> 6518 bytes
skin.avalon/media/flags/videocodec/avc1.png | Bin 0 -> 4050 bytes
skin.avalon/media/osd/CloseFO.png | Bin 0 -> 7058 bytes
skin.avalon/media/osd/CloseNF.png | Bin 0 -> 7213 bytes
skin.avalon/media/osd/ForwardFO.png | Bin 0 -> 6867 bytes
skin.avalon/media/osd/ForwardNF.png | Bin 0 -> 7118 bytes
skin.avalon/media/osd/InfoFO.png | Bin 0 -> 7074 bytes
skin.avalon/media/osd/InfoNF.png | Bin 0 -> 7366 bytes
skin.avalon/media/osd/InfoSelFO.png | Bin 0 -> 7454 bytes
skin.avalon/media/osd/InfoSelNF.png | Bin 0 -> 7366 bytes
skin.avalon/media/osd/NextTrackFO.png | Bin 0 -> 7102 bytes
skin.avalon/media/osd/NextTrackNF.png | Bin 0 -> 7313 bytes
skin.avalon/media/osd/PrevTrackFO.png | Bin 0 -> 7109 bytes
skin.avalon/media/osd/PrevTrackNF.png | Bin 0 -> 7328 bytes
skin.avalon/media/osd/RewindFO.png | Bin 0 -> 6906 bytes
skin.avalon/media/osd/RewindNF.png | Bin 0 -> 7127 bytes
skin.avalon/media/osd/StopFO.png | Bin 0 -> 6201 bytes
skin.avalon/media/osd/StopNF.png | Bin 0 -> 6338 bytes
skin.avalon/media/osd/arrow.png | Bin 0 -> 3092 bytes
32 files changed, 2581 insertions(+), 725 deletions(-)
create mode 100644 skin.avalon/language/English/strings.po
delete mode 100644 skin.avalon/language/English/strings.xml
create mode 100644 skin.avalon/language/German/strings.po
delete mode 100644 skin.avalon/language/German/strings.xml
create mode 100644 skin.avalon/media/dialogs/videoinfo/tvstudio-icon.png
create mode 100644 skin.avalon/media/flags/videocodec/avc1.png
create mode 100644 skin.avalon/media/osd/CloseFO.png
create mode 100644 skin.avalon/media/osd/CloseNF.png
create mode 100644 skin.avalon/media/osd/ForwardFO.png
create mode 100644 skin.avalon/media/osd/ForwardNF.png
create mode 100644 skin.avalon/media/osd/InfoFO.png
create mode 100644 skin.avalon/media/osd/InfoNF.png
create mode 100644 skin.avalon/media/osd/InfoSelFO.png
create mode 100644 skin.avalon/media/osd/InfoSelNF.png
create mode 100644 skin.avalon/media/osd/NextTrackFO.png
create mode 100644 skin.avalon/media/osd/NextTrackNF.png
create mode 100644 skin.avalon/media/osd/PrevTrackFO.png
create mode 100644 skin.avalon/media/osd/PrevTrackNF.png
create mode 100644 skin.avalon/media/osd/RewindFO.png
create mode 100644 skin.avalon/media/osd/RewindNF.png
create mode 100644 skin.avalon/media/osd/StopFO.png
create mode 100644 skin.avalon/media/osd/StopNF.png
create mode 100644 skin.avalon/media/osd/arrow.png
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
