* src/DisplayModels.py: handle places correctly

* src/DisplayTabs.py: Add LocationTab
* src/EditPlace.py: update to use DisplayTabs
* src/ImageSelect.py: remove SelectObject
* src/LocEdit.py: use DisplayManager
* src/gramps.glade: update editors
* src/GrampsDb/_GrampsDbBase.py: use db_is_open
* src/RelLib/_Place.py: typo


svn: r5887

gramps2/ChangeLog

@@ -1,3 +1,13 @@
+2006-02-05  Don Allingham  <don@gramps-project.org>
+	* src/DisplayModels.py: handle places correctly
+	* src/DisplayTabs.py: Add LocationTab
+	* src/EditPlace.py: update to use DisplayTabs
+	* src/ImageSelect.py: remove SelectObject
+	* src/LocEdit.py: use DisplayManager
+	* src/gramps.glade: update editors
+	* src/GrampsDb/_GrampsDbBase.py: use db_is_open
+	* src/RelLib/_Place.py: typo
+	
 2006-02-04  Don Allingham  <don@gramps-project.org>
 	* src/ChooseParents.py: removed
 	* src/ListBox.py: removed

gramps2/src/DisplayModels.py

@@ -333,37 +333,37 @@ class PlaceModel(BaseModel):
 
     def column_parish(self,data):
         try:
-            return data[5].get_parish()
+            return data[5][1]
         except:
             return u''
 
     def column_city(self,data):
         try:
-            return data[5].get_city()
+            return data[5][0][0]
         except:
             return u''
         
     def column_county(self,data):
         try:
-            return data[5].get_county()
+            return data[5][2]
         except:
             return u''
     
     def column_state(self,data):
         try:
-            return data[5].get_state()
+            return data[5][0][1]
         except:
             return u''
 
     def column_country(self,data):
         try:
-            return data[5].get_country()
+            return data[5][0][2]
         except:
             return u''
 
     def column_postal_code(self,data):
         try:
-            return data[5].get_postal_code()
+            return data[5][0][3]
         except:
             return u''
 

gramps2/src/DisplayTabs.py

@@ -897,6 +897,55 @@ class AddrEmbedList(EmbeddedList):
     def edit_callback(self,name):
         self.rebuild()
 
+#-------------------------------------------------------------------------
+#
+# 
+#
+#-------------------------------------------------------------------------
+class LocationEmbedList(EmbeddedList):
+
+    _HANDLE_COL = 5
+    _DND_TYPE   = DdTargets.ADDRESS
+
+    _column_names = [
+        (_('City'),           0, 150),
+        (_('County'),         1, 100),
+        (_('Church Parish'),  2, 100),
+        (_('State/Province'), 3, 100),
+        (_('Country'),        4, 75),
+        ]
+    
+    def __init__(self,dbstate,uistate,track,data):
+        self.data = data
+        EmbeddedList.__init__(self, dbstate, uistate, track,
+                              _('Alternate Locations'), LocationModel)
+
+    def get_data(self):
+        return self.data
+
+    def column_order(self):
+        return ((1,0),(1,1),(1,2),(1,3),(1,4))
+
+    def add_button_clicked(self,obj):
+        import LocEdit
+        loc = RelLib.Location()
+        LocEdit.LocationEditor(self.dbstate, self.uistate, self.track,
+                               loc, self.add_callback)
+
+    def add_callback(self,name):
+        self.get_data().append(name)
+        self.rebuild()
+
+    def edit_button_clicked(self,obj):
+        loc = self.get_selected()
+        if loc:
+            import LocEdit
+            LocEdit.LocationEditor(self.dbstate, self.uistate, self.track,
+                                   addr, self.edit_callback)
+
+    def edit_callback(self,name):
+        self.rebuild()
+
 #-------------------------------------------------------------------------
 #
 # NoteTab
@@ -1400,6 +1449,20 @@ class AddressModel(gtk.ListStore):
                 obj,
                 ])
 
+#-------------------------------------------------------------------------
+#
+# LocationModel
+#
+#-------------------------------------------------------------------------
+class LocationModel(gtk.ListStore):
+
+    def __init__(self,obj_list,db):
+        gtk.ListStore.__init__(self,str,str,str,str,str,object)
+        self.db = db
+        for obj in obj_list:
+            self.append(row=[obj.city, obj.county, obj.parish,
+                             obj.state, obj.country, obj, ])
+
 #-------------------------------------------------------------------------
 #
 # AddressModel
@@ -1503,6 +1566,11 @@ class SourceBackRefModel(gtk.ListStore):
                 gid = p.gramps_id
                 handle = p.handle
                 name = Utils.family_name(p,self.db)
