Fix image layout problems

svn: r16479
This commit is contained in:
Nick Hall 2011-01-26 19:42:01 +00:00
parent df8a2a7bf3
commit 1ef88b3eac
2 changed files with 7 additions and 7 deletions

View File

@ -36,7 +36,6 @@ class PersonDetails(Gramplet):
self.gui.WIDGET = self.build_gui() self.gui.WIDGET = self.build_gui()
self.gui.get_container_widget().remove(self.gui.textview) self.gui.get_container_widget().remove(self.gui.textview)
self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET)
self.gui.WIDGET.show()
self.uistate.connect('nameformat-changed', self.update) self.uistate.connect('nameformat-changed', self.update)
def build_gui(self): def build_gui(self):
@ -46,7 +45,7 @@ class PersonDetails(Gramplet):
self.gui.tooltip = '' self.gui.tooltip = ''
self.load_obj = None self.load_obj = None
self.load_rect = None self.load_rect = None
top = gtk.HBox() self.top = gtk.HBox()
vbox = gtk.VBox() vbox = gtk.VBox()
self.obj_photo = gtk.Image() self.obj_photo = gtk.Image()
self.name = gtk.Label() self.name = gtk.Label()
@ -67,9 +66,9 @@ class PersonDetails(Gramplet):
self.occupation = self.make_row(table, 0, _('Occupation')) self.occupation = self.make_row(table, 0, _('Occupation'))
vbox.pack_start(table, fill=True, expand=False, padding=5) vbox.pack_start(table, fill=True, expand=False, padding=5)
vbox.show_all() vbox.show_all()
top.pack_start(self.obj_photo, fill=True, expand=False, padding=5) self.top.pack_start(self.obj_photo, fill=True, expand=False, padding=5)
top.pack_start(vbox, fill=True, expand=True, padding=10) self.top.pack_start(vbox, fill=True, expand=True, padding=10)
return top return self.top
def make_row(self, table, row, title): def make_row(self, table, row, title):
""" """
@ -93,10 +92,12 @@ class PersonDetails(Gramplet):
def main(self): # return false finishes def main(self): # return false finishes
active_handle = self.get_active('Person') active_handle = self.get_active('Person')
active_person = self.dbstate.db.get_person_from_handle(active_handle) active_person = self.dbstate.db.get_person_from_handle(active_handle)
self.top.hide()
if active_person: if active_person:
self.display_person(active_person) self.display_person(active_person)
else: else:
self.display_empty() self.display_empty()
self.top.show()
def display_person(self, active_person): def display_person(self, active_person):
""" """

View File

@ -32,7 +32,6 @@ class PersonGallery(Gramplet):
self.gui.WIDGET = self.build_gui() self.gui.WIDGET = self.build_gui()
self.gui.get_container_widget().remove(self.gui.textview) self.gui.get_container_widget().remove(self.gui.textview)
self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET) self.gui.get_container_widget().add_with_viewport(self.gui.WIDGET)
self.gui.WIDGET.show()
def build_gui(self): def build_gui(self):
""" """
@ -86,8 +85,8 @@ class PersonGallery(Gramplet):
eb.add(image) eb.add(image)
self.image_list.append(eb) self.image_list.append(eb)
image.set_from_pixbuf(pb) image.set_from_pixbuf(pb)
eb.show_all()
self.top.pack_start(eb, expand=False, fill=False) self.top.pack_start(eb, expand=False, fill=False)
self.top.show_all()
def display_image(self, widget, event, path): def display_image(self, widget, event, path):
""" """