diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index d58cf96cc..9c98440d6 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,6 +1,11 @@ 2004-01-20 Alex Roitman * doc/gramps.1.in, doc/gramps.1: Update. * doc/gramps-manual/C/gramps-manual.xml: Update. + * src/PedView.py (build_nav_menu): Ditch stock Home item. + * src/FamilyView.py (build_ap_menu, build_nav_menu, + build_parents_nosel_menu, build_sp_parents_nosel_menu, + build_child_menu, build_spouse_menu, build_parents_menu, + build_sp_parents_menu): Ditch stock Home item. 2004-01-19 Don Allingham * src/plugins/FilterEditor.py: handle unicode characters diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index e5de1bc8e..4879a9ea0 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -297,13 +297,20 @@ class FamilyView: entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (_("Add Bookmark"),self.parent.on_add_bookmark_activate,1), ] menu = gtk.Menu() menu.set_title(_('People Menu')) for stock_id,callback,sensitivity in entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity) @@ -319,12 +326,19 @@ class FamilyView: entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), ] menu = gtk.Menu() menu.set_title(_('People Menu')) for stock_id,callback,sensitivity in entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity) @@ -340,7 +354,9 @@ class FamilyView: entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (None,None,0), (_("Add parents"),self.add_parents_clicked,1), ] @@ -348,6 +364,11 @@ class FamilyView: menu.set_title(_('People Menu')) for stock_id,callback,sensitivity in entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity) @@ -363,7 +384,9 @@ class FamilyView: entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (None,None,0), (_("Add parents"),self.add_sp_parents,1), ] @@ -371,6 +394,11 @@ class FamilyView: menu.set_title(_('People Menu')) for stock_id,callback,sensitivity in entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity) @@ -405,11 +433,18 @@ class FamilyView: nav_entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (None,None,0), ] for stock_id,callback,sensitivity in nav_entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity) @@ -462,11 +497,18 @@ class FamilyView: nav_entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (None,None,0), ] for stock_id,callback,sensitivity in nav_entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity) @@ -923,11 +965,18 @@ class FamilyView: nav_entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (None,None,0), ] for stock_id,callback,sensitivity in nav_entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity) @@ -954,11 +1003,18 @@ class FamilyView: nav_entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (None,None,0), ] for stock_id,callback,sensitivity in nav_entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity) diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py index fc26631a8..f38bbd5fa 100644 --- a/gramps2/src/PedView.py +++ b/gramps2/src/PedView.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2001-2003 Donald N. Allingham +# Copyright (C) 2001-2004 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -486,9 +486,11 @@ class PedigreeView: back_sensitivity = self.parent.hindex > 0 fwd_sensitivity = self.parent.hindex + 1 < len(self.parent.history) entries = [ - ('gtk-go-back',self.parent.back_clicked,back_sensitivity), - ('gtk-go-forward',self.parent.fwd_clicked,fwd_sensitivity), - ('gtk-home',self.parent.on_home_clicked,1), + (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), + (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), + #FIXME: revert to stock item when German gtk translation is fixed + #(gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (None,None,0), (_("Set anchor"),self.on_anchor_set,1), (_("Remove anchor"),self.on_anchor_removed,1), @@ -497,6 +499,11 @@ class PedigreeView: menu.set_title(_('People Menu')) for stock_id,callback,sensitivity in entries: item = gtk.ImageMenuItem(stock_id) + #FIXME: remove when German gtk translation is fixed + if stock_id == _("Home"): + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) if callback: item.connect("activate",callback) item.set_sensitive(sensitivity)