+            elif dtype == 'Source':
+                p = self.db.get_source_from_handle(ref[1])
+                gid = p.gramps_id
+                handle = p.handle
+                name = p.get_title()
             elif dtype == 'Event':
                 p = self.db.get_event_from_handle(ref[1])
                 gid = p.gramps_id

gramps2/src/EditPlace.py

@@ -60,6 +60,7 @@ import ListModel
 
 from DdTargets import DdTargets
 from WindowUtils import GladeIf
+from DisplayTabs import *
 
 #-------------------------------------------------------------------------
 #
@@ -81,24 +82,15 @@ class EditPlace(DisplayState.ManagedWindow):
         self.not_loaded = True
         self.model = None # becomes the model for back references.
         self.lists_changed = 0
-        if place:
-            self.srcreflist = place.get_source_references()
-        else:
-            self.srcreflist = []
 
         self.top = gtk.glade.XML(const.gladeFile,"placeEditor","gramps")
         self.gladeif = GladeIf(self.top)
 
         self.window = self.top.get_widget("placeEditor")
-        self.iconlist = self.top.get_widget('iconlist')
         title_label = self.top.get_widget('title')
 
         Utils.set_titles(self.window,title_label,_('Place Editor'))
 
-        self.glry = ImageSelect.Gallery(place, self.db.commit_place, self.path,
-                                        self.iconlist, self.db,
-                                        self,self.window)
-
         mode = not self.dbstate.db.readonly
         self.title = self.top.get_widget("place_title")
         self.title.set_editable(mode)
@@ -120,46 +112,9 @@ class EditPlace(DisplayState.ManagedWindow):
         self.longitude.set_editable(mode)
         self.latitude = self.top.get_widget("latitude")
         self.latitude.set_editable(mode)
-        self.note = self.top.get_widget("place_note")
-        self.note.set_editable(mode)
-        self.spell = Spell.Spell(self.note)
-
-        self.web_list = self.top.get_widget("web_list")
-        self.web_url = self.top.get_widget("web_url")
-        self.web_go = self.top.get_widget("web_go")
-        self.web_edit = self.top.get_widget("web_edit")
-        self.web_description = self.top.get_widget("url_des")
 
         self.top.get_widget('changed').set_text(place.get_change_display())
 
-        # event display
-        self.web_model = gtk.ListStore(str,str)
-        self.build_columns(self.web_list, [(_('Path'),150),
-                                           (_('Description'),150)])
-        self.web_list.set_model(self.web_model)
-        self.web_list.get_selection().connect('changed',
-                                              self.on_web_list_select_row)
-        
-        self.loc_edit = self.top.get_widget("loc_edit")
-        self.loc_list = self.top.get_widget("loc_list")
-        self.loc_city = self.top.get_widget("loc_city")
-        self.loc_county = self.top.get_widget("loc_county")
-        self.loc_state  = self.top.get_widget("loc_state")
-        self.loc_postal = self.top.get_widget("loc_postal")
-        self.loc_phone  = self.top.get_widget("loc_phone")
-        self.loc_parish  = self.top.get_widget("loc_parish")
-        self.loc_country = self.top.get_widget("loc_country")
-
-        self.ulist = place.get_url_list()[:]
-        self.llist = place.get_alternate_locations()[:]
-
-        self.loc_model = gtk.ListStore(str,str,str,str)
-        self.build_columns(self.loc_list, [(_('City'),150), (_('County'),100),
-                                           (_('State'),100), (_('Country'),50)])
-        self.loc_list.set_model(self.loc_model)
-        self.loc_sel = self.loc_list.get_selection()
-        self.loc_sel.connect('changed',self.on_loc_list_select_row)
-
         self.title.set_text(place.get_title())
         mloc = place.get_main_location()
         self.city.set_text(mloc.get_city())
@@ -172,97 +127,28 @@ class EditPlace(DisplayState.ManagedWindow):
         self.longitude.set_text(place.get_longitude())
         self.latitude.set_text(place.get_latitude())
         self.plist = self.top.get_widget("refinfo")
-        self.slist = self.top.get_widget("slist")
 
-        self.sources_label = self.top.get_widget("sourcesPlaceEdit")
+        self.notebook = self.top.get_widget('notebook3')
-        self.names_label = self.top.get_widget("namesPlaceEdit")
-        self.notes_label = self.top.get_widget("notesPlaceEdit")
-        self.gallery_label = self.top.get_widget("galleryPlaceEdit")
-        self.inet_label = self.top.get_widget("inetPlaceEdit")
-        self.refs_label = self.top.get_widget("refsPlaceEdit")
-        self.flowed = self.top.get_widget("place_flowed")
-        self.preform = self.top.get_widget("place_preform")
-
-        self.note_buffer = self.note.get_buffer()
-        if place.get_note():
-            self.note_buffer.set_text(place.get_note())
-            Utils.bold_label(self.notes_label)
-            if place.get_note_format() == 1:
-                self.preform.set_active(1)
-            else:
-                self.flowed.set_active(1)
-        else:
-            Utils.unbold_label(self.notes_label)
-
-        self.flowed.set_sensitive(mode)
-        self.preform.set_sensitive(mode)
-
-        if self.place.get_media_list():
-            Utils.bold_label(self.gallery_label)
-        else:
-            Utils.unbold_label(self.gallery_label)
 
         self.gladeif.connect('placeEditor', 'delete_event', self.on_delete_event)
         self.gladeif.connect('button127', 'clicked', self.close)
         self.gladeif.connect('ok', 'clicked', self.on_place_apply_clicked)
         self.gladeif.connect('button135', 'clicked', self.on_help_clicked)
-        self.gladeif.connect('notebook3', 'switch_page', self.on_switch_page)
-        self.gladeif.connect('add_name', 'clicked', self.on_add_loc_clicked)
-        self.gladeif.connect('loc_edit', 'clicked', self.on_update_loc_clicked)
-        self.gladeif.connect('del_name', 'clicked', self.on_delete_loc_clicked)
-        self.gladeif.connect('add_photo', 'clicked', self.glry.on_add_media_clicked)
-        self.gladeif.connect('sel_photo', 'clicked', self.glry.on_select_media_clicked)
-        self.gladeif.connect('button134', 'clicked', self.glry.on_edit_media_clicked)
-        self.gladeif.connect('delete_photo', 'clicked', self.glry.on_delete_media_clicked)
-        self.gladeif.connect('add_url', 'clicked', self.on_add_url_clicked)
-        self.gladeif.connect('web_edit', 'clicked', self.on_update_url_clicked)
-        self.gladeif.connect('web_go', 'clicked', self.on_web_go_clicked)
-        self.gladeif.connect('del_url', 'clicked', self.on_delete_url_clicked)
 
         DisplayState.ManagedWindow.__init__(self, uistate, track, place)
         
-#         self.sourcetab = Sources.SourceTab(
-#             self.dbstate, self.uistate, self.track,
-#             self.srcreflist,self,
-#             self.top,self.window,self.slist,
-#             self.top.get_widget('add_src'),
-#             self.top.get_widget('edit_src'),
-#             self.top.get_widget('del_src'),
-#             self.dbstate.db.readonly)
-        
         if self.place.get_handle() == None or self.dbstate.db.readonly:
             self.top.get_widget("add_photo").set_sensitive(0)
             self.top.get_widget("delete_photo").set_sensitive(0)
 
-        self.web_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,
-                                    [DdTargets.URL.target()],
-                                    gtk.gdk.ACTION_COPY)
-        self.web_list.drag_source_set(gtk.gdk.BUTTON1_MASK,
-                                      [DdTargets.URL.target()],
-                                      gtk.gdk.ACTION_COPY)
-        self.web_list.connect('drag_data_get',
-                              self.url_source_drag_data_get)
-        if not self.db.readonly:
-            self.web_list.connect('drag_data_received',
-                              self.url_dest_drag_data_received)
-
-        for name in ['del_name','add_name','sel_photo','add_url','del_url']:
-            self.top.get_widget(name).set_sensitive(mode)
-
-        self.redraw_url_list()
-        self.redraw_location_list()
         self.top.get_widget('ok').set_sensitive(not self.db.readonly)
-        self.show()
 
+        self._create_tabbed_pages()
+        self.show()
 
         self.pdmap = {}
         self.build_pdmap()
         
-        if self.ref_not_loaded:
-            Utils.temp_label(self.refs_label,self.window)
-            self.cursor_type = None
-            self.idle = gobject.idle_add(self.display_references)
-            self.ref_not_loaded = False
 
     def build_window_key(self,place):
         if place:
@@ -286,18 +172,46 @@ class EditPlace(DisplayState.ManagedWindow):
             data = cursor.next()
         cursor.close()
 
