The branch, eden has been updated
via 3229bd79a3fb1f6910e502d5757ab21046573193 (commit)
via 5d928efc0b6880334376c1ff5a61a6c7277fddbc (commit)
from 31c9be902fe41f421bebcc6c30c03b84d0296804 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=3229bd79a3fb1f6910e502d5757ab21046573193
commit 3229bd79a3fb1f6910e502d5757ab21046573193
Author: Martijn Kaijser <[email protected]>
Date: Tue Nov 27 18:06:17 2012 +0100
[script.speedfaninfo] -0.3.5
diff --git a/script.speedfaninfo/CHANGELOG.txt
b/script.speedfaninfo/CHANGELOG.txt
index f17cdb3..cbf8630 100644
--- a/script.speedfaninfo/CHANGELOG.txt
+++ b/script.speedfaninfo/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.3.5 11/21/2012
+-changed the way the degree sign is displayed as old way didn't work either on
OSX or with Frodo (not sure which)
+-included new language files for XBMC Frodo and added addon to transifex
translation engine
+
0.3.4 03/03/2012
-added support for languages that use comma as the ordinal separator for
decimals
diff --git a/script.speedfaninfo/addon.xml b/script.speedfaninfo/addon.xml
index e65f783..cb30ab8 100644
--- a/script.speedfaninfo/addon.xml
+++ b/script.speedfaninfo/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.speedfaninfo"
- name="SpeedFan Information Display" version="0.3.4"
provider-name="kylejohnson (pkscuot)">
+ name="SpeedFan Information Display" version="0.3.5"
provider-name="kylejohnson (pkscuot)">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
diff --git a/script.speedfaninfo/default.py b/script.speedfaninfo/default.py
index 17e1398..1b2756b 100644
--- a/script.speedfaninfo/default.py
+++ b/script.speedfaninfo/default.py
@@ -65,8 +65,8 @@ class SpeedFanInfoWindow(xbmcgui.WindowXMLDialog):
#add a fancy degree symbol to the temperatures
lw.log('add fancy degree symbol to temperatures', 'verbose')
for i in range(len(temps)):
- temps[i][1] = temps[i][1][:-1] + unichr(176).encode("latin-1") +
temps[i][1][-1:]
- #now parse all the data and get it into ListIems for display on the
page
+ temps[i][1] = temps[i][1][:-1] + u'\N{DEGREE SIGN}' +
temps[i][1][-1:]
+ #now parse all the data and get it into ListIems for display on the page
lw.log('reset the window to prep it for data', 'verbose')
self.getControl(120).reset()
#this allows for a line space *after* the first one so the page looks
pretty
diff --git a/script.speedfaninfo/resources/language/English/strings.xml
b/script.speedfaninfo/resources/language/English/strings.xml
index 7c9f2c0..7c3c1c1 100644
--- a/script.speedfaninfo/resources/language/English/strings.xml
+++ b/script.speedfaninfo/resources/language/English/strings.xml
@@ -1,6 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- English language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/en/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
<strings>
- <!-- Plugin settings -->
+ <!-- Plugin Settings -->
<string id="30000">SpeedFan Log Folder</string>
<string id="30001">Enable Verbose Logging</string>
<string id="30002">Log Temperature Scale</string>
@@ -8,6 +12,4 @@
<string id="30100">Temperature Information</string>
<string id="30101">Fan Speed Information</string>
<string id="30102">Voltage Information</string>
- <!-- Other text display strings -->
-
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=5d928efc0b6880334376c1ff5a61a6c7277fddbc
commit 5d928efc0b6880334376c1ff5a61a6c7277fddbc
Author: Martijn Kaijser <[email protected]>
Date: Tue Nov 27 18:03:20 2012 +0100
[script.artistslideshow] -1.4.6
diff --git a/script.artistslideshow/addon.xml b/script.artistslideshow/addon.xml
index 81f2bab..542d60b 100644
--- a/script.artistslideshow/addon.xml
+++ b/script.artistslideshow/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.artistslideshow" name="Artist Slideshow" version="1.4.5"
provider-name="ronie/kyleejohnson (pkscuot)">
+<addon id="script.artistslideshow" name="Artist Slideshow" version="1.4.6"
provider-name="ronie/kyleejohnson (pkscuot)">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.elementtree" version="1.2.7"/>
diff --git a/script.artistslideshow/changelog.txt
b/script.artistslideshow/changelog.txt
index dad323a..d9df34a 100644
--- a/script.artistslideshow/changelog.txt
+++ b/script.artistslideshow/changelog.txt
@@ -1,3 +1,9 @@
+v.1.4.6
+- fix for improper parsing of multiple artists
+- fix multiartist display in cases where first artist has no images
+- fixed script error when using utf-8 encoded text in download pop up messages
+- added English strings.po file for Frodo and added addon to transifex
translation engine
+
v.1.4.5
- fix for improper clearing of info labels on XBMC abort request
diff --git a/script.artistslideshow/default.py
b/script.artistslideshow/default.py
index 625f388..a92ab25 100644
--- a/script.artistslideshow/default.py
+++ b/script.artistslideshow/default.py
@@ -160,14 +160,14 @@ class Main:
def _use_correct_artwork( self ):
self._clean_dir( self.MergeDir )
- artists = self._get_current_artist()
- self.ALLARTISTS = artists
- self.ARTISTNUM = 0
- self.TOTALARTISTS = len(artists)
- self.MergedImagesFound = False
- for artist in artists:
- log('current artist is %s' % artist.decode("utf-8"))
- self.ARTISTNUM += 1
+ artists = self._get_current_artist()
+ self.ALLARTISTS = artists
+ self.ARTISTNUM = 0
+ self.TOTALARTISTS = len(artists)
+ self.MergedImagesFound = False
+ for artist in artists:
+ log('current artist is %s' % artist.decode("utf-8"))
+ self.ARTISTNUM += 1
self.NAME = artist
if(self.PRIORITY == '1' and not self.LOCALARTISTPATH == ''):
log('looking for local artwork')
@@ -243,12 +243,12 @@ class Main:
self.PROGRESSPATH = __addon__.getSetting( "progress_path" )
log('set progress path to %s' % self.PROGRESSPATH)
else:
- self.PROGRESSPATH = ''
+ self.PROGRESSPATH = ''
if len ( __addon__.getSetting( "fanart_folder" ) ) > 0:
self.FANARTFOLDER = __addon__.getSetting( "fanart_folder" )
log('set fanart folder to %s' % self.FANARTFOLDER)
else:
- self.FANARTFOLDER = 'extrafanart'
+ self.FANARTFOLDER = 'extrafanart'
def _init_vars( self ):
@@ -336,17 +336,18 @@ class Main:
else:
log('outdated %s found' % filename)
cached_image_info = False
- if self.NOTIFICATIONTYPE == "1":
- self._set_property("ArtistSlideshow", self.InitDir)
- if not cached_image_info:
- xbmc.executebuiltin('XBMC.Notification("' +
__language__(30300).encode("utf8") + '", "' +
__language__(30301).encode("utf8") + '", 5000, ' + __addonicon__ + ')')
- elif self.NOTIFICATIONTYPE == "2":
- if not cached_image_info:
- self._set_property("ArtistSlideshow",
self.PROGRESSPATH)
- else:
- self._set_property("ArtistSlideshow", self.InitDir)
- else:
- self._set_property("ArtistSlideshow", self.InitDir)
+ if self.NOTIFICATIONTYPE == "1":
+ self._set_property("ArtistSlideshow", self.InitDir)
+ self._set_property("ArtistSlideshow",
self.InitDir) TH) 0300).encode("utf8") + '", "' +
__language__(30301).encode("utf8") + '", 5000, ' + __addonicon__ +
')') ø1Æ>+ }Åÿ TÆ>+ rÅÿ PqÅÿ k Å>+ 6
è è ! è !
}Åÿ }Åÿ x´1Æ>+ sÅÿ âÅ>+ Å>+
}Åÿ `âÅ>+ _}Åÿ À¯Æ>+ uêÅ>+ Æ>+ ؤÆ>+ ¨©Æ>+
Å>+ x´1Æ>+ sÅÿ PrÅÿ k Å>+ à! à!
}Åÿ }Åÿ H~Æ>+ `tÅÿ âÅ>+ Å>+
}Åÿ `âÅ>+ _}Åÿ P}Åÿ H}Åÿ 8 6Å>+ p }Åÿ uêÅ>+
Å>+ `tÅÿ 0sÅÿ k Å>+ G H I J K M N O P
}Åÿ }Åÿ H5èÅ>+ vÅÿ âÅ>+ Å>+
}Åÿ 0¯Æ>+ uêÅ>+ À1Æ>+ iÅÅ>+ Æ>+ ؤÆ>+ ¨©Æ>+
Å>+ H5èÅ>+ vÅÿ @tÅÿ k Å>+ 85èÅ>+ vÅÿ ptÅÿ k Å>+ (5èÅ>+ vÅÿ tÅÿ k Å>+ 5èÅ>+ vÅÿ ÐtÅÿ k Å>+
¨®Æ>+ uêÅ>+ ¨©Æ>+ PoÅÿ ¸ÅÅ>+ eéÅ>+ ؤÆ>+ puÅÿ y¸ÅÅ>+ eéÅ>+ Æ>+ uÅÿ Z¸ÅÅ>+ eéÅ>+ ØdÅÅ>+ À1Æ>+ iÅÅ>+ Æ>+ ØÄ1Æ>+ ؤÆ>+ ¨©Æ>+
Å>+ 8 6Å>+ -Å>+ }Åÿ pûÄÅ>+ PwÅÿ
vÅÿ k Å>+ 5 6 7 8 : < = > ? @ B D
}Åÿ }Åÿ à-Å>+ }Åÿ uêÅ>+ 6Å>+ ÐuÅÿ -Å>+ eéÅ>+ 6Å>+ Õ_@f ÆS
Qöl±í ÁC]Å>+ }Åÿ à-Å>+ `xÅÿ 0wÅÿ k Å>+ u]ÞÓ
4Q ÷U^Qʧ ¶uª¹ñìò*Äv
}Åÿ }Åÿ H~ZÅ>+ ÄÅ>+ Ð~Åÿ ¦ÐøÆ>+ ¦ÐøÆ>+ Å>+ _}Åÿ ~Åÿ H}Åÿ °yÅÿ Ï1Æ>+ uêÅ>+ ØÄ1Æ>+ Åÿ ¢ÐøÆ>+ à~Åÿ pzÅÿ ÿÿÿÿÿÿÿÿ¢ÐøÆ>+ }Åÿ
if not cached_image_info:
+ execute_text = 'XBMC.Notification("' +
__language__(30300) + '", "' + __language__(30301) + '", 5000, ' +
__addonicon__ + ')'
+ xbmc.executebuiltin(execute_text.encode("utf-8"))
+ elif self.NOTIFICATIONTYPE == "2":
+ if not cached_image_info:
+ self._set_property("ArtistSlideshow",
self.PROGRESSPATH)
+ else:
+ self._set_property("ArtistSlideshow", self.InitDir)
+ else:
+ self._set_property("ArtistSlideshow", self.InitDir)
if self.LASTFM == "true":
lastfmlist = self._get_images('lastfm')
@@ -408,7 +409,8 @@ class Main:
if self.ARTISTNUM == 1:
self._refresh_image_directory()
if self.NOTIFICATIONTYPE == "1" and not cached_image_info:
- xbmc.executebuiltin('XBMC.Notification("' +
__language__(30304).encode("utf8") + '", "' +
__language__(30305).encode("utf8") + '", 5000, ' + __addonicon__ + ')')
+ execute_text = 'XBMC.Notification("' +
__language__(30304) + '", "' + __language__(30305) + '", 5000, ' +
__addonicon__ + ')'
+ xbmc.executebuiltin(execute_text.encode("utf-8"))
if self.TOTALARTISTS > 1:
self._merge_images()
if( xbmc.getInfoLabel( self.ARTISTSLIDESHOW ).decode("utf-8") ==
self.BlankDir and self.ARTISTNUM == 1):
@@ -425,11 +427,12 @@ class Main:
log('clearing ArtistSlideshow property')
self._set_property("ArtistSlideshow", self.InitDir)
if self.NOTIFICATIONTYPE == "1" and not cached_image_info:
- xbmc.executebuiltin('XBMC.Notification("' +
__language__(30302).encode("utf8") + '", "' +
__language__(30303).encode("utf8") + '", 10000, ' + __addonicon__ + ')')
+ execute_text = 'XBMC.Notification("' +
__language__(30302) + '", "' + __language__(30303) + '", 10000, ' +
__addonicon__ + ')'
+ xbmc.executebuiltin(execute_text.encode("utf-8"))
if( self.ARTISTINFO == "true" and not
self._playback_stopped_or_changed() ):
self._get_artistinfo()
- elif self.TOTALARTISTS > 1:
- self._merge_images()
+ elif self.TOTALARTISTS > 1:
+ self._merge_images()
def _wait( self, wait_time ):
@@ -475,7 +478,7 @@ class Main:
featured_artist = xbmc.getInfoLabel( self.SKINTITLE
).replace('ft.','feat.').split('feat.')
else:
artist = ''
- artists = artist.replace('ft.','/').replace('feat.','/').split('/')
+ artists = artist.replace('ft.',' / ').replace('feat.',' / ').split(' /
')
if len( featured_artist ) > 1:
artists.append( featured_artist[-1] )
return [a.strip(' ()') for a in artists]
diff --git a/script.artistslideshow/resources/language/English/strings.xml
b/script.artistslideshow/resources/language/English/strings.xml
index b9deae2..9a8b55e 100644
--- a/script.artistslideshow/resources/language/English/strings.xml
+++ b/script.artistslideshow/resources/language/English/strings.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- English language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/en/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
<strings>
- <!-- Languages -->
+ <!-- Languages -->
<string id="30201">Albanian</string>
<string id="30202">Arabic</string>
<string id="30203">Belarusian</string>
@@ -45,14 +49,16 @@
<string id="30245">Ukrainian</string>
<string id="30246">Vietnamese</string>
<string id="30247">Farsi</string>
- <!-- Dialog Text -->
+
+ <!-- Dialog Text -->
<string id="30300">Downloading</string>
<string id="30301">Downloading artist images</string>
<string id="30302">Nothing Downloaded</string>
- <string id="30303">No images found for artist</string>
+ <string id="30303">No images found for artist</string>
<string id="30304">Download Complete</string>
- <string id="30305">All artist images downloaded</string>
- <!-- Settings -->
+ <string id="30305">All artist images downloaded</string>
+
+ <!-- Settings -->
<string id="32000">Download</string>
<string id="32001">Download images from last.fm</string>
<string id="32002">Download images from htbackdrops.com</string>
@@ -66,9 +72,6 @@
<string id="32102"> Image Priority</string>
<string id="32103">Fallback slideshow folder</string>
<string id="32104">Override slideshow folder</string>
- <string id="32901">Use remote images first</string>
- <string id="32902">Use local images first</string>
- <string id="32903">Use both local and remote images</string>
<string id="32200">Advanced</string>
<string id="32201">Limit size of download cache</string>
<string id="32202"> Maximum cache size (in megabytes)</string>
@@ -78,4 +81,7 @@
<string id="32206">None</string>
<string id="32207">Text notifications</string>
<string id="32208">Custom images</string>
+ <string id="32901">Use remote images first</string>
+ <string id="32902">Use local images first</string>
+ <string id="32903">Use both local and remote images</string>
</strings>
-----------------------------------------------------------------------
Summary of changes:
script.artistslideshow/addon.xml | 2 +-
script.artistslideshow/changelog.txt | 6 +
script.artistslideshow/default.py | 55 ++--
.../resources/language/English/strings.po | 321 ++++++++++++++++++++
.../resources/language/English/strings.xml | 22 +-
script.speedfaninfo/CHANGELOG.txt | 4 +
script.speedfaninfo/addon.xml | 2 +-
script.speedfaninfo/default.py | 4 +-
.../resources/language/English/strings.po | 47 +++
.../resources/language/English/strings.xml | 10 +-
10 files changed, 431 insertions(+), 42 deletions(-)
create mode 100644 script.artistslideshow/resources/language/English/strings.po
create mode 100644 script.speedfaninfo/resources/language/English/strings.po
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
