The branch, eden has been updated
via 3508c982efc1664be9326dcb2314d99490ae0cae (commit)
from 90160022e5d31086bd36d3ead583927462f30baf (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3508c982efc1664be9326dcb2314d99490ae0cae
commit 3508c982efc1664be9326dcb2314d99490ae0cae
Author: Martijn Kaijser <[email protected]>
Date: Sat Aug 4 13:28:38 2012 +0200
[plugin.image.iphoto] -v1.9.1
diff --git a/plugin.image.iphoto/README.txt b/plugin.image.iphoto/README.txt
index a73175c..43e43c8 100644
--- a/plugin.image.iphoto/README.txt
+++ b/plugin.image.iphoto/README.txt
@@ -37,11 +37,12 @@ time of your AlbumData.xml with its current database and
update the database
automatically on start. This is disabled by default, but is probably what
you want after testing the plugin.
-You can also choose the view style for albums if you're using the Confluence
-skin. You may set this to "Image Wrap," "Pic Thumbs," or "Default". If you
-choose "Default," it will preserve whatever view mode you have chosen in XBMC
-for each album; otherwise, it will force the view style to the one selected
-here.
+You can also choose the view style for albums if you're using select skins.
+In Confluence, you may set this to "Image Wrap" or "Pic Thumbs".
+In Metropolis, you may set this to "Galary Fanart" or "Picture Grid".
+In all skins, if you choose "Default," it will preserve whatever view mode you
+have chosen in XBMC for each album; otherwise, it will force the view style to
+the one selected here.
Referenced and Managed Libraries
@@ -101,7 +102,7 @@ Known Issues
See http://trac.xbmc.org/ticket/11826
* Sorting by Date sorts on the file date, not the EXIF date.
See http://trac.xbmc.org/ticket/10519
-* Can only set default view mode in Confluence skin
+* Can only set default view mode in select skins
See http://trac.xbmc.org/ticket/9952
@@ -117,6 +118,22 @@ your debug log from XBMC and, if you don't mind, your
AlbumData.xml from your
iPhoto library. Remember to remove any private information from both files
before posting them.
+For iOS platforms (AppleTV2, iPhone, iPad, etc) please read:
+
+ http://forum.xbmc.org/showthread.php?t=92480
+
+For Mac:
+
+ http://forum.xbmc.org/showthread.php?t=47124
+
+For Linux:
+
+ http://forum.xbmc.org/showthread.php?t=34655
+
+For Windows:
+
+ http://forum.xbmc.org/showthread.php?t=42708
+
Credits
=======
diff --git a/plugin.image.iphoto/addon.py b/plugin.image.iphoto/addon.py
index 6e6f9db..89370ea 100644
--- a/plugin.image.iphoto/addon.py
+++ b/plugin.image.iphoto/addon.py
@@ -40,14 +40,22 @@ ICONS_PATH = os.path.join(RESOURCE_PATH, "icons",
ICONS_THEME)
LIB_PATH = os.path.join(RESOURCE_PATH, "lib")
sys.path.append(LIB_PATH)
+# we do special things for these skins
+SKIN_DIR = xbmc.getSkinDir()
+if (SKIN_DIR == "skin.confluence"):
+ SKIN_NAME = "confluence"
+elif (SKIN_DIR == "skin.metropolis"):
+ SKIN_NAME = "metropolis"
+else:
+ SKIN_NAME = ""
+view_mode = 0
+
from resources.lib.iphoto_parser import *
db_file = xbmc.translatePath(os.path.join(addon.getAddonInfo("Profile"),
"iphoto.db"))
db = None
apple_epoch = 978307200
-view_mode = 0
-
# ignore empty albums if configured to do so
album_ign_empty = addon.getSetting('album_ignore_empty')
if (album_ign_empty == ""):
@@ -98,7 +106,10 @@ def textview(file):
except:
print traceback.print_exc()
else:
- window.getControl(CONTROL_LABEL).setLabel("%s - %s" % (heading,
__plugin__))
+ try:
+ window.getControl(CONTROL_LABEL).setLabel("%s - %s" % (heading,
__plugin__))
+ except:
+ pass
window.getControl(CONTROL_TEXTBOX).setText(text)
def md5sum(filename):
@@ -114,19 +125,23 @@ def md5sum(filename):
def render_media(media):
global view_mode
- # default view in Confluence
- vm = addon.getSetting('view_mode')
- if (vm == ""):
- vm = "0"
- addon.setSetting('view_mode', vm)
- vm = int(vm)
- if (vm == 1):
- view_mode = 510
- elif (vm == 2):
- view_mode = 514
- else:
- view_mode = vm
-
+ # default view for select skins
+ if (SKIN_NAME != ""):
+ vm = addon.getSetting(SKIN_NAME + '_view_default')
+ if (vm == ""):
+ addon.setSetting(SKIN_NAME + '_view_default', "0")
+ else:
+ vm = int(vm)
+ if (SKIN_NAME == "confluence"):
+ if (vm == 1):
+ view_mode = 514 # Pic Thumbs
+ elif (vm == 2):
+ view_mode = 510 # Image Wrap
+ if (SKIN_NAME == "metropolis"):
+ if (vm == 1):
+ view_mode = 500 # Picture Grid
+ elif (vm == 2):
+ view_mode = 59 # Galary Fanart
sort_date = False
n = 0
for (caption, mediapath, thumbpath, originalpath, rating, mediadate,
mediasize) in media:
@@ -202,12 +217,14 @@ def list_albums(params):
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_UNSORTED)
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_LABEL)
- # default view in Confluence
- vm = addon.getSetting('confluence_view_albums')
- if (vm == ""):
- vm = "0"
- view_mode = int(vm)
- addon.setSetting('confluence_view_albums', "0")
+ # default view for select skins
+ if (SKIN_NAME != ""):
+ if (addon.getSetting(SKIN_NAME + '_view_albums') == ""):
+ if (SKIN_NAME == "confluence"):
+ view_mode = 51 # Big List
+ elif (SKIN_NAME == "metropolis"):
+ view_mode = 0
+ addon.setSetting(SKIN_NAME + '_view_albums', str(view_mode))
return n
@@ -262,12 +279,14 @@ def list_events(params):
if (sort_date == True):
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_DATE)
- # default view in Confluence
- vm = addon.getSetting('confluence_view_events')
- if (vm == ""):
- vm = "0"
- view_mode = int(vm)
- addon.setSetting('confluence_view_events', "0")
+ # default view for select skins
+ if (SKIN_NAME != ""):
+ if (addon.getSetting(SKIN_NAME + '_view_events') == ""):
+ if (SKIN_NAME == "confluence"):
+ view_mode = 0
+ elif (SKIN_NAME == "metropolis"):
+ view_mode = 0
+ addon.setSetting(SKIN_NAME + '_view_events', str(view_mode))
return n
@@ -311,12 +330,14 @@ def list_faces(params):
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_UNSORTED)
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_LABEL)
- # default view in Confluence
- vm = addon.getSetting('confluence_view_faces')
- if (vm == ""):
- vm = "0"
- view_mode = int(vm)
- addon.setSetting('confluence_view_faces', "0")
+ # default view for select skins
+ if (SKIN_NAME != ""):
+ if (addon.getSetting(SKIN_NAME + '_view_faces') == ""):
+ if (SKIN_NAME == "confluence"):
+ view_mode = 500 # Thumbnails
+ elif (SKIN_NAME == "metropolis"):
+ view_mode = 59 # Gallary Fanart
+ addon.setSetting(SKIN_NAME + '_view_faces', str(view_mode))
return n
@@ -389,12 +410,14 @@ def list_places(params):
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_UNSORTED)
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_LABEL)
- # default view in Confluence
- vm = addon.getSetting('confluence_view_places')
- if (vm == ""):
- vm = "0"
- view_mode = int(vm)
- addon.setSetting('confluence_view_places', "0")
+ # default view for select skins
+ if (SKIN_NAME != ""):
+ if (addon.getSetting(SKIN_NAME + '_view_places') == ""):
+ if (SKIN_NAME == "confluence"):
+ view_mode = 500 # Thumbnails
+ elif (SKIN_NAME == "metropolis"):
+ view_mode = 59 # Gallary Fanart
+ addon.setSetting(SKIN_NAME + '_view_places', str(view_mode))
return n
@@ -445,12 +468,14 @@ def list_keywords(params):
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_UNSORTED)
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_LABEL)
- # default view in Confluence
- vm = addon.getSetting('confluence_view_keywords')
- if (vm == ""):
- vm = "0"
- view_mode = int(vm)
- addon.setSetting('confluence_view_keywords', "0")
+ # default view for select skins
+ if (SKIN_NAME != ""):
+ if (addon.getSetting(SKIN_NAME + '_view_keywords') == ""):
+ if (SKIN_NAME == "confluence"):
+ view_mode = 51 # Big List
+ elif (SKIN_NAME == "metropolis"):
+ view_mode = 0
+ addon.setSetting(SKIN_NAME + '_view_keywords', str(view_mode))
return n
@@ -486,12 +511,14 @@ def list_ratings(params):
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_UNSORTED)
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_LABEL)
- # default view in Confluence
- vm = addon.getSetting('confluence_view_ratings')
- if (vm == ""):
- vm = "0"
- view_mode = int(vm)
- addon.setSetting('confluence_view_ratings', "0")
+ # default view for select skins
+ if (SKIN_NAME != ""):
+ if (addon.getSetting(SKIN_NAME + '_view_ratings') == ""):
+ if (SKIN_NAME == "confluence"):
+ view_mode = 51 # Big List
+ elif (SKIN_NAME == "metropolis"):
+ view_mode = 0
+ addon.setSetting(SKIN_NAME + '_view_ratings', str(view_mode))
return n
@@ -845,7 +872,7 @@ if (__name__ == "__main__"):
if (items):
plugin.endOfDirectory(int(sys.argv[1]), True)
- if (view_mode > 0 and xbmc.getSkinDir() == "skin.confluence"):
+ if (view_mode):
xbmc.sleep(300)
xbmc.executebuiltin("Container.SetViewMode(%d)" % (view_mode))
diff --git a/plugin.image.iphoto/addon.xml b/plugin.image.iphoto/addon.xml
index 77c95b5..dde6093 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.9.0"
provider-name="jingai">
+<addon id="plugin.image.iphoto" name="iPhoto" version="1.9.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 72c4df2..d5ba4d8 100644
--- a/plugin.image.iphoto/changelog.txt
+++ b/plugin.image.iphoto/changelog.txt
@@ -1,3 +1,6 @@
+1.9.1 - 20120803
+- Support for Metropolis skin.
+
1.9.0 - 20120216
- Allow access to network browser from addon settings.
- Online documentation.
diff --git a/plugin.image.iphoto/resources/language/English/strings.xml
b/plugin.image.iphoto/resources/language/English/strings.xml
index 33cd0ef..a2f826b 100644
--- a/plugin.image.iphoto/resources/language/English/strings.xml
+++ b/plugin.image.iphoto/resources/language/English/strings.xml
@@ -27,6 +27,7 @@
<string id="30260">Library import in progress</string>
<string id="30261">Unable to reset database.</string>
+
<!-- Category strings -->
<string id="30100">Events</string>
<string id="30101">Albums</string>
@@ -37,6 +38,7 @@
<string id="30106">Places</string>
<string id="30107"><< View Documentation >></string>
+
<!-- Plugin settings strings -->
<string id="30000">Path to iPhoto Library</string>
<string id="30001">Ignore published (MobileMe) albums</string>
@@ -45,10 +47,6 @@
<string id="30004">Hide Update Library item in main menu</string>
<string id="30005">Ignore empty albums</string>
<string id="30006">Ignore keywords</string>
- <string id="30007">View mode in Confluence</string>
- <string id="30008">Default</string>
- <string id="30009">Image Wrap</string>
- <string id="30010">Pic Thumbs</string>
<string id="30015">Enable Places support</string>
<string id="30016">Show Places as</string>
<string id="30017">Addresses</string>
@@ -63,8 +61,22 @@
<string id="30029">Rewrite root path as</string>
<string id="30030">Hide View Documentation item in main menu</string>
- <!-- Plugin settings categories strings -->
- <string id="30050">General</string>
- <string id="30051">View</string>
- <string id="30059">Advanced</string>
+
+ <!-- Plugin settings Skin strings -->
+ <string id="30060">View mode in Confluence</string>
+ <string id="30061">Default</string>
+ <string id="30062">Pic Thumbs</string>
+ <string id="30063">Image Wrap</string>
+
+ <string id="30066">View mode in Metropolis</string>
+ <string id="30067">Default</string>
+ <string id="30068">Picture Grid</string>
+ <string id="30069">Galary Fanart</string>
+
+
+ <!-- Plugin settings Categories strings -->
+ <string id="30090">General</string>
+ <string id="30091">View</string>
+ <string id="30092">Skin</string>
+ <string id="30099">Advanced</string>
</strings>
diff --git a/plugin.image.iphoto/resources/language/Spanish/strings.xml
b/plugin.image.iphoto/resources/language/Spanish/strings.xml
index dda9cd7..19ba364 100644
--- a/plugin.image.iphoto/resources/language/Spanish/strings.xml
+++ b/plugin.image.iphoto/resources/language/Spanish/strings.xml
@@ -13,6 +13,7 @@
<string id="30222">Esto puede relentizar un poco la importación de la
biblioteca.</string>
<string id="30223">También tandrás que volver a importar la
biblioteca.</string>
+
<!-- Category strings -->
<string id="30100">Eventos</string>
<string id="30101">Ãlbumes</string>
@@ -22,6 +23,7 @@
<string id="30105">Caras</string>
<string id="30106">Lugares</string>
+
<!-- Plugin settings strings -->
<string id="30000">Ruta a AlbumData.xml</string>
<string id="30001">Ignorar Ãlbumes publicados (MobileMe)</string>
@@ -30,10 +32,6 @@
<string id="30004">Ocultar Actualizar biblioteca en el menú
principal</string>
<string id="30005">Ignorar Ãlbumes vacios</string>
<string id="30006">Ignorar Palabras Clave</string>
- <string id="30007">Modo de Vista en Confluence</string>
- <string id="30008">Por defecto</string>
- <string id="30009">Image Wrap</string>
- <string id="30010">Pic Thumbs</string>
<string id="30015">Habilitar Soporte para Lugares</string>
<string id="30016">Mostrar Lugares como</string>
<string id="30017">Direcciones</string>
@@ -44,8 +42,21 @@
<string id="30025">Descargar mapa desde Google</string>
<string id="30026">Mostrar mapa como fanart</string>
- <!-- Plugin settings categories strings -->
- <string id="30050">General</string>
- <string id="30051">Vista</string>
- <string id="30059">Avanzado</string>
+
+ <!-- Plugin settings Skin strings -->
+ <string id="30060">Modo de Vista en Confluence</string>
+ <string id="30061">Por defecto</string>
+ <string id="30062">Pic Thumbs</string>
+ <string id="30063">Image Wrap</string>
+
+ <string id="30066">Modo de Vista en Metropolis</string>
+ <string id="30067">Por defecto</string>
+ <string id="30068">Picture Grid</string>
+ <string id="30069">Galary Fanart</string>
+
+
+ <!-- Plugin settings Categories strings -->
+ <string id="30090">General</string>
+ <string id="30091">Vista</string>
+ <string id="30099">Avanzado</string>
</strings>
diff --git a/plugin.image.iphoto/resources/settings.xml
b/plugin.image.iphoto/resources/settings.xml
index 049b31b..50a4a6d 100644
--- a/plugin.image.iphoto/resources/settings.xml
+++ b/plugin.image.iphoto/resources/settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<!-- General -->
- <category label="30050">
+ <category label="30090">
<setting id="albumdata_xml_path" type="folder" source="" label="30000"
default=""/>
<setting id="managed_lib_enable" type="bool" label="30027"
default="true"/>
<setting id="masters_path" type="text" label="30028"
default="/Volumes/Pictures/" enable="eq(-1,false)"/>
@@ -12,10 +12,7 @@
</category>
<!-- View -->
- <category label="30051">
- <setting id="view_mode" type="enum" label="30007"
lvalues="30008|30009|30010" default="0"/>
- <setting id="default_sort_photo" type="enum" label="30020"
lvalues="30021|30022" default="0"/>
- <setting type="sep"/>
+ <category label="30091">
<setting id="places_labels" type="enum" label="30016"
lvalues="30017|30018" default="0"/>
<setting id="places_show_fanart" type="bool" label="30026"
default="true"/>
<setting type="sep"/>
@@ -24,16 +21,29 @@
<setting id="album_ignore_flagged" type="bool" label="30002"
default="true"/>
<setting type="sep"/>
<setting id="hidden_keywords" type="text" label="30006" default=""/>
- <setting id="confluence_view_events" type="text" visible="false"
default="0"/>
- <setting id="confluence_view_albums" type="text" visible="false"
default="51"/>
- <setting id="confluence_view_faces" type="text" visible="false"
default="500"/>
- <setting id="confluence_view_places" type="text" visible="false"
default="500"/>
- <setting id="confluence_view_keywords" type="text" visible="false"
default="51"/>
- <setting id="confluence_view_ratings" type="text" visible="false"
default="51"/>
+ </category>
+
+ <!-- Skin -->
+ <category label="30092">
+ <setting id="default_sort_photo" type="enum" label="30020"
lvalues="30021|30022" default="0"/>
+ <setting id="confluence_view_default" type="enum" label="30060"
lvalues="30061|30062|30063" default="0"/>
+ <setting id="confluence_view_events" type="text" visible="false"/>
+ <setting id="confluence_view_albums" type="text" visible="false"/>
+ <setting id="confluence_view_faces" type="text" visible="false"/>
+ <setting id="confluence_view_places" type="text" visible="false"/>
+ <setting id="confluence_view_keywords" type="text" visible="false"/>
+ <setting id="confluence_view_ratings" type="text" visible="false"/>
+ <setting id="metropolis_view_default" type="enum" label="30066"
lvalues="30067|30068|30069" default="0"/>
+ <setting id="metropolis_view_events" type="text" visible="false"/>
+ <setting id="metropolis_view_albums" type="text" visible="false"/>
+ <setting id="metropolis_view_faces" type="text" visible="false"/>
+ <setting id="metropolis_view_places" type="text" visible="false"/>
+ <setting id="metropolis_view_keywords" type="text" visible="false"/>
+ <setting id="metropolis_view_ratings" type="text" visible="false"/>
</category>
<!-- Advanced -->
- <category label="30059">
+ <category label="30099">
<setting id="hide_import_lib" type="bool" label="30004"
default="false"/>
<setting id="hide_view_readme" type="bool" label="30030"
default="false"/>
</category>
-----------------------------------------------------------------------
Summary of changes:
plugin.image.iphoto/README.txt | 29 ++++-
plugin.image.iphoto/addon.py | 133 ++++++++++++--------
plugin.image.iphoto/addon.xml | 2 +-
plugin.image.iphoto/changelog.txt | 3 +
.../resources/language/English/strings.xml | 28 +++--
.../resources/language/Spanish/strings.xml | 27 +++--
plugin.image.iphoto/resources/settings.xml | 34 ++++--
7 files changed, 168 insertions(+), 88 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
