The branch, frodo-skins-staging has been updated
via 5e11a2f4c26af4a4acad81916a2490633adb7bd9 (commit)
from d23ea874722be3935cfb75f891c70c2c20071be0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=5e11a2f4c26af4a4acad81916a2490633adb7bd9
commit 5e11a2f4c26af4a4acad81916a2490633adb7bd9
Author: Martijn Kaijser <[email protected]>
Date: Sun Aug 25 18:38:45 2013 +0200
[skin.avalon] 1.4.2
diff --git a/skin.avalon/1080i/DialogContextMenu.xml
b/skin.avalon/1080i/DialogContextMenu.xml
index 2b57a2c..13ad5d5 100644
--- a/skin.avalon/1080i/DialogContextMenu.xml
+++ b/skin.avalon/1080i/DialogContextMenu.xml
@@ -2,14 +2,16 @@
<window id="106">
<defaultcontrol always="true">1000</defaultcontrol>
<allowoverlay>yes</allowoverlay>
+
<controls>
- <!--Panel-->
+ <!--Dialog Context Menu-->
<control type="group">
<posx>620</posx>
<posy>50</posy>
<include>animation_dialog</include>
+ <!--Panel-->
<control type="image">
<posx>460</posx>
<posy>360</posy>
@@ -19,13 +21,13 @@
</control>
<control type="image">
<width>500</width>
- <height>800</height>
+ <height>860</height>
<texture
border="39">dialogs/default/bg-black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<!--Label Menu: -->
- <control type="label" id="200">
<!--Label Menu-->
+ <control type="label" id="200"> <!--Label
Menu-->
<posx>21</posx>
<posy>60</posy>
<width>458</width>
@@ -35,7 +37,7 @@
<textcolor>mainblue</textcolor>
<label>$LOCALIZE[41090]:</label>
</control>
- <control type="image" id="201">
<!--Seperator-->
+ <control type="image" id="201">
<!--Seperator-->
<posx>21</posx>
<posy>120</posy>
<width>458</width>
@@ -48,14 +50,15 @@
<posx>21</posx>
<posy>170</posy>
<width></width>
- <height>570</height>
+ <height>630</height>
<itemgap>3</itemgap>
-
+
<!--Buttons-->
<control type="button" id="1000">
<description>Buttons</description>
<include>SubMenuButton</include>
</control>
+
</control>
</control>
diff --git a/skin.avalon/1080i/DialogExtendedProgressBar.xml
b/skin.avalon/1080i/DialogExtendedProgressBar.xml
index 6da4fa5..2d1b9b4 100644
--- a/skin.avalon/1080i/DialogExtendedProgressBar.xml
+++ b/skin.avalon/1080i/DialogExtendedProgressBar.xml
@@ -6,13 +6,12 @@
<controls>
<control type="group">
+ <posx>35</posx>
+ <posy>25</posy>
<include>animation_static_dialog</include>
<include>animation_visible_hidden</include>
- <include>animation_fade</include>
-
- <posx>35</posx>
- <posy>25</posy>
+ <include>animation_fade</include>
<visible>!Window.IsActive(DialogKayToast.xml)</visible>
<control type="multiimage"> <!--Busy Image-->
@@ -42,7 +41,7 @@
<width>540</width>
<height>48</height>
<font>Light25</font>
- <textcolor>80FFFFFF</textcolor>
+ <textcolor>80FFFFFF</textcolor>
<label>-</label>
</control>
diff --git a/skin.avalon/1080i/DialogKaiToast.xml
b/skin.avalon/1080i/DialogKaiToast.xml
index 472d338..71e81e3 100644
--- a/skin.avalon/1080i/DialogKaiToast.xml
+++ b/skin.avalon/1080i/DialogKaiToast.xml
@@ -1,8 +1,16 @@
<!--Avalon-->
<window>
- <defaultcontrol>-</defaultcontrol>
+ <defaultcontrol>-</defaultcontrol>
<controls>
+ <control type="image" id="400">
+ <description>Icon</description>
+ <posx>-20</posx>
+ <posy>-20</posy>
+ <width>1</width>
+ <height>1</height>
+ <texture>-</texture>
+ </control>
<control type="label" id="401">
<description>Line 1</description>
<font>-</font>
@@ -21,9 +29,10 @@
<posx>35</posx>
<posy>25</posy>
- <visible>!Window.IsActive(fullscreenvideo) +
!Window.IsActive(visualisation) + !Window.IsVisible(startup)</visible>
+ <visible>!Window.IsActive(fullscreenvideo) +
!Window.IsActive(visualisation) + !Window.IsVisible(startup)</visible>
+ <visible>!Window.IsActive(DialogVideoInfo.xml)</visible>
<control type="group">
- <control type="image" id="400">
+ <control type="image">
<description>Icon</description>
<posx>0</posx>
<posy>15</posy>
diff --git a/skin.avalon/1080i/DialogOk.xml b/skin.avalon/1080i/DialogOk.xml
index dc46a2d..cca1978 100644
--- a/skin.avalon/1080i/DialogOk.xml
+++ b/skin.avalon/1080i/DialogOk.xml
@@ -52,7 +52,7 @@
<control type="label" id="1">
<description>Dialog Header</description>
<posx>460</posx>
- <posy>327</posy>
+ <posy>317</posy>
<width>1000</width>
<height>22</height>
<font>Light34</font>
@@ -65,7 +65,7 @@
<control type="label" id="2">
<description>Line 1</description>
<posx>100</posx>
- <posy>367</posy>
+ <posy>357</posy>
<width>1720</width>
<font>Light45</font>
<align>center</align>
@@ -77,7 +77,7 @@
<control type="label" id="3">
<description>Line 2</description>
<posx>100</posx>
- <posy>417</posy>
+ <posy>407</posy>
<width>1720</width>
<font>Light45</font>
<align>center</align>
@@ -89,7 +89,7 @@
<control type="label" id="4">
<description>Line 3</description>
<posx>100</posx>
- <posy>467</posy>
+ <posy>457</posy>
<width>1720</width>
<font>Light45</font>
<align>center</align>
diff --git a/skin.avalon/1080i/DialogProgress.xml
b/skin.avalon/1080i/DialogProgress.xml
index e815eb6..8f2bc5e 100644
--- a/skin.avalon/1080i/DialogProgress.xml
+++ b/skin.avalon/1080i/DialogProgress.xml
@@ -6,7 +6,8 @@
<controls>
<!--Bussy-->
- <control type="group">
+ <control type="group">
+ <visible>!Window.IsActive(MyPrograms.xml)</visible>
<posx>920</posx> <!--Center-->
<posy>380</posy> <!--Center-->
@@ -23,54 +24,42 @@
</control>
</control>
- <!--Infos-->
- <control type="group">
+ <!--For Artwork Downloader-->
+ <control type="group">
+ <posx>35</posx>
+ <posy>25</posy>
<include>animation_visible_hidden</include>
- <include>animation_fade</include>
+ <include>animation_fade</include>
+ <visible>Window.IsActive(MyPrograms.xml)</visible>
- <visible>Window.IsActive(programs)</visible><!--For
Artwork Downloader-->
-
- <control type="label" id="1"> <!--heading-->
- <posx>40</posx>
- <posy>40</posy>
+ <control type="label" id="1"> <!--Label Artwork
Downloader-->
+ <posx>75</posx>
+ <posy>0</posy>
<posy>10</posy>
<width>540</width>
<height>48</height>
- <font>Avalon25</font>
- <textcolor>Global_Main</textcolor>
- </control>
- <control type="label" id="2"> <!--Line 1-->
- <posx>400</posx>
- <posy>65</posy>
- <width>540</width>
- <height>48</height>
- <font>Avalon25</font>
- <textcolor>Global_Main</textcolor>
- </control>
- <control type="label" id="3"> <!--Line 2-->
- <posx>400</posx>
- <posy>90</posy>
- <width>540</width>
- <height>48</height>
- <font>Avalon25</font>
- <textcolor>Global_Main</textcolor>
+ <font>Light25</font>
+ <textcolor>C0FFFFFF</textcolor>
</control>
- <!--Line 3 Disable-->
- <!--<control type="label" id="4">
- <posx>400</posx>
- <posy>85</posy>
+ <control type="label" id="2"> <!--Process Item-->
+ <posx>75</posx>
+ <posy>25</posy>
<width>540</width>
<height>48</height>
- <font>Avalon25</font>
- <textcolor>Global_Main</textcolor>
- </control>-->
- <control type="progress">
<!--Progressbar-->
- <posx>400</posx>
- <posy>130</posy>
- <width>540</width>
- <height>10</height>
- <info>System.Progressbar</info>
+ <font>Light25</font>
+ <textcolor>80FFFFFF</textcolor>
+ </control>
+ <control type="multiimage"> <!--Busy
Image-->
+ <description>Busy animation</description>
+ <posx>0</posx>
+ <posy>-0</posy>
+ <height>70</height>
+ <width>70</width>
+ <colordiffuse>99FFFFFF</colordiffuse>
+ <imagepath>dialogs/busy_small</imagepath>
+ <timeperimage>100</timeperimage>
+ <fadetime>0</fadetime>
</control>
</control>
diff --git a/skin.avalon/1080i/DialogSelect.xml
b/skin.avalon/1080i/DialogSelect.xml
index 61a596f..db676c4 100644
--- a/skin.avalon/1080i/DialogSelect.xml
+++ b/skin.avalon/1080i/DialogSelect.xml
@@ -1,7 +1,8 @@
-<!--Basic-->
+<!--Avalon-->
<window id="2000">
<defaultcontrol always="true">3</defaultcontrol>
<allowoverlay>yes</allowoverlay>
+ <zorder>2</zorder> <!--Normal "1" over DialogVideoInfo.xml-->
<controls>
@@ -32,7 +33,7 @@
<height>60</height>
<texture>dialogs/default/arrow.png</texture>
</control>
- <control type="group"><!--Container 3-->
+ <control type="group"><!--Container 3 Small-->
<visible>Control.IsVisible(3)</visible>
<control type="image">
<posx>604</posx>
@@ -49,7 +50,7 @@
<texture
border="5">dialogs/default/inner.png</texture>
</control>
</control>
- <control type="group"><!--Container 6-->
+ <control type="group"><!--Container 6 Big-->
<visible>Control.IsVisible(6)</visible>
<control type="image">
<posx>387</posx>
@@ -94,6 +95,8 @@
<height>60</height>
<textoffsetx>20</textoffsetx>
<align>left</align>
+ <texturefocus>-</texturefocus>
+ <texturenofocus>-</texturenofocus>
<label>$LOCALIZE[21863]</label>
<label2>$INFO[Container(6).ListItem.Property(Addon.Creator)]</label2>
<include>DialogLabel</include>
@@ -102,12 +105,12 @@
</control>
<!--List-->
- <control type="list" id="3"><!--Container 3-->
+ <control type="list" id="3"><!--Container 3 Small-->
<posx>638</posx>
<posy>300</posy>
<width>644</width>
<height>480</height>
- <onleft>8000</onleft>
+ <onleft>8000</onleft>
<onright>-</onright>
<onup>3</onup>
<ondown>3</ondown>
@@ -323,12 +326,12 @@
</control>
</focusedlayout>
</control>
- <control type="list" id="6"><!--Container 6-->
+ <control type="list" id="6"><!--Container 6 Big-->
<posx>421</posx>
<posy>300</posy>
<width>644</width>
<height>480</height>
- <onleft>8000</onleft>
+ <onleft>8000</onleft>
<onright>-</onright>
<onup>6</onup>
<ondown>6</ondown>
@@ -343,10 +346,10 @@
<texture>dialogs/default/separator.png</texture>
</control>
<control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>60</width>
- <height>60</height>
+ <posx>10</posx>
+ <posy>5</posy>
+ <width>50</width>
+ <height>50</height>
<aspectratio>keep</aspectratio>
<texture background="true"
fallback="dialogs/select/icons/DefaultAddon.png">$INFO[ListItem.Icon]</texture>
</control>
@@ -444,10 +447,10 @@
</control>
</control>
<control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>60</width>
- <height>60</height>
+ <posx>10</posx>
+ <posy>5</posy>
+ <width>50</width>
+ <height>50</height>
<aspectratio>keep</aspectratio>
<texture background="true"
fallback="dialogs/select/icons/DefaultAddon.png">$INFO[ListItem.Icon]</texture>
</control>
@@ -458,8 +461,9 @@
<control type="group" id="8000">
<posx>626</posx>
<posy>776</posy>
- <animation effect="slide" end="-217" time="0"
condition="Control.IsVisible(6)">Conditional</animation>
- <control type="button" id="5">
+
<visible>!Window.IsVisible(Custom_MediaDialog.xml)</visible><!--Not visible
Artwork Downloader-->
+ <animation effect="slide" end="-217" time="0"
condition="Control.IsVisible(6)">Conditional</animation>
+ <control type="button" id="5">
<description>OK</description>
<label>OK</label>
<include>DialogButtonOKCancel</include>
@@ -469,19 +473,17 @@
<textoffsetx>100</textoffsetx>
<pulseonselect>false</pulseonselect>
<width>350</width>
- <height>100</height>
- <onleft>20</onleft>
- <onright>20</onright>
+ <height>100</height>
<onleft>7</onleft>
<onright>7</onright>
<onup
condition="Control.IsVisible(3)">3</onup>
<ondown
condition="Control.IsVisible(3)">3</ondown>
<onup
condition="Control.IsVisible(6)">6</onup>
<ondown
condition="Control.IsVisible(6)">6</ondown>
- <onclick
condition="Window.IsActive(3003)">Dialog.Close(3003)</onclick>
+ <onclick
condition="Window.IsActive(3003)">Dialog.Close(3003)</onclick> <!--Custom
Home-->
<animation effect="fade" start="100"
end="75" time="0" condition="!Control.IsEnabled(5)">Conditional</animation>
</control>
- <control type="button" id="7">
+ <control type="button" id="7">
<posx>200</posx>
<description>Close</description>
<label>$LOCALIZE[222]</label>
@@ -491,9 +493,7 @@
<textoffsetx>100</textoffsetx>
<pulseonselect>false</pulseonselect>
<width>350</width>
- <height>100</height>
- <onleft>20</onleft>
- <onright>20</onright>
+ <height>100</height>
<onclick>Action(close)</onclick>
<onleft>5</onleft>
<onright>5</onright>
@@ -501,10 +501,10 @@
<ondown
condition="Control.IsVisible(3)">3</ondown>
<onup
condition="Control.IsVisible(6)">6</onup>
<ondown
condition="Control.IsVisible(6)">6</ondown>
- <animation effect="slide" end="-200"
time="0" condition="IsEmpty(Control.GetLabel(5))">Conditional</animation>
+ <animation effect="slide" end="-200"
time="0" condition="IsEmpty(Control.GetLabel(5))">Conditional</animation>
<animation effect="fade" start="100"
end="75" time="0" condition="!Control.IsEnabled(7)">Conditional</animation>
- </control>
- </control>
+ </control>
+ </control>
</control>
</controls>
diff --git a/skin.avalon/1080i/DialogVideoInfo.xml
b/skin.avalon/1080i/DialogVideoInfo.xml
index fcb570f..c4c6b40 100644
--- a/skin.avalon/1080i/DialogVideoInfo.xml
+++ b/skin.avalon/1080i/DialogVideoInfo.xml
@@ -1,11 +1,11 @@
<!--Avalon-->
<window>
<defaultcontrol always="true">9000</defaultcontrol>
- <allowoverlay>no</allowoverlay>
+ <allowoverlay>no</allowoverlay>
<controls>
<!-- Movies, TVShows, Seasons, Episodes -->
- <control type="group"> <!--Dialog Overlay-->
+ <control type="group"> <!--Dialog Overlay-->
<visible>Container.Content(movies) |
Container.Content(tvshows) | Container.Content(episodes)</visible>
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
<control type="image">
@@ -87,12 +87,22 @@
<align>center</align>
<textoffsetx>0</textoffsetx>
</control>
- <control type="button" id ="10">
<!--Get Thumb-->
+ <control type="button" id ="10">
<!--Get Thumb-->
+
<visible>Skin.HasSetting(NoArtworkDownloader)</visible>
<label>13511</label>
<width>585</width>
<height>60</height>
<align>center</align>
- <textoffsetx>0</textoffsetx>
+ <textoffsetx>0</textoffsetx>
+ </control>
+ <control type="button" id ="101">
<!--Get Thumb Artwork Downloader-->
+
<visible>!Skin.HasSetting(NoArtworkDownloader)</visible>
+ <label>13511</label>
+ <width>585</width>
+ <height>60</height>
+ <align>center</align>
+ <textoffsetx>0</textoffsetx>
+
<onclick>ActivateWindow(3004)</onclick>
</control>
</control>
diff --git a/skin.avalon/1080i/Includes.xml b/skin.avalon/1080i/Includes.xml
index 1c45f38..2a0e2aa 100644
--- a/skin.avalon/1080i/Includes.xml
+++ b/skin.avalon/1080i/Includes.xml
@@ -9,6 +9,7 @@
<include file="IncludesHomeSubMenu.xml" />
<include file="IncludesNowPlaying.xml" />
<include file="Custom_Home.xml" />
+ <include file="Custom_MediaDialog.xml" />
<!--PVR-->
<include file="MyPVR.xml" />
@@ -23,7 +24,7 @@
<align>right</align>
<font>Light40</font>
<textcolor>midgrey</textcolor>
- <label>Avalon 1.3.7</label>
+ <label>Avalon 1.4.2</label>
<include>animation_visible_hidden</include>
<include>animation_fade</include>
</control>
@@ -127,7 +128,7 @@
<include name="HeaderHome">
<control type="group">
<visible>!Window.IsActive(DialogKaiToast.xml)</visible>
-
<visible>!Window.IsActive(DialogExtendedProgressBar.xml)</visible>
+
<visible>!Window.IsActive(DialogExtendedProgressBar.xml)</visible>
<include>animation_visible_hidden</include>
<animation effect="fade" time="600"
>WindowOpen</animation>
<animation effect="fade" time="600"
>WindowClose</animation>
@@ -470,6 +471,7 @@
<control type="group">
<visible>!Window.IsActive(DialogKaiToast.xml)</visible>
<visible>!Window.IsActive(DialogExtendedProgressBar.xml)</visible>
+ <visible>!Window.IsActive(DialogProgress.xml)</visible>
<include>animation_visible_hidden</include>
<animation effect="fade" time="600"
>WindowOpen</animation>
<animation effect="fade" time="600"
>WindowClose</animation>
diff --git a/skin.avalon/1080i/IncludesInfos.xml
b/skin.avalon/1080i/IncludesInfos.xml
index e1d58d9..0dd3aec 100644
--- a/skin.avalon/1080i/IncludesInfos.xml
+++ b/skin.avalon/1080i/IncludesInfos.xml
@@ -515,6 +515,47 @@
</control>
</include>
+ <!--Others Info-->
+ <include name="OtherInfos">
+ <control type="group" id="5011">
+ <visible>!Window.IsVisible(videolibrary) +
!Window.IsVisible(videoplaylist)</visible>
+ <visible>!Window.IsVisible(musiclibrary) +
!Window.IsActive(musicfiles) +!Window.IsVisible(musicplaylist)</visible>
+ <include>animation_hoverslide</include>
+ <control type="label"> <!--Page-Info-->
+ <posx>1820</posx>
+ <posy>720</posy> <!--720-->
+ <width>250</width>
+ <align>right</align>
+ <font>Light32</font>
+ <textcolor>mainblue</textcolor>
+
<label>$INFO[Container.CurrentPage]/$INFO[Container.NumPages]</label>
+ </control>
+ </control>
+ <control type="group" id="5022">
+ <visible>!Window.IsVisible(videolibrary) +
!Window.IsVisible(videoplaylist)</visible>
+ <visible>!Window.IsVisible(musiclibrary) +
!Window.IsActive(musicfiles) +!Window.IsVisible(musicplaylist)</visible>
+ <include>animation_fade</include>
+ <control type="label"> <!--Label 1-->
+ <posx>1820</posx>
+ <posy>800</posy>
+ <width>950</width>
+ <align>right</align>
+ <font>Reg40</font>
+ <textcolor>aawhite</textcolor>
+ <label>[B]$INFO[ListItem.Label][/B]</label>
+ </control>
+ <control type="label"> <!--Label 2-->
+ <posx>1820</posx>
+ <posy>865</posy>
+ <width>700</width>
+ <align>right</align>
+ <font>Light32</font>
+ <textcolor>mainblue</textcolor>
+ <label>$INFO[ListItem.Label2]</label>
+ </control>
+ </control>
+ </include>
+
<!--PVRInfos-->
<include name="PVRInfos">
<control type="group" id="5011">
diff --git a/skin.avalon/1080i/View_50_List.xml
b/skin.avalon/1080i/View_50_List.xml
index 9a94e8d..a671f6c 100644
--- a/skin.avalon/1080i/View_50_List.xml
+++ b/skin.avalon/1080i/View_50_List.xml
@@ -13,7 +13,7 @@
<!--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>
@@ -94,7 +94,7 @@
<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>
@@ -116,7 +116,7 @@
<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>
@@ -152,7 +152,7 @@
<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>
@@ -201,7 +201,7 @@
<viewtype label="535">List</viewtype>
<posx>1168</posx>
<posy>185</posy>
- <width>650</width>
+ <width>700</width>
<height>480</height>
<onleft>9000</onleft>
<onright>60</onright>
@@ -211,47 +211,95 @@
<focusposition>0</focusposition>
<scrolltime>200</scrolltime>
- <itemlayout width="650" height="60">
- <control type="label"> <!--No Albums-->
-
<visible>!Container.Content(albums)</visible>
- <posx>50</posx>
- <width>520</width>
- <font>Light35</font>
- <textcolor>midgrey</textcolor>
- <selectedcolor>orange</selectedcolor>
- <label>$INFO[ListItem.Label]</label>
+ <itemlayout width="700" height="60">
+ <control type="group"> <!--Movie & TV-Shows &
Video Addons-->
+ <visible>Window.IsVisible(videolibrary)
| Window.IsVisible(videoplaylist)</visible>
+ <control type="label"> <!--Label-->
+ <posx>50</posx>
+ <width>520</width>
+ <font>Light35</font>
+ <textcolor>midgrey</textcolor>
+
<selectedcolor>orange</selectedcolor>
+
<label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="image"> <!--Watched
Overlay Movies, Episode-->
+
<visible>Container.Content(movies) | Container.Content(episodes)</visible>
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
+ <posx>600</posx>
+ <posy>23</posy>
+ <width>44</width>
+ <height>20</height>
+
<colordiffuse>55ffffff</colordiffuse>
+
<texture>$INFO[ListItem.Overlay,overlays/,/view_50_watched.png]</texture>
+ </control>
+ <control type="label"> <!--Count of
Unwatched Episodes-->
+
<visible>Container.Content(tvshows) | Container.Content(seasons)</visible>
+ <posx>630</posx>
+ <width>50</width>
+ <font>Light32</font>
+ <align>center</align>
+ <textcolor>midgrey</textcolor>
+
<label>$INFO[ListItem.Property(UnWatchedEpisodes)]</label>
+ </control>
</control>
- <control type="label"> <!--Albums-->
-
<visible>Container.Content(albums)</visible>
- <posx>50</posx>
- <width>520</width>
- <font>Light35</font>
- <textcolor>midgrey</textcolor>
- <selectedcolor>orange</selectedcolor>
- <label>$INFO[ListItem.Label2] -
$INFO[ListItem.Label]</label>
+ <control type="group"> <!--Music-->
+ <visible>Window.IsVisible(musiclibrary)
| Window.IsActive(musicfiles) | Window.IsVisible(musicplaylist)</visible>
+ <control type="label"> <!--Albums-->
+
<visible>Container.Content(albums)</visible>
+ <posx>50</posx>
+ <width>520</width>
+ <font>Light35</font>
+ <textcolor>midgrey</textcolor>
+
<selectedcolor>orange</selectedcolor>
+ <label>$INFO[ListItem.Label2] -
$INFO[ListItem.Label]</label>
+ </control>
+ <control type="label"> <!--No Album-->
+
<visible>!Container.Content(albums)</visible>
+ <posx>50</posx>
+ <width>520</width>
+ <font>Light35</font>
+ <textcolor>midgrey</textcolor>
+
<selectedcolor>orange</selectedcolor>
+
<label>$INFO[ListItem.Label]</label>
+ </control>
</control>
- <control type="image"> <!--Watched
Overlay Movies, Episode-->
- <visible>Container.Content(movies) |
Container.Content(episodes)</visible>
-
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
- <posx>600</posx>
- <posy>23</posy>
- <width>44</width>
- <height>20</height>
- <colordiffuse>55ffffff</colordiffuse>
-
<texture>$INFO[ListItem.Overlay,overlays/,/view_50_watched.png]</texture>
+ <control type="group"> <!--Others-->
+
<visible>!Window.IsVisible(videolibrary) +
!Window.IsVisible(videoplaylist)</visible>
+
<visible>!Window.IsVisible(musiclibrary) + !Window.IsActive(musicfiles)
+!Window.IsVisible(musicplaylist)</visible>
+ <control type="label"> <!--Label 1-->
+ <posx>50</posx>
+ <width>520</width>
+ <font>Light35</font>
+ <textcolor>midgrey</textcolor>
+
<selectedcolor>orange</selectedcolor>
+
<label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="image"> <!--Activate
Icon-->
+
<visible>!IsEmpty(ListItem.Label2)</visible>
+
<visible>SubString(ListItem.Label2,$LOCALIZE[305])</visible>
+ <posx>600</posx>
+ <posy>10</posy>
+ <width>40</width>
+ <height>40</height>
+ <aspectratio>scale</aspectratio>
+
<colordiffuse>88ffffff</colordiffuse>
+
<texture>common/check.png</texture>
+ </control>
+ <control type="image"> <!--Download
Icon-->
+
<visible>!IsEmpty(ListItem.Label2)</visible>
+
<visible>SubString(ListItem.Label2,%,right)</visible>
+ <animation effect="fade"
start="100" end="40" tween="sine" easing="inout" time="1200" pulse="true"
reversible="false" condition="true">Conditional</animation>
+ <posx>600</posx>
+ <posy>10</posy>
+ <width>40</width>
+ <height>40</height>
+
<aspectratio>scale</aspectratio>
+
<texture>common/download.png</texture>
+ </control>
</control>
- <control type="label"> <!--Count of
Unwatched Episodes-->
- <visible>Container.Content(tvshows) |
Container.Content(seasons)</visible>
- <posx>630</posx>
- <width>50</width>
- <font>Light32</font>
- <align>center</align>
- <textcolor>midgrey</textcolor>
-
<label>$INFO[ListItem.Property(UnWatchedEpisodes)]</label>
- </control>
</itemlayout>
- <focusedlayout width="650" height="60">
- <control type="image"> <!--Slider-->
+ <focusedlayout width="700" height="60">
+ <control type="image"> <!--Slider-->
<animation type="Focus"
condition="Container(50).OnNext" reversible="false">
<effect type="slide"
start="0,-50" end="0,0" time="150" tween="Quadratic" easing="out"/>
</animation>
@@ -260,51 +308,100 @@
</animation>
<posx>0</posx>
<posy>5</posy>
- <width>650</width>
+ <width>680</width>
<height>50</height>
<texture>common/slider.png</texture>
<colordiffuse>DDffffff</colordiffuse>
</control>
- <control type="label"> <!--No Albums-->
-
<visible>!Container.Content(albums)</visible>
- <posx>50</posx>
- <width>520</width>
- <scrollspeed>30</scrollspeed>
- <font>Light35</font>
- <textcolor>mainblue</textcolor>
- <selectedcolor>orange</selectedcolor>
- <label>$INFO[ListItem.Label]</label>
+ <control type="group"> <!--Movie & TV-Shows &
Video Addons-->
+ <visible>Window.IsVisible(videolibrary)
| Window.IsVisible(videoplaylist)</visible>
+ <control type="label">
<!--Label-->
+ <posx>50</posx>
+ <width>520</width>
+ <scrollspeed>30</scrollspeed>
+ <font>Light35</font>
+ <textcolor>mainblue</textcolor>
+
<selectedcolor>orange</selectedcolor>
+
<label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="image">
<!--Watched Overlay Movies, Episode-->
+
<visible>Container.Content(movies) | Container.Content(episodes)</visible>
+
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
+ <posx>600</posx>
+ <posy>23</posy>
+ <width>44</width>
+ <height>20</height>
+
<colordiffuse>88ffffff</colordiffuse>
+
<texture>$INFO[ListItem.Overlay,overlays/,/view_50_watched.png]</texture>
+ </control>
+ <control type="label">
<!--Count of Unwatched Episodes-->
+
<visible>Container.Content(tvshows) | Container.Content(seasons)</visible>
+ <posx>630</posx>
+ <width>50</width>
+ <font>Light32</font>
+ <align>center</align>
+ <textcolor>midgrey</textcolor>
+
<selectedcolor>midgrey</selectedcolor>
+
<label>$INFO[ListItem.Property(UnWatchedEpisodes)]</label>
+ </control>
</control>
- <control type="label"> <!--Albums-->
-
<visible>Container.Content(albums)</visible>
- <posx>50</posx>
- <width>520</width>
- <scrollspeed>30</scrollspeed>
- <font>Light35</font>
- <textcolor>mainblue</textcolor>
- <selectedcolor>orange</selectedcolor>
- <label>$INFO[ListItem.Label2] -
$INFO[ListItem.Label]</label>
- </control>
- <control type="image"> <!--Watched
Overlay Movies, Episode-->
- <visible>Container.Content(movies) |
Container.Content(episodes)</visible>
-
<visible>!substring(Container.FolderPath,addons://sources/video/) +
!substring(Container.FolderPath,plugin://plugin.video)</visible>
- <posx>600</posx>
- <posy>23</posy>
- <width>44</width>
- <height>20</height>
- <colordiffuse>88ffffff</colordiffuse>
-
<texture>$INFO[ListItem.Overlay,overlays/,/view_50_watched.png]</texture>
+ <control type="group"> <!--Music-->
+ <visible>Window.IsVisible(musiclibrary)
| Window.IsActive(musicfiles) | Window.IsVisible(musicplaylist)</visible>
+ <control type="label"> <!--Albums-->
+
<visible>Container.Content(albums)</visible>
+ <posx>50</posx>
+ <width>520</width>
+ <scrollspeed>30</scrollspeed>
+ <font>Light35</font>
+ <textcolor>mainblue</textcolor>
+
<selectedcolor>orange</selectedcolor>
+ <label>$INFO[ListItem.Label2] -
$INFO[ListItem.Label]</label>
+ </control>
+ <control type="label"> <!--No
Albums-->
+
<visible>!Container.Content(albums)</visible>
+ <posx>50</posx>
+ <width>520</width>
+ <scrollspeed>30</scrollspeed>
+ <font>Light35</font>
+ <textcolor>mainblue</textcolor>
+
<selectedcolor>orange</selectedcolor>
+
<label>$INFO[ListItem.Label]</label>
+ </control>
+ </control>
+ <control type="group"> <!--Others-->
+
<visible>!Window.IsVisible(videolibrary) +
!Window.IsVisible(videoplaylist)</visible>
+
<visible>!Window.IsVisible(musiclibrary) + !Window.IsActive(musicfiles)
+!Window.IsVisible(musicplaylist)</visible>
+ <control type="label"> <!--Label 1-->
+ <posx>50</posx>
+ <width>520</width>
+ <font>Light35</font>
+ <textcolor>mainblue</textcolor>
+
<selectedcolor>orange</selectedcolor>
+
<label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="image"> <!--Activate
Icon-->
+
<visible>!IsEmpty(ListItem.Label2)</visible>
+
<visible>SubString(ListItem.Label2,$LOCALIZE[305])</visible>
+ <posx>600</posx>
+ <posy>10</posy>
+ <width>40</width>
+ <height>40</height>
+ <aspectratio>scale</aspectratio>
+
<colordiffuse>eeffffff</colordiffuse>
+
<texture>common/check.png</texture>
+ </control>
+ <control type="image"> <!--Download
Icon-->
+
<visible>!IsEmpty(ListItem.Label2)</visible>
+
<visible>SubString(ListItem.Label2,%,right)</visible>
+ <animation effect="fade"
start="100" end="40" tween="sine" easing="inout" time="1200" pulse="true"
reversible="false" condition="true">Conditional</animation>
+ <posx>600</posx>
+ <posy>10</posy>
+ <width>40</width>
+ <height>40</height>
+
<aspectratio>scale</aspectratio>
+
<texture>common/download.png</texture>
+ </control>
</control>
- <control type="label"> <!--Count of
Unwatched Episodes-->
- <visible>Container.Content(tvshows) |
Container.Content(seasons)</visible>
- <posx>630</posx>
- <width>50</width>
- <font>Light32</font>
- <align>center</align>
- <textcolor>midgrey</textcolor>
- <selectedcolor>midgrey</selectedcolor>
-
<label>$INFO[ListItem.Property(UnWatchedEpisodes)]</label>
- </control>
</focusedlayout>
</control>
@@ -315,7 +412,8 @@
<include>MovieInfos</include>
<include>TVShowInfos</include>
<include>AlbumsInfos</include>
- <include>SongsInfos</include>
+ <include>SongsInfos</include>
+ <include>OtherInfos</include>
</control>
<!--Flags Video-->
@@ -379,7 +477,7 @@
<texture
fallback="flags/audiochannels/default.png">$INFO[ListItem.AudioChannels,flags/audiochannels/,.png]</texture>
</control>
</control>
-
+
<!--Scrollbar-->
<control type="group">
<visible>Control.IsVisible(50)</visible>
diff --git a/skin.avalon/addon.xml b/skin.avalon/addon.xml
index 5e9ff4a..9280971 100644
--- a/skin.avalon/addon.xml
+++ b/skin.avalon/addon.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="skin.avalon"
- version="1.3.7"
+ version="1.4.2"
name="Avalon"
provider-name="reazorFX">
<requires>
<import version="4.0.0" addon="xbmc.gui"/>
- <import version="0.0.16" addon="service.skin.widgets"/>
+ <import version="0.0.16" addon="service.skin.widgets"/>
+ <import addon="script.artwork.downloader" version="12.0.15" />
</requires>
<extension
point="xbmc.gui.skin"
diff --git a/skin.avalon/colors/Defaults.xml b/skin.avalon/colors/Defaults.xml
index d677af5..40ec842 100644
--- a/skin.avalon/colors/Defaults.xml
+++ b/skin.avalon/colors/Defaults.xml
@@ -12,9 +12,9 @@
<!--Global-->
<!--Titan 00b8ff-->
<!--Avalon 6aa5cb-->
- <color name="mainblue">FF6aa5cb</color> <!--Main Blue-->
- <color name="ccmainblue">cc6aa5cb</color> <!--Main Blue-->
- <color name="orange">FFff7800</color> <!--Orange-->
+ <color name="mainblue">FF6aa5cb</color> <!--Main
Blue-->
+ <color name="ccmainblue">cc6aa5cb</color> <!--Main
Blue-->
+ <color name="orange">FFff7800</color> <!--Orange-->
<!--Grey-->
<color name="grey">FFC0C2C2</color>
-----------------------------------------------------------------------
Summary of changes:
skin.avalon/1080i/Custom_MediaDialog.xml | 194 ++++++++++++++
skin.avalon/1080i/DialogContextMenu.xml | 15 +-
skin.avalon/1080i/DialogExtendedProgressBar.xml | 9 +-
skin.avalon/1080i/DialogKaiToast.xml | 15 +-
skin.avalon/1080i/DialogOk.xml | 8 +-
skin.avalon/1080i/DialogProgress.xml | 69 +++---
skin.avalon/1080i/DialogSelect.xml | 56 ++--
skin.avalon/1080i/DialogVideoInfo.xml | 18 +-
skin.avalon/1080i/Includes.xml | 6 +-
skin.avalon/1080i/IncludesInfos.xml | 41 +++
skin.avalon/1080i/View_50_List.xml | 264 ++++++++++++++------
skin.avalon/addon.xml | 5 +-
skin.avalon/colors/Defaults.xml | 6 +-
.../media/common/check.png | Bin 3051 -> 3133 bytes
.../media/common/download.png | Bin 2913 -> 3078 bytes
15 files changed, 526 insertions(+), 180 deletions(-)
create mode 100644 skin.avalon/1080i/Custom_MediaDialog.xml
copy skin.amber/media/MusicOSD/ProgressBG.png =>
skin.avalon/media/common/check.png (85%)
copy skin.amber/media/MusicOSD/ProgressLeft.png =>
skin.avalon/media/common/download.png (87%)
hooks/post-receive
--
Skins
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
