The branch, frodo has been updated
via 81f2ed8a7b1c6a23eb8bfbd00aa25488ea7eb391 (commit)
via db23cb6833ce5ab6b22a3301d0ca9055790496c7 (commit)
via 474dde77eb9e48a0407671237da90cd2b12e5038 (commit)
from a1ea8301ae9f04270a92f786f0c9e0abdba57339 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=81f2ed8a7b1c6a23eb8bfbd00aa25488ea7eb391
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=db23cb6833ce5ab6b22a3301d0ca9055790496c7
commit db23cb6833ce5ab6b22a3301d0ca9055790496c7
Author: Martijn Kaijser <[email protected]>
Date: Thu Jan 17 17:37:35 2013 +0100
[script.xbmc.boblight] -2.0.3
diff --git a/script.xbmc.boblight/addon.xml b/script.xbmc.boblight/addon.xml
index 387c74e..030e832 100644
--- a/script.xbmc.boblight/addon.xml
+++ b/script.xbmc.boblight/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.xbmc.boblight" name="XBMC Boblight" version="2.0.2"
provider-name="bobo1on1, Memphiz">
+<addon id="script.xbmc.boblight" name="XBMC Boblight" version="2.0.3"
provider-name="bobo1on1, Memphiz">
<requires>
- <import addon="xbmc.python" version="2.1"/>
+ <import addon="xbmc.python" version="2.1.0"/>
</requires>
<extension point="xbmc.service" library="default.py"
start="login"></extension>
<extension point="xbmc.addon.metadata">
- <summary>XBMC output to boblight.</summary>
- <description>XBMC output to boblight
http://code.google.com/p/boblight/</description>
+ <summary lang="en">XBMC output to boblight.</summary>
+ <description lang="en">XBMC output to boblight
http://code.google.com/p/boblight/</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/script.xbmc.boblight/changelog.txt
b/script.xbmc.boblight/changelog.txt
index efd0cea..13cc1f6 100644
--- a/script.xbmc.boblight/changelog.txt
+++ b/script.xbmc.boblight/changelog.txt
@@ -1,3 +1,7 @@
+2.0.3
+- [add] - option for disabling/enabling the initial color blink
+- [add] - option for disabling/enabling any user notifications (connection
lost and so on)
+
2.0.2
- [fix] activate static light when playing audio
diff --git a/script.xbmc.boblight/default.py b/script.xbmc.boblight/default.py
index d1d5859..2e6a15f 100644
--- a/script.xbmc.boblight/default.py
+++ b/script.xbmc.boblight/default.py
@@ -95,14 +95,15 @@ class Main():
if not ret:
log("connection to boblightd failed: %s" % bob.bob_geterror())
text = __language__(500)
- if self.warning < 3:
+ if self.warning < 3 and settings.other_misc_notifications:
xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
self.warning += 1
return False
else:
self.warning = 0
- text = __language__(501)
- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
+ if settings.other_misc_notifications:
+ text = __language__(501)
+ xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
log("connected to boblightd")
bob.bob_set_priority(128)
return True
@@ -123,7 +124,7 @@ class Main():
t1 = __language__(504) # lib for osx, ios and
windows
t2 = __language__(509)
if xbmcgui.Dialog().yesno(__scriptname__,t1,t2):
- tools_downloadLibBoblight(platform)
+ tools_downloadLibBoblight(platform,settings.other_misc_notifications)
loaded = bob.bob_loadLibBoblight(libpath,platform)
diff --git a/script.xbmc.boblight/resources/language/English/strings.xml
b/script.xbmc.boblight/resources/language/English/strings.xml
index 3665402..cecfc76 100644
--- a/script.xbmc.boblight/resources/language/English/strings.xml
+++ b/script.xbmc.boblight/resources/language/English/strings.xml
@@ -41,6 +41,8 @@
<string id="403">Green</string>
<string id="404">Blue</string>
<string id="405">Disable when Screen Saver is on</string>
+ <string id="406">Enable initial light flash</string>
+ <string id="407">Enable status notifications</string>
<!--Notifications-->
<string id="500">Failed to connect to boblightd!</string>
diff --git a/script.xbmc.boblight/resources/language/German/strings.xml
b/script.xbmc.boblight/resources/language/German/strings.xml
index 8edfbb1..456062b 100644
--- a/script.xbmc.boblight/resources/language/German/strings.xml
+++ b/script.xbmc.boblight/resources/language/German/strings.xml
@@ -41,6 +41,8 @@
<string id="403">Gruen</string>
<string id="404">Blau</string>
<string id="405">Waehrend Bildschirmschoner Licht ausschalten</string>
+ <string id="406">Initialen Lichttest aktivieren</string>
+ <string id="407">Statusnachrichten aktivieren</string>
<!--Notifications-->
<string id="500">Fehler beim Verbinden zu boblightd!</string>
diff --git a/script.xbmc.boblight/resources/lib/settings.py
b/script.xbmc.boblight/resources/lib/settings.py
index 7ce4f37..724e99c 100644
--- a/script.xbmc.boblight/resources/lib/settings.py
+++ b/script.xbmc.boblight/resources/lib/settings.py
@@ -79,6 +79,8 @@ class settings():
self.other_static_green =
int(float(__addon__.getSetting("other_static_green")))
self.other_static_blue =
int(float(__addon__.getSetting("other_static_blue")))
self.other_static_onscreensaver =
__addon__.getSetting("other_static_onscreensaver") == "true"
+ self.other_misc_initialflash =
__addon__.getSetting("other_misc_initialflash") == "true"
+ self.other_misc_notifications =
__addon__.getSetting("other_misc_notifications") == "true"
# Movie settings
self.movie_saturation =
float(__addon__.getSetting("movie_saturation"))
@@ -239,10 +241,14 @@ class settings():
self.handleGlobalSettings()
bob.bob_set_priority(128) # allow lights to be turned on, we
will switch them off
# in 'handleStaticBgSettings()' if
they are not needed
- for i in range(len(BLING)):
- rgb = (c_int * 3)(BLING[i][0],BLING[i][1],BLING[i][2])
+ if self.other_misc_initialflash:
+ for i in range(len(BLING)):
+ rgb = (c_int * 3)(BLING[i][0],BLING[i][1],BLING[i][2])
+ bob.bob_set_static_color(byref(rgb))
+ xbmc.sleep(1000)
+ else:
+ rgb = (c_int * 3)(0,0,0)
bob.bob_set_static_color(byref(rgb))
- xbmc.sleep(1000)
self.run_init = False
xbmc.sleep(500)
return True
diff --git a/script.xbmc.boblight/resources/lib/tools.py
b/script.xbmc.boblight/resources/lib/tools.py
index 6696d7f..2ba1a06 100644
--- a/script.xbmc.boblight/resources/lib/tools.py
+++ b/script.xbmc.boblight/resources/lib/tools.py
@@ -48,7 +48,7 @@ def _pbhook(numblocks, blocksize, filesize, url=None,dp=None):
log("boblight: DOWNLOAD CANCELLED") # need to get this part working
dp.close()
-def tools_downloadLibBoblight(platform):
+def tools_downloadLibBoblight(platform,allowNotify):
log("boblight: try to fetch libboblight")
libname = get_libname(platform)
destdir = xbmc.translatePath( os.path.join( __cwd__, 'resources', 'lib') )
@@ -60,8 +60,9 @@ def tools_downloadLibBoblight(platform):
xbmc.executebuiltin('XBMC.Extract("%s.zip","%s")' % (dest, destdir), True)
os.remove(dest + ".zip")
except:
- text = __language__(510)
- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
+ if allowNotify:
+ text = __language__(510)
+ xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
def log(msg):
xbmc.log("### [%s] - %s" % (__scriptname__,msg,),level=xbmc.LOGDEBUG )
diff --git a/script.xbmc.boblight/resources/settings.xml
b/script.xbmc.boblight/resources/settings.xml
index a10c986..702a459 100644
--- a/script.xbmc.boblight/resources/settings.xml
+++ b/script.xbmc.boblight/resources/settings.xml
@@ -41,5 +41,8 @@
<setting id="other_static_green" type="slider" subsetting="true"
enable="eq(-2,true)" label="403" option="int" default="128" range="0,255" />
<setting id="other_static_blue" type="slider" subsetting="true"
enable="eq(-3,true)" label="404" option="int" default="128" range="0,255" />
<setting id="other_static_onscreensaver" type="bool" label="405"
default="false" />
+ <setting id="sep3" type="sep" />
+ <setting id="other_misc_initialflash" type="bool" label="406"
default="true" />
+ <setting id="other_misc_notifications" type="bool" label="407"
default="true" />
</category>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=474dde77eb9e48a0407671237da90cd2b12e5038
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
screensaver.qlock/addon.xml | 12 +
screensaver.qlock/changelog.txt | 5 +
screensaver.qlock/default.py | 19 +
screensaver.qlock/fanart.jpg | Bin 0 -> 41273 bytes
screensaver.qlock/icon.png | Bin 0 -> 21196 bytes
screensaver.qlock/resources/lib/gui.py | 38 ++
.../skins/default/720p/script-python-qlock.xml | 673 ++++++++++++++++++++
script.xbmc.boblight/addon.xml | 8 +-
script.xbmc.boblight/changelog.txt | 4 +
script.xbmc.boblight/default.py | 9 +-
.../resources/language/English/strings.xml | 2 +
.../resources/language/German/strings.xml | 2 +
script.xbmc.boblight/resources/lib/settings.py | 12 +-
script.xbmc.boblight/resources/lib/tools.py | 7 +-
script.xbmc.boblight/resources/settings.xml | 3 +
.../LICENSE.txt | 0
script.xbmc.unpausejumpback/README | 1 +
script.xbmc.unpausejumpback/addon.xml | 17 +
script.xbmc.unpausejumpback/changelog.txt | 5 +
script.xbmc.unpausejumpback/default.py | 94 +++
script.xbmc.unpausejumpback/icon.png | Bin 0 -> 61991 bytes
script.xbmc.unpausejumpback/resources/settings.xml | 7 +
23 files changed, 904 insertions(+), 14 deletions(-)
copy {screensaver.xbmc.slideshow => screensaver.qlock}/LICENSE.txt (100%)
create mode 100644 screensaver.qlock/addon.xml
create mode 100644 screensaver.qlock/changelog.txt
create mode 100644 screensaver.qlock/default.py
create mode 100644 screensaver.qlock/fanart.jpg
create mode 100644 screensaver.qlock/icon.png
create mode 100644 screensaver.qlock/resources/lib/gui.py
create mode 100644
screensaver.qlock/resources/skins/default/720p/script-python-qlock.xml
copy {script.xbmc.boblight => script.xbmc.unpausejumpback}/LICENSE.txt (100%)
create mode 100644 script.xbmc.unpausejumpback/README
create mode 100644 script.xbmc.unpausejumpback/addon.xml
create mode 100644 script.xbmc.unpausejumpback/changelog.txt
create mode 100644 script.xbmc.unpausejumpback/default.py
create mode 100644 script.xbmc.unpausejumpback/icon.png
create mode 100644 script.xbmc.unpausejumpback/resources/settings.xml
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