+    def _add_page(self,page):
+        self.notebook.insert_page(page)
+        self.notebook.set_tab_label(page,page.get_tab_widget())
+        return page
+
+    def _create_tabbed_pages(self):
+        """
+        Creates the notebook tabs and inserts them into the main
+        window.
+        
+        """
+        self.loc_list = self._add_page(LocationEmbedList(
+            self.dbstate,self.uistate, self.track,
+            self.place.alt_loc))
+        self.srcref_list = self._add_page(SourceEmbedList(
+            self.dbstate,self.uistate, self.track,
+            self.place.source_list))
+        self.note_tab = self._add_page(NoteTab(
+            self.dbstate, self.uistate, self.track,
+            self.place.get_note_object()))
+        self.gallery_tab = self._add_page(GalleryTab(
+            self.dbstate, self.uistate, self.track,
+            self.place.get_media_list()))
+        self.web_list = self._add_page(WebEmbedList(
+            self.dbstate,self.uistate,self.track,
+            self.place.get_url_list()))
+        self.backref_list = self._add_page(SourceBackRefList(
+            self.dbstate,self.uistate,self.track,
+            self.db.find_backlink_handles(self.place.handle)))
+
     def on_delete_event(self,obj,b):
         self.gladeif.close()
-        self.glry.close()
+        self.close()
-        gc.collect()
 
-    def close(self,obj):
+    def close_window(self,obj):
-        self.glry.close()
         self.gladeif.close()
+        self.close()
         self.window.destroy()
         if self.idle != None:
             gobject.source_remove(self.idle)
-        gc.collect()
 
     def on_help_clicked(self,obj):
         """Display the relevant portion of GRAMPS manual"""
@@ -312,60 +226,6 @@ class EditPlace(DisplayState.ManagedWindow):
             cnum = cnum + 1
             tree.append_column(column)
 
-    def url_dest_drag_data_received(self,widget,context,x,y,sel_data,info,time):
-        if sel_data and sel_data.data:
-            exec 'data = %s' % sel_data.data
-            exec 'mytype = "%s"' % data[0]
-            exec 'place = "%s"' % data[1]
-            if place == self.place.get_handle() or mytype != 'url':
-                return
-            foo = pickle.loads(data[2]);
-            self.ulist.append(foo)
-            self.lists_changed = 1
-            self.redraw_url_list()
-
-    def url_source_drag_data_get(self,widget, context, sel_data, info, time):
-        store,node = self.web_list.get_selection().get_selected()
-        if not node:
-            return
-        row = store.get_path(node)
-        url = self.ulist[row[0]]
-        bits_per = 8; # we're going to pass a string
-        pickled = pickle.dumps(url)
-        data = str(('url',self.place.get_handle(),pickled))
-        sel_data.set(sel_data.target, bits_per, data)
-
-    def update_lists(self):
-        self.place.set_url_list(self.ulist)
-        self.place.set_alternate_locations(self.llist)
-            
-    def redraw_url_list(self):
-        length = Utils.redraw_list(self.ulist,self.web_model,disp_url)
-        if length > 0:
-            self.web_go.set_sensitive(1)
-            self.web_edit.set_sensitive(1)
-            Utils.bold_label(self.inet_label)
-        else:
-            self.web_edit.set_sensitive(0)
-            self.web_go.set_sensitive(0)
-            self.web_url.set_text("")
-            self.web_description.set_text("")
-            Utils.unbold_label(self.inet_label)
-
-    def redraw_location_list(self):
-        Utils.redraw_list(self.llist,self.loc_model,disp_loc)
-        if len(self.llist) > 0:
-            self.loc_edit.set_sensitive(1)
-            Utils.bold_label(self.names_label)
-        else:
-            self.loc_edit.set_sensitive(0)
-            Utils.unbold_label(self.names_label)
-
-    def on_web_go_clicked(self,obj):
-        text = self.web_url.get()
-        if text != "":
-            GrampsDisplay.url(text)
-
     def set(self,field,getf,setf):
         text = unicode(field.get_text())
         if text != getf():
@@ -373,15 +233,12 @@ class EditPlace(DisplayState.ManagedWindow):
     
     def on_place_apply_clicked(self,obj):
 
-        note = unicode(self.note_buffer.get_text(self.note_buffer.get_start_iter(),
-                                 self.note_buffer.get_end_iter(),False))
-        format = self.preform.get_active()
         mloc = self.place.get_main_location()
-
         title = self.title.get_text()
         if self.pdmap.has_key(title) and self.pdmap[title] != self.place.handle:
             import QuestionDialog
