* various: merge changes made in gramps20 up until R2_0_10_real tag.

* configure.in: Bump up release number.
* Release: Version 2.0.10 "Holy Hand Grenade of Antioch" released.


svn: r6011

gramps2/src/Utils.py

@@ -49,6 +49,7 @@ import GrampsMime
 import NameDisplay
 import RelLib
 import Errors
+from QuestionDialog import WarningDialog
 
 #-------------------------------------------------------------------------
 #
@@ -1144,6 +1145,7 @@ class ProgressMeter:
         Specify the title and the current pass header.
         """
         self.ptop = gtk.Dialog()
+        self.ptop.connect('delete_event',self.warn)
         self.ptop.set_has_separator(False)
         self.ptop.set_title(title)
         self.ptop.set_border_width(12)
@@ -1193,6 +1195,13 @@ class ProgressMeter:
         while gtk.events_pending():
             gtk.main_iteration()
 
+    def warn(self,obj,obj2):
+        WarningDialog(
+            _("Attempt to force closing the dialog"),
+            _("Please do not force closing this important dialog."),
+            self.ptop)
+        return True
+
     def close(self):
         """
         Close the progress meter