The branch, frodo has been updated
via 69a83e85dd3d02d6782ecae5fff945b6b0dbee22 (commit)
from d7a2aca9dfe230dd061001e5d5aec1deb4e0c44d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=69a83e85dd3d02d6782ecae5fff945b6b0dbee22
commit 69a83e85dd3d02d6782ecae5fff945b6b0dbee22
Author: ronie <ronie>
Date: Sun Oct 6 17:44:00 2013 +0200
[skin.amber] -v1.0.9
diff --git a/skin.amber/1080i/DialogBusy.xml b/skin.amber/1080i/DialogBusy.xml
index e64a0a0..df86f78 100644
--- a/skin.amber/1080i/DialogBusy.xml
+++ b/skin.amber/1080i/DialogBusy.xml
@@ -5,6 +5,7 @@
<posy>0</posy>
</coordinates>
<controls>
+ <include>DimBG</include>
<control type="group" description="Content">
<animation effect="slide" start="0,0" end="0,-124"
time="200">WindowOpen</animation>
<posy>604</posy>
diff --git a/skin.amber/1080i/DialogFullScreenInfo.xml
b/skin.amber/1080i/DialogFullScreenInfo.xml
index eb5ea50..703112b 100644
--- a/skin.amber/1080i/DialogFullScreenInfo.xml
+++ b/skin.amber/1080i/DialogFullScreenInfo.xml
@@ -1,8 +1,18 @@
<window type="dialog">
+ <defaultcontrol always="true">9000</defaultcontrol>
<include>OSDFade</include>
<controls>
- <control type="group">
- <visible>!Window.IsActive(videoosd.xml)</visible>
+ <control type="button" id="9000">
+ <include>HiddenButton</include>
+ <onleft>Dialog.Close(10142)</onleft>
+ <onright>Dialog.Close(10142)</onright>
+ <onup>Dialog.Close(10142)</onup>
+ <ondown>Dialog.Close(10142)</ondown>
+ <onback>Dialog.Close(10142)</onback>
+ <onclick>Dialog.Close(10142)</onclick>
+ <onfocus>noop</onfocus>
+ </control>
+ <control type="group">
<posy>720</posy>
<control type="image" description="Background">
<posx>0</posx>
diff --git a/skin.amber/1080i/Font.xml b/skin.amber/1080i/Font.xml
index e4ba300..b341172 100644
--- a/skin.amber/1080i/Font.xml
+++ b/skin.amber/1080i/Font.xml
@@ -131,6 +131,7 @@
<style>bold</style>
<size>28</size>
<linespacing>1.0</linespacing>
+ <aspect>1.0</aspect>
</font>
<font>
<name>InfoPath</name>
diff --git a/skin.amber/1080i/MyVideoNav.xml b/skin.amber/1080i/MyVideoNav.xml
index e8a5c27..6e19603 100644
--- a/skin.amber/1080i/MyVideoNav.xml
+++ b/skin.amber/1080i/MyVideoNav.xml
@@ -1,5 +1,6 @@
<window>
<defaultcontrol always="true">50</defaultcontrol>
+ <onload condition="Skin.HasSetting(TVTunes.Enabled) +
System.HasAddon(script.tvtunes)">XBMC.RunScript(script.tvtunes,backend=True&loop=False)</onload>
<controls>
<control type="group" description="BG">
<include>Fanart_Art</include>
diff --git a/skin.amber/1080i/Settings.xml b/skin.amber/1080i/Settings.xml
index 14fa435..d7ac605 100644
--- a/skin.amber/1080i/Settings.xml
+++ b/skin.amber/1080i/Settings.xml
@@ -119,6 +119,10 @@
<onclick>noop</onclick>
</item>
<include description="Item 8"
condition="System.HasAddon(plugin.video.plexbmc)">Plexbmc.Settings.Section.Label</include>
+ <item id="10" description="Advanced">
+ <label>$LOCALIZE[31985]</label>
+ <onclick>noop</onclick>
+ </item>
</content>
</control>
<control type="group" id="9010">
@@ -426,20 +430,6 @@
<label2>$INFO[Skin.String(SubtitleScript_Path)]</label2>
<onclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</onclick>
</item>
- <item id="11" description="Artist slideshow">
- <visible>System.HasAddon(script.artistslideshow)</visible>
- <visible>Skin.HasSetting(Use_Artist_Slideshow)</visible>
- <label>$LOCALIZE[31969]</label>
- <label2>$LOCALIZE[107]</label2>
- <onclick>Skin.ToggleSetting(Use_Artist_Slideshow)</onclick>
- </item>
- <item id="11" description="Artist slideshow">
- <visible>System.HasAddon(script.artistslideshow)</visible>
- <visible>!Skin.HasSetting(Use_Artist_Slideshow)</visible>
- <label>$LOCALIZE[31969]</label>
- <label2>$LOCALIZE[106]</label2>
- <onclick>Skin.ToggleSetting(Use_Artist_Slideshow)</onclick>
- </item>
<item id="12" description="Show player on home">
<visible>Skin.HasSetting(Show_Player)</visible>
<label>$LOCALIZE[31991]</label>
@@ -508,7 +498,7 @@
<width>26</width>
<height>60</height>
<aspectratio>keep</aspectratio>
- <texture>overlay/OverlayUnwatched.png</texture>
+ <texture>OverlayInProgress.png</texture>
</control>
</control>
<!-- 9000 3 -->
@@ -1838,9 +1828,154 @@
</control>
<!-- 9000 8 -->
<include description="Item 8"
condition="System.HasAddon(plugin.video.plexbmc)">Plexbmc.Settings.Controls</include>
+ <!-- 9000 10 -->
+ <control type="panel" id="9007">
+ <visible>Container(9000).HasFocus(10)</visible>
+ <posx>390</posx>
+ <posy>210</posy>
+ <width>1140</width>
+ <height>780</height>
+ <onleft>9000</onleft>
+ <onright>500</onright>
+ <onup>9007</onup>
+ <ondown>9007</ondown>
+ <pagecontrol>-</pagecontrol>
+ <scrolltime>280</scrolltime>
+ <itemlayout width="1140" height="60">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>60</height>
+ <width>1140</width>
+ <texture border="3">buttons/ButtonNF.png</texture>
+ </control>
+ <control type="label" description="Label 2">
+ <posx>30r</posx>
+ <posy>0</posy>
+ <height>60</height>
+ <width>600</width>
+ <font>Label2</font>
+ <haspath>true</haspath>
+ <align>right</align>
+ <scroll>false</scroll>
+ <textcolor>Orange</textcolor>
+ <label>$INFO[ListItem.Label2]</label>
+ </control>
+ <control type="label" description="Main Label">
+ <posx>30</posx>
+ <posy>0</posy>
+ <height>60</height>
+ <width>930</width>
+ <scroll>false</scroll>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="image" description="Icon">
+ <visible>!IsEmpty(ListItem.Icon)</visible>
+ <posx>81r</posx>
+ <posy>0</posy>
+ <height>60</height>
+ <width>60</width>
+ <aspectratio>keep</aspectratio>
+ <bordersize>6</bordersize>
+ <texture>$INFO[ListItem.Icon]</texture>
+ </control>
+ </itemlayout>
+ <focusedlayout width="1140" height="60">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>60</height>
+ <width>1140</width>
+ <texture border="2">buttons/ButtonFO.png</texture>
+ </control>
+ <control type="label" description="Label 2">
+ <posx>30r</posx>
+ <posy>0</posy>
+ <height>60</height>
+ <width>600</width>
+ <font>Label2</font>
+ <haspath>true</haspath>
+ <align>right</align>
+ <scroll>false</scroll>
+ <textcolor>Orange</textcolor>
+ <label>$INFO[ListItem.Label2]</label>
+ </control>
+ <control type="label" description="Main Label">
+ <posx>30</posx>
+ <posy>0</posy>
+ <height>60</height>
+ <width>930</width>
+ <scroll>false</scroll>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="image" description="Icon">
+ <visible>!IsEmpty(ListItem.Icon)</visible>
+ <posx>81r</posx>
+ <posy>0</posy>
+ <height>60</height>
+ <width>60</width>
+ <bordersize>6</bordersize>
+ <aspectratio>keep</aspectratio>
+ <texture>$INFO[ListItem.Icon]</texture>
+ </control>
+ </focusedlayout>
+ <content>
+ <item id="1" description="TVTunes">
+ <visible>!Skin.HasSetting(TVTunes.Enabled)</visible>
+ <label>$LOCALIZE[31984]</label>
+ <label2>$LOCALIZE[13106]</label2>
+ <onclick>Skin.ToggleSetting(TVTunes.Enabled)</onclick>
+ </item>
+ <item id="1" description="Quit">
+ <visible>Skin.HasSetting(TVTunes.Enabled)</visible>
+ <label>$LOCALIZE[31984]</label>
+ <label2>$LOCALIZE[305]</label2>
+ <onclick>Skin.ToggleSetting(TVTunes.Enabled)</onclick>
+ </item>
+ <item id="2" description="Artist slideshow">
+ <visible>System.HasAddon(script.artistslideshow)</visible>
+ <visible>!Skin.HasSetting(Use_Artist_Slideshow)</visible>
+ <label>$LOCALIZE[31969]</label>
+ <label2>$LOCALIZE[13106]</label2>
+ <onclick>Skin.ToggleSetting(Use_Artist_Slideshow)</onclick>
+ </item>
+ <item id="2" description="Artist slideshow">
+ <visible>System.HasAddon(script.artistslideshow)</visible>
+ <visible>Skin.HasSetting(Use_Artist_Slideshow)</visible>
+ <label>$LOCALIZE[31969]</label>
+ <label2>$LOCALIZE[305]</label2>
+ <onclick>Skin.ToggleSetting(Use_Artist_Slideshow)</onclick>
+ </item>
+ <item id="3" description="Dont wait for widgets">
+ <visible>!Skin.HasSetting(Hide.RecentlyAdded)</visible>
+ <visible>!Skin.HasSetting(Use.FastStart)</visible>
+ <label>$LOCALIZE[31977]</label>
+ <label2>$LOCALIZE[13106]</label2>
+ <onclick>Skin.ToggleSetting(Use.FastStart)</onclick>
+ </item>
+ <item id="3" description="Dont wait for widgets">
+ <visible>!Skin.HasSetting(Hide.RecentlyAdded)</visible>
+ <visible>Skin.HasSetting(Use.FastStart)</visible>
+ <label>$LOCALIZE[31977]</label>
+ <label2>$LOCALIZE[305]</label2>
+ <onclick>Skin.ToggleSetting(Use.FastStart)</onclick>
+ </item>
+ </content>
+ </control>
</control>
</control>
- <control type="scrollbar" id="63">
+ <control type="textbox">
+ <visible>Container(9007).HasFocus(3)</visible>
+ <posx>1548</posx>
+ <posy>210</posy>
+ <width>294</width>
+ <height>780</height>
+ <font>InfoPlot</font>
+ <align>left</align>
+ <textcolor>Orange</textcolor>
+ <label>$LOCALIZE[31982]</label>
+ </control>
+ <control type="scrollbar" id="63">
<visible>Control.IsVisible(9003)</visible>
<posx>1518</posx>
<posy>210</posy>
diff --git a/skin.amber/1080i/Startup.xml b/skin.amber/1080i/Startup.xml
index e4206f3..596bfa6 100644
--- a/skin.amber/1080i/Startup.xml
+++ b/skin.amber/1080i/Startup.xml
@@ -11,18 +11,8 @@
<!-- Show home if skin widgets loading is finished -->
<control type="button" id="11">
<include>HiddenButton</include>
- <!--<posx>510</posx>
- <posy>500</posy>
- <width>900</width>
- <height>80</height>
- <align>center</align>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <textcolor>Orange</textcolor>
- <focusedcolor>Orange</focusedcolor>
- <label>$LOCALIZE[31979]</label>-->
- <onfocus condition="!System.HasAddon(service.skin.widgets) |
Skin.HasSetting(Hide.RecentlyAdded) |
Skin.HasSetting(plexbmc)">SetFocus(12)</onfocus>
- <onfocus condition="![!System.HasAddon(service.skin.widgets) |
Skin.HasSetting(Hide.RecentlyAdded) |
Skin.HasSetting(plexbmc)]">SetFocus(11)</onfocus>
+ <onfocus condition="!System.HasAddon(service.skin.widgets) |
Skin.HasSetting(Hide.RecentlyAdded) | Skin.HasSetting(plexbmc) |
Skin.HasSetting(Use.FastStart)">SetFocus(12)</onfocus>
+ <onfocus condition="![!System.HasAddon(service.skin.widgets) |
Skin.HasSetting(Hide.RecentlyAdded) | Skin.HasSetting(plexbmc) |
Skin.HasSetting(Use.FastStart)]">SetFocus(11)</onfocus>
<visible>IsEmpty(Window(Home).Property(SkinWidgets_Running))</visible>
</control>
<control type="button" id="11">
diff --git a/skin.amber/1080i/View_57_58_59_Showcase.xml
b/skin.amber/1080i/View_57_58_59_Showcase.xml
index 8b4109f..c032d97 100644
--- a/skin.amber/1080i/View_57_58_59_Showcase.xml
+++ b/skin.amber/1080i/View_57_58_59_Showcase.xml
@@ -136,7 +136,7 @@
<control type="group" description="Showcase 59 Movies TV Seasons">
<visible>Control.IsVisible(59)</visible>
<control type="fixedlist" id="59">
- <visible>[container.content(MusicVideos) +
Window.IsActive(myvideonav.xml)] | container.content(movies) |
container.content(tvshows) | container.content(seasons)</visible>
+ <visible>[container.content(MusicVideos) +
Window.IsActive(myvideonav.xml)] | container.content(movies) |
container.content(sets) | container.content(tvshows) |
container.content(seasons)</visible>
<animation effect="slide" easing="out" start="0,0" end="0,800"
time="350" delay="0" center="120,350" reversible="true"
condition="Control.HasFocus(7000)">Conditional</animation>
<animation effect="slide" easing="out" start="0,0" end="0,60"
time="350" delay="0" center="120,350" reversible="true"
condition="Skin.HasSetting(Posters_Info)">Conditional</animation>
<posx>-120</posx>
@@ -362,7 +362,7 @@
<control type="group" description="Showcase 58 Squares">
<visible>Control.IsVisible(58)</visible>
<control type="fixedlist" id="58">
- <visible>![[container.content(MusicVideos) +
Window.IsActive(myvideonav.xml)] | container.content(movies) |
container.content(tvshows) | container.content(seasons) |
container.content(episodes)]</visible>
+ <visible>![[container.content(MusicVideos) +
Window.IsActive(myvideonav.xml)] | container.content(movies) |
container.content(sets) | container.content(tvshows) |
container.content(seasons) | container.content(episodes)]</visible>
<animation effect="slide" easing="out" start="0,0" end="0,800"
time="350" delay="0" center="120,350" reversible="true"
condition="Control.HasFocus(7000)">Conditional</animation>
<animation effect="slide" easing="out" start="0,0" end="0,60"
time="350" delay="0" center="120,350" reversible="true"
condition="Skin.HasSetting(Music_Info)">Conditional</animation>
<posx>-174</posx>
diff --git a/skin.amber/addon.xml b/skin.amber/addon.xml
index 5f3d97a..123c7cd 100644
--- a/skin.amber/addon.xml
+++ b/skin.amber/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.amber" version="1.0.8" name="Amber" provider-name="Pecinko">
+<addon id="skin.amber" version="1.0.9" name="Amber" provider-name="Pecinko">
<requires>
<import addon="xbmc.gui" version="4.0.0"/>
<import addon="script.favourites" version="3.2.0"/>
diff --git a/skin.amber/changelog.txt b/skin.amber/changelog.txt
index 80e50b2..c6708f3 100644
--- a/skin.amber/changelog.txt
+++ b/skin.amber/changelog.txt
@@ -1,3 +1,11 @@
+1.0.9
+Add fast start option that skips waiting for skin widgets
+Fix Player VideoInfo dialog closing
+Fix partial flag in settings, move artist slideshow to advanced settings
+Add option for TV Tunes
+Dim background a bit when busy dialog is active
+Fix covers AR for movie sets
+
1.0.8
Add dialogs for WMC pvr addon
Open programs on Android differently
diff --git a/skin.amber/language/English/strings.po
b/skin.amber/language/English/strings.po
index 832d7de..840e22c 100644
--- a/skin.amber/language/English/strings.po
+++ b/skin.amber/language/English/strings.po
@@ -304,7 +304,7 @@ msgid "Show info"
msgstr ""
msgctxt "#31969"
-msgid "Show artist slideshow backgrounds in music player"
+msgid "Artist slideshow (requires Artist slideshow add-on)"
msgstr ""
msgctxt "#31970"
@@ -336,7 +336,9 @@ msgctxt "#31976"
msgid "Home shelf"
msgstr ""
-#empty string with id 31977
+msgctxt "#31977"
+msgid "Fast start"
+msgstr ""
msgctxt "#31978"
msgid "Show library info on Home (totals, unwatched...)"
@@ -354,13 +356,21 @@ msgctxt "#31981"
msgid "Hide watched marks"
msgstr ""
-#empty string with id 31982
+msgctxt "#31982"
+msgid "Shelf items populate more slowly on some systems. By default, skin
waits for them to be ready and presents Home screen afterwards.[CR][CR]This
option skips this step and presents Home page immediately. Shelf items will
appear with a delay, depending on a speed of your system."
+msgstr ""
msgctxt "#31983"
msgid "Choose from menu"
msgstr ""
-#empty strings from id 31984 to 31985
+msgctxt "#31984"
+msgid "TV Tunes (requires TV Tunes add-on)"
+msgstr ""
+
+msgctxt "#31985"
+msgid "Advanced"
+msgstr ""
msgctxt "#31986"
msgid "Use default background on Home page"
-----------------------------------------------------------------------
Summary of changes:
skin.amber/1080i/DialogBusy.xml | 1 +
skin.amber/1080i/DialogFullScreenInfo.xml | 14 ++-
skin.amber/1080i/Font.xml | 1 +
skin.amber/1080i/MyVideoNav.xml | 1 +
skin.amber/1080i/Settings.xml | 167 ++++++++++++++++++++++++---
skin.amber/1080i/Startup.xml | 14 +--
skin.amber/1080i/View_57_58_59_Showcase.xml | 4 +-
skin.amber/addon.xml | 2 +-
skin.amber/changelog.txt | 8 ++
skin.amber/language/English/strings.po | 18 +++-
10 files changed, 193 insertions(+), 37 deletions(-)
hooks/post-receive
--
Skins
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
