Removed Sorter.py

svn: r1162

src/plugins/ChangeTypes.py

@@ -28,9 +28,8 @@ import gtk.glade
 
 import const
 import Utils
-import intl
-
-_ = intl.gettext
+from intl import gettext as _
+from QuestionDialog import OkDialog
 
 #-------------------------------------------------------------------------
 #
@@ -79,7 +78,7 @@ class ChangeTypes:
         else:
             msg = _("%d event records were modified") % modified
             
-        gnome.ui.GnomeOkDialog(msg)
+        OkDialog(msg)
         Utils.destroy_passed_object(obj)
 
 #------------------------------------------------------------------------

src/plugins/Check.py

@@ -22,14 +22,14 @@
 
 import RelLib
 import Utils
-import intl
-_ = intl.gettext
+from intl import gettext as _
 
 import os
 
 import gnome.ui
 import gtk
 import gtk.glade
+from QuestionDialog import OkDialog
 
 #-------------------------------------------------------------------------
 #
@@ -145,7 +145,7 @@ class CheckIntegrity:
         errors = blink + efam + photos + rel
         
         if errors == 0:
-            gnome.ui.GnomeOkDialog(_("No errors were found"))
+            OkDialog(_("No errors were found"))
             return
 
         text = ""

src/plugins/Merge.py

@@ -23,9 +23,8 @@
 import RelLib
 import Utils
 import soundex
-import intl
 import GrampsCfg
-_ = intl.gettext
+from intl import gettext as _ 
 
 import string
 import os
@@ -35,7 +34,6 @@ from gnome.ui import *
 import gtk 
 import gtk.glade
 
-
 #-------------------------------------------------------------------------
 #
 #
@@ -116,8 +114,8 @@ class Merge:
     
     def progress_update(self,val):
         self.progress.set_value(val)
-        while events_pending():
-            mainiteration()
+        while gtk.events_pending():
+            gtk.mainiteration()
 
     def find_potentials(self,thresh):
         top = gtk.glade.XML(self.glade_file,"message")

src/plugins/PatchNames.py

@@ -25,12 +25,12 @@ import re
 import intl
 import Utils
 
-_ = intl.gettext
+from intl import gettext as _
 
 import gtk
 import gtk.glade
-from gnome.ui import *
-
+import gnome.ui
+from QuestionDialog import OkDialog
 
 _title_re = re.compile(r"^([A-Za-z][A-Za-z]+\.)\s+(.*)$")
 _nick_re = re.compile(r"(.+)[(\"](.*)[)\"]")
@@ -57,7 +57,7 @@ class PatchNames:
         self.db = db
         self.title_list = []
         self.nick_list = []
-        
+
         for key in self.db.getPersonKeys():
         
             person = self.db.getPerson(key)
@@ -72,6 +72,7 @@ class PatchNames:
                 self.nick_list.append((key,groups[0],groups[1]))
 
         msg = ""
+
         if len(self.nick_list) > 0 or len(self.title_list) > 0:
             for (id,name,nick) in self.nick_list:
                 p = self.db.getPerson(id)
@@ -93,7 +94,7 @@ class PatchNames:
                 })
             self.top.get_widget("textwindow").show_string(msg)
         else:
-            GnomeOkDialog(_("No titles or nicknames were found"))
+            OkDialog(_("No titles or nicknames were found"))
             self.cb(0)
 
     def on_ok_clicked(self,obj):