The branch, frodo has been updated
via 9db9408855fd9f9fa107849870b10e747875a7cb (commit)
from b6663856cf8fedbdc42eb049146b827ffaed97f1 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=9db9408855fd9f9fa107849870b10e747875a7cb
commit 9db9408855fd9f9fa107849870b10e747875a7cb
Author: ronie <[email protected]>
Date: Fri Aug 9 23:44:52 2013 +0200
[skin.simplicity] -v3.2.9
diff --git a/skin.simplicity/720p/DialogFullScreenInfo.xml
b/skin.simplicity/720p/DialogFullScreenInfo.xml
index 412491b..9157d23 100644
--- a/skin.simplicity/720p/DialogFullScreenInfo.xml
+++ b/skin.simplicity/720p/DialogFullScreenInfo.xml
@@ -50,7 +50,7 @@
<width>690</width>
<height>142</height>
<font>Simplicity_18</font>
- <align>justify</align>
+ <align>left</align>
<textcolor>white</textcolor>
<label>[B]$INFO[VideoPlayer.Plot][/B]</label>
<autoscroll time="2000" delay="3000"
repeat="5270">Skin.HasSetting(AutoScroll)</autoscroll>
@@ -399,9 +399,23 @@
<shadowcolor>black</shadowcolor>
</control>
<control type="label">
+ <posx>60</posx>
+ <posy>55</posy>
+ <width>700</width>
+ <height>25</height>
+ <label>$INFO[VideoPlayer.Director],
$INFO[VideoPlayer.Year]</label>
+ <scroll>true</scroll>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>Simplicity_18</font>
+ <textcolor>grey</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+
+ <control type="label">
<description>Popup
Info</description>
<posx>60</posx>
- <posy>72</posy>
+ <posy>215</posy>
<width>530</width>
<height>20</height>
<font>Simplicity_18_Bold</font>
@@ -414,7 +428,7 @@
<control type="label">
<description>Popup
Info</description>
<posx>400</posx>
- <posy>72</posy>
+ <posy>215</posy>
<width>530</width>
<height>20</height>
<font>Simplicity_18_Bold</font>
@@ -426,7 +440,7 @@
<control type="label">
<description>Popup
Info</description>
<posx>320r</posx>
- <posy>72</posy>
+ <posy>215</posy>
<width>530</width>
<height>20</height>
<font>Simplicity_18_Bold</font>
@@ -438,7 +452,7 @@
<control type="progress" id="404">
<description>progress control</description>
<posx>60</posx>
- <posy>97</posy>
+ <posy>197</posy>
<width>850</width>
<height>12</height>
<info>Player.Progress</info>
@@ -446,7 +460,7 @@
<texturebg
border="6,0,6,0">simplicity/progress-back.png</texturebg>
<lefttexture
border="6,0,0,0">simplicity/progress-left.png</lefttexture>
<midtexture
border="6,0,6,0">simplicity/osd-front.png</midtexture>
- </control>
+ </control>
<control type="image">
<posx>-130</posx>
<posy>22</posy>
@@ -459,18 +473,18 @@
<control type="textbox">
<description>Description Value The
Movie</description>
<posx>60</posx>
- <posy>122</posy>
+ <posy>95</posy>
<width>850</width>
- <height>110</height>
+ <height>90</height>
<font>Simplicity_18</font>
- <align>justify</align>
+ <align>left</align>
<textcolor>white</textcolor>
<label>[B]$INFO[VideoPlayer.Plot][/B]</label>
<autoscroll time="2000" delay="5000"
repeat="5270">Skin.HasSetting(AutoScroll)</autoscroll>
</control>
<control type="grouplist">
<description>Media Codec Flagging
Images</description>
- <posx>980</posx>
+ <posx>1000</posx>
<posy>30</posy>
<height>250</height>
<!-- <width>530</width> -->
@@ -637,14 +651,14 @@
<posy>52</posy>
<width>700</width>
<height>55</height>
-
<label>"$INFO[VideoPlayer.Title]"</label>
+ <label>$INFO[VideoPlayer.Title]</label>
<scroll>true</scroll>
<align>left</align>
- <font>Simplicity_30</font>
- <textcolor>white</textcolor>
+ <font>Simplicity_24</font>
+ <textcolor>grey</textcolor>
<shadowcolor>black</shadowcolor>
</control>
-<!-- -
[COLOR=grey]"$INFO[VideoPlayer.Title]"[/COLOR] -->
+
<control type="label">
<posx>110</posx>
<posy>15</posy>
@@ -666,7 +680,7 @@
<height>139</height>
<aspect>keep</aspect>
<texture
fallback="blank.png">$INFO[Player.Art(tvshow.clearart)]</texture>
- <bordertexture
border="3">simplicity/folder-focus.png</bordertexture>
+<!-- <bordertexture
border="3">simplicity/folder-focus.png</bordertexture> -->
<bordersize>3</bordersize>
</control>
<control type="image">
@@ -684,17 +698,17 @@
<control type="textbox">
<description>Description Value The
Movie</description>
<posx>110</posx>
- <posy>132</posy>
+ <posy>95</posy>
<width>850</width>
- <height>110</height>
+ <height>90</height>
<font>Simplicity_18</font>
- <align>justify</align>
+ <align>left</align>
<textcolor>white</textcolor>
<label>[B]$INFO[VideoPlayer.Plot][/B]</label>
<autoscroll time="2000" delay="5000"
repeat="5270">Skin.HasSetting(AutoScroll)</autoscroll>
</control>
<control type="label">
- <posx>-150</posx>
+ <posx>-130</posx>
<posy>185</posy>
<width>360</width>
<height>20</height>
@@ -707,8 +721,8 @@
</control>
<control type="label">
<description>Popup
Info</description>
- <posx>110</posx>
- <posy>90</posy>
+ <posx>110</posx>
+ <posy>215</posy>
<width>250</width>
<height>20</height>
<font>Simplicity_18_Bold</font>
@@ -731,8 +745,8 @@
</control>-->
<control type="label">
<description>Popup
Info</description>
- <posx>400</posx>
- <posy>90</posy>
+ <posx>455</posx>
+ <posy>215</posy>
<width>530</width>
<height>20</height>
<font>Simplicity_18_Bold</font>
@@ -743,8 +757,8 @@
</control>
<control type="label">
<description>Popup
Info</description>
- <posx>950</posx>
- <posy>90</posy>
+ <posx>950</posx>
+ <posy>215</posy>
<width>240</width>
<height>20</height>
<font>Simplicity_18_Bold</font>
@@ -756,7 +770,7 @@
<control type="progress" id="404">
<description>progress
control</description>
<posx>110</posx>
- <posy>115</posy>
+ <posy>197</posy>
<width>850</width>
<height>12</height>
<info>Player.Progress</info>
@@ -764,7 +778,7 @@
<texturebg
border="6,0,6,0">simplicity/progress-back.png</texturebg>
<lefttexture
border="6,0,0,0">simplicity/progress-left.png</lefttexture>
<midtexture
border="6,0,6,0">simplicity/osd-front.png</midtexture>
- </control>
+ </control>
<control type="grouplist">
<description>Media Codec Flagging
Images</description>
@@ -993,4 +1007,4 @@
</control>
</control>
</controls>
-</window>
\ No newline at end of file
+</window>
diff --git a/skin.simplicity/720p/DialogSeekBar.xml
b/skin.simplicity/720p/DialogSeekBar.xml
index 1e5c296..1c0fd5e 100644
--- a/skin.simplicity/720p/DialogSeekBar.xml
+++ b/skin.simplicity/720p/DialogSeekBar.xml
@@ -339,6 +339,7 @@
<height>114</height>
<aspectratio>keep</aspectratio>
<texture
background="true">$INFO[Player.Art(tvshow.clearlogo)]</texture>
+
<visible>Skin.HasSetting(EnableClearartViews)</visible>
</control>
<!-- <control type="image">
<posx>820</posx>
@@ -436,6 +437,7 @@
<height>114</height>
<aspectratio>keep</aspectratio>
<texture
background="true">$INFO[Player.Art(clearlogo)]</texture>
+
<visible>Skin.HasSetting(EnableClearartViews)</visible>
</control>
<!--<control type="image">
<posx>820</posx>
diff --git a/skin.simplicity/720p/DialogVideoInfo.xml
b/skin.simplicity/720p/DialogVideoInfo.xml
index a6186e4..8c2cf14 100644
--- a/skin.simplicity/720p/DialogVideoInfo.xml
+++ b/skin.simplicity/720p/DialogVideoInfo.xml
@@ -316,7 +316,7 @@
<width>400</width>
<height>155</height>
<aligny>center</aligny>
- <texture background = "true"
fallback = "logo-fallback.png">$INFO[ListItem.Art(clearlogo)]</texture>
+ <texture background =
"true">$INFO[ListItem.Art(clearlogo)]</texture>
<aspectratio>keep</aspectratio>
<visible>Skin.HasSetting(EnableClearartViews)</visible>
</control>
@@ -1206,13 +1206,14 @@
<label>$LOCALIZE[20410]</label>
<visible>!IsEmpty(ListItem.Trailer)</visible>
</control>
- <control type="button" id="13">
+ <control type="button" id="17">
<description>Home Cinema
Experience</description>
<include>ButtonInfoDialogsCommonValuesInfo</include>
<label>$LOCALIZE[31473]</label>
<onclick>Dialog.Close(MovieInformation)</onclick>
<onclick>Playlist.Clear</onclick>
-
<onclick>RunScript(special://home/addons/script.cinema.experience/addon.py)</onclick>
+
<onclick>XBMC.RunScript(script.cinema.experience,movieid=$INFO[ListItem.DBID])</onclick>
+<!--
<onclick>RunScript(special://home/addons/script.cinema.experience/addon.py)</onclick>
-->
<visible>Container.Content(Movies) +
Skin.HasSetting(CinemaExperienceButton)</visible>
</control>
<control type = "button" id = "14">
diff --git a/skin.simplicity/720p/Home.xml b/skin.simplicity/720p/Home.xml
index b9278f8..9ca514c 100644
--- a/skin.simplicity/720p/Home.xml
+++ b/skin.simplicity/720p/Home.xml
@@ -570,7 +570,7 @@
<font>Simplicity_26_Bold</font>
<label>$INFO[ListItem.Label]</label>
<textcolor>grey3</textcolor>
-
<visible>!Skin.HasSetting(AlternateHome)</visible>
+
<visible>Skin.HasSetting(AlternateHome)</visible>
</control>
<control type="image">
<posx>55</posx>
@@ -581,7 +581,7 @@
<colordiffuse>40FFFFFF</colordiffuse>
<texture
diffuse="icons/icondiffuse.png"
fallback="icons/programsicon.png">$INFO[ListItem.Thumb]</texture>
<animation effect="fade" start="100"
end="0" time="100"
condition="ControlGroup(9001).HasFocus">Conditional</animation>
-
<visible>Skin.HasSetting(AlternateHome)</visible>
+
<visible>!Skin.HasSetting(AlternateHome)</visible>
</control>
</itemlayout>
<focusedlayout width="200" height="200">
@@ -609,7 +609,7 @@
<animation effect="fade" start="100"
end="30" time="0" condition="Control.HasFocus(24)">Conditional</animation>
<animation effect="fade" start="100"
end="30" time="0" condition="Control.HasFocus(25)">Conditional</animation>
<animation effect="fade" start="100"
end="30" time="0"
condition="ControlGroup(9001).HasFocus">Conditional</animation>
-
<visible>!Skin.HasSetting(AlternateHome)</visible>
+
<visible>Skin.HasSetting(AlternateHome)</visible>
</control>
<control type="image">
<animation effect="slide" start="0,0"
end="0,-45" time="100" >Focus</animation>
@@ -633,7 +633,7 @@
<align>center</align>
<width>90</width>
<height>90</height>
-
<visible>Skin.HasSetting(AlternateHome)</visible>
+
<visible>!Skin.HasSetting(AlternateHome)</visible>
<texture
fallback="icons/programsicon.png">$INFO[ListItem.Thumb]</texture>
</control>
<control type="image">
@@ -642,7 +642,7 @@
<align>center</align>
<width>110</width>
<height>110</height>
-
<visible>Skin.HasSetting(AlternateHome)</visible>
+
<visible>!Skin.HasSetting(AlternateHome)</visible>
<texture>lights.png</texture>
<animation effect="fade" start="100"
end="30" time="0" condition="Control.HasFocus(8000)">Conditional</animation>
<animation effect="fade" start="100"
end="30" time="0" condition="Control.HasFocus(8002)">Conditional</animation>
@@ -1691,7 +1691,7 @@
<animation effect="fade" start="100" end="20" time="0"
condition="Control.HasFocus(25)">Conditional</animation>
<animation effect="fade" start="100" end="20" time="0"
condition="ControlGroup(9001).HasFocus">Conditional</animation>
<visible>!ControlGroup(9001).HasFocus</visible>
- <visible>Skin.HasSetting(AlternateHome)</visible>
+ <visible>!Skin.HasSetting(AlternateHome)</visible>
</control>
<!--END NEW HOME LIST-->
diff --git a/skin.simplicity/720p/Pointer.xml b/skin.simplicity/720p/Pointer.xml
index 8061eaf..811115d 100644
--- a/skin.simplicity/720p/Pointer.xml
+++ b/skin.simplicity/720p/Pointer.xml
@@ -9,32 +9,32 @@
<description>Pointer Image</description>
<posx>0</posx>
<posy>0</posy>
- <width>186</width>
- <height>50</height>
+ <width>40</width>
+ <height>40</height>
<texture>pointer-focus.png</texture>
</control>
<control type="image" id="2">
<description>Pointer Focus Image</description>
<posx>0</posx>
<posy>0</posy>
- <width>186</width>
- <height>50</height>
+ <width>40</width>
+ <height>40</height>
<texture>pointer-focus.png</texture>
</control>
<control type="image" id="3">
<description>Pointer Drag Image</description>
<posx>0</posx>
<posy>0</posy>
- <width>186</width>
- <height>50</height>
+ <width>40</width>
+ <height>40</height>
<texture>pointer-focus.png</texture>
</control>
<control type="image" id="4">
<description>Pointer Click Image</description>
<posx>0</posx>
<posy>0</posy>
- <width>186</width>
- <height>50</height>
+ <width>40</width>
+ <height>40</height>
<texture>pointer-focus.png</texture>
</control>
</controls>
diff --git a/skin.simplicity/720p/ViewsVideoLibrary.xml
b/skin.simplicity/720p/ViewsVideoLibrary.xml
index 432e04d..b82111f 100644
--- a/skin.simplicity/720p/ViewsVideoLibrary.xml
+++ b/skin.simplicity/720p/ViewsVideoLibrary.xml
@@ -909,6 +909,7 @@
<texture
background="true">$INFO[ListItem.Art(clearlogo)]</texture>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
<visible>Container.Content(Movies)|Container.Content(TVShows)</visible>
+
<visible>Skin.HasSetting(EnableClearartViews)</visible>
</control>
<control
type="largeimage">
<posx>850</posx>
@@ -919,6 +920,7 @@
<texture
background="true">$INFO[ListItem.Art(tvshow.clearlogo)]</texture>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
<visible>Container.Content(Seasons)</visible>
+
<visible>Skin.HasSetting(EnableClearartViews)</visible>
</control>
</control>
@@ -1177,6 +1179,7 @@
<texture
background="true">$INFO[ListItem.Art(clearlogo)]</texture>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
<visible>Container.Content(Movies)|Container.Content(TVShows)</visible>
+
<visible>Skin.HasSetting(EnableClearartViews)</visible>
</control>
</control>
</control>
@@ -6560,6 +6563,7 @@
<aspectratio>keep</aspectratio>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
<fadetime>IconCrossfadeTime</fadetime>
+
<visible>Skin.HasSetting(EnableClearartViews)</visible>
</control>
</control>
</control>
@@ -6604,7 +6608,7 @@
<scrolltime>300</scrolltime>
<focusposition>3</focusposition>
<orientation>vertical</orientation>
- <preloaditems>200</preloaditems>
+ <preloaditems>2</preloaditems>
<itemlayout height="270"
width="420">
<control type="image">
<posx>20</posx>
@@ -6630,7 +6634,7 @@
<width>360</width>
<height>204</height>
<aligny>center</aligny>
- <texture
background="true"
fallback="nothumb.png">$INFO[Listitem.Property(Fanart_Image)]</texture>
+ <texture
background="true" fallback="nothumb.png">$INFO[Listitem.Art(fanart)]</texture>
<aspectratio>stretch</aspectratio>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
</control>
@@ -6648,7 +6652,7 @@
<posy>116</posy>
<width>214</width>
<height>83</height>
- <texture
background="true"
fallback="logo-fallback.png">$INFO[ListItem.Art(clearlogo)]</texture>
+ <texture
background="true">$INFO[ListItem.Art(clearlogo)]</texture>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
</control>
<control type="image">
@@ -6726,7 +6730,7 @@
<posy>15</posy>
<width>360</width>
<height>204</height>
- <texture
background="true"
fallback="nothumb.png">$INFO[Listitem.Property(Fanart_Image)]</texture>
+ <texture
background="true" fallback="nothumb.png">$INFO[Listitem.Art(fanart)]</texture>
<aspectratio>stretch</aspectratio>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
<animation
type="Focus" reversible="false">
@@ -6739,7 +6743,7 @@
<posy>15</posy>
<width>360</width>
<height>204</height>
- <texture
background="true"
fallback="nothumb.png">$INFO[Listitem.Property(Fanart_Image)]</texture>
+ <texture
background="true" fallback="nothumb.png">$INFO[Listitem.Art(fanart)]</texture>
<aspectratio>stretch</aspectratio>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
<visible>Skin.HasSetting(NoGridFade)</visible>
@@ -6826,7 +6830,7 @@
<posy>116</posy>
<width>214</width>
<height>83</height>
- <texture
background="true"
fallback="logo-fallback.png">$INFO[ListItem.Art(clearlogo)]</texture>
+ <texture
background="true">$INFO[ListItem.Art(clearlogo)]</texture>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
<animation
type="Focus" reversible="false">
<effect
type="fade" start="100" end="0" time="300" delay="1050"/>
@@ -6838,7 +6842,7 @@
<posy>116</posy>
<width>214</width>
<height>83</height>
- <texture
background="true"
fallback="logo-fallback.png">$INFO[ListItem.Art(clearlogo)]</texture>
+ <texture
background="true">$INFO[ListItem.Art(clearlogo)]</texture>
<visible>!stringcompare(ListItem.Icon,DefaultFolderBack.png)</visible>
<visible>Skin.HasSetting(NoGridFade)</visible>
</control>
@@ -6880,8 +6884,8 @@
<width>250</width>
<height>20</height>
<font>Simplicity_18</font>
-
<scroll>false</scroll>
-
<scrollspeed>0</scrollspeed>
+
<scroll>true</scroll>
+
<scrollspeed>30</scrollspeed>
<textcolor>grey4</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
diff --git a/skin.simplicity/addon.xml b/skin.simplicity/addon.xml
index d13986f..0633d12 100644
--- a/skin.simplicity/addon.xml
+++ b/skin.simplicity/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="skin.simplicity"
- version="3.2.8"
+ version="3.2.9"
name="Simplicity"
provider-name="igotdvds|Balinus">
<requires>
diff --git a/skin.simplicity/changelog.txt b/skin.simplicity/changelog.txt
index 011b3f3..ebbf34c 100644
--- a/skin.simplicity/changelog.txt
+++ b/skin.simplicity/changelog.txt
@@ -1,3 +1,7 @@
+[B]3.2.9[/B]
+- Modified default Home screen to Icons instead of Text
+- New Player Infoscreen Layout
+
[B]3.2.4[/B]
- Added back support for TV Show Next Aired script
- Fixed bugs in TV show views at season and episode level
diff --git a/skin.simplicity/language/English/strings.xml
b/skin.simplicity/language/English/strings.xml
index 1d7efb4..0182d94 100644
--- a/skin.simplicity/language/English/strings.xml
+++ b/skin.simplicity/language/English/strings.xml
@@ -383,9 +383,9 @@
<string id="31384">Disable View Preview Images</string>
<string id="31385">Enable Smoke Effect From AEON</string>
<string id="31386">Use Landscapes</string>
- <string id="31387">Enable TV Show Logo Support</string>
+ <string id="31387">Enable Logo Support</string>
<string id="31388">Startup Window</string>
- <string id="31389">Use Alternate Home Layout (Icons)</string>
+ <string id="31389">Use Alternate Home Layout (Text)</string>
<string id="31390">Disable Weather Beside Clock</string>
<string id="31391">Use TV Alert Feed (Must disable RSS feed)</string>
<string id="31392">Enable Random Items Functionality</string>
diff --git a/skin.simplicity/media/ScrollBarNib.png
b/skin.simplicity/media/ScrollBarNib.png
index 64f6956..bb071a0 100644
Binary files a/skin.simplicity/media/ScrollBarNib.png and
b/skin.simplicity/media/ScrollBarNib.png differ
diff --git a/skin.simplicity/media/pointer-focus.png
b/skin.simplicity/media/pointer-focus.png
index 2f33466..0e9b734 100644
Binary files a/skin.simplicity/media/pointer-focus.png and
b/skin.simplicity/media/pointer-focus.png differ
-----------------------------------------------------------------------
Summary of changes:
skin.simplicity/720p/DialogFullScreenInfo.xml | 70 ++++++++++++--------
skin.simplicity/720p/DialogSeekBar.xml | 2 +
skin.simplicity/720p/DialogVideoInfo.xml | 7 +-
skin.simplicity/720p/Home.xml | 12 ++--
skin.simplicity/720p/Pointer.xml | 16 ++--
skin.simplicity/720p/ViewsVideoLibrary.xml | 22 ++++---
skin.simplicity/addon.xml | 2 +-
skin.simplicity/changelog.txt | 4 +
skin.simplicity/language/English/strings.xml | 4 +-
skin.simplicity/media/ScrollBarNib.png | Bin 116 -> 225 bytes
.../{pointer-focus.png => pointer-focus-od.png} | Bin 3634 -> 3634 bytes
skin.simplicity/media/pointer-focus.png | Bin 3634 -> 1746 bytes
12 files changed, 82 insertions(+), 57 deletions(-)
copy skin.simplicity/media/{pointer-focus.png => pointer-focus-od.png} (100%)
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
