Merge changes made in gramps20 into HEAD

svn: r4431
This commit is contained in:
Alex Roitman
2005-04-26 16:04:21 +00:00
parent 7549d625e6
commit a7ca0ddf7f
27 changed files with 6302 additions and 8647 deletions

View File

@@ -305,7 +305,7 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
self.spouse_combo= self.gtop.get_widget("spouse_combo")
self.spouse_tab = self.gtop.get_widget("spouse_tab")
self.undolabel = self.gtop.get_widget('undolabel')
self.redolabel = self.gtop.get_widget('redolabel')
#self.redolabel = self.gtop.get_widget('redolabel')
self.open_recent = self.gtop.get_widget('open_recent1')
self.child_model = gtk.ListStore(
@@ -493,13 +493,14 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
label.set_use_underline(1)
def redo_callback(self,text):
self.redolabel.set_sensitive(bool(text))
label = self.redolabel.get_children()[0]
if text:
label.set_text(text)
else:
label.set_text(_("_Redo"))
label.set_use_underline(1)
return
#self.redolabel.set_sensitive(bool(text))
#label = self.redolabel.get_children()[0]
#if text:
# label.set_text(text)
#else:
# label.set_text(_("_Redo"))
#label.set_use_underline(1)
def undo(self,*args):
"""
@@ -1746,7 +1747,7 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
self.goto_active_person()
else:
ErrorDialog(_("No Home Person has been set."),
_("The Home Person may be set from the Settings menu."))
_("The Home Person may be set from the Edit menu."))
def on_add_bookmark_activate(self,obj):
if self.active_person: