From 6523c4ff2b6d5f9396e943f1bd78d6d102c7a221 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Wed, 26 May 2004 02:51:45 +0000
Subject: [PATCH] * src/plugins/ChangeTypes.py: Correct transaction. *
 src/plugins/changetype.glade: HIGify dialog. * src/plugins/PatchNames.py:
 Correct transaction.

svn: r3192
---
 ChangeLog                    |  4 ++++
 src/plugins/ChangeTypes.py   | 13 ++++---------
 src/plugins/PatchNames.py    |  2 +-
 src/plugins/changetype.glade | 33 ++++++++++++++++++++-------------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 505288178..2ba981a2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,10 @@
 	src/Sort.py, src/GenericFilter.py, src/SubstKeywords.py,
 	src/GraphLayout.py: Switch from find_* to try_to_find_* methods.
 
+	* src/plugins/ChangeTypes.py: Correct transaction.
+	* src/plugins/changetype.glade: HIGify dialog.
+	* src/plugins/PatchNames.py: Correct transaction.
+
 2004-05-24  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/PeopleModel.py: temporary fix for add person update
 	* src/PeopleView.py: temporary fix for add person update
diff --git a/src/plugins/ChangeTypes.py b/src/plugins/ChangeTypes.py
index 2bc590c31..57b4560e6 100644
--- a/src/plugins/ChangeTypes.py
+++ b/src/plugins/ChangeTypes.py
@@ -40,13 +40,8 @@ import AutoComp
 #-------------------------------------------------------------------------
 def runTool(database,person,callback,parent=None):
     try:
-        trans = database.start_transaction()
-        ChangeTypes(database,person,parent,trans)
-        database.add_transaction(trans,_('Change types'))
+        ChangeTypes(database,person,parent)
     except:
-        database.add_transaction(trans,_('Change types'))
-        database.undo()
-
         import DisplayTrace
         DisplayTrace.DisplayTrace()
 
@@ -56,11 +51,10 @@ def runTool(database,person,callback,parent=None):
 #
 #-------------------------------------------------------------------------
 class ChangeTypes:
-    def __init__(self,db,person,parent,trans):
+    def __init__(self,db,person,parent):
         self.person = person
         self.db = db
-        self.trans = trans
-
+        self.trans = db.start_transaction()
         base = os.path.dirname(__file__)
         glade_file = "%s/%s" % (base,"changetype.glade")
         self.glade = gtk.glade.XML(glade_file,"top","gramps")
@@ -101,6 +95,7 @@ class ChangeTypes:
             msg = _("%d event records were modified") % modified
             
         OkDialog(_('Change types'),msg)
+        self.db.add_transaction(self.trans,_('Change types'))
         Utils.destroy_passed_object(obj)
 
 #------------------------------------------------------------------------
diff --git a/src/plugins/PatchNames.py b/src/plugins/PatchNames.py
index 5f7306491..d351fba06 100644
--- a/src/plugins/PatchNames.py
+++ b/src/plugins/PatchNames.py
@@ -221,7 +221,7 @@ class PatchNames:
                 name.set_title(grp[1].strip())
                 self.db.commit_person(p,self.trans)
 
-        self.db.add_transaction(self.trans)
+        self.db.add_transaction(self.trans,_("Extract information from names"))
         self.close(obj)
         self.cb(1)
         
diff --git a/src/plugins/changetype.glade b/src/plugins/changetype.glade
index 11d4ce7e5..deebb5984 100644
--- a/src/plugins/changetype.glade
+++ b/src/plugins/changetype.glade
@@ -11,6 +11,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -24,19 +29,6 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="on_apply_clicked" object="top"/>
-	    </widget>
-	  </child>
-
 	  <child>
 	    <widget class="GtkButton" id="button5">
 	      <property name="visible">True</property>
@@ -45,10 +37,25 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 	      <signal name="clicked" handler="on_close_clicked" object="top"/>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="button3">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="on_apply_clicked" object="top"/>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>