The branch, dharma-pre has been updated
via c1f67182c8cdb30b780b50f4cbcadf682ee0e5a4 (commit)
from 601bb5e19503150972c55ee4f06a9587c3be496b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c1f67182c8cdb30b780b50f4cbcadf682ee0e5a4
commit c1f67182c8cdb30b780b50f4cbcadf682ee0e5a4
Author: spiff <[email protected]>
Date: Wed Nov 10 20:51:30 2010 +0100
[plugin.image.flickr] updated to version 0.9.8
diff --git a/plugin.image.flickr/addon.xml b/plugin.image.flickr/addon.xml
index 82cfb4c..95db3b0 100644
--- a/plugin.image.flickr/addon.xml
+++ b/plugin.image.flickr/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.image.flickr"
name="flickr"
- version="0.9.5"
+ version="0.9.8"
provider-name="Rick Phillips (ruuk)">
<requires>
<import addon="xbmc.python" version="1.0"/>
@@ -13,12 +13,14 @@
<provides>image</provides>
</extension>
<extension point="xbmc.addon.metadata">
- <summary>flickrXBMC: flickr on XBMC</summary>
+ <summary lang="en">flickrXBMC: flickr on XBMC</summary>
<summary lang="de">flickrXBMC: flickr in XBMC</summary>
<summary lang="es">flickrXBMC: flickr en XBMC</summary>
+ <summary lang="nl">flickrXBMC: Flickr op XBMC</summary>
<description>flickrXBMC allows you to: Browse your photostream,
collections, sets, galleries, tags, places, and favorites. Browse your contacts
and their content. Search you or your contacts photostream, or search
flickr.</description>
<description lang="de">flickrXBMC ermöglicht Fotostreams, Sammlungen,
Sets, Gallerien, Tags, Orte und Favoriten zu dursuchen. Durchsuche deine
Freunde und deren Fotos. Durchsuche deine Fotos oder die deiner Freunde, oder
durchsuche flickr allgemein.</description>
<description lang="es">flickrXBMC le permite: Busca en tu galerÃa de
fotos, colecciones, conjuntos, galerÃas, etiquetas, lugares, y favoritos.
Busque sus contactos y su contenido. Buscar contactos que usted o su galerÃa
de fotos, o flickr de búsqueda.</description>
+ <description lang="nl">flickrXBMC geeft u de mogelijkheid om te bladeren
door uw photostreams, verzamelingen, sets, galerijen, tags, plaatsen en
favorieten. Bekijk uw contacten en hun foto's. Zoek door uw eigen of van uw
contacts de photostreams of door geheel Flickr.</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/plugin.image.flickr/changelog.txt
b/plugin.image.flickr/changelog.txt
index 3a60132..56d58ef 100644
--- a/plugin.image.flickr/changelog.txt
+++ b/plugin.image.flickr/changelog.txt
@@ -1,6 +1,19 @@
flickrXBMC Changelog
-Current Version : 0.9.5
+Current Version : 0.9.8
+
+** 0.9.8 ***
+
+Added Language Translation: Chinese (Traditional) - thanks to Ramius
+
+** 0.9.7 ***
+
+Changed default map to google
+Added Dutch language - thanks to Michel de Bokx
+
+** 0.9.6 ***
+
+Improved directory load cancelling
** 0.9.5 ***
diff --git a/plugin.image.flickr/default.py b/plugin.image.flickr/default.py
index 79a370b..21afec2 100644
--- a/plugin.image.flickr/default.py
+++ b/plugin.image.flickr/default.py
@@ -6,11 +6,11 @@ import xbmc, xbmcgui, xbmcplugin, xbmcaddon
import sys, os, time
from urllib2 import HTTPError, URLError
-__plugin__ = 'flickr'
+__plugin__ = 'flickr'
__author__ = 'ruuk'
__url__ = 'http://code.google.com/p/flickrxbmc/'
-__date__ = '09-25-2010'
-__version__ = '0.9.5'
+__date__ = '11-10-2010'
+__version__ = '0.9.8'
__settings__ = xbmcaddon.Addon(id='plugin.image.flickr')
__language__ = __settings__.getLocalizedString
@@ -283,12 +283,13 @@ class FlickrSession:
ct=1
for photo in
self.flickr.walk_photos_by_page(method,page=page,per_page=self.max_per_page,extras=extras,**kwargs):
ct+=1
- self.addPhoto( photo.get('title'),
- photo.get('id'),
-
photo.get(self.SIZE_KEYS[self.defaultThumbSize]),
-
photo.get(self.SIZE_KEYS[self.defaultDisplaySize]),
-
lat=photo.get('latitude'),lon=photo.get('longitude'),
- mapOption=mapOption)
+ ok = self.addPhoto( photo.get('title'),
+ photo.get('id'),
+
photo.get(self.SIZE_KEYS[self.defaultThumbSize]),
+
photo.get(self.SIZE_KEYS[self.defaultDisplaySize]),
+
lat=photo.get('latitude'),lon=photo.get('longitude'),
+
mapOption=mapOption)
+ if not ok: break
#Add Next Footer if necessary
#print "PAGES: " + str(page) + " " +
str(self.flickr.TOTAL_PAGES) + " " + self.flickr.TOTAL_ON_LAST_PAGE
@@ -320,7 +321,7 @@ class FlickrSession:
if mapOption:
if not lat+lon == '00':
contextMenu =
[(__language__(30510),'XBMC.RunScript(special://home/addons/plugin.image.flickr/default.py,map,'+lat+','+lon+')')]
-
self.addLink(title,display,thumb,tot=self.flickr.TOTAL_ON_PAGE,contextMenu=contextMenu)
+ return
self.addLink(title,display,thumb,tot=self.flickr.TOTAL_ON_PAGE,contextMenu=contextMenu)
def CATEGORIES(self):
self.addDir(__language__(30300),'photostream',1,os.path.join(IMAGES_PATH,'photostream.png'))
@@ -343,23 +344,23 @@ class FlickrSession:
mode,cols = self.getCollectionsInfoList(cid=cid,userid=userid)
total = len(cols)
for c in cols:
-
self.addDir(c['title'],c['id'],mode,c['tn'],tot=total,userid=userid)
+ if not
self.addDir(c['title'],c['id'],mode,c['tn'],tot=total,userid=userid): break
def SETS(self,mode=103,userid=None):
sets = self.getSetsInfoList(userid=userid)
total = len(sets)
for s in sets:
- self.addDir(s['title']+'
('+s['count']+')',s['id'],mode,s['tn'],tot=total)
+ if not self.addDir(s['title']+'
('+s['count']+')',s['id'],mode,s['tn'],tot=total): break
def GALLERIES(self,userid=None):
galleries = self.getGalleriesInfoList(userid=userid)
for g in galleries:
-
self.addDir(g.get('title',''),g.get('id'),104,g.get('tn'),tot=len(galleries))
+ if not
self.addDir(g.get('title',''),g.get('id'),104,g.get('tn'),tot=len(galleries)):
break
def TAGS(self,userid=''):
tags = self.getTagsList(userid=userid)
for t in tags:
- self.addDir(t,t,105,'',tot=len(tags),userid=userid)
+ if not
self.addDir(t,t,105,'',tot=len(tags),userid=userid): break
def PLACES(self,pid,woeid=None,name='',zoom='2'):
places = self.getPlacesInfoList(pid,woeid=woeid)
@@ -375,7 +376,7 @@ class FlickrSession:
count = p.get('count','0')
tn = ''
if self.maps: tn =
self.maps.getMap(p.get('lat','0'),p.get('lon','0'),zoom)
- self.addDir(p.get('place','')+'
('+count+')',p.get('woeid'),1000 + pid,tn,tot=len(places))
+ if not self.addDir(p.get('place','')+'
('+count+')',p.get('woeid'),1000 + pid,tn,tot=len(places)): break
idx+=1
def FAVORITES(self,page,userid=None):
@@ -385,7 +386,7 @@ class FlickrSession:
contacts = self.getContactsInfoList(userid=userid)
total = len(contacts)
for c in contacts:
- self.addDir(c['username'],c['id'],107,c['tn'],tot=total)
+ if not
self.addDir(c['username'],c['id'],107,c['tn'],tot=total): break
def SEARCH_TAGS(self,tags,page,mode=9,userid=None):
if tags == '@@search@@' or tags == userid:
@@ -427,9 +428,7 @@ class FlickrSession:
liz=xbmcgui.ListItem(name, iconImage="DefaultImage.png",
thumbnailImage=iconimage)
liz.setInfo( type="image", infoLabels={ "Title": name } )
if contextMenu: liz.addContextMenuItems(contextMenu)
-
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz,isFolder=False,totalItems=tot)
- return ok
-
+ return
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz,isFolder=False,totalItems=tot)
def addDir(self,name,url,mode,iconimage,page=1,tot=0,userid=''):
if userid: userid = "&userid="+urllib.quote_plus(userid)
@@ -437,8 +436,7 @@ class FlickrSession:
ok=True
liz=xbmcgui.ListItem(name,
'test',iconImage="DefaultFolder.png", thumbnailImage=iconimage)
liz.setInfo( type="image", infoLabels={"Title": name} )
-
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True,totalItems=tot)
- return ok
+ return
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True,totalItems=tot)
class ImageShower(xbmcgui.Window):
def showImage(self,image):
diff --git a/plugin.image.flickr/resources/settings.xml
b/plugin.image.flickr/resources/settings.xml
index a199c02..7653328 100644
--- a/plugin.image.flickr/resources/settings.xml
+++ b/plugin.image.flickr/resources/settings.xml
@@ -11,7 +11,7 @@
</category>
<category label="30201">
<setting label="30254" type="lsep" />
- <setting id="default_map_source" type="enum" label="30005"
values="Google|Yahoo|Open Street Map" default="1" />
+ <setting id="default_map_source" type="enum" label="30005"
values="Google|Yahoo|Open Street Map" default="0" />
<setting id="default_map_type" type="enum" label="30012"
values="Hybrid|Satellite|Terrain|Roadmap" default="0" />
<setting label="30253" type="lsep" />
<setting id="enable_maps" type="bool" label="30011" default="true" />
-----------------------------------------------------------------------
Summary of changes:
plugin.image.flickr/addon.xml | 6 +-
plugin.image.flickr/changelog.txt | 15 ++++-
plugin.image.flickr/default.py | 40 ++++++------
.../language/Chinese (Traditional)/strings.xml | 64 +++++++++++++++++++
.../resources/language/Dutch/strings.xml | 65 ++++++++++++++++++++
plugin.image.flickr/resources/settings.xml | 2 +-
6 files changed, 167 insertions(+), 25 deletions(-)
create mode 100644 plugin.image.flickr/resources/language/Chinese
(Traditional)/strings.xml
create mode 100644 plugin.image.flickr/resources/language/Dutch/strings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
