The branch, frodo has been updated
via 0a4cbf0ae7804f1e75b51f9d2a0d64ffd41622d7 (commit)
from ef6631543f4de273d416ab63a127521a7dcaea2a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=0a4cbf0ae7804f1e75b51f9d2a0d64ffd41622d7
commit 0a4cbf0ae7804f1e75b51f9d2a0d64ffd41622d7
Author: Martijn Kaijser <[email protected]>
Date: Sat Mar 1 14:30:16 2014 +0100
[script.xbmc.boblight] 2.0.8
diff --git a/script.xbmc.boblight/addon.xml b/script.xbmc.boblight/addon.xml
index bab33cf..da66f3b 100644
--- a/script.xbmc.boblight/addon.xml
+++ b/script.xbmc.boblight/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.xbmc.boblight" name="XBMC Boblight" version="2.0.7"
provider-name="bobo1on1, Memphiz">
+<addon id="script.xbmc.boblight" name="XBMC Boblight" version="2.0.8"
provider-name="bobo1on1, Memphiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
diff --git a/script.xbmc.boblight/changelog.txt
b/script.xbmc.boblight/changelog.txt
index b4d81da..8d4c074 100644
--- a/script.xbmc.boblight/changelog.txt
+++ b/script.xbmc.boblight/changelog.txt
@@ -1,3 +1,6 @@
+2.0.8
+- [fix] work around UTF8 encoding problems for dialogs
+
2.0.7
- [updated] language files from Transifex
- [fix] for the newly added categories livetv, tvshow and files the category
override didn't work
diff --git a/script.xbmc.boblight/default.py b/script.xbmc.boblight/default.py
index e8bb040..5dad581 100644
--- a/script.xbmc.boblight/default.py
+++ b/script.xbmc.boblight/default.py
@@ -96,9 +96,11 @@ class Main():
if not ret:
log("connection to boblightd failed: %s" % bob.bob_geterror())
- text = __language__(32500)
if self.warning < 3 and settings.other_misc_notifications:
- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
+ xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,
+
localize(32500),
+ 750,
+ __icon__))
self.warning += 1
settings.reconnect = True
settings.run_init = True
@@ -107,8 +109,10 @@ class Main():
else:
self.warning = 0
if settings.other_misc_notifications:
- text = __language__(32501)
- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
+ xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,
+
localize(32501),
+ 750,
+ __icon__))
log("connected to boblightd")
bob.bob_set_priority(128)
return True
@@ -120,23 +124,24 @@ class Main():
if loaded == 1: #libboblight not found
if platform == 'linux':
- t1 = __language__(32504)
- t2 = __language__(32505)
- t3 = __language__(32506)
- xbmcgui.Dialog().ok(__scriptname__,t1,t2,t3)
+ xbmcgui.Dialog().ok(__scriptname__,
+ localize(32504),
+ localize(32505),
+ localize(32506))
- else: # ask user if we should
fetch the
- t1 = __language__(32504) # lib for osx, ios and
windows
- t2 = __language__(32509)
- if xbmcgui.Dialog().yesno(__scriptname__,t1,t2):
+ else:
+ # ask user if we should fetch the lib for osx, ios and windows
+ if xbmcgui.Dialog().yesno(__scriptname__,
+ localize(32504),
+ localize(32509)):
tools_downloadLibBoblight(platform,settings.other_misc_notifications)
loaded = bob.bob_loadLibBoblight(libpath,platform)
elif loaded == 2: #no ctypes available
- t1 = __language__(32507)
- t2 = __language__(32508)
- xbmcgui.Dialog().ok(__scriptname__,t1,t2)
+ xbmcgui.Dialog().ok(__scriptname__,
+ localize(32507),
+ localize(32508))
return loaded
@@ -153,9 +158,12 @@ def myPlayerChanged(state):
if state == 'stop':
ret = "static"
else:
+ ret = "movie"
# Possible Videoplayer options: files, movies, episodes, musicvideos,
livetv
if xbmc.getCondVisibility("Player.HasVideo()"):
- if xbmc.getCondVisibility("VideoPlayer.Content(musicvideos)"):
+ if xbmc.getCondVisibility('VideoPlayer.Content(movies)'):
+ ret = "movie"
+ elif xbmc.getCondVisibility("VideoPlayer.Content(musicvideos)"):
ret = "musicvideo"
elif xbmc.getCondVisibility("VideoPlayer.Content(episodes)"):
ret = "tvshow"
@@ -233,6 +241,9 @@ def run_boblight():
del player_monitor
del xbmc_monitor
+def localize(id):
+ return __language__(id).encode('utf-8','ignore')
+
if ( __name__ == "__main__" ):
run_boblight()
bob.bob_set_priority(255) # we are shutting down, kill the LEDs
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.boblight/addon.xml | 2 +-
script.xbmc.boblight/changelog.txt | 3 ++
script.xbmc.boblight/default.py | 43 ++++++++++++++++++++++-------------
3 files changed, 31 insertions(+), 17 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
