diff --git a/ChangeLog b/ChangeLog index f1fbdd56d..4c048e1b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2005-08-12 Don Allingham + * src/Navigation.py: Don't disable the interface all the time. + 2005-08-12 Alex Roitman * src/ArgHandler.py: start fixing. * src/gramps_main.py: Run ArgHandler with new arguments. diff --git a/src/Navigation.py b/src/Navigation.py index cb45eab9b..4d0b43b67 100644 --- a/src/Navigation.py +++ b/src/Navigation.py @@ -80,7 +80,10 @@ class BaseNavigation: Builds the UI and action group. """ self.items = items - self.disable() + + if self.active != DISABLED: + self.uistate.uimanager.remove_ui(self.active) + self.uistate.uimanager.remove_action_group(self.action_group) data = map(lambda x: '' % (self.title,x), range(0,len(items))) self.ui = _top + "".join(data) + _btm @@ -119,8 +122,8 @@ class PersonNavigation(BaseNavigation): Builds a name in the format of 'NAME [GRAMPSID]' """ person = self.uistate.dbstate.db.get_person_from_handle(item) - name = "%s [%s]" % (NameDisplay.displayer.display(person), - person.gramps_id) + return "%s [%s]" % (NameDisplay.displayer.display(person), + person.gramps_id) def f0(self,obj): self.uistate.dbstate.change_active_handle(self.items[0]) diff --git a/src/PageView.py b/src/PageView.py index f6de625ed..d0c46f972 100644 --- a/src/PageView.py +++ b/src/PageView.py @@ -251,7 +251,6 @@ class PersonNavView(PageView): def change_page(self): hobj = self.uistate.phistory - print hobj.at_end(), hobj.at_front() self.fwd_action.set_sensitive(not hobj.at_end()) self.back_action.set_sensitive(not hobj.at_front()) diff --git a/src/PersonView.py b/src/PersonView.py index f6fde2ecf..853ecbcb1 100644 --- a/src/PersonView.py +++ b/src/PersonView.py @@ -95,7 +95,7 @@ class PersonView(PageView.PersonNavView): self.add_action('Edit', gtk.STOCK_EDIT, "_Edit", callback=self.edit) self.add_action('Remove', gtk.STOCK_REMOVE,"_Remove",callback=self.remove) self.add_action('HomePerson',gtk.STOCK_HOME, "_Home", callback=self.home) - + self.add_toggle_action('Filter', None, '_Filter', callback=self.filter_toggle) def get_stock(self):