The branch, frodo has been updated
via 32ce94f33d5bdeba71083f113e120a8469877415 (commit)
via fadf3b2f2c8b9578a839143972d3fac25e308e42 (commit)
from 3a4c45d49872ea723106639a83710e11404b0495 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=32ce94f33d5bdeba71083f113e120a8469877415
commit 32ce94f33d5bdeba71083f113e120a8469877415
Author: Martijn Kaijser <[email protected]>
Date: Thu Apr 17 08:15:25 2014 +0200
[script.grab.fanart] 0.12.9
diff --git a/script.grab.fanart/README.txt b/script.grab.fanart/README.txt
index 152fc7f..4e78d97 100644
--- a/script.grab.fanart/README.txt
+++ b/script.grab.fanart/README.txt
@@ -27,17 +27,23 @@ script.grab.fanart.Global.FanArt - path to the fanart image
for this media
script.grab.fanart.Video.Title - the title of a random video (movie or tv
show). There is a 10% chance of this being a TV show.
script.grab.fanart.Video.FanArt - the path to the fanart image for this video
script.grab.fanart.Video.Poster - path to poster image for this video
+script.grab.fanart.Video.Logo - path to clear logo for this video - blank if
it doesn't exist
script.grab.fanart.Video.Plot - plot outline of this video
+script.grab.fanart.Video.Path - path to the video file
script.grab.fanart.Movie.Title - title of the selected movie
script.grab.fanart.Movie.FanArt - path to movie fanart
script.grab.fanart.Movie.Poster - path to movie poster
+script.grab.fanart.Movie.Logo - path to clear logo for movie - blank if it
doesn't exist
script.grab.fanart.Movie.Plot - movie plot
+script.grab.fanart.Movie.Path - path to the movie file
script.grab.fanart.TV.Title - title of selected tv show
script.grab.fanart.TV.FanArt - path to tv show fanart
script.grab.fanart.TV.Poster - path to tv show poster
+script.grab.fanart.TV.Logo - path to clear logo for tv show - blank if it
doesn't exist
script.grab.fanart.TV.Plot - tv show plot description
+script.grab.fanart.TV.Path - path to the tv show show (will be the root folder
if in "random" mode or the specific episode if in "recent" mode)
These will only have values when the addon mode is "recent"
script.grab.fanart.TV.Season - selected tv show season
diff --git a/script.grab.fanart/addon.xml b/script.grab.fanart/addon.xml
index 894d993..c7a81fa 100755
--- a/script.grab.fanart/addon.xml
+++ b/script.grab.fanart/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.grab.fanart"
- name="Grab Fanart" version="0.12.8" provider-name="robweber">
+ name="Grab Fanart" version="0.12.9" provider-name="robweber">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
diff --git a/script.grab.fanart/service.py b/script.grab.fanart/service.py
index fecc733..7944f8c 100644
--- a/script.grab.fanart/service.py
+++ b/script.grab.fanart/service.py
@@ -60,7 +60,9 @@ class GrabFanartService:
self.WINDOW.setProperty('script.grab.fanart.Movie.Title',self.xbmc_movies[self.movie_index].title)
self.WINDOW.setProperty('script.grab.fanart.Movie.FanArt',self.xbmc_movies[self.movie_index].fan_art)
self.WINDOW.setProperty('script.grab.fanart.Movie.Poster',self.xbmc_movies[self.movie_index].poster)
+
self.WINDOW.setProperty('script.grab.fanart.Movie.Logo',self.xbmc_movies[self.movie_index].logo)
self.WINDOW.setProperty('script.grab.fanart.Movie.Plot',self.xbmc_movies[self.movie_index].plot)
+
self.WINDOW.setProperty('script.grab.fanart.Movie.Path',self.xbmc_movies[self.movie_index].path)
aVideo = self.xbmc_movies[self.movie_index]
globalArt = aVideo
@@ -79,7 +81,9 @@ class GrabFanartService:
self.WINDOW.setProperty('script.grab.fanart.TV.Title',self.xbmc_tv[self.tv_index].title)
self.WINDOW.setProperty('script.grab.fanart.TV.FanArt',self.xbmc_tv[self.tv_index].fan_art)
self.WINDOW.setProperty('script.grab.fanart.TV.Poster',self.xbmc_tv[self.tv_index].poster)
+
self.WINDOW.setProperty('script.grab.fanart.TV.Logo',self.xbmc_tv[self.tv_index].logo)
self.WINDOW.setProperty('script.grab.fanart.TV.Plot',self.xbmc_tv[self.tv_index].plot)
+
self.WINDOW.setProperty('script.grab.fanart.TV.Path',self.xbmc_tv[self.tv_index].path)
#this will only have a value when "recent" is the type
self.WINDOW.setProperty('script.grab.fanart.TV.Season',str(self.xbmc_tv[self.tv_index].season))
@@ -106,7 +110,9 @@ class GrabFanartService:
self.WINDOW.setProperty('script.grab.fanart.Video.Title',aVideo.title)
self.WINDOW.setProperty('script.grab.fanart.Video.FanArt',aVideo.fan_art)
self.WINDOW.setProperty('script.grab.fanart.Video.Poster',aVideo.poster)
+
self.WINDOW.setProperty('script.grab.fanart.Video.Logo',aVideo.logo)
self.WINDOW.setProperty('script.grab.fanart.Video.Plot',aVideo.plot)
+
self.WINDOW.setProperty('script.grab.fanart.Video.Path',aVideo.path)
if(len(self.xbmc_music) > 0):
@@ -158,13 +164,17 @@ class GrabFanartService:
newMedia = XbmcMedia()
newMedia.title = aMovie['title']
newMedia.plot = aMovie['plot']
-
+ newMedia.path = aMovie['file']
+
if(aMovie['art'].has_key('fanart')):
newMedia.fan_art = aMovie['art']['fanart']
if(aMovie['art'].has_key('poster')):
newMedia.poster = aMovie['art']['poster']
+ if(aMovie['art'].has_key('clearlogo')):
+ newMedia.logo = aMovie['art']['clearlogo']
+
if(newMedia.verify()):
self.xbmc_movies.append(newMedia)
random.shuffle(self.xbmc_movies)
@@ -181,13 +191,17 @@ class GrabFanartService:
newMedia = XbmcMedia()
newMedia.title = aShow['title']
newMedia.plot = aShow['plot']
-
+ newMedia.path = aShow['file']
+
if(aShow['art'].has_key('fanart')):
newMedia.fan_art = aShow['art']['fanart']
if(aShow['art'].has_key('poster')):
newMedia.poster = aShow['art']['poster']
+ if(aShow['art'].has_key('clearlogo')):
+ newMedia.logo = aShow['art']['clearlogo']
+
if(newMedia.verify()):
self.xbmc_tv.append(newMedia)
@@ -228,13 +242,17 @@ class GrabFanartService:
newMedia = XbmcMedia()
newMedia.title = aMovie['title']
newMedia.plot = aMovie['plot']
-
+ newMedia.path = aMovie['file']
+
if(aMovie['art'].has_key('fanart')):
newMedia.fan_art = aMovie['art']['fanart']
if(aMovie['art'].has_key('poster')):
newMedia.poster = aMovie['art']['poster']
+ if(aMovie['art'].has_key('clearlogo')):
+ newMedia.logo = aMovie['art']['clearlogo']
+
if(newMedia.verify()):
self.xbmc_movies.append(newMedia)
@@ -254,6 +272,7 @@ class GrabFanartService:
newMedia.plot = aShow['plot']
newMedia.season = aShow['season']
newMedia.episode = aShow['episode']
+ newMedia.path = aMovie['file']
if(aShow['art'].has_key('tvshow.fanart')):
newMedia.fan_art = aShow['art']['tvshow.fanart']
@@ -261,6 +280,9 @@ class GrabFanartService:
if(aShow['art'].has_key('tvshow.poster')):
newMedia.poster = aShow['art']['tvshow.poster']
+ if(aShow['art'].has_key('tvshow.clearlogo')):
+ newMedia.logo = aShow['art']['tvshow.clearlogo']
+
if(aShow['art'].has_key('thumb')):
newMedia.thumb = aShow['art']['thumb']
@@ -310,11 +332,13 @@ class XbmcMedia:
title = ''
fan_art = ''
poster = ''
+ logo = ''
plot = ''
season = ''
episode = ''
thumb = ''
-
+ path = ''
+
def verify(self):
result = True
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=fadf3b2f2c8b9578a839143972d3fac25e308e42
commit fadf3b2f2c8b9578a839143972d3fac25e308e42
Author: Martijn Kaijser <[email protected]>
Date: Thu Apr 17 08:14:17 2014 +0200
[screensaver.unaryclock] 0.7.1
diff --git a/screensaver.unaryclock/addon.xml b/screensaver.unaryclock/addon.xml
index 9122cc0..7fe1e0f 100644
--- a/screensaver.unaryclock/addon.xml
+++ b/screensaver.unaryclock/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="screensaver.unaryclock" name="Unary Clock Screensaver"
version="0.5.2" provider-name="Philip Schmiegelt" >
+<addon id="screensaver.unaryclock" name="Unary Clock Screensaver"
version="0.7.1" provider-name="Philip Schmiegelt" >
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.addon" version="12.0.0"/>
@@ -11,6 +11,8 @@
<description lang="en">A screensaver which displays a unary
clock</description>
<platform>all</platform>
<disclaimer lang="en">For bugs, requests or general questions visit see
https://github.com/schmiegelt/xbmc.screensaver.unaryclock </disclaimer>
+ <language></language>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
<forum>http://forum.xbmc.org/showthread.php?tid=179237</forum>
<website>https://github.com/schmiegelt/xbmc.screensaver.unaryclock</website>
<email></email>
diff --git a/screensaver.unaryclock/changelog.txt
b/screensaver.unaryclock/changelog.txt
index b025972..3650097 100644
--- a/screensaver.unaryclock/changelog.txt
+++ b/screensaver.unaryclock/changelog.txt
@@ -1,3 +1,6 @@
+2014-04-14 v0.7.1 ensured XBMC compliance
+2014-02-11 v0.7 added user chosen colors
+2014-01-21 v0.6 added additional user-driven options to control hh:mm:ss block
randomization
2013-12-05 v0.5 fixed autoscaling and display bugs
2013-11-29 v0.4 added settings (show seconds and redraw interval)
2013-11-27 v0.3 initial release
diff --git a/screensaver.unaryclock/resources/language/English/strings.xml
b/screensaver.unaryclock/resources/language/English/strings.xml
index 44cf19f..fe9d1c0 100644
--- a/screensaver.unaryclock/resources/language/English/strings.xml
+++ b/screensaver.unaryclock/resources/language/English/strings.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<strings>
- <string id="33111">Show seconds</string>
- <string id="33112">Redraw the clock after (seconds)</string>
+ <string id="32111">Show seconds</string>
+ <string id="32112">Redraw the clock after (seconds)</string>
+ <string id="32113">Randomize Hour/Minute</string>
+ <string id="32114">Randomize Seconds (when shown)</string>
+ <string id="32115">Color Hours 1</string>
+ <string id="32116">Color Hours 2</string>
+ <string id="32117">Color Minutes 1</string>
+ <string id="32118">Color Minutes 2</string>
+ <string id="32119">Color Seconds</string>
</strings>
diff --git a/screensaver.unaryclock/resources/language/German/strings.xml
b/screensaver.unaryclock/resources/language/German/strings.xml
index b0d52d3..a0a1f32 100644
--- a/screensaver.unaryclock/resources/language/German/strings.xml
+++ b/screensaver.unaryclock/resources/language/German/strings.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<strings>
<!-- Addon settings -->
- <string id="33111">Zeige Sekunden</string>
- <string id="33112">Zeichne die Uhr neu nach (Sekunden)</string>
+ <string id="32111">Zeige Sekunden</string>
+ <string id="32112">Zeichne die Uhr neu nach (Sekunden)</string>
+ <string id="32113">Zeichne Stunde und Minute zufällig</string>
+ <string id="32114">Zeige Sekunden zufällig</string>
+ <string id="32115">Farbe Stunden 1</string>
+ <string id="32116">Farbe Stunden 2</string>
+ <string id="32117">Farbe Minuten 1</string>
+ <string id="32118">Farbe Minuten 2</string>
+ <string id="32119">Farbe Sekunden</string>
</strings>
diff --git a/screensaver.unaryclock/resources/lib/gui.py
b/screensaver.unaryclock/resources/lib/gui.py
index f56877f..1d24aaa 100644
--- a/screensaver.unaryclock/resources/lib/gui.py
+++ b/screensaver.unaryclock/resources/lib/gui.py
@@ -65,12 +65,15 @@ class Screensaver(xbmcgui.WindowXMLDialog):
- def computeActiveLights(self, size, numberOfLights):
+ def computeActiveLights(self, size, numberOfLights, randomized):
self.flatLightsArray = list()
for number in range(0,size*size):
self.flatLightsArray.append(0)
for number in range(0,numberOfLights):
- rand = random.randint(0,size*size-1)
+ if (randomized):
+ rand = random.randint(0,size*size-1)
+ else:
+ rand = number
while self.flatLightsArray[rand] == 1:
rand = (rand+1) % (size*size)
self.flatLightsArray[rand] = 1
@@ -78,8 +81,8 @@ class Screensaver(xbmcgui.WindowXMLDialog):
#self.log(self.flatLightsArray)
return self.flatLightsArray
- def drawSinglePart(self, xOffset, yOffset, numberOfLights, blockSize,
texture, imageOffset):
- lightBlock = self.computeActiveLights(blockSize, numberOfLights)
+ def drawSinglePart(self, xOffset, yOffset, numberOfLights, blockSize,
texture, imageOffset, randomized):
+ lightBlock = self.computeActiveLights(blockSize, numberOfLights,
randomized)
lightSize = self.lightSizeNormal
lightPadding = self.lightPaddingNormal
#autoscaling
@@ -142,16 +145,16 @@ class Screensaver(xbmcgui.WindowXMLDialog):
hour = now.hour
#self.log(('hour ' + str(hour)))
- self.drawSinglePart(0, 0, (hour/10), blockSizeNormal, 'red.png', 0)
-
self.drawSinglePart(3*(self.lightSizeNormal+self.lightPaddingNormal)+1*self.blockPaddingSmall,
0, (hour%10), blockSizeNormal, 'cyan.png', 9)
+ self.drawSinglePart(0, 0, (hour/10), blockSizeNormal,
self.hour1Color, 0, self.randHourMin)
+
self.drawSinglePart(3*(self.lightSizeNormal+self.lightPaddingNormal)+1*self.blockPaddingSmall,
0, (hour%10), blockSizeNormal, self.hour2Color, 9, self.randHourMin)
minute = now.minute
#self.log(('minute ' + str(minute)))
-
self.drawSinglePart(6*(self.lightSizeNormal+self.lightPaddingNormal)+1*self.blockPaddingSmall+self.blockPaddingLarge,
0, (minute/10), blockSizeNormal, 'green.png', 18)
-
self.drawSinglePart(9*(self.lightSizeNormal+self.lightPaddingNormal)+2*self.blockPaddingSmall+self.blockPaddingLarge,
0, (minute%10), blockSizeNormal, 'purple.png', 27)
+
self.drawSinglePart(6*(self.lightSizeNormal+self.lightPaddingNormal)+1*self.blockPaddingSmall+self.blockPaddingLarge,
0, (minute/10), blockSizeNormal, self.min1Color, 18, self.randHourMin)
+
self.drawSinglePart(9*(self.lightSizeNormal+self.lightPaddingNormal)+2*self.blockPaddingSmall+self.blockPaddingLarge,
0, (minute%10), blockSizeNormal, self.min2Color, 27, self.randHourMin)
if (self.showSeconds == True):
second = now.second
-
self.drawSinglePart(12*(self.lightSizeNormal+self.lightPaddingNormal)+3*self.blockPaddingSmall+2*self.blockPaddingLarge,
0, second, blockSizeSeconds, 'blue.png', 36)
+
self.drawSinglePart(12*(self.lightSizeNormal+self.lightPaddingNormal)+3*self.blockPaddingSmall+2*self.blockPaddingLarge,
0, second, blockSizeSeconds, self.secondsColor, 36, self.randSec)
if (onlySeconds == False):
for b in self.allImages[:]:
@@ -166,7 +169,20 @@ class Screensaver(xbmcgui.WindowXMLDialog):
self.showSeconds = False
else:
self.showSeconds = True
+ if (self.addon.getSetting('setting_show_random_sec') in ['false',
'False']):
+ self.randSec = False
+ else:
+ self.randSec = True
+ if (self.addon.getSetting('setting_show_random_hourmin') in ['false',
'False']):
+ self.randHourMin = False
+ else:
+ self.randHourMin = True
self.redrawInterval =
int(self.addon.getSetting('setting_redraw_interval'))
+ self.hour1Color =
(self.addon.getSetting('setting_color_col_1')+".png").lower()
+ self.hour2Color =
(self.addon.getSetting('setting_color_col_2')+".png").lower()
+ self.min1Color =
(self.addon.getSetting('setting_color_col_3')+".png").lower()
+ self.min2Color =
(self.addon.getSetting('setting_color_col_4')+".png").lower()
+ self.secondsColor =
(self.addon.getSetting('setting_color_col_5')+".png").lower()
self.monitor = self.ExitMonitor(self.exit, self.log)
self.allImages = list()
self.topX = 20
@@ -196,4 +212,5 @@ class Screensaver(xbmcgui.WindowXMLDialog):
def log(self, msg):
xbmc.log(u'Unary Clock Screensaver: %s' % msg)
+
diff --git a/screensaver.unaryclock/resources/settings.xml
b/screensaver.unaryclock/resources/settings.xml
index 05c26c5..47475ae 100644
--- a/screensaver.unaryclock/resources/settings.xml
+++ b/screensaver.unaryclock/resources/settings.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
- <setting id="setting_show_seconds" type="bool" label="33111"
default="true"/>
- <setting id="setting_redraw_interval" type="labelenum" label="33112"
values="15|30|60" default="30"/>
+ <setting id="setting_show_seconds" type="bool" label="32111"
default="true"/>
+ <setting id="setting_redraw_interval" type="labelenum" label="32112"
values="15|30|60" default="30"/>
+ <setting id="setting_show_random_hourmin" type="bool" label="32113"
default="true"/>
+ <setting id="setting_show_random_sec" type="bool" label="32114"
default="true"/>
+ <setting id="setting_color_col_1" type="labelenum" label="32115"
values="Red|Orange|Yellow|Green|Cyan|Blue|Purple" default="Red"/>
+ <setting id="setting_color_col_2" type="labelenum" label="32116"
values="Red|Orange|Yellow|Green|Cyan|Blue|Purple" default="Cyan"/>
+ <setting id="setting_color_col_3" type="labelenum" label="32117"
values="Red|Orange|Yellow|Green|Cyan|Blue|Purple" default="Green"/>
+ <setting id="setting_color_col_4" type="labelenum" label="32118"
values="Red|Orange|Yellow|Green|Cyan|Blue|Purple" default="Purple"/>
+ <setting id="setting_color_col_5" type="labelenum" label="32119"
values="Red|Orange|Yellow|Green|Cyan|Blue|Purple" default="Blue"/>
</settings>
diff --git a/screensaver.unaryclock/resources/skins/default/720p/unaryclock.xml
b/screensaver.unaryclock/resources/skins/default/720p/unaryclock.xml
index 6eb4579..5bdaf7f 100644
--- a/screensaver.unaryclock/resources/skins/default/720p/unaryclock.xml
+++ b/screensaver.unaryclock/resources/skins/default/720p/unaryclock.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<window>
<controls>
<control type="image">
-----------------------------------------------------------------------
Summary of changes:
screensaver.unaryclock/addon.xml | 4 ++-
screensaver.unaryclock/changelog.txt | 3 ++
.../resources/language/English/strings.xml | 11 +++++-
.../resources/language/German/strings.xml | 11 +++++-
screensaver.unaryclock/resources/lib/gui.py | 35 ++++++++++++++-----
screensaver.unaryclock/resources/settings.xml | 11 +++++-
.../resources/skins/default/720p/unaryclock.xml | 1 +
.../resources/skins/default/media/orange.png | Bin 2790 -> 2772 bytes
.../resources/skins/default/media/yellow.png | Bin 2790 -> 2772 bytes
script.grab.fanart/README.txt | 6 +++
script.grab.fanart/addon.xml | 2 +-
script.grab.fanart/service.py | 32 ++++++++++++++++--
12 files changed, 95 insertions(+), 21 deletions(-)
copy
script.xbmc.audio.mixer/resources/skins/Default/media/alsa-slider-nib-focus.png
=> screensaver.unaryclock/resources/skins/default/media/orange.png (93%)
copy
script.xbmc.audio.mixer/resources/skins/Default/media/alsa-slider-nib-focus.png
=> screensaver.unaryclock/resources/skins/default/media/yellow.png (93%)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
