The branch, eden-pre has been updated
via dad800c0783aa6d87ac2bda7414c756445f6d6f0 (commit)
via 59587af7694c6bf2efbddfb46c38b212ad17d9a8 (commit)
from 4f620f4f8c54aa6d0cd67e217775adefc889b9ea (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=dad800c0783aa6d87ac2bda7414c756445f6d6f0
commit dad800c0783aa6d87ac2bda7414c756445f6d6f0
Author: spiff <[email protected]>
Date: Fri Feb 3 18:53:45 2012 +0100
[plugin.audio.npr] updated to version 2.0.1
diff --git a/.gitignore b/.gitignore
index 11d8a77..1ed048a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,4 @@ plugin.audio.radio_de/.git
plugin.video.jupiterbroadcasting/.git
plugin.video.news.tv2.dk/.git
plugin.video.g4tv/.git
+plugin.audio.npr/.git
diff --git a/plugin.audio.npr/addon.xml b/plugin.audio.npr/addon.xml
index 2968698..c2bceee 100644
--- a/plugin.audio.npr/addon.xml
+++ b/plugin.audio.npr/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.audio.npr"
name="NPR (National Public Radio)"
- version="2.0.0"
+ version="2.0.1"
provider-name="Stieg, Fisslefink">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.audio.npr/default.py b/plugin.audio.npr/default.py
index c64e381..e2d3eb5 100644
--- a/plugin.audio.npr/default.py
+++ b/plugin.audio.npr/default.py
@@ -129,7 +129,7 @@ def get_station_streams(tree):
elist = tree.findall('station/url')
for e in elist:
url_id = e.get('typeId')
- if url_id == '10' or url_id == '15':
+ if url_id == '10':
title = e.get('title')
text = e.text
streams[title] = text
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=59587af7694c6bf2efbddfb46c38b212ad17d9a8
commit 59587af7694c6bf2efbddfb46c38b212ad17d9a8
Author: spiff <[email protected]>
Date: Fri Feb 3 18:46:34 2012 +0100
[plugin.image.iphoto] updated to version 1.7.1
diff --git a/plugin.image.iphoto/README.txt b/plugin.image.iphoto/README.txt
index f09e245..2315fc0 100644
--- a/plugin.image.iphoto/README.txt
+++ b/plugin.image.iphoto/README.txt
@@ -70,4 +70,14 @@ Known Issues
============
* Sorting by Date sorts on the file date, not the EXIF date.
See http://trac.xbmc.org/ticket/10519
-* Need icons for Faces, Places, and Keywords.
+
+Credits
+=======
+jingai (jingai at floatingpenguins dot com)
+Original code:
+- Anoop Menon
+- Nuka1195
+- JMarshal
+Icons:
+- Firnsy
+- brsev (http://brsev.com#licensing)
diff --git a/plugin.image.iphoto/addon.py b/plugin.image.iphoto/addon.py
index ffe8d03..db017d1 100644
--- a/plugin.image.iphoto/addon.py
+++ b/plugin.image.iphoto/addon.py
@@ -4,7 +4,7 @@
__plugin__ = "iPhoto"
__author__ = "jingai <[email protected]>"
-__credits__ = "Anoop Menon, Nuka1195, JMarshal, jingai"
+__credits__ = "Anoop Menon, Nuka1195, JMarshal, jingai, brsev
(http://brsev.com#licensing)"
__url__ = "git://github.com/jingai/plugin.image.iphoto.git"
import sys
@@ -35,7 +35,8 @@ ALBUM_DATA_XML = "AlbumData.xml"
BASE_URL = "%s" % (sys.argv[0])
PLUGIN_PATH = addon.getAddonInfo("path")
RESOURCE_PATH = os.path.join(PLUGIN_PATH, "resources")
-ICONS_PATH = os.path.join(RESOURCE_PATH, "icons")
+ICONS_THEME = "token_light"
+ICONS_PATH = os.path.join(RESOURCE_PATH, "icons", ICONS_THEME)
LIB_PATH = os.path.join(RESOURCE_PATH, "lib")
sys.path.append(LIB_PATH)
@@ -129,7 +130,7 @@ def list_photos_in_album(params):
return render_media(media)
def list_albums(params):
- global db, BASE_URL, album_ign_empty
+ global db, BASE_URL, ICONS_PATH, album_ign_empty
albumid = 0
try:
@@ -153,7 +154,7 @@ def list_albums(params):
if (not count and album_ign_empty == "true"):
continue
- item = gui.ListItem(name, thumbnailImage="DefaultFolder.png")
+ item = gui.ListItem(name, thumbnailImage=ICONS_PATH+"/folder.png")
plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=albums&albumid=%s" % (albumid), listitem = item, isFolder
= True, totalItems = count)
n += 1
@@ -323,7 +324,7 @@ def list_photos_with_keyword(params):
return render_media(media)
def list_keywords(params):
- global db, BASE_URL, album_ign_empty
+ global db, BASE_URL, ICONS_PATH, album_ign_empty
keywordid = 0
try:
@@ -349,7 +350,7 @@ def list_keywords(params):
if (not count and album_ign_empty == "true"):
continue
- item = gui.ListItem(name, thumbnailImage="DefaultFolder.png")
+ item = gui.ListItem(name, thumbnailImage=ICONS_PATH+"/folder.png")
item.addContextMenuItems([(addon.getLocalizedString(30214),
"XBMC.RunPlugin(\""+BASE_URL+"?action=hidekeyword&keyword=%s\")" % (name),)])
plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=keywords&keywordid=%s" % (keywordid), listitem = item,
isFolder = True, totalItems = count)
n += 1
@@ -606,7 +607,7 @@ if (__name__ == "__main__"):
hide_import_lib = "false"
addon.setSetting('hide_import_lib', hide_import_lib)
if (hide_import_lib == "false"):
- item = gui.ListItem(addon.getLocalizedString(30103),
thumbnailImage=PLUGIN_PATH+"/icon.png")
+ item = gui.ListItem(addon.getLocalizedString(30103),
thumbnailImage=ICONS_PATH+"/update.png")
plugin.addDirectoryItem(int(sys.argv[1]),
BASE_URL+"?action=rescan", item, False)
except:
plugin.endOfDirectory(int(sys.argv[1]), False)
diff --git a/plugin.image.iphoto/addon.xml b/plugin.image.iphoto/addon.xml
index dee6278..83679a5 100644
--- a/plugin.image.iphoto/addon.xml
+++ b/plugin.image.iphoto/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.image.iphoto" name="iPhoto" version="1.7.0"
provider-name="jingai">
+<addon id="plugin.image.iphoto" name="iPhoto" version="1.7.1"
provider-name="jingai">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/plugin.image.iphoto/changelog.txt
b/plugin.image.iphoto/changelog.txt
index 95ead9c..0e66f4b 100644
--- a/plugin.image.iphoto/changelog.txt
+++ b/plugin.image.iphoto/changelog.txt
@@ -1,3 +1,6 @@
+1.7.1 - 20120202
+- New icons.
+
1.7.0 - 20120128
- Support for referenced masters.
- Add context menu item to reset addon database.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
plugin.audio.npr/README | 63 +++++++++++
plugin.audio.npr/addon.xml | 2 +-
plugin.audio.npr/default.py | 2 +-
plugin.audio.npr/stations.py | 109 ++++++++++++++++++++
plugin.image.iphoto/README.txt | 12 ++-
plugin.image.iphoto/addon.py | 15 ++--
plugin.image.iphoto/addon.xml | 2 +-
plugin.image.iphoto/changelog.txt | 3 +
plugin.image.iphoto/resources/icons/albums.png | Bin 70192 -> 0 bytes
plugin.image.iphoto/resources/icons/events.png | Bin 39614 -> 0 bytes
plugin.image.iphoto/resources/icons/star.png | Bin 23548 -> 0 bytes
plugin.image.iphoto/resources/icons/star1.png | Bin 25271 -> 0 bytes
plugin.image.iphoto/resources/icons/star2.png | Bin 26238 -> 0 bytes
plugin.image.iphoto/resources/icons/star3.png | Bin 26923 -> 0 bytes
plugin.image.iphoto/resources/icons/star4.png | Bin 27179 -> 0 bytes
plugin.image.iphoto/resources/icons/star5.png | Bin 23548 -> 0 bytes
.../resources/icons/token_dark/albums.png | Bin 0 -> 10133 bytes
.../resources/icons/token_dark/events.png | Bin 0 -> 16644 bytes
.../resources/icons/token_dark/faces.png | Bin 0 -> 14618 bytes
.../resources/icons/token_dark/folder.png | Bin 0 -> 8805 bytes
.../resources/icons/token_dark/keywords.png | Bin 0 -> 19005 bytes
.../resources/icons/token_dark/places.png | Bin 0 -> 28781 bytes
.../resources/icons/token_dark/star.png | Bin 0 -> 16273 bytes
.../resources/icons/token_dark/star1.png | Bin 0 -> 11734 bytes
.../resources/icons/token_dark/star2.png | Bin 0 -> 14109 bytes
.../resources/icons/token_dark/star3.png | Bin 0 -> 15557 bytes
.../resources/icons/token_dark/star4.png | Bin 0 -> 17005 bytes
.../resources/icons/token_dark/star5.png | Bin 0 -> 16273 bytes
.../resources/icons/token_dark/update.png | Bin 0 -> 19317 bytes
.../resources/icons/token_light/albums.png | Bin 0 -> 10690 bytes
.../resources/icons/token_light/events.png | Bin 0 -> 15375 bytes
.../resources/icons/token_light/faces.png | Bin 0 -> 16527 bytes
.../resources/icons/token_light/folder.png | Bin 0 -> 8763 bytes
.../resources/icons/token_light/keywords.png | Bin 0 -> 21329 bytes
.../resources/icons/token_light/places.png | Bin 0 -> 31444 bytes
.../resources/icons/token_light/star.png | Bin 0 -> 16990 bytes
.../resources/icons/token_light/star1.png | Bin 0 -> 12373 bytes
.../resources/icons/token_light/star2.png | Bin 0 -> 14720 bytes
.../resources/icons/token_light/star3.png | Bin 0 -> 16275 bytes
.../resources/icons/token_light/star4.png | Bin 0 -> 17301 bytes
.../resources/icons/token_light/star5.png | Bin 0 -> 16990 bytes
.../resources/icons/token_light/update.png | Bin 0 -> 22081 bytes
43 files changed, 198 insertions(+), 11 deletions(-)
create mode 100644 plugin.audio.npr/README
create mode 100644 plugin.audio.npr/stations.py
delete mode 100644 plugin.image.iphoto/resources/icons/albums.png
delete mode 100644 plugin.image.iphoto/resources/icons/events.png
delete mode 100644 plugin.image.iphoto/resources/icons/star.png
delete mode 100644 plugin.image.iphoto/resources/icons/star1.png
delete mode 100644 plugin.image.iphoto/resources/icons/star2.png
delete mode 100644 plugin.image.iphoto/resources/icons/star3.png
delete mode 100644 plugin.image.iphoto/resources/icons/star4.png
delete mode 100644 plugin.image.iphoto/resources/icons/star5.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/albums.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/events.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/faces.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/folder.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/keywords.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/places.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/star.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/star1.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/star2.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/star3.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/star4.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/star5.png
create mode 100644 plugin.image.iphoto/resources/icons/token_dark/update.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/albums.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/events.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/faces.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/folder.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/keywords.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/places.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/star.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/star1.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/star2.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/star3.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/star4.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/star5.png
create mode 100644 plugin.image.iphoto/resources/icons/token_light/update.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
