From 665f991b367d173397e1b03328e51c16a32482f1 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Tue, 26 Apr 2011 02:39:04 +0000 Subject: [PATCH] Removed registry of Edit Image Exif Metadata from its own file into gramplet.gpr.py svn: r17267 --- src/plugins/gramplet/EditExifMetadata.gpr.py | 45 -------------------- src/plugins/gramplet/EditExifMetadata.py | 14 +++--- src/plugins/gramplet/Makefile.am | 1 - src/plugins/gramplet/gramplet.gpr.py | 22 ++++++++++ 4 files changed, 29 insertions(+), 53 deletions(-) delete mode 100644 src/plugins/gramplet/EditExifMetadata.gpr.py diff --git a/src/plugins/gramplet/EditExifMetadata.gpr.py b/src/plugins/gramplet/EditExifMetadata.gpr.py deleted file mode 100644 index d1eb53f71..000000000 --- a/src/plugins/gramplet/EditExifMetadata.gpr.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2009-2011 Rob G. Healey -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -# $Id$ -# -#------------------------------------------------------------------------ -# Edit 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 = 550, - expand = False, - gramplet = 'EditExifMetadata', - gramplet_title = _("Edit Exif Metadata"), - detached_width = 510, - detached_height = 550, - version = '1.5.0', - gramps_target_version = '3.4', - status = STABLE, - fname = "EditExifMetadata.py", - help_url = "Edit Exif Metadata", - authors = ['Rob G. Healey'], - authors_email = ['robhealey1@gmail.com'], - navtypes = ["Media"], - ) diff --git a/src/plugins/gramplet/EditExifMetadata.py b/src/plugins/gramplet/EditExifMetadata.py index 6ff1bb6c5..cb86f5752 100644 --- a/src/plugins/gramplet/EditExifMetadata.py +++ b/src/plugins/gramplet/EditExifMetadata.py @@ -81,7 +81,7 @@ except ImportError, msg: WarningDialog(_("You need to install, %s or greater, for this addon to work...\n" "I would recommend installing, %s, and it may be downloaded from here: \n%s") % ( Min_VERSION_str, Pref_VERSION_str, _DOWNLOAD_LINK), str(msg)) - raise Exception(_("Failed to load 'Image Metadata Gramplet'...")) + raise Exception(_("Failed to load 'Edit Image Exif Metadata'...")) # This only happends if the user has pyexiv2-0.1.3 installed on their computer... except AttributeError: @@ -217,7 +217,7 @@ def _help_page(obj): will bring up a Wiki help page. """ - GrampsDisplay.help(webpage = 'Image Metadata Gramplet') + GrampsDisplay.help(webpage = "Edit Image Exif Metadata") _allmonths = list([_dd.short_months[i], _dd.long_months[i], i] for i in range(1, 13)) @@ -512,7 +512,7 @@ class EditExifMetadata(Gramplet): self.SavedEntries = [entry for entry in self.SavedEntries if entry] if self.SavedEntries: - QuestionDialog(_("Image Metadata Gramplet"), _("Save Exif metadata to this image?"), + QuestionDialog(_("Edit Image Exif Metadata"), _("Save Exif metadata to this image?"), _("Save"), self.save_metadata) def __delete_dialog(self, obj): @@ -520,7 +520,7 @@ class EditExifMetadata(Gramplet): Handles the Delete Dialog... """ - QuestionDialog(_("Image Metadata Gramplet"), _("WARNING! You are about to completely " + QuestionDialog(_("Edit Image Exif Metadata"), _("WARNING! You are about to completely " "delete the Exif metadata from this image?"), _("Delete"), self.strip_metadata) @@ -560,7 +560,7 @@ class EditExifMetadata(Gramplet): def make_row(self, pos, text, choices=None, readonly=False, callback_list=[], mark_dirty=False, default=0): - # Image Metadata Gramplet + # "Edit Image Exif Metadata" Gramplet row = gtk.HBox() label = gtk.Label() if readonly: @@ -629,7 +629,7 @@ class EditExifMetadata(Gramplet): """ gets the value from the Exif Key, and returns it... - @param: KeyTag -- image metadata key + @param: KeyTag -- Edit Image Exif Metadata key """ KeyValue = "" @@ -986,7 +986,7 @@ class EditExifMetadata(Gramplet): def save_metadata(self): """ gets the information from the plugin data fields - and sets the KeyTag = keyvalue image metadata + and sets the KeyTag = keyvalue """ # Description data field diff --git a/src/plugins/gramplet/Makefile.am b/src/plugins/gramplet/Makefile.am index bd574b0c6..52d61e08d 100644 --- a/src/plugins/gramplet/Makefile.am +++ b/src/plugins/gramplet/Makefile.am @@ -16,7 +16,6 @@ pkgdata_PYTHON = \ Children.py \ DescendGramplet.py \ EditExifMetadata.py \ - EditExifMetadata.gpr.py \ Events.py \ FanChartGramplet.py \ FaqGramplet.py \ diff --git a/src/plugins/gramplet/gramplet.gpr.py b/src/plugins/gramplet/gramplet.gpr.py index 30e0c7558..e7f2033d2 100644 --- a/src/plugins/gramplet/gramplet.gpr.py +++ b/src/plugins/gramplet/gramplet.gpr.py @@ -305,3 +305,25 @@ register(GRAMPLET, gramps_target_version="3.4", ) +#------------------------------------------------------------------------ +# 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 = 550, + expand = False, + gramplet = 'EditExifMetadata', + gramplet_title = _("Edit Exif Metadata"), + detached_width = 510, + detached_height = 550, + version = '1.5.0', + gramps_target_version = '3.4', + status = STABLE, + fname = "EditExifMetadata.py", + help_url = "Edit Image Exif Metadata", + authors = ['Rob G. Healey'], + authors_email = ['robhealey1@gmail.com'], + navtypes = ["Media"], + )