Enable pyexiv2 import - bug #6042 now fixed

svn: r20426
This commit is contained in:
Nick Hall 2012-09-21 16:59:51 +00:00
parent 2e1b94b0d1
commit be06435c9e

View File

@ -313,26 +313,25 @@ register(GRAMPLET,
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# Edit Image Exif Metadata class # Edit Image Exif Metadata class
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# GTK3 TODO: The pyexiv2 module causes problems - see bug #6042 register(GRAMPLET,
#register(GRAMPLET, id = "Edit Image Exif Metadata",
#id = "Edit Image Exif Metadata", name = _("Edit Image Exif Metadata"),
#name = _("Edit Image Exif Metadata"), description = _("Gramplet to view, edit, and save image Exif metadata"),
#description = _("Gramplet to view, edit, and save image Exif metadata"), height = 450,
#height = 450, expand = False,
#expand = False, gramplet = 'EditExifMetadata',
#gramplet = 'EditExifMetadata', gramplet_title = _("Edit Exif Metadata"),
#gramplet_title = _("Edit Exif Metadata"), detached_width = 510,
#detached_width = 510, detached_height = 550,
#detached_height = 550, version = '1.5.0',
#version = '1.5.0', gramps_target_version = '4.0',
#gramps_target_version = '4.0', status = STABLE,
#status = STABLE, fname = "editexifmetadata.py",
#fname = "editexifmetadata.py", help_url = "Edit Image Exif Metadata",
#help_url = "Edit Image Exif Metadata", authors = ['Rob G. Healey'],
#authors = ['Rob G. Healey'], authors_email = ['robhealey1@gmail.com'],
#authors_email = ['robhealey1@gmail.com'], navtypes = ["Media"],
#navtypes = ["Media"], )
#)
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# Bottombar # Bottombar
@ -393,30 +392,29 @@ register(GRAMPLET,
navtypes=["Media"], navtypes=["Media"],
) )
# GTK3 TODO: The pyexiv2 module causes problems - see bug #6042 try:
#try: import pyexiv2
#import pyexiv2 available = True
#available = True except:
#except: import logging
#import logging logging.warning(_("WARNING: pyexiv2 module not loaded. "
#logging.warning(_("WARNING: pyexiv2 module not loaded. " "Image metadata functionality will not be available."))
#"Image metadata functionality will not be available.")) available = False
#available = False
#if available: if available:
#register(GRAMPLET, register(GRAMPLET,
#id = "Metadata Viewer", id = "Metadata Viewer",
#name = _("Metadata Viewer"), name = _("Metadata Viewer"),
#description = _("Gramplet showing metadata for a media object"), description = _("Gramplet showing metadata for a media object"),
#version = "1.0.0", version = "1.0.0",
#gramps_target_version = "4.0", gramps_target_version = "4.0",
#status = STABLE, status = STABLE,
#fname = "metadataviewer.py", fname = "metadataviewer.py",
#height = 200, height = 200,
#gramplet = 'MetadataViewer', gramplet = 'MetadataViewer',
#gramplet_title = _("Image Metadata"), gramplet_title = _("Image Metadata"),
#navtypes=["Media"], navtypes=["Media"],
#) )
register(GRAMPLET, register(GRAMPLET,
id="Person Residence", id="Person Residence",