The branch, dharma-pre has been updated
via 95237b16b62e8e3f2be7b2ecd8e34f30849d3630 (commit)
from 7dafb16a31c3262f7acd50ecd7e7109c2d483425 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=95237b16b62e8e3f2be7b2ecd8e34f30849d3630
commit 95237b16b62e8e3f2be7b2ecd8e34f30849d3630
Author: Cory Fields <[email protected]>
Date: Sat Oct 16 12:47:18 2010 -0400
[alaska] Updated to 1.1.9. Upstream r23.
diff --git a/skin.alaska/720p/DialogAddonSettings.xml
b/skin.alaska/720p/DialogAddonSettings.xml
index 42d04d7..e5f490d 100644
--- a/skin.alaska/720p/DialogAddonSettings.xml
+++ b/skin.alaska/720p/DialogAddonSettings.xml
@@ -89,9 +89,9 @@
<include>Animation_ZoomedByMenu</include>
<include>Animation_ZoomOutZoomIn</include>
<posx>250</posx>
- <posy>188</posy>
+ <posy>204</posy>
<width>778</width>
- <height>320</height>
+ <height>220</height>
<itemgap>6</itemgap>
<onleft>9000</onleft>
<onright>9000</onright>
@@ -141,6 +141,7 @@
</control>
<control type="label" id="7">
<description>Separator label</description>
+ <visible>false</visible>
</control>
<control type="sliderex" id="8">
<description>Slider</description>
@@ -229,7 +230,7 @@
<include>Animation_ZoomOutZoomIn</include>
<include>Animation_ZoomedByMenu</include>
<posx>630</posx>
- <posy>130</posy>
+ <posy>180</posy>
<height>20</height>
<width>20</width>
<texture>arrowupfo.png</texture>
@@ -241,7 +242,7 @@
<include>Animation_ZoomOutZoomIn</include>
<include>Animation_ZoomedByMenu</include>
<posx>630</posx>
- <posy>478</posy>
+ <posy>430</posy>
<height>20</height>
<width>20</width>
<texture>arrowdownfo.png</texture>
diff --git a/skin.alaska/720p/Includes.xml b/skin.alaska/720p/Includes.xml
index 59f0d5f..d638eee 100644
--- a/skin.alaska/720p/Includes.xml
+++ b/skin.alaska/720p/Includes.xml
@@ -236,7 +236,7 @@
</control>
<control type="label">
<description>Pictures</description>
- <label>[COLOR clear]$LOCALIZE[1][/COLOR]:
$INFO[ListItem.Label]</label>
+ <label>$LOCALIZE[1]:
$INFO[ListItem.Label]</label>
<include>Global_HeadingSectionVars</include>
<visible>[Window.IsActive(2) +
[Control.IsVisible(59) | [substring(listitem.filenameandpath,jpg) |
substring(listitem.filenameandpath,bmp) |
substring(listitem.filenameandpath,png) |
substring(listitem.filenameandpath,tif) |
substring(listitem.filenameandpath,ico) |
substring(listitem.filenameandpath,pcx) |
substring(listitem.filenameandpath,tga)]]] + !Window.IsActive(134)</visible>
</control>
diff --git a/skin.alaska/720p/Viewtype_Banner.xml
b/skin.alaska/720p/Viewtype_Banner.xml
index 44a49cf..476c082 100644
--- a/skin.alaska/720p/Viewtype_Banner.xml
+++ b/skin.alaska/720p/Viewtype_Banner.xml
@@ -42,7 +42,7 @@
<font>Font_ListTitleNF</font>
<textcolor>Text</textcolor>
<selectedcolor>ListTitleNF</selectedcolor>
- <label>$INFO[ListItem.Label][COLOR
EpisodeWatchedNF] †[/COLOR]</label>
+ <label>$INFO[ListItem.Label][COLOR
EpisodeWatchedNF] †[/COLOR]</label>
<animation effect="slide" end="-50,0"
condition="Skin.HasSetting(NoStars)">Conditional</animation>
<visible>Skin.HasSetting(tvoverlays) +
stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
</control>
diff --git a/skin.alaska/720p/Viewtype_Episode.xml
b/skin.alaska/720p/Viewtype_Episode.xml
index c626d47..744b7d5 100644
--- a/skin.alaska/720p/Viewtype_Episode.xml
+++ b/skin.alaska/720p/Viewtype_Episode.xml
@@ -41,10 +41,21 @@
<width>830</width>
<height>60</height>
<align>left</align>
+ <label>[COLOR
TimeAMPM]$INFO[ListItem.TVShowTitle,, - ][/COLOR]$INFO[ListItem.Title]</label>
+ <font>Font_EpisodeTitleNF</font>
+ <textcolor>EpisodeLabelFO</textcolor>
+ <visible>!IsEmpty(ListItem.Episode) +
SubString(Container.FolderPath,videodb://5/)</visible>
+ </control>
+ <control type="label">
+ <posx>150</posx>
+ <posy>8</posy>
+ <width>830</width>
+ <height>60</height>
+ <align>left</align>
<label>$INFO[ListItem.Title]</label>
<font>Font_EpisodeTitleNF</font>
- <textcolor>EpisodeNF</textcolor>
-
<visible>!IsEmpty(ListItem.Episode)</visible>
+ <textcolor>EpisodeLabelFO</textcolor>
+ <visible>!IsEmpty(ListItem.Episode) +
!SubString(Container.FolderPath,videodb://5/)</visible>
</control>
<control type="label">
<posx>150</posx>
@@ -54,7 +65,7 @@
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<font>Font_EpisodeTitleNF</font>
- <textcolor>EpisodeNF</textcolor>
+ <textcolor>EpisodeLabelFO</textcolor>
<visible>IsEmpty(ListItem.Episode)</visible>
</control>
<control type="label">
@@ -76,7 +87,7 @@
<width>633</width>
<height>60</height>
<align>left</align>
- <label>$LOCALIZE[40234]
$INFO[ListItem.Premiered][COLOR EpisodeWatchedNF] †[/COLOR]</label>
+ <label>$LOCALIZE[40234]
$INFO[ListItem.Premiered][COLOR EpisodeWatchedNF] †[/COLOR]</label>
<font>Font_EpisodeDetailNF</font>
<textcolor>EpisodeNF</textcolor>
<visible>Skin.HasSetting(tvoverlays) +
stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
@@ -87,7 +98,7 @@
<width>633</width>
<height>60</height>
<align>left</align>
- <label>$LOCALIZE[40234]
$INFO[ListItem.Premiered][COLOR EpisodeWatchedNF] ‡[/COLOR]</label>
+ <label>$LOCALIZE[40234]
$INFO[ListItem.Premiered][COLOR EpisodeWatchedNF] ‡[/COLOR]</label>
<font>Font_EpisodeDetailNF</font>
<textcolor>EpisodeNF</textcolor>
<visible>Skin.HasSetting(tvoverlays) +
[!stringcompare(ListItem.Overlay,OverlayWatched.png) +
[stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.1.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.2.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.3.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.4.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.5.EpisodeTitle))]]</visible>
diff --git a/skin.alaska/720p/Viewtype_Files.xml
b/skin.alaska/720p/Viewtype_Files.xml
index 352c1e1..4a780f5 100644
--- a/skin.alaska/720p/Viewtype_Files.xml
+++ b/skin.alaska/720p/Viewtype_Files.xml
@@ -85,7 +85,7 @@
<font>Font_ListTitleNF</font>
<textcolor>Text</textcolor>
<selectedcolor>ListSelectedNF</selectedcolor>
- <label>$INFO[ListItem.Label,, ][COLOR
EpisodeWatchedNF]†[/COLOR]</label>
+ <label>$INFO[ListItem.Label,, ][COLOR
EpisodeWatchedNF]†[/COLOR]</label>
<scroll>false</scroll>
<visible>Window.IsActive(25) +
Container.Content(movies) + Skin.HasSetting(movieoverlays) +
stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
</control>
@@ -99,7 +99,7 @@
<font>Font_ListTitleNF</font>
<textcolor>Text</textcolor>
<selectedcolor>ListSelectedNF</selectedcolor>
- <label>$INFO[ListItem.Label,, ][COLOR
EpisodeWatchedNF]‡[/COLOR]</label>
+ <label>$INFO[ListItem.Label,, ][COLOR
EpisodeWatchedNF]‡[/COLOR]</label>
<scroll>false</scroll>
<visible>Window.IsActive(25) +
Container.Content(movies) + Skin.HasSetting(movieoverlays) +
!stringcompare(ListItem.Overlay,OverlayWatched.png) +
[stringcompare(ListItem.Title,Window(0).Property(LatestMovie.1.Title)) |
stringcompare(ListItem.Title,Window(0).Property(LatestMovie.2.Title)) |
stringcompare(ListItem.Title,Window(0).Property(LatestMovie.3.Title)) |
stringcompare(ListItem.Title,Window(0).Property(LatestMovie.4.Title)) |
stringcompare(ListItem.Title,Window(0).Property(LatestMovie.5.Title))]s</visible>
</control>
@@ -127,7 +127,7 @@
<font>Font_ListTitleNF</font>
<textcolor>Text</textcolor>
<selectedcolor>ListSelectedNF</selectedcolor>
- <label>$INFO[ListItem.Title,, ][COLOR
EpisodeWatchedNF]†[/COLOR]</label>
+ <label>$INFO[ListItem.Title,, ][COLOR
EpisodeWatchedNF]†[/COLOR]</label>
<scroll>false</scroll>
<visible>Window.IsActive(25) +
[Container.Content(tvshows) | Container.Content(seasons)] +
Skin.HasSetting(tvoverlays) +
stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
</control>
@@ -155,7 +155,7 @@
<font>Font_ListTitleNF</font>
<textcolor>Text</textcolor>
<selectedcolor>ListSelectedNF</selectedcolor>
-
<label>$INFO[ListItem.Episode]$INFO[ListItem.Title,. , ][COLOR
EpisodeWatchedNF]†[/COLOR]</label>
+
<label>$INFO[ListItem.Episode]$INFO[ListItem.Title,. , ][COLOR
EpisodeWatchedNF]†[/COLOR]</label>
<scroll>false</scroll>
<visible>Window.IsActive(25) +
Container.Content(episodes) + Skin.HasSetting(tvoverlays) +
stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
</control>
@@ -169,7 +169,7 @@
<font>Font_ListTitleNF</font>
<textcolor>Text</textcolor>
<selectedcolor>ListSelectedNF</selectedcolor>
-
<label>$INFO[ListItem.Episode]$INFO[ListItem.Title,. , ][COLOR
EpisodeWatchedNF]‡[/COLOR]</label>
+
<label>$INFO[ListItem.Episode]$INFO[ListItem.Title,. , ][COLOR
EpisodeWatchedNF]‡[/COLOR]</label>
<scroll>false</scroll>
<visible>Window.IsActive(25) +
Container.Content(episodes) + Skin.HasSetting(tvoverlays) +
!stringcompare(ListItem.Overlay,OverlayWatched.png) +
[stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.1.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.2.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.3.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.4.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.5.EpisodeTitle))]</visible>
</control>
@@ -277,7 +277,7 @@
<font>Font_ListTitleBigger</font>
<textcolor>ListTitleFO</textcolor>
<selectedcolor>ListSelectedFO</selectedcolor>
- <label>$INFO[ListItem.Label,, ][COLOR
EpisodeWatchedFO]†[/COLOR]</label>
+ <label>$INFO[ListItem.Label,, ][COLOR
EpisodeWatchedFO]†[/COLOR]</label>
<visible>Window.IsActive(25) +
Container.Content(movies) + Skin.HasSetting(movieoverlays) +
stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
<animation effect="slide" end="0,-10"
condition="!IsEmpty(ListItem.Genre) +
!IsEmpty(ListItem.Duration)">Conditional</animation>
</control>
@@ -295,7 +295,7 @@
<font>Font_ListTitleBigger</font>
<textcolor>ListTitleFO</textcolor>
<selectedcolor>ListSelectedFO</selectedcolor>
- <label>$INFO[ListItem.Label,, ][COLOR
EpisodeWatchedFO]‡[/COLOR]</label>
+ <label>$INFO[ListItem.Label,, ][COLOR
EpisodeWatchedFO]‡[/COLOR]</label>
<visible>Window.IsActive(25) +
Container.Content(movies) + Skin.HasSetting(movieoverlays) +
!stringcompare(ListItem.Overlay,OverlayWatched.png) +
[stringcompare(ListItem.Title,Window(0).Property(LatestMovie.1.Title)) |
stringcompare(ListItem.Title,Window(0).Property(LatestMovie.2.Title)) |
stringcompare(ListItem.Title,Window(0).Property(LatestMovie.3.Title)) |
stringcompare(ListItem.Title,Window(0).Property(LatestMovie.4.Title)) |
stringcompare(ListItem.Title,Window(0).Property(LatestMovie.5.Title))]s</visible>
<animation effect="slide" end="0,-10"
condition="!IsEmpty(ListItem.Genre) +
!IsEmpty(ListItem.Duration)">Conditional</animation>
</control>
@@ -382,7 +382,7 @@
<font>Font_ListTitleBigger</font>
<textcolor>ListTitleFO</textcolor>
<selectedcolor>ListSelectedFO</selectedcolor>
- <label>$INFO[ListItem.Title,, ][COLOR
EpisodeWatchedFO]†[/COLOR]</label>
+ <label>$INFO[ListItem.Title,, ][COLOR
EpisodeWatchedFO]†[/COLOR]</label>
<visible>Window.IsActive(25) +
[Container.Content(tvshows) | Container.Content(seasons)] +
Skin.HasSetting(tvoverlays) +
stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
<animation effect="slide" end="0,-10"
condition="!IsEmpty(ListItem.Premiered)">Conditional</animation>
</control>
@@ -400,7 +400,7 @@
<font>Font_ListTitleBigger</font>
<textcolor>ListTitleFO</textcolor>
<selectedcolor>ListSelectedFO</selectedcolor>
- <label>$INFO[ListItem.Title,, ][COLOR
EpisodeWatchedFO]‡[/COLOR]</label>
+ <label>$INFO[ListItem.Title,, ][COLOR
EpisodeWatchedFO]‡[/COLOR]</label>
<visible>Window.IsActive(25) +
[Container.Content(tvshows) | Container.Content(seasons)] +
Skin.HasSetting(tvoverlays) +
!stringcompare(ListItem.Overlay,OverlayWatched.png) +
[stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.1.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.2.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.3.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.4.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.5.EpisodeTitle))]</visible>
<animation effect="slide" end="0,-10"
condition="!IsEmpty(ListItem.Premiered)">Conditional</animation>
</control>
@@ -449,7 +449,7 @@
<font>Font_ListTitleBigger</font>
<textcolor>ListTitleFO</textcolor>
<selectedcolor>ListSelectedFO</selectedcolor>
-
<label>$INFO[ListItem.Episode]$INFO[ListItem.Title,. , ][COLOR
EpisodeWatchedFO]†[/COLOR]</label>
+
<label>$INFO[ListItem.Episode]$INFO[ListItem.Title,. , ][COLOR
EpisodeWatchedFO]†[/COLOR]</label>
<visible>Window.IsActive(25) +
Container.Content(episodes) + Skin.HasSetting(tvoverlays) +
stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
<animation effect="slide" end="0,-10"
condition="!IsEmpty(ListItem.Premiered)">Conditional</animation>
</control>
@@ -467,7 +467,7 @@
<font>Font_ListTitleBigger</font>
<textcolor>ListTitleFO</textcolor>
<selectedcolor>ListSelectedFO</selectedcolor>
-
<label>$INFO[ListItem.Episode]$INFO[ListItem.Title,. , ][COLOR
EpisodeWatchedFO]‡[/COLOR]</label>
+
<label>$INFO[ListItem.Episode]$INFO[ListItem.Title,. , ][COLOR
EpisodeWatchedFO]‡[/COLOR]</label>
<visible>Window.IsActive(25) +
Container.Content(episodes) + Skin.HasSetting(tvoverlays) +
!stringcompare(ListItem.Overlay,OverlayWatched.png) +
[stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.1.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.2.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.3.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.4.EpisodeTitle))
|
stringcompare(ListItem.Title,Window(0).Property(LatestEpisode.5.EpisodeTitle))]</visible>
<animation effect="slide" end="0,-10"
condition="!IsEmpty(ListItem.Premiered)">Conditional</animation>
</control>
diff --git a/skin.alaska/addon.xml b/skin.alaska/addon.xml
index db7ae1b..e678976 100644
--- a/skin.alaska/addon.xml
+++ b/skin.alaska/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.alaska" version="1.1.7" name="Alaska" provider-name="Hitcher">
+<addon id="skin.alaska" version="1.1.9" name="Alaska" provider-name="Hitcher">
<requires>
<import addon="xbmc.gui" version="2.11"/>
<import addon="script.recentlyadded" version="1.0.8"/>
diff --git a/skin.alaska/changelog.txt b/skin.alaska/changelog.txt
index 1b61207..f6b1407 100644
--- a/skin.alaska/changelog.txt
+++ b/skin.alaska/changelog.txt
@@ -1,3 +1,11 @@
+[B]1.1.9[/B]
+
+Changed: Added TV Show Title to 'Recently Added Episodes' list
+
+[B]1.1.8[/B]
+
+Fixed: Watched/New Icon font problem
+
[B]1.1.7[/B]
Changed: Plugin label to AddOn
-----------------------------------------------------------------------
Summary of changes:
skin.alaska/720p/DialogAddonSettings.xml | 9 +++++----
skin.alaska/720p/Includes.xml | 2 +-
skin.alaska/720p/Viewtype_Banner.xml | 2 +-
skin.alaska/720p/Viewtype_Episode.xml | 21 ++++++++++++++++-----
skin.alaska/720p/Viewtype_Files.xml | 22 +++++++++++-----------
skin.alaska/addon.xml | 2 +-
skin.alaska/changelog.txt | 8 ++++++++
7 files changed, 43 insertions(+), 23 deletions(-)
hooks/post-receive
--
Skins
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
