* src/DataViews/_SourceView.py: source merge support

svn: r6777

src/DataViews/_PersonView.py

@@ -154,7 +154,7 @@ class PersonView(PageView.PersonNavView):
             ErrorDialog(msg,msg2)
         else:
             from QuestionDialog import ErrorDialog
-            import MergePeople
+            from Merge import MergePeople
             p1 = self.db.get_person_from_handle(mlist[0])
             p2 = self.db.get_person_from_handle(mlist[1])
             if p1 and p2:
@@ -176,12 +176,12 @@ class PersonView(PageView.PersonNavView):
                      "control key while clicking on the desired person.")
             ErrorDialog(msg,msg2)
         else:
-            from MergePeople import MergePeopleUI
+            from Merge import MergePeople
             
             p1 = self.db.get_person_from_handle(mlist[0])
             p2 = self.db.get_person_from_handle(mlist[1])
             if p1 and p2:
-                MergePeopleUI(self.dbstate, self.uistate, p1, p2)
+                MergePeople.MergePeopleUI(self.dbstate, self.uistate, p1, p2)
             else:
                 msg = _("Cannot merge people")
                 msg2 = _("Exactly two people must be selected to perform a merge. "
@@ -634,7 +634,8 @@ class PersonView(PageView.PersonNavView):
             sel_data.set(sel_data.target, 8 ,pickle.dumps(data))
 
     def person_added(self,handle_list):
-        self.model.clear_cache()
+        if not self.model:
+            return
         for node in handle_list:
             person = self.dbstate.db.get_person_from_handle(node)
             top = person.get_primary_name().get_group_name()
@@ -651,6 +652,9 @@ class PersonView(PageView.PersonNavView):
             self.model.row_inserted(path,pnode)
 
     def person_removed(self,handle_list):
+        if not self.model:
+            return
+        
         self.model.clear_cache()
         for node in handle_list:
             person = self.dbstate.db.get_person_from_handle(node)
@@ -669,6 +673,9 @@ class PersonView(PageView.PersonNavView):
             self.model.assign_data()
             
     def person_updated(self,handle_list):
+        if not self.model:
+            return
+        
         self.model.clear_cache()
         for node in handle_list:
             person = self.dbstate.db.get_person_from_handle(node)

src/DataViews/_PlaceView.py

@@ -217,12 +217,11 @@ class PlaceView(PageView.ListView):
         if len(mlist) != 2:
             msg = _("Cannot merge places.")
             msg2 = _("Exactly two places must be selected to perform a merge. "
-                "A second place can be selected by holding down the "
-                "control key while clicking on the desired place.")
+                     "A second place can be selected by holding down the "
+                     "control key while clicking on the desired place.")
             ErrorDialog(msg,msg2)
         else:
             import MergeData
-            MergeData.MergePlaces(self.dbstate, self.uistate, mlist[0],
-                                  mlist[1], self.build_tree)
+            MergeData.MergePlaces(self.dbstate, self.uistate, mlist[0], mlist[1])
 
     

src/DataViews/_SourceView.py

@@ -83,7 +83,7 @@ class SourceView(PageView.ListView):
             self, _('Sources'), dbstate, uistate, column_names,
             len(column_names), DisplayModels.SourceModel, signal_map,
             dbstate.db.get_source_bookmarks(),
-            Bookmarks.SourceBookmarks)
+            Bookmarks.SourceBookmarks, multiple=True)
 
     def get_bookmarks(self):
         return self.dbstate.db.get_source_bookmarks()
@@ -95,6 +95,8 @@ class SourceView(PageView.ListView):
         PageView.ListView.define_actions(self)
         self.add_action('ColumnEdit', gtk.STOCK_PROPERTIES,
                         _('_Column Editor'), callback=self.column_editor)
+        self.add_action('FastMerge', None, _('_Merge'),
+                        callback=self.fast_merge)
 
     def column_editor(self,obj):
         import ColumnOrder
@@ -132,6 +134,9 @@ class SourceView(PageView.ListView):
                 <menuitem action="Remove"/>
               </placeholder>
               <menuitem action="ColumnEdit"/>
+              <placeholder name="Merge">
+                <menuitem action="FastMerge"/>
+              </placeholder>
             </menu>
           </menubar>
           <toolbar name="ToolBar">
@@ -194,3 +199,17 @@ class SourceView(PageView.ListView):
             except Errors.WindowActiveError:
                 pass
 
+    def fast_merge(self, obj):
+        mlist = []
+        self.selection.selected_foreach(self.blist,mlist)
+        
+        if len(mlist) != 2:
+            msg = _("Cannot merge sources.")
+            msg2 = _("Exactly two sources must be selected to perform a merge. "
+                     "A second source can be selected by holding down the "
+                     "control key while clicking on the desired source.")
+            ErrorDialog(msg,msg2)
+        else:
+            import MergeData
+            MergeData.MergeSources(self.dbstate, self.uistate, mlist[0], mlist[1])
+