From e84f6c41d186d638f5b179bc53fe0991c90d262a Mon Sep 17 00:00:00 2001 From: Michiel Nauta Date: Sun, 3 Jun 2012 20:12:22 +0000 Subject: [PATCH] 5809: Multisurname editor impossibly narrow svn: r19748 --- src/gui/editors/editperson.py | 9 +++------ src/gui/logger/_errorview.py | 1 + src/gui/merge/mergenote.py | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/editors/editperson.py b/src/gui/editors/editperson.py index cfb449baa..9b04a92a7 100644 --- a/src/gui/editors/editperson.py +++ b/src/gui/editors/editperson.py @@ -560,12 +560,7 @@ class EditPerson(EditPrimary): self.pname.get_primary_surname().set_origintype, self.pname.get_primary_surname().get_origintype) - #remove present surname tab, and put new one based on current prim name - msurhbox = self.top.get_object("hboxmultsurnames") - msurhbox.remove(self.surntab) - self.surntab = SurnameTab(self.dbstate, self.uistate, self.track, - self.obj.get_primary_name()) - msurhbox.pack_start(self.surntab) + self.__renewmultsurnames() if len(self.pname.get_surname_list()) == 1: self.singlesurn_active = True @@ -912,6 +907,8 @@ class EditPerson(EditPrimary): msurhbox.remove(self.surntab) self.surntab = SurnameTab(self.dbstate, self.uistate, self.track, self.obj.get_primary_name()) + self.multsurnfr.set_size_request(-1, + int(config.get('interface.surname-box-height'))) msurhbox.pack_start(self.surntab) def load_person_image(self): diff --git a/src/gui/logger/_errorview.py b/src/gui/logger/_errorview.py index 4801a27a3..9a2516e9a 100644 --- a/src/gui/logger/_errorview.py +++ b/src/gui/logger/_errorview.py @@ -119,6 +119,7 @@ class ErrorView(object): scroll = gtk.ScrolledWindow() scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + scroll.set_size_request(-1, 60) tb_frame.add(scroll) scroll.add_with_viewport(tb_label) diff --git a/src/gui/merge/mergenote.py b/src/gui/merge/mergenote.py index 0ea2443a2..c5f77f0d1 100644 --- a/src/gui/merge/mergenote.py +++ b/src/gui/merge/mergenote.py @@ -73,11 +73,13 @@ class MergeNote(ManagedWindow.ManagedWindow): tb1 = StyledTextBuffer() tv1.set_buffer(tb1) tb1.set_text(text1) + tv1.set_size_request(-1, 60) text2 = self.no2.get_styledtext() tv2 = self.get_widget("text2") tb2 = StyledTextBuffer() tv2.set_buffer(tb2) tb2.set_text(text2) + tv2.set_size_request(-1, 60) if text1 == text2: for widget_name in ('text1', 'text2', 'text_btn1', 'text_btn2'): self.get_widget(widget_name).set_sensitive(False)