5809: Multisurname editor impossibly narrow

svn: r19748
This commit is contained in:
Michiel Nauta 2012-06-03 20:12:22 +00:00
parent 87942d80fa
commit e84f6c41d1
3 changed files with 6 additions and 6 deletions

View File

@ -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):

View File

@ -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)

View File

@ -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)