From 115e268aec587b6606a08fa3dd43b33a84a479ca Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 4 May 2006 01:33:37 +0000 Subject: [PATCH] 2006-05-03 Don Allingham * src/ViewManager.py: do a better job of building the buttons. svn: r6539 --- ChangeLog | 3 +++ src/ViewManager.py | 24 +++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b707e942e..b85fbb2c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2006-05-03 Don Allingham + * src/ViewManager.py: do a better job of building the buttons. + 2006-05-03 Alex Roitman * src/GrampsDb/_GrampsInMemDB.py (abort_changes): Remove method. * src/GrampsDb/_GrampsDbBase.py (abort_changes): Remove method. diff --git a/src/ViewManager.py b/src/ViewManager.py index aed63d54e..f87919548 100644 --- a/src/ViewManager.py +++ b/src/ViewManager.py @@ -570,18 +570,24 @@ class ViewManager: # create the button and add it to the sidebar button = gtk.ToggleButton() + hbox = gtk.HBox() + hbox.show() + image = gtk.Image() if use_text: - if page_stock: - button.set_use_stock(True) - button.set_label(page_stock) - else: - button.set_label(page_title) + image.set_from_stock(page_stock, gtk.ICON_SIZE_BUTTON) else: - image = gtk.Image() image.set_from_stock(page_stock, gtk.ICON_SIZE_LARGE_TOOLBAR) - image.show() - button.add(image) - button.set_border_width(4) + image.show() + hbox.pack_start(image,False,False) + hbox.set_spacing(4) + + print use_text + if use_text: + label = gtk.Label(page_title) + label.show() + hbox.pack_start(label,False,True) + + button.add(hbox) button.set_relief(gtk.RELIEF_NONE) button.set_alignment(0, 0.5) button.connect('clicked',