From ead6d60e1afebfbd9ef7a11758546b1927b29700 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Thu, 5 Feb 2009 21:25:05 +0000 Subject: [PATCH] 2674: smaller edit family window - Part 1 svn: r11879 --- src/Editors/_EditFamily.py | 3 +- src/glade/gramps.glade | 482 ++++++++++++++++++++----------------- src/widgets/linkbox.py | 2 +- 3 files changed, 258 insertions(+), 229 deletions(-) diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py index b7379d335..8f2866231 100644 --- a/src/Editors/_EditFamily.py +++ b/src/Editors/_EditFamily.py @@ -45,6 +45,7 @@ log = logging.getLogger(".") import gtk from gtk import glade from gtk import gdk +import pango #------------------------------------------------------------------------- # @@ -836,7 +837,7 @@ class EditFamily(EditPrimary): self.tooltips.set_tip(edit_btn, _('Edit %s') % name) box.pack_start(LinkBox( - BasicLabel(name), + BasicLabel(name, ellipsize=pango.ELLIPSIZE_END), edit_btn) ) else: diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade index c6e54bc88..d50a06961 100644 --- a/src/glade/gramps.glade +++ b/src/glade/gramps.glade @@ -623,7 +623,7 @@ True - True + False 0 @@ -631,7 +631,7 @@ 6 True 4 - 4 + 2 False 6 12 @@ -655,10 +655,11 @@ 0 - 1 - 2 + 0 + 1 1 2 + 10 fill @@ -683,10 +684,11 @@ 0 - 1 - 2 + 0 + 1 2 3 + 10 fill @@ -711,116 +713,22 @@ 0 - 1 - 2 + 0 + 1 3 4 + 10 fill - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 3 - 4 - fill - - - - - - - True - False - 6 - - - - - - - 3 - 4 - 1 - 4 - fill - fill - - - - - + True False 0 - - - - - - 2 - 3 - 1 - 2 - fill - fill - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - - - - - - - True - False - 4 - True @@ -867,7 +775,7 @@ - 0 + 2 False False @@ -906,6 +814,80 @@ 0 1 fill + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + False + 0 + + + + + + + 1 + 2 + 1 + 2 fill @@ -917,12 +899,63 @@ + + + True + False + 0 + + + + True + + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + + + 0 + True + True + GTK_PACK_END + + + + + 0 + False + False + + + 6 True 4 - 3 + 2 False 6 12 @@ -946,10 +979,11 @@ 0 - 1 - 2 + 0 + 1 1 2 + 10 fill @@ -974,10 +1008,11 @@ 0 - 1 - 2 + 0 + 1 2 3 + 10 fill @@ -1002,10 +1037,11 @@ 0 - 1 - 2 + 0 + 1 3 4 + 10 fill @@ -1030,8 +1066,8 @@ 0 - 2 - 3 + 1 + 2 3 4 fill @@ -1039,39 +1075,6 @@ - - - True - False - 0 - - - - True - False - 0 - - - - - - - 0 - True - True - - - - - 2 - 3 - 1 - 2 - fill - fill - - - True @@ -1091,19 +1094,20 @@ 0 - 2 - 3 + 1 + 2 2 3 + fill - + True False - 4 + 0 @@ -1183,6 +1187,40 @@ False + + + + True + Indicates if the record is private + True + GTK_RELIEF_NONE + True + False + False + + + + True + 4 + gramps-unlock + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + GTK_PACK_END + + + + + + 0 @@ -1190,6 +1228,24 @@ 0 1 fill + + + + + + True + False + 0 + + + + + + + 1 + 2 + 1 + 2 fill @@ -1213,11 +1269,39 @@ 6 True 2 - 8 + 6 False 6 12 + + + True + <b>Relationship Information</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 6 + 0 + 1 + fill + + + + True @@ -1238,10 +1322,11 @@ 0 - 1 - 2 + 0 + 1 1 2 + 10 fill @@ -1258,13 +1343,13 @@ True * False + 6 - 2 - 3 + 1 + 2 1 2 - fill @@ -1289,8 +1374,8 @@ 0 - 3 - 4 + 2 + 3 1 2 fill @@ -1318,68 +1403,8 @@ 0 - 5 - 6 - 1 - 2 - fill - - - - - - - True - <b>Relationship Information</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 8 - 0 - 1 - fill - - - - - - - True - Indicates if the record is private - True - GTK_RELIEF_NONE - True - False - False - - - - True - 4 - gramps-unlock - 0.5 - 0.5 - 0 - 0 - - - - - 7 - 8 + 4 + 5 1 2 fill @@ -1390,16 +1415,18 @@ True + True False True True - 4 - 5 + 3 + 4 1 2 - + shrink|fill + fill @@ -1411,11 +1438,12 @@ True - 6 - 7 + 5 + 6 1 2 - + shrink|fill + fill diff --git a/src/widgets/linkbox.py b/src/widgets/linkbox.py index a6dab2bed..35d825ee9 100644 --- a/src/widgets/linkbox.py +++ b/src/widgets/linkbox.py @@ -47,7 +47,7 @@ class LinkBox(gtk.HBox): def __init__(self, link, button): gtk.HBox.__init__(self) self.set_spacing(6) - self.pack_start(link, False) + self.pack_start(link, True) if button: self.pack_start(button, False) self.show()