* various updates to CitationView, CitationEmbedView and CitationEditor to take account of Rev 17973 for two different object types in selectors

* updates to citationviews to support all the functionality (add source etc.) provided by sourceview (including different tooltips for tree view and list view)
* moved registration of citationtreeview into view.grp.py
* removed citationtreeview.grp.py module
* fixed update to citation when note is deleted
* fixed update to citation when media object is deleted
* re-enabled edit button in sourcebackreflist
* improved date display in mergecitation
* changed default note type for citation notes
* changed backref in citation editor to CitationBackRefList
* fixed removal of citation handles from the list in primary objects when a citation is deleted
* fixes for pylint

svn: r18095

src/Merge/mergecitation.py

@@ -30,13 +30,13 @@ Provide merge capabilities for citations.
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.lib import (Person, Family, Event, Place, Source, Repository,
-                     MediaObject)
+from gen.lib import (Person, Family, Event, Place, MediaObject)
 from gen.db import DbTxn
 from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
 import ManagedWindow
+import DateHandler
 from Errors import MergeError
 from Utils import confidence
 
@@ -84,8 +84,8 @@ class MergeCitations(ManagedWindow.ManagedWindow):
 
         entry1 = self.get_widget("date1")
         entry2 = self.get_widget("date2")
-        entry1.set_text(repr(self.citation1.get_date_object()))
-        entry2.set_text(repr(self.citation2.get_date_object()))
+        entry1.set_text(DateHandler.get_date(self.citation1))
+        entry2.set_text(DateHandler.get_date(self.citation2))
         if entry1.get_text() == entry2.get_text():
             for widget_name in ('date1', 'date2', 'date_btn1',
                     'date_btn2'):