From ed1d0a8a1f8a1aad2ad910f8617035077ea31d9a Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Tue, 26 Apr 2011 02:26:54 +0000
Subject: [PATCH] Removed registry of Edit Image Exif Metadata from its own
 file into gramplet.gpr.py

svn: r17266
---
 src/plugins/gramplet/EditExifMetadata.gpr.py | 45 --------------------
 src/plugins/gramplet/EditExifMetadata.py     |  2 +-
 src/plugins/gramplet/Makefile.am             |  1 -
 src/plugins/gramplet/gramplet.gpr.py         | 22 ++++++++++
 4 files changed, 23 insertions(+), 47 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 c40e2ac61..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 <robhealey1@gmail.com>
-#
-# 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.3',
-         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..c816b4afb 100644
--- a/src/plugins/gramplet/EditExifMetadata.py
+++ b/src/plugins/gramplet/EditExifMetadata.py
@@ -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))
 
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 453ef1a7b..434421f57 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.3",
          )
 
+#------------------------------------------------------------------------
+# 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.3',
+         status                = STABLE,
+         fname                 = "EditExifMetadata.py",
+         help_url              = "Edit Image Exif Metadata",
+         authors               = ['Rob G. Healey'],
+         authors_email         = ['robhealey1@gmail.com'],
+         navtypes              = ["Media"],
+    )