-            QuestionDialog.ErrorDialog(_("Place title is already in use"),
+            QuestionDialog.ErrorDialog(
+                _("Place title is already in use"),
                 _("Each place must have a unique title, and "
                   "title you have selected is already used by "
                   "another place"))
@@ -400,17 +257,6 @@ class EditPlace(DisplayState.ManagedWindow):
         self.set(self.latitude,self.place.get_latitude,
                  self.place.set_latitude)
 
-        if self.lists_changed:
-            self.place.set_source_reference_list(self.srcreflist)
-        
-        if note != self.place.get_note():
-            self.place.set_note(note)
-
-        if format != self.place.get_note_format():
-            self.place.set_note_format(format)
-
-        self.update_lists()
-
         trans = self.db.transaction_begin()
         if self.place.get_handle():
             self.db.commit_place(self.place,trans)
@@ -421,320 +267,6 @@ class EditPlace(DisplayState.ManagedWindow):
         
         self.close(obj)
 
-    def on_switch_page(self,obj,a,page):
-        if page == 4 and self.not_loaded:
-            self.not_loaded = False
-            self.glry.load_images()
-        elif page == 6 and self.ref_not_loaded:
-            self.ref_not_loaded = False
-            Utils.temp_label(self.refs_label,self.window)
-            self.idle = gobject.idle_add(self.display_references)
-        text = unicode(self.note_buffer.get_text(self.note_buffer.get_start_iter(),
-                                self.note_buffer.get_end_iter(),False))
-        if text:
-            Utils.bold_label(self.notes_label)
-        else:
-            Utils.unbold_label(self.notes_label)
-
-    def on_update_url_clicked(self,obj):
-        import UrlEdit
-        store,node = self.web_list.get_selection().get_selected()
-        if node:
-            row = store.get_path(node)
-            url = self.ulist[row[0]]
-            name = ""
-            if self.place:
-            	name = self.place.get_title()
-            UrlEdit.UrlEditor(self,name,url,self.url_edit_callback)
-
-    def on_update_loc_clicked(self,obj):
-        import LocEdit
-
-        store,node = self.loc_sel.get_selected()
-        if node:
-            row = store.get_path(node)
-            loc = self.llist[row[0]]
-            LocEdit.LocationEditor(self,loc,self.window)
-
-    def on_delete_url_clicked(self,obj):
-        if Utils.delete_selected(self.web_list,self.ulist):
-            self.lists_changed = 1
-            self.redraw_url_list()
-
-    def on_delete_loc_clicked(self,obj):
-        if Utils.delete_selected(self.loc_list,self.llist):
-            self.lists_changed = 1
-            self.redraw_location_list()
-
-    def on_add_url_clicked(self,obj):
-        import UrlEdit
-        name = ""
-        if self.place:
-            name = self.place.get_title()
-        UrlEdit.UrlEditor(self,name,None,self.url_edit_callback)
-
-    def url_edit_callback(self,url):
-        self.redraw_url_list()
-
-    def on_add_loc_clicked(self,obj):
-        import LocEdit
-        LocEdit.LocationEditor(self,None,self.window)
-
-    def on_web_list_select_row(self,obj):
-        store,node = obj.get_selected()
-        if not node:
-            self.web_url.set_text("")
-            self.web_go.set_sensitive(0)
-            self.web_description.set_text("")
-        else:
-            row = store.get_path(node)
-            url = self.ulist[row[0]]
-            path = url.get_path()
-            self.web_url.set_text(path)
-            self.web_go.set_sensitive(1)
-            self.web_description.set_text(url.get_description())
-
-    def on_loc_list_select_row(self,obj):
-        store,node = self.loc_sel.get_selected()
-        if not node:
-            self.loc_city.set_text('')
-            self.loc_county.set_text('')
-            self.loc_state.set_text('')
-            self.loc_postal.set_text('')
-            self.loc_phone.set_text('')
-            self.loc_parish.set_text('')
-            self.loc_country.set_text('')
-        else:
-            row = store.get_path(node)
-            loc = self.llist[row[0]]
-
-            self.loc_city.set_text(loc.get_city())
-            self.loc_county.set_text(loc.get_county())
-            self.loc_state.set_text(loc.get_state())
-            self.loc_postal.set_text(loc.get_postal_code())
-            self.loc_phone.set_text(loc.get_phone())
-            self.loc_parish.set_text(loc.get_parish())
-            self.loc_country.set_text(loc.get_country())
-
-    def button_press(self,obj):
-        data = self.model.get_selected_objects()
-        if not data:
-            return
-        (data_type,handle) = data[0]
-        import EventEdit
-        event = self.db.get_event_from_handle(handle)
-        event_name = event.get_name()
-        if data_type == 0:
-            if event_name in ["Birth","Death"]:
-                EventEdit.PersonEventEditor(
-                    self,", ", event, None, 1, None, None, self.db.readonly)
-            else:
-                EventEdit.PersonEventEditor(
-                    self,", ", event, None, 0, None, None, self.db.readonly)
-        elif data_type == 1:
-            EventEdit.FamilyEventEditor(
-                self,", ", event, None, 0, None, None, self.db.readonly)
-
-    def display_references(self):
-
-
-        if not self.model:
-            self.any_refs = False
-            place_handle = self.place.get_handle()
-
-            titles = [(_('Type'),0,150),(_('Name'),1,150),
-                      (_('ID'),2,75),(_('Event Name'),3,150)]
-
-            self.model = ListModel.ListModel(self.plist,
-                                             titles,
-                                             event_func=self.button_press)
-            self.backlink_generator = self.db.find_backlink_handles(place_handle)
-            
-
-        while True: # The loop is broken when the backlink_generator finishes
-
-            try:
-                reference = self.backlink_generator.next()
-            except StopIteration:
-                # Last reference reached.
-                break
-
-            cls_name,handle = reference
-            
-            if cls_name == 'Person':
-                person = self.db.get_person_from_handle(handle)
-                for event_handle in [person.get_birth_handle(),
-                                     person.get_death_handle()] \
-                                     + person.get_event_list():
-                    event = self.db.get_event_from_handle(event_handle)
-                    if event and event.get_place_handle() == place_handle:
-                        pname = self.name_display(person)
-                        gramps_id = person.get_gramps_id()
-                        ename = event.get_name()
-                        self.model.add(
-                            [_("Personal Event"),pname,gramps_id,ename],
-                            (0,event_handle))
-                        self.any_refs = True
-
-            elif cls_name == 'Family':
-                family = self.db.get_family_from_handle(handle)
-                for event_handle in family.get_event_list():
-                    event = self.db.get_event_from_handle(event_handle)
-                    if event and event.get_place_handle() == place_handle:
-                        father = family.get_father_handle()
-                        mother = family.get_mother_handle()
-                        if father and mother:
-                            fname = _("%(father)s and %(mother)s")  % {
-                                "father" : self.name_display(
-                                self.db.get_person_from_handle(father)),
-                                "mother" : self.name_display(
-                                self.db.get_person_from_handle(mother))
-                                }
-                        elif father:
-                            fname = self.name_display(
-                                self.db.get_person_from_handle(father))
-                        else:
-                            fname = self.name_display(
-                                self.db.get_person_from_handle(mother))
-                            
-                        gramps_id = family.get_gramps_id()
-                        ename = event.get_name()
-                        self.model.add(
-                            [_("Family Event"),fname,gramps_id,ename],
-                            (1,event_handle))
-                        self.any_refs = True
-
-            elif cls_name == 'Event':
-                event = self.db.get_event_from_handle(handle)
-                ev_type = event.get_type()[1]
-                description = event.get_description()
-                gramps_id = event.get_gramps_id()
-                self.model.add([_("Event"),str(ev_type),gramps_id,description],(2,handle))
-
-            else:
-                # If we get here it means there is a new Primary object type
-                # that has been added to the database or that Place has started
-                # to be referenced by a different primary object. Print a warning
-                # to remind us that this code need updating.
-                log.warning("Unhandled Primary object type returned from "
-                            "find_backlink_handles(): %s \n" % str(cls_name))
-                
-            if gtk.events_pending():
-                return True
-
-        if self.any_refs:
-            Utils.bold_label(self.refs_label,self.window)
-        else:
-            Utils.unbold_label(self.refs_label,self.window)
-            
-        self.ref_not_loaded = 0
-        self.backlink_generator = None
-        
-        return False
-
-
-        
-        place_handle = self.place.get_handle()
-        # Initialize things if we're entering this functioin
-        # for the first time
-        if not self.cursor_type:
-            self.cursor_type = 'Person'
-            self.cursor = self.db.get_person_cursor()
-            self.data = self.cursor.first()
-        
-            self.any_refs = False
-            titles = [(_('Type'),0,150),(_('Name'),1,150),
-                      (_('ID'),2,75),(_('Event Name'),3,150)]
-            self.model = ListModel.ListModel(self.plist,
-                                             titles,
-                                             event_func=self.button_press)
-
-        if self.cursor_type == 'Person':
-            while self.data:
-                handle,val = self.data
-                person = RelLib.Person()
-                person.unserialize(val)
-                for event_handle in [person.get_birth_handle(),
-                                     person.get_death_handle()] \
-                                     + person.get_event_list():
-                    event = self.db.get_event_from_handle(event_handle)
-                    if event and event.get_place_handle() == place_handle:
-                        pname = self.name_display(person)
-                        gramps_id = person.get_gramps_id()
-                        ename = event.get_name()
-                        self.model.add(
-                            [_("Personal Event"),pname,gramps_id,ename],
-                            (0,event_handle))
-                        self.any_refs = True
-                self.data = self.cursor.next()
-                if gtk.events_pending():
-                    return True
-            self.cursor.close()
-            
-            self.cursor_type = 'Family'
-            self.cursor = self.db.get_family_cursor()
-            self.data = self.cursor.first()
-
-        if self.cursor_type == 'Family':
-            while self.data:
-                handle,val = self.data
-                family = RelLib.Family()
-                family.unserialize(val)
-                for event_handle in family.get_event_list():
-                    event = self.db.get_event_from_handle(event_handle)
-                    if event and event.get_place_handle() == place_handle:
-                        father = family.get_father_handle()
-                        mother = family.get_mother_handle()
-                        if father and mother:
-                            fname = _("%(father)s and %(mother)s")  % {
-                                "father" : self.name_display(
-                                self.db.get_person_from_handle(father)),
-                                "mother" : self.name_display(
-                                self.db.get_person_from_handle(mother))
-                                }
-                        elif father:
-                            fname = self.name_display(
-                                self.db.get_person_from_handle(father))
-                        else:
-                            fname = self.name_display(
-                                self.db.get_person_from_handle(mother))
-
-                        gramps_id = family.get_gramps_id()
-                        ename = event.get_name()
-                        self.model.add(
-                            [_("Family Event"),fname,gramps_id,ename],
-                            (1,event_handle))
-                        self.any_refs = True
-                self.data = self.cursor.next()
-                if gtk.events_pending():
-                    return True
-            self.cursor.close()
-
-        if self.any_refs:
-            Utils.bold_label(self.refs_label,self.window)
-        else:
-            Utils.unbold_label(self.refs_label,self.window)
-
-        self.ref_not_loaded = 0
-        self.cursor_type = None
-        return False
-        
-#-------------------------------------------------------------------------
-#
-# disp_url
-#
-#-------------------------------------------------------------------------
-def disp_url(url):
-    return [url.get_path(),url.get_description()]
-
-#-------------------------------------------------------------------------
-#
-# disp_loc
-#
-#-------------------------------------------------------------------------
-def disp_loc(loc):
-    return [loc.get_city(),loc.get_county(),loc.get_state(),loc.get_country()]
-
 #-------------------------------------------------------------------------
 #
 # DeletePlaceQuery

gramps2/src/GrampsDb/_GrampsDbBase.py

@@ -979,7 +979,7 @@ class GrampsDbBase(GrampsDBCallback):
         the database. If sort_handles is True, the list is sorted by
         Place title.
         """
-        if self.place_map:
+        if self.db_is_open:
             if sort_handles:
                 slist = []
                 cursor = self.get_place_cursor()
@@ -1001,7 +1001,7 @@ class GrampsDbBase(GrampsDBCallback):
         the database. If sort_handles is True, the list is sorted by
         Source title.
         """
-        if self.source_map:
+        if self.db_is_open:
             handle_list = self._all_handles(self.source_map)
             if sort_handles:
                 handle_list.sort(self._sortbysource)
@@ -1013,7 +1013,7 @@ class GrampsDbBase(GrampsDBCallback):
         Returns a list of database handles, one handle for each MediaObject in
         the database. If sort_handles is True, the list is sorted by title.
         """
-        if self.media_map:
+        if self.db_is_open:
             handle_list = self._all_handles(self.media_map)
             if sort_handles:
                 handle_list.sort(self._sortbymedia)
@@ -1025,7 +1025,7 @@ class GrampsDbBase(GrampsDBCallback):
         Returns a list of database handles, one handle for each Event in
         the database. 
         """
-        if self.event_map:
+        if self.db_is_open:
             return self._all_handles(self.event_map)
         return []
 
@@ -1034,7 +1034,7 @@ class GrampsDbBase(GrampsDBCallback):
         Returns a list of database handles, one handle for each Family in
         the database.
         """
-        if self.family_map:
+        if self.db_is_open:
             return self._all_handles(self.family_map)
         return []
 
@@ -1043,7 +1043,7 @@ class GrampsDbBase(GrampsDBCallback):
         Returns a list of database handles, one handle for each Repository in
         the database.
         """
-        if self.repository_map:
+        if self.db_is_open:
             return self._all_handles(self.repository_map)
         return []
 

gramps2/src/ImageSelect.py

@@ -52,7 +52,6 @@ import PluginMgr
 import RelLib
 import RelImage
 import ListModel
-import SelectObject
 import GrampsMime
 import Sources
 import DateEdit

gramps2/src/LocEdit.py

@@ -37,8 +37,9 @@ import const
 import Utils
 import RelLib
 import GrampsDisplay
-from WindowUtils import GladeIf
+import DisplayState
 
+from WindowUtils import GladeIf
 from gettext import gettext as _
 
 #-------------------------------------------------------------------------
@@ -46,18 +47,11 @@ from gettext import gettext as _
 # LocationEditor class
 #
 #-------------------------------------------------------------------------
-class LocationEditor:
+class LocationEditor(DisplayState.ManagedWindow):
+
+    def __init__(self,dbstate,uistate,track,location,callback):
+        DisplayState.ManagedWindow.__init__(self, uistate, track, location)
 
-    def __init__(self,parent,location,parent_window=None):
-        self.parent = parent
-        if location:
-            if self.parent.child_windows.has_key(location):
-                self.parent.child_windows[location].present(None)
-                return
-            else:
-                self.win_key = location
-        else:
-            self.win_key = self
         self.location = location
         self.top = gtk.glade.XML(const.gladeFile, "loc_edit","gramps")
         self.gladeif = GladeIf(self.top)
@@ -70,6 +64,7 @@ class LocationEditor:
         self.parish = self.top.get_widget("parish")
         self.county = self.top.get_widget("county")
         self.country = self.top.get_widget("country")
+        self.callback = callback
 
         Utils.set_titles(self.window, self.top.get_widget('title'),
                          _('Location Editor'))
@@ -83,40 +78,20 @@ class LocationEditor:
             self.postal.set_text(location.get_postal_code())
             self.parish.set_text(location.get_parish())
 
-        self.window.set_data("o",self)
-
         self.gladeif.connect('loc_edit','delete_event',self.on_delete_event)
-        self.gladeif.connect('button119','clicked',self.close)
+        self.gladeif.connect('button119','clicked',self.close_window)
         self.gladeif.connect('button118','clicked',self.on_ok_clicked)
         self.gladeif.connect('button128','clicked',self.on_help_clicked)
         
-        if parent_window:
+        self.show()
-            self.window.set_transient_for(parent_window)
-        self.add_itself_to_menu()
-        self.window.show()
 
     def on_delete_event(self,obj,b):
         self.gladeif.close()
-        self.remove_itself_from_menu()
+        self.close()
 
-    def close(self,obj):
+    def close_window(self,obj):
         self.gladeif.close()
-        self.remove_itself_from_menu()
+        self.close()
-        self.window.destroy()
-        
-    def add_itself_to_menu(self):
-        self.parent.child_windows[self.win_key] = self
-        self.parent_menu_item = gtk.MenuItem(_('Location Editor'))
-        self.parent_menu_item.connect("activate",self.present)
-        self.parent_menu_item.show()
-        self.parent.winsmenu.append(self.parent_menu_item)
-
-    def remove_itself_from_menu(self):
-        del self.parent.child_windows[self.win_key]
-        self.parent_menu_item.destroy()
-
-    def present(self,obj):
-        self.window.present()
         
     def on_help_clicked(self,obj):
         """Display the relevant portion of GRAMPS manual"""
@@ -131,40 +106,28 @@ class LocationEditor:
         postal = unicode(self.postal.get_text())
         parish = unicode(self.parish.get_text())
         
-        if self.location == None:
-            self.location = RelLib.Location()
-            self.parent.llist.append(self.location)
-        
         self.update_location(city,parish,county,state,phone,postal,country)
-        
+        self.callback(self.location)
-        self.parent.redraw_location_list()
         self.close(obj)
 
     def update_location(self,city,parish,county,state,phone,postal,country):
         if self.location.get_city() != city:
             self.location.set_city(city)
-            self.parent.lists_changed = 1
 
         if self.location.get_parish() != parish:
             self.location.set_parish(parish)
-            self.parent.lists_changed = 1
 
         if self.location.get_county() != county:
             self.location.set_county(county)
-            self.parent.lists_changed = 1
 
         if self.location.get_state() != state:
             self.location.set_state(state)
-            self.parent.lists_changed = 1
 
         if self.location.get_phone() != phone:
             self.location.set_phone(phone)
-            self.parent.lists_changed = 1
 
         if self.location.get_postal_code() != postal:
             self.location.set_postal_code(postal)
-            self.parent.lists_changed = 1
 
         if self.location.get_country() != country:
             self.location.set_country(country)
-            self.parent.lists_changed = 1

gramps2/src/RelLib/_Place.py

@@ -115,7 +115,7 @@ class Place(PrimaryObject,SourceNote,MediaBase,UrlBase):
         if main_loc == None:
             self.main_loc = None
         else:
-            self.main.loc = Location().unserialize(main_loc)
+            self.main_loc = Location().unserialize(main_loc)
         self.alt_loc = [Location().unserialize(al) for al in alt_loc]
         UrlBase.unserialize(self,urls)
         MediaBase.unserialize(self,media_list)