Disable loading of pyexiv2 - see bug #6042

svn: r20374
This commit is contained in:
Nick Hall 2012-09-12 21:35:11 +00:00
parent 078c5eda3f
commit 6708e3b6b5
2 changed files with 44 additions and 42 deletions

View File

@ -329,7 +329,7 @@ class SystemFonts(object):
"""
if SystemFonts.__FONTS is None:
families = PangoCairo.font_map_get_default().list_families()
print ('GRAMPS GTK3: a g_value_get_object warning:')
#print ('GRAMPS GTK3: a g_value_get_object warning:')
SystemFonts.__FONTS = [family.get_name() for family in families]
SystemFonts.__FONTS.sort()

View File

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