diff --git a/gramps/gui/editors/editlink.py b/gramps/gui/editors/editlink.py index 8ef1be7ee..33aa9aef8 100644 --- a/gramps/gui/editors/editlink.py +++ b/gramps/gui/editors/editlink.py @@ -74,8 +74,7 @@ class EditLink(ManagedWindow): self.set_window(self.top.toplevel, self.top.get_object("title"), _('Link Editor')) - self.table = self.top.get_object('table27') - self.uri_list = Gtk.ComboBoxText() + self.uri_list = self.top.get_object('link_type') for text in [_("Internet Address"), # 0 this order range above _("Event"), # 1 _("Family"), # 2 @@ -87,7 +86,6 @@ class EditLink(ManagedWindow): _("Source"), # 8 ]: self.uri_list.append_text(text) - self.table.attach(self.uri_list, 1, 2, 0, 1) self.pick_item = self.top.get_object('button1') self.new_button = self.top.get_object('new') self.edit_button = self.top.get_object('edit') diff --git a/gramps/gui/editors/filtereditor.py b/gramps/gui/editors/filtereditor.py index c595357cd..72867ab16 100644 --- a/gramps/gui/editors/filtereditor.py +++ b/gramps/gui/editors/filtereditor.py @@ -459,7 +459,7 @@ class EditRule(ManagedWindow): self.notebook.set_show_tabs(0) self.notebook.set_show_border(0) self.notebook.show() - self.valuebox.add(self.notebook) + self.valuebox.pack_start(self.notebook, True, True, 0) self.page_num = 0 self.page = [] self.class2page = {} @@ -496,15 +496,11 @@ class EditRule(ManagedWindow): #c.set_data('d', pos) c.show() the_map[class_obj] = c - # Only add a table with parameters if there are any parameters - if arglist: - table = Gtk.Table(n_rows=3, n_columns=len(arglist)) - else: - table = Gtk.Table(n_rows=1, n_columns=1) - table.set_border_width(6) - table.set_col_spacings(6) - table.set_row_spacings(6) - table.show() + grid = Gtk.Grid() + grid.set_border_width(12) + grid.set_column_spacing(6) + grid.set_row_spacing(6) + grid.show() for v in arglist: l = Gtk.Label(label=v) l.set_alignment(1, 0.5) @@ -590,9 +586,10 @@ class EditRule(ManagedWindow): t = MyList(map(str, range(7)), days_of_week) else: t = MyEntry() + t.set_hexpand(True) tlist.append(t) - table.attach(l, 1, 2, pos, pos+1, Gtk.AttachOptions.FILL, 0, 5, 5) - table.attach(t, 2, 3, pos, pos+1, Gtk.AttachOptions.EXPAND|Gtk.AttachOptions.FILL, 0, 5, 5) + grid.attach(l, 0, pos, 1, 1) + grid.attach(t, 1, pos, 1, 1) pos += 1 use_regex = None @@ -610,14 +607,13 @@ class EditRule(ManagedWindow): 'A caret will match the start of a line. ' 'A dollar sign will match the end of a line.') use_regex.set_tooltip_text(tip) - table.attach(use_regex, 2, 3, pos, pos+1, - Gtk.AttachOptions.FILL, 0, 5, 5) + grid.attach(use_regex, 1, pos, 1, 1) self.page.append((class_obj, vallist, tlist, use_regex)) - # put the table into a scrollable area: + # put the grid into a scrollable area: scrolled_win = Gtk.ScrolledWindow() - scrolled_win.add_with_viewport(table) + scrolled_win.add_with_viewport(grid) scrolled_win.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) scrolled_win.show() self.notebook.append_page(scrolled_win, Gtk.Label(label=class_obj.name)) diff --git a/gramps/gui/glade/addmedia.glade b/gramps/gui/glade/addmedia.glade index 5d1dfcb9e..bdb45f2f9 100644 --- a/gramps/gui/glade/addmedia.glade +++ b/gramps/gui/glade/addmedia.glade @@ -1,6 +1,8 @@ + - + + False 650 @@ -10,6 +12,7 @@ True False + vertical 8 @@ -24,7 +27,6 @@ True True True - False True @@ -42,7 +44,6 @@ True True True - False True @@ -59,7 +60,6 @@ True True True - False True @@ -77,10 +77,11 @@ - + True False 6 + vertical 6 @@ -95,20 +96,22 @@ - + True False 12 - 2 - 12 6 + 12 True False - vertical + + 0 + 0 + @@ -141,9 +144,7 @@ 1 - 2 - - + 0 @@ -154,17 +155,12 @@ - + True False 6 - 2 - 2 - 6 6 - - - + 6 True @@ -176,20 +172,20 @@ photoDescription - GTK_FILL - + 0 + 0 True True + True ● 1 - 2 - + 0 @@ -199,20 +195,18 @@ True True False - False True 0.5 True 1 - 2 1 - 2 - GTK_FILL - + + + False diff --git a/gramps/gui/glade/baseselector.glade b/gramps/gui/glade/baseselector.glade index bf3a1f16c..4f52e23cf 100644 --- a/gramps/gui/glade/baseselector.glade +++ b/gramps/gui/glade/baseselector.glade @@ -1,6 +1,7 @@ + - + False True @@ -12,6 +13,7 @@ True False + vertical True @@ -25,7 +27,6 @@ True True True - False True @@ -42,7 +43,6 @@ True True True - False True @@ -60,10 +60,11 @@ - + True False 6 + vertical 6 @@ -105,7 +106,6 @@ False True False - False True 0.5 True diff --git a/gramps/gui/glade/book.glade b/gramps/gui/glade/book.glade index 2ab91e4e4..04ff7d8de 100644 --- a/gramps/gui/glade/book.glade +++ b/gramps/gui/glade/book.glade @@ -1,5 +1,5 @@ - + @@ -10,6 +10,7 @@ True False + vertical True @@ -72,9 +73,10 @@ - + True False + vertical True @@ -132,17 +134,19 @@ False Book - + True False + vertical - + True False - + True False + vertical True @@ -157,11 +161,11 @@ - + True False - + True False @@ -199,7 +203,7 @@ - + True False @@ -309,23 +313,23 @@ - + True False - 2 + 12 True False 0 0 - 12 6 True avail_tree - + 0 + 0 @@ -337,6 +341,8 @@ True True + True + True @@ -344,13 +350,14 @@ + 0 1 - 2 - GTK_FILL - 12 - 6 + 2 + + + True @@ -360,23 +367,23 @@ - + True False - 2 + 12 True False 0 0 - 12 6 True book_tree - + 0 + 0 @@ -388,6 +395,8 @@ True True + True + True @@ -395,13 +404,14 @@ + 0 1 - 2 - GTK_FILL - 12 - 6 + 2 + + + True @@ -418,16 +428,18 @@ - + True False + vertical - + True False + vertical 2 @@ -566,7 +578,7 @@ - + True False 6 diff --git a/gramps/gui/glade/configure.glade b/gramps/gui/glade/configure.glade index fa4552739..e1597d36b 100644 --- a/gramps/gui/glade/configure.glade +++ b/gramps/gui/glade/configure.glade @@ -1,6 +1,7 @@ + - + True False @@ -11,6 +12,7 @@ True False + vertical True @@ -24,7 +26,6 @@ True True False - False True @@ -41,7 +42,6 @@ True True False - False True @@ -59,18 +59,17 @@ - + True False + vertical - + True False 12 - 4 - 2 - 12 6 + 12 True @@ -82,8 +81,8 @@ name_entry - GTK_FILL - + 0 + 0 @@ -97,36 +96,32 @@ format_entry + 0 1 - 2 - GTK_FILL - True True + True • 1 - 2 - + 0 True True + True • 1 - 2 1 - 2 - @@ -160,10 +155,8 @@ - 2 + 0 3 - 4 - GTK_FILL @@ -176,10 +169,8 @@ example_label + 0 2 - 3 - GTK_FILL - @@ -193,13 +184,12 @@ 1 - 2 2 - 3 - GTK_FILL - + + + True diff --git a/gramps/gui/glade/dbman.glade b/gramps/gui/glade/dbman.glade index 9393b7025..f1ed43581 100644 --- a/gramps/gui/glade/dbman.glade +++ b/gramps/gui/glade/dbman.glade @@ -1,5 +1,5 @@ - + @@ -13,6 +13,7 @@ True False + vertical True @@ -43,17 +44,12 @@ - + True False 6 - 2 - 3 - 6 6 - - - + 6 True @@ -65,26 +61,29 @@ - 3 - GTK_FILL - + 1 + 0 True True + True ● True 1 - 3 1 - 2 - + + + + + + False @@ -131,7 +130,7 @@ 0 2 - + True False 2 @@ -185,7 +184,7 @@ 0 0 - + True False 2 @@ -234,18 +233,20 @@ - + True False + vertical 6 - + True False - + True False + vertical True @@ -288,18 +289,20 @@ - + True False + vertical True False 12 - + True False + vertical 6 start diff --git a/gramps/gui/glade/dialog.glade b/gramps/gui/glade/dialog.glade index 2810736b4..a41887bb3 100644 --- a/gramps/gui/glade/dialog.glade +++ b/gramps/gui/glade/dialog.glade @@ -1,6 +1,7 @@ + - + False dialog @@ -38,47 +39,37 @@ - + True False 12 - 3 - 3 - 6 6 - - - - - - + 6 True False 0 gtk-dialog-warning - 6 + 6 - 2 - GTK_FILL - GTK_FILL + 0 + 0 True False + True 0 True True - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - + 1 + 0 @@ -93,32 +84,28 @@ 1 - 3 2 - 3 - - + + + + + True + False + True + 0 + 12 + True + + + 1 + 1 - - True - False - 0 - 12 - True - - - 2 - 3 - 1 - 2 - GTK_FILL - - + @@ -170,30 +157,21 @@ - + True False 12 - 2 - 3 - - - - - - True False 0 gtk-dialog-info - 6 + 6 - 2 - GTK_FILL - GTK_FILL + 0 + 0 @@ -206,10 +184,8 @@ True - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - + 1 + 0 @@ -225,6 +201,8 @@ 210 True True + True + True natural natural False @@ -232,12 +210,13 @@ - 2 - 3 + 1 1 - 2 + + + False @@ -279,7 +258,7 @@ 0 0 - + True False 2 @@ -351,7 +330,7 @@ 0 0 - + True False 2 @@ -400,28 +379,15 @@ - + True False 12 - 3 - 3 - - - - - - - - - - - - True False + True 0 6 24 @@ -430,12 +396,8 @@ start - 2 - 3 + 1 1 - 2 - GTK_FILL - @@ -444,28 +406,26 @@ False 0 gtk-dialog-warning - 6 + 6 - 2 - GTK_FILL - GTK_FILL + 0 + 0 True False + True 0 6 True True - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - + 1 + 0 @@ -480,14 +440,16 @@ True - 2 - 3 + 1 2 - 3 - GTK_FILL - + + + + + + False @@ -553,22 +515,15 @@ - + True False 12 - 2 - 3 - - - - - - True False + True 0 6 12 @@ -576,12 +531,8 @@ True - 2 - 3 + 1 1 - 2 - GTK_FILL - @@ -590,30 +541,31 @@ False 0 gtk-dialog-warning - 6 + 6 - 2 - GTK_FILL - GTK_FILL + 0 + 0 True False + True 0 6 True True - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - + 1 + 0 + + + False @@ -639,6 +591,48 @@ True False vertical + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + True @@ -648,7 +642,7 @@ True False gtk-dialog-question - 6 + 6 False @@ -703,48 +697,6 @@ 0 - - - True - False - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - True - True - True - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - @@ -821,18 +773,10 @@ - + True False 6 - 3 - 3 - - - - - - True @@ -844,12 +788,8 @@ True - 2 - 3 + 1 1 - 2 - GTK_FILL - @@ -858,12 +798,11 @@ False 0 gtk-dialog-warning - 6 + 6 - 2 - GTK_FILL - GTK_FILL + 0 + 0 @@ -876,10 +815,8 @@ True - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - + 1 + 0 @@ -894,16 +831,15 @@ 1 - 3 2 - 3 - GTK_FILL - + + + True diff --git a/gramps/gui/glade/editaddress.glade b/gramps/gui/glade/editaddress.glade index b937c3b3f..8bfbdc047 100644 --- a/gramps/gui/glade/editaddress.glade +++ b/gramps/gui/glade/editaddress.glade @@ -1,8 +1,8 @@ - + - + False dialog @@ -10,6 +10,7 @@ True False + vertical True @@ -73,27 +74,17 @@ - + True False + vertical - + True False 12 - 5 - 7 - 12 6 - - - - - - - - - + 12 True @@ -105,8 +96,8 @@ date_entry - GTK_FILL - + 0 + 0 @@ -120,10 +111,8 @@ street + 0 1 - 2 - GTK_FILL - @@ -137,10 +126,8 @@ city + 0 3 - 4 - GTK_FILL - @@ -148,14 +135,12 @@ True True The town or city of the address + True ● 1 - 3 3 - 4 - @@ -169,12 +154,8 @@ state - 4 - 5 + 2 2 - 3 - GTK_FILL - @@ -188,10 +169,8 @@ postal + 0 4 - 5 - GTK_FILL - @@ -199,14 +178,12 @@ True True Postal code + True ● 1 - 3 4 - 5 - @@ -220,12 +197,8 @@ country - 4 - 5 + 2 3 - 4 - GTK_FILL - @@ -238,12 +211,8 @@ phone - 4 - 5 + 2 4 - 5 - GTK_FILL - @@ -251,14 +220,13 @@ True True Phone number linked to the address. + True ● - 5 - 7 + 3 4 - 5 - + 2 @@ -266,14 +234,13 @@ True True The state or county of the address in case a mail address must contain this. + True ● - 5 - 7 + 3 2 - 3 - + 2 @@ -281,14 +248,13 @@ True True Country of the address + True ● - 5 - 7 + 3 3 - 4 - + 2 @@ -298,25 +264,15 @@ Mail address. Note: Use Residence Event for genealogical address data. + True ● 1 - 6 1 - 2 - + 4 - - - - - - - - - True @@ -344,12 +300,8 @@ Note: Use Residence Event for genealogical address data. - 6 - 7 + 5 1 - 2 - - @@ -383,10 +335,8 @@ Note: Use Residence Event for genealogical address data. - 6 - 7 - - + 5 + 0 @@ -394,12 +344,13 @@ Note: Use Residence Event for genealogical address data. True True Date at which the address is valid. + True ● 1 - 2 - + 0 + 4 @@ -412,10 +363,8 @@ Note: Use Residence Event for genealogical address data. locality + 0 2 - 3 - GTK_FILL - @@ -423,19 +372,23 @@ Note: Use Residence Event for genealogical address data. True True The locality of the address + True ● 1 - 3 2 - 3 - + + + + + + False diff --git a/gramps/gui/glade/editattribute.glade b/gramps/gui/glade/editattribute.glade index 2947df40b..d8e2f1977 100644 --- a/gramps/gui/glade/editattribute.glade +++ b/gramps/gui/glade/editattribute.glade @@ -1,6 +1,8 @@ + - + + False dialog @@ -8,6 +10,7 @@ True False + vertical True @@ -21,7 +24,6 @@ True True True - False True @@ -39,7 +41,6 @@ True True True - False True @@ -56,7 +57,6 @@ True True True - False True @@ -74,18 +74,17 @@ - + True False + vertical - + True False 12 - 2 - 3 - 12 6 + 12 True @@ -97,8 +96,8 @@ attr_menu - GTK_FILL - + 0 + 0 @@ -112,10 +111,8 @@ attr_value + 0 1 - 2 - GTK_FILL - @@ -123,14 +120,12 @@ True True The value of the attribute. Eg. 1.8, Sunny, or Blue eyes. + True ● 1 - 3 1 - 2 - @@ -139,33 +134,30 @@ True True True - False none - - - - Private - - True False gtk-dialog-authentication + 1 Privacy - 1 + + + Private + + + 2 - 3 - - + 0 @@ -180,16 +172,19 @@ Note: several predefined attributes refer to values present in the GEDCOM standa True + True True 1 - 2 - GTK_FILL + 0 + + + False diff --git a/gramps/gui/glade/editchildref.glade b/gramps/gui/glade/editchildref.glade index 7482f9985..f0ce857aa 100644 --- a/gramps/gui/glade/editchildref.glade +++ b/gramps/gui/glade/editchildref.glade @@ -1,6 +1,7 @@ + - + False 600 @@ -10,6 +11,7 @@ True False + vertical True @@ -23,7 +25,6 @@ True True True - False True @@ -44,7 +45,6 @@ True Accept changes and close window Accept changes and close window - False True @@ -61,7 +61,6 @@ True True True - False True @@ -79,21 +78,17 @@ - + True False + vertical - + True False 12 - 3 - 7 - 12 6 - - - + 12 True @@ -105,16 +100,15 @@ mrel + 0 2 - 3 - GTK_FILL - True False + True True @@ -125,11 +119,7 @@ 1 - 6 2 - 3 - GTK_FILL - GTK_FILL @@ -143,16 +133,15 @@ frel + 0 1 - 2 - GTK_FILL - True False + True True @@ -163,10 +152,7 @@ 1 - 6 1 - 2 - GTK_FILL @@ -175,35 +161,30 @@ True True True - False none - - - - Private - - True False gtk-dialog-authentication + 1 Privacy - 1 + + + Private + + + - 6 - 7 + 2 2 - 3 - - @@ -216,26 +197,26 @@ name - GTK_FILL - + 0 + 0 - False + False + False True False + True 0 1 - 6 - GTK_FILL - + 0 @@ -247,9 +228,20 @@ True Open person editor of this child Open person editor of this child - False none - + + + True + False + gtk-edit + 1 + + + Edition + + + + @@ -258,27 +250,16 @@ Child - - - True - False - gtk-edit - - - Edition - - - 1 - - + - 6 - 7 - GTK_FILL - + 2 + 0 + + + False diff --git a/gramps/gui/glade/editcitation.glade b/gramps/gui/glade/editcitation.glade index e695687ec..672c4def2 100644 --- a/gramps/gui/glade/editcitation.glade +++ b/gramps/gui/glade/editcitation.glade @@ -1,7 +1,8 @@ + - - + + @@ -16,6 +17,7 @@ True False + vertical True @@ -75,20 +77,12 @@ - + True False 12 - 6 - 4 - 12 6 - - - - - - + 12 True @@ -100,10 +94,8 @@ date_entry + 0 2 - 3 - GTK_FILL - @@ -114,12 +106,6 @@ True Invoke date editor none - - - - Date - - True @@ -132,14 +118,16 @@ + + + Date + + + - 3 - 4 + 2 2 - 3 - GTK_FILL - @@ -153,10 +141,7 @@ 1 - 3 3 - 4 - @@ -170,10 +155,8 @@ volume + 0 3 - 4 - GTK_FILL - @@ -187,10 +170,8 @@ confidence + 0 4 - 5 - GTK_FILL - @@ -204,14 +185,11 @@ 1 - 3 2 - 3 - - + True False 12 @@ -271,11 +249,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 - 3 4 - 5 - GTK_FILL - @@ -286,8 +260,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

Source: - GTK_FILL - + 0 + 0 @@ -298,19 +272,18 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

none - 3 - 4 - GTK_FILL - + 2 + 0 - + True False - source_event_box + - False + False + False True @@ -342,9 +315,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 - 3 - GTK_FILL - + 0 @@ -353,12 +324,6 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True True none - - - - Private - - True @@ -371,14 +336,16 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

+ + + Private + + + - 3 - 4 + 2 3 - 4 - GTK_FILL - @@ -389,10 +356,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

Tags: + 0 5 - 6 - GTK_FILL - @@ -403,11 +368,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 - 3 5 - 6 - GTK_FILL - @@ -417,12 +378,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True - 3 - 4 + 2 5 - 6 - GTK_FILL - @@ -433,10 +390,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

Author: + 0 1 - 2 - GTK_FILL - @@ -447,13 +402,15 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

1 - 3 1 - 2 - GTK_FILL - + + + + + + False diff --git a/gramps/gui/glade/editdate.glade b/gramps/gui/glade/editdate.glade index 2681352ee..685fceeb4 100644 --- a/gramps/gui/glade/editdate.glade +++ b/gramps/gui/glade/editdate.glade @@ -1,6 +1,8 @@ + - + + 31 1 @@ -36,20 +38,11 @@ True False + 12 + 12 + True vertical - - - True - False - 2 - - - False - True - end - 0 - - + 6 True @@ -63,7 +56,6 @@ True True False - False True @@ -80,7 +72,6 @@ True True False - False True @@ -97,7 +88,6 @@ True True False - False True @@ -115,21 +105,37 @@ - + True False + 2 + + + False + True + end + 0 + + + + + True + False + vertical - + True False + vertical - + True False True False + 6 0 Calenda_r: True @@ -157,7 +163,6 @@ True True - 6 1 @@ -170,7 +175,7 @@ - + True False @@ -193,7 +198,6 @@ True False Old Style/New Style - False True 0.5 True @@ -223,6 +227,7 @@ True + False Month-Day of first day of new year (e.g., "1-1", "3-1", "3-25") @@ -241,31 +246,11 @@ - + True False - 5 - 8 - 6 6 - - - - - - - - - - - - - - - - - - + 6 True @@ -280,26 +265,21 @@ - 4 - GTK_FILL - + 3 + 0 True False - + + 12 + True - 1 - 4 + 0 1 - 2 - GTK_FILL - GTK_FILL - 6 - 6 @@ -316,26 +296,20 @@ - 4 - 8 - GTK_FILL - + 0 + 0 True False + 12 + True - 5 - 8 + 3 1 - 2 - GTK_FILL - GTK_FILL - 6 - 6 @@ -350,11 +324,8 @@ - 4 + 0 2 - 3 - GTK_FILL - @@ -366,12 +337,8 @@ start_day - 1 - 2 + 0 3 - 4 - GTK_FILL - @@ -383,12 +350,8 @@ start_month_box - 2 - 3 + 1 3 - 4 - GTK_FILL - @@ -400,60 +363,48 @@ start_year - 3 - 4 + 2 3 - 4 - GTK_FILL - True True + 12 + True adjustment1 1 True - 1 - 2 + 0 4 - 5 - - 6 True False + True - 2 - 3 + 1 4 - 5 - GTK_FILL - 6 True True + True adjustment2 1 True - 3 - 4 + 2 4 - 5 - - 6 @@ -468,12 +419,8 @@ - 4 - 8 + 3 2 - 3 - GTK_FILL - @@ -485,12 +432,8 @@ stop_day - 5 - 6 + 3 3 - 4 - GTK_FILL - @@ -502,12 +445,8 @@ stop_month_box - 6 - 7 + 4 3 - 4 - GTK_FILL - @@ -519,62 +458,86 @@ stop_year - 7 - 8 + 5 3 - 4 - GTK_FILL - True True + 12 + True adjustment3 1 True - 5 - 6 + 3 4 - 5 - - 6 True False + True - 6 - 7 + 4 4 - 5 - GTK_FILL - 6 True True + True adjustment4 1 True - 7 - 8 + 5 4 - 5 - - 6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False @@ -584,13 +547,14 @@ - + True False True False + 6 Te_xt comment: True date_text_entry @@ -610,7 +574,6 @@ True True - 6 1 @@ -635,6 +598,9 @@ 1 + + + diff --git a/gramps/gui/glade/editevent.glade b/gramps/gui/glade/editevent.glade index 00fd6e272..40f273c01 100644 --- a/gramps/gui/glade/editevent.glade +++ b/gramps/gui/glade/editevent.glade @@ -1,6 +1,8 @@ + - + + False dialog @@ -75,18 +77,17 @@ - + True False + vertical - + True False 12 - 4 - 5 - 12 4 + 12 True @@ -98,8 +99,8 @@ personal_events - GTK_FILL - + 0 + 0 @@ -114,9 +115,7 @@ 2 - 3 - GTK_FILL - + 0 @@ -127,15 +126,6 @@ True Invoke date editor none - - - - - - - Date - - True @@ -150,12 +140,19 @@ + + + + + + Date + + + 4 - 5 - GTK_FILL - + 0 @@ -169,10 +166,8 @@ event_description + 0 1 - 2 - GTK_FILL - @@ -180,14 +175,13 @@ True True Description of the event. Leave empty if you want to autogenerate this with the tool 'Extract Event Description'. + True ● 1 - 4 1 - 2 - + 3 @@ -202,10 +196,8 @@ select_place + 0 2 - 3 - GTK_FILL - @@ -214,34 +206,32 @@ True True none - True False + 4 - 5 2 - 3 - GTK_FILL - - + True False - False + False + False True False + True 0 end @@ -259,15 +249,6 @@ True True none - - - - - - - Place - - True @@ -280,6 +261,15 @@ + + + + + + Place + + + False @@ -290,11 +280,8 @@ 1 - 4 2 - 3 - GTK_FILL - GTK_FILL + 3 @@ -306,15 +293,14 @@ True + True True 1 - 2 - GTK_FILL - + 0 @@ -327,10 +313,8 @@ gid + 0 3 - 4 - GTK_FILL - @@ -339,12 +323,12 @@ True True Date of the event. This can be an exact date, a range (from ... to, between, ...), or an inexact date (about, ...). + True ● 3 - 4 - + 0 @@ -353,12 +337,6 @@ True True none - - - - Private - - True @@ -371,14 +349,16 @@ + + + Private + + + 4 - 5 1 - 2 - - @@ -418,6 +398,7 @@ True False + True 0 0.4699999988079071 @@ -445,16 +426,14 @@ 1 - 5 3 - 4 - GTK_FILL + 4 False - False + True 0 diff --git a/gramps/gui/glade/editeventref.glade b/gramps/gui/glade/editeventref.glade index 2b0824d6b..78ed939b9 100644 --- a/gramps/gui/glade/editeventref.glade +++ b/gramps/gui/glade/editeventref.glade @@ -1,8 +1,8 @@ - + - + False 600 @@ -11,6 +11,7 @@ True False + vertical True @@ -98,13 +99,12 @@ True 6 - + True False 12 - 4 - 12 6 + 12 True @@ -117,8 +117,8 @@ eer_role_combo - GTK_FILL - + 0 + 0 @@ -149,16 +149,15 @@ - 3 - 4 - GTK_FILL - + 2 + 0 True False + True True @@ -169,8 +168,7 @@ 1 - 3 - + 0 @@ -208,26 +206,12 @@ True False - + True False 12 - 7 - 3 - 12 6 - - - - - - - - - - - - + 12 True @@ -239,8 +223,8 @@ eer_type_combo - GTK_FILL - + 0 + 0 @@ -254,10 +238,8 @@ eer_date_entry + 0 1 - 2 - GTK_FILL - @@ -271,10 +253,8 @@ eer_description + 0 4 - 5 - GTK_FILL - @@ -289,10 +269,8 @@ share_place + 0 3 - 4 - GTK_FILL - @@ -305,27 +283,27 @@ gid + 0 2 - 3 - GTK_FILL - - + True False - - False - - - True - False - 0 - - - + + False + False + + + True + False + True + 0 + + + True True @@ -355,11 +333,7 @@ 1 - 2 3 - 4 - GTK_FILL - @@ -378,11 +352,7 @@ 2 - 3 3 - 4 - GTK_FILL - @@ -418,11 +388,7 @@ 2 - 3 1 - 2 - GTK_FILL - @@ -453,17 +419,14 @@ 2 - 3 - 1 - 4 - GTK_FILL - + 2 True False + True True @@ -474,9 +437,7 @@ 1 - 2 - GTK_FILL - GTK_FILL + 0 @@ -484,32 +445,28 @@ True True A unique ID to identify the event + True ● 1 - 2 2 - 3 - True True + True ● 1 - 2 4 - 5 - - + False 6 12 @@ -547,28 +504,28 @@ - 3 + 0 5 - 6 - GTK_SHRINK + 3 + + + + + True + True + True + ● + + + 1 + 1 - - True - True - ● - - - 1 - 2 - 1 - 2 - - + @@ -576,7 +533,7 @@ - + True False 6 diff --git a/gramps/gui/glade/editfamily.glade b/gramps/gui/glade/editfamily.glade index d30e79d66..adbd8705b 100644 --- a/gramps/gui/glade/editfamily.glade +++ b/gramps/gui/glade/editfamily.glade @@ -1,6 +1,8 @@ + - + + False dialog @@ -25,7 +27,6 @@ True Abandon changes and close window Abandon changes and close window - False True @@ -46,7 +47,6 @@ True Accept changes and close window Accept changes and close window - False True @@ -63,7 +63,6 @@ True True True - False True @@ -84,280 +83,262 @@ True - False False + False - + True False 6 + vertical 4 - + True False True - False + False + False - - 132 - True - False - 6 - 4 - 2 - 12 - 6 - - - True - False - 0 - Name: - - - 1 - 2 - GTK_FILL - - 10 - - - - - True - False - 0 - Birth: - - - 2 - 3 - GTK_FILL - - 10 - - - - - True - False - 0 - Death: - - - 3 - 4 - GTK_FILL - - 10 - - - - - True - False - - - True - False - 0 - Father/partner1 - - - - - - False - False - 0 - - - - - False - True - True - True - False - none - - - Father - - - - - True - False - gtk-index - - - Selector - - - - - - - False - False - 2 - 1 - - - - - False - True - True - True - False - none - - - Add - - - - - True - False - gtk-add - - - Add - - - - - - - False - False - 2 - - - - - False - True - True - True - False - none - - - Remove - - - - - True - False - gtk-remove - - - Remove - - - - - - - False - False - 3 - - - - - False - True - True - True - False - none - - - - Edit - - - - - True - False - gtk-edit - - - Edition - - - - - - - False - False - 4 - - - - - 2 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - True - False - 0 - end - - - 1 - 2 - 1 - 2 - - - - + + 132 + True + False + 6 + 6 + 12 + + + True + False + 6 + 0 + Name: + + + 0 + 1 + + + + + True + False + 6 + 0 + Birth: + + + 0 + 2 + + + + + True + False + 6 + 0 + Death: + + + 0 + 3 + + + + + True + False + + + True + False + 0 + Father/partner1 + + + + + + False + False + 0 + + + + + False + True + True + True + none + + + True + False + gtk-index + + + Selector + + + + + + + Father + + + + + False + False + 2 + 1 + + + + + False + True + True + True + none + + + True + False + gtk-add + + + Add + + + + + + + Add + + + + + False + False + 2 + + + + + False + True + True + True + none + + + True + False + gtk-remove + + + Remove + + + + + + + Remove + + + + + False + False + 3 + + + + + False + True + True + True + none + + + True + False + gtk-edit + + + Edition + + + + + + + Edit + + + + + + False + False + 4 + + + + + 0 + 0 + 2 + + + + + True + False + True + 0 + + + 1 + 2 + + + + + True + False + True + 0 + + + 1 + 3 + + + + + True + False + True + 0 + end + + + 1 + 1 + + + @@ -372,296 +353,276 @@ True - False + False + False - - 132 - True - False - 6 - 4 - 2 - 12 - 6 - - - True - False - 0 - Name: - - - 1 - 2 - GTK_FILL - - 10 - - - - - True - False - 0 - Birth: - - - 2 - 3 - GTK_FILL - - 10 - - - - - True - False - 0 - Death: - - - 3 - 4 - GTK_FILL - - 10 - - - - - True - False - 0 - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - True - False - 0 - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - False - - - True - False - 0 - Mother/partner2 - - - - - - False - False - 0 - - - - - False - True - True - True - False - none - - - Mother - - - - - True - False - gtk-index - - - Selector - - - - - - - False - False - 1 - - - - - False - True - True - True - False - none - - - Add - - - - - True - False - gtk-add - - - Add - - - - - - - False - False - 2 - - - - - False - True - True - True - True - Indicates if the record is private - Indicates if the record is private - False - none - - - - True - False - gtk-dialog-authentication - - - Privacy - - - - - - - False - False - end - 3 - - - - - False - True - True - True - False - none - - - Remove - - - - - True - False - gtk-remove - - - Remove - - - - - - - False - False - 4 - - - - - False - True - True - True - False - none - - - - Edit - - - - - True - False - gtk-edit - - - Edition - - - - - - - False - False - 5 - - - - - 2 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - end - - - 1 - 2 - 1 - 2 - - - - + + 132 + True + False + 6 + 6 + 12 + + + True + False + 6 + 0 + Name: + + + 0 + 1 + + + + + True + False + 6 + 0 + Birth: + + + 0 + 2 + + + + + True + False + 6 + 0 + Death: + + + 0 + 3 + + + + + True + False + True + 0 + + + 1 + 3 + + + + + True + False + True + 0 + + + 1 + 2 + + + + + True + False + + + True + False + 0 + Mother/partner2 + + + + + + False + False + 0 + + + + + False + True + True + True + none + + + True + False + gtk-index + + + Selector + + + + + + + Mother + + + + + False + False + 1 + + + + + False + True + True + True + none + + + True + False + gtk-add + + + Add + + + + + + + Add + + + + + False + False + 2 + + + + + False + True + True + True + True + Indicates if the record is private + Indicates if the record is private + none + + + True + False + gtk-dialog-authentication + + + Privacy + + + + + + + + False + False + end + 3 + + + + + False + True + True + True + none + + + True + False + gtk-remove + + + Remove + + + + + + + Remove + + + + + False + False + 4 + + + + + False + True + True + True + none + + + True + False + gtk-edit + + + Edition + + + + + + + Edit + + + + + + False + False + 5 + + + + + 0 + 0 + 2 + + + + + True + False + True + 0 + end + + + 1 + 1 + + + @@ -678,14 +639,12 @@ - + True False 6 - 3 - 4 - 12 6 + 12 True @@ -697,26 +656,24 @@ - 4 - GTK_FILL - + 0 + 0 + 4 True False + 6 0 _ID: True gid + 0 1 - 2 - GTK_FILL - - 10 @@ -724,15 +681,13 @@ True True A unique ID for the family + True ● 6 1 - 2 1 - 2 - @@ -747,11 +702,7 @@ 2 - 3 1 - 2 - GTK_FILL - @@ -759,6 +710,7 @@ True False The relationship type, eg 'Married' or 'Unmarried'. Use Events for more details. + True True @@ -769,37 +721,33 @@ 3 - 4 1 - 2 - True False + 6 0 _Tags: True tag_button + 0 2 - 3 - GTK_FILL - - 10 - + True False True False + True True @@ -814,7 +762,9 @@ True True Edit the tag list - False + + + @@ -823,9 +773,6 @@ Tags - - - False @@ -836,12 +783,19 @@ 1 - 4 2 - 3 - + 3 + + + + + + + + + False diff --git a/gramps/gui/glade/editldsord.glade b/gramps/gui/glade/editldsord.glade index 439194901..4dea563de 100644 --- a/gramps/gui/glade/editldsord.glade +++ b/gramps/gui/glade/editldsord.glade @@ -1,8 +1,8 @@ - + - + @@ -97,24 +97,17 @@ - + True False + vertical - + True False 12 - 6 - 3 - 12 6 - - - - - - + 12 True @@ -126,10 +119,8 @@ date_entry + 0 3 - 4 - GTK_FILL - @@ -143,10 +134,8 @@ share_place + 0 4 - 5 - GTK_FILL - @@ -182,11 +171,7 @@ 2 - 3 3 - 4 - - @@ -197,8 +182,8 @@ Ordinance: - GTK_FILL - + 0 + 0 @@ -211,16 +196,15 @@ temple + 0 1 - 2 - GTK_FILL - True False + True liststore3 @@ -231,11 +215,7 @@ 1 - 2 1 - 2 - GTK_FILL - @@ -247,24 +227,19 @@ parents_select + 0 5 - 6 - GTK_FILL - False + True 0 1 - 2 5 - 6 - GTK_FILL - @@ -297,11 +272,7 @@ 2 - 3 5 - 6 - GTK_FILL - @@ -314,16 +285,15 @@ status + 0 2 - 3 - GTK_FILL - True False + True liststore2 @@ -334,24 +304,22 @@ 1 - 2 2 - 3 - GTK_FILL - - + True False - False + False + False True False + True 0 end @@ -386,11 +354,7 @@ 1 - 2 4 - 5 - GTK_FILL - GTK_FILL @@ -422,9 +386,7 @@ 2 - 3 - GTK_FILL - + 0 @@ -443,17 +405,14 @@ 2 - 3 4 - 5 - GTK_FILL - True False + True liststore1 @@ -464,24 +423,27 @@ 1 - 2 - GTK_FILL + 0 True True + True ● 1 - 2 3 - 4 - GTK_FILL + + + + + + False diff --git a/gramps/gui/glade/editlink.glade b/gramps/gui/glade/editlink.glade index d0eb84bc8..e6eb4f504 100644 --- a/gramps/gui/glade/editlink.glade +++ b/gramps/gui/glade/editlink.glade @@ -1,6 +1,8 @@ + - + + False 600 @@ -10,6 +12,7 @@ True False + vertical True @@ -23,7 +26,6 @@ True True True - False True @@ -44,7 +46,6 @@ True Accept changes and close window Accept changes and close window - False True @@ -61,7 +62,6 @@ True True True - False True @@ -79,18 +79,17 @@ - + True False + vertical - + True False 12 - 3 - 4 - 12 6 + 12 True @@ -101,10 +100,8 @@ center + 0 1 - 2 - GTK_FILL - @@ -118,10 +115,8 @@ entry1 + 0 2 - 3 - GTK_FILL - @@ -134,26 +129,23 @@ button1 - GTK_FILL - + 0 + 0 True True + True ● False False - True - True 1 - 4 2 - 3 - + 3 @@ -162,32 +154,29 @@ True True True - False - - - - Link - - True False gtk-index + 2 Selector - 2 + + + Link + + + 2 - 3 - - + 0 @@ -197,15 +186,12 @@ 0 in - + True False - - - True - False - - + start + 12 + True @@ -214,14 +200,10 @@ 1 - 3 1 - 2 + 2 - - - New @@ -229,12 +211,10 @@ True True True - False 3 - 4 - + 0 @@ -244,14 +224,21 @@ True True True - False 3 - 4 1 - 2 - + + + + + True + False + True + + + 1 + 0 diff --git a/gramps/gui/glade/editlocation.glade b/gramps/gui/glade/editlocation.glade index 4348058b0..0c5e8c4b0 100644 --- a/gramps/gui/glade/editlocation.glade +++ b/gramps/gui/glade/editlocation.glade @@ -1,6 +1,8 @@ + - + + False 550 @@ -9,6 +11,7 @@ True False + vertical True @@ -22,7 +25,6 @@ True True True - False True @@ -40,7 +42,6 @@ True True True - False True @@ -57,7 +58,6 @@ True True True - False True @@ -75,18 +75,17 @@ - + True False + vertical - + True False 12 - 5 - 4 - 12 6 + 12 True @@ -98,10 +97,8 @@ city + 0 2 - 3 - GTK_FILL - @@ -109,14 +106,12 @@ True True The town or city where the place is. + True ● 1 - 2 2 - 3 - @@ -130,8 +125,8 @@ city - GTK_FILL - + 0 + 0 @@ -146,11 +141,7 @@ 2 - 3 1 - 2 - GTK_FILL - @@ -158,14 +149,12 @@ True True Lowest clergical division of this place. Typically used for church sources that only mention the parish. + True ● 3 - 4 1 - 2 - @@ -179,10 +168,8 @@ county + 0 3 - 4 - GTK_FILL - @@ -190,14 +177,12 @@ True True Third level of place division. Eg., in the USA a county. + True ● 1 - 2 3 - 4 - @@ -212,11 +197,7 @@ 2 - 3 2 - 3 - GTK_FILL - @@ -224,14 +205,12 @@ True True Second level of place division, eg., in the USA a state, in Germany a Bundesland. + True ● 3 - 4 2 - 3 - @@ -245,10 +224,8 @@ country + 0 4 - 5 - GTK_FILL - @@ -256,14 +233,12 @@ True True The country where the place is. + True ● 1 - 2 4 - 5 - @@ -277,25 +252,19 @@ 2 - 3 3 - 4 - GTK_FILL - True True + True ● 3 - 4 3 - 4 - @@ -309,25 +278,19 @@ 2 - 3 4 - 5 - GTK_FILL - True True + True ● 3 - 4 4 - 5 - @@ -335,12 +298,13 @@ True True Lowest level of a place division: eg the street name. + True ● 1 - 4 - + 0 + 3 @@ -353,10 +317,8 @@ locality + 0 1 - 2 - GTK_FILL - @@ -364,14 +326,12 @@ True True A district within, or a settlement near to, a town or city. + True ● 1 - 2 1 - 2 - diff --git a/gramps/gui/glade/editmedia.glade b/gramps/gui/glade/editmedia.glade index 8a482dbdc..b97e70b26 100644 --- a/gramps/gui/glade/editmedia.glade +++ b/gramps/gui/glade/editmedia.glade @@ -1,6 +1,8 @@ + - + + False dialog @@ -8,6 +10,7 @@ True False + vertical 8 @@ -22,7 +25,6 @@ True True True - False True @@ -40,7 +42,6 @@ True True True - False True @@ -57,7 +58,6 @@ True True True - False True @@ -75,20 +75,19 @@ - + True False 12 + vertical 6 - + True False 12 - 5 - 4 - 5 4 + 5 True @@ -101,11 +100,7 @@ 1 - 2 1 - 2 - GTK_FILL - @@ -119,9 +114,7 @@ 1 - 2 - GTK_FILL - + 0 @@ -135,11 +128,7 @@ 1 - 2 2 - 3 - GTK_FILL - @@ -154,11 +143,7 @@ 1 - 2 3 - 4 - GTK_FILL - @@ -168,10 +153,8 @@ center + 0 4 - 5 - GTK_FILL - @@ -210,9 +193,9 @@ - 4 - GTK_FILL - GTK_FILL + 0 + 0 + 4 @@ -221,14 +204,12 @@ True Path of the media object on your computer. Gramps does not store the media internally, it only stores the path! Set the 'Relative Path' in the Preferences to avoid retyping the common base directory where all your media is stored. The 'Media Manager' tool can help managing paths of a collection of media objects. + True ● 2 - 3 3 - 4 - @@ -236,12 +217,12 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True True Descriptive title for this media object. + True ● 2 - 4 - + 0 @@ -252,17 +233,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True True Invoke date editor - False none - - - - - - - Date - - True @@ -275,14 +246,19 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re + + + + + + Date + + + 3 - 4 2 - 3 - GTK_FILL - @@ -292,16 +268,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True True Open File Browser to select a media file on your computer. - False none - - - - - - Path - - True @@ -314,14 +281,18 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re + + + + + + Path + + 3 - 4 3 - 4 - GTK_FILL - @@ -329,14 +300,12 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True True A unique ID to identify the Media object. + True ● 2 - 3 1 - 2 - @@ -345,14 +314,7 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True True True - False none - - - - Private - - True @@ -365,14 +327,16 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re + + + Private + + + 3 - 4 1 - 2 - GTK_FILL - @@ -380,14 +344,12 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True True A date associated with the media, eg., for a picture the date it is taken. + True ● 2 - 3 2 - 3 - @@ -401,21 +363,18 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 1 - 2 4 - 5 - GTK_FILL - - + True False True False + True True @@ -429,7 +388,6 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re True True True - False @@ -448,12 +406,13 @@ Gramps does not store the media internally, it only stores the path! Set the 'Re 2 - 4 4 - 5 - + 2 + + + False diff --git a/gramps/gui/glade/editmediaref.glade b/gramps/gui/glade/editmediaref.glade index 34816df7d..5e77756b6 100644 --- a/gramps/gui/glade/editmediaref.glade +++ b/gramps/gui/glade/editmediaref.glade @@ -1,6 +1,8 @@ + - + + 100 1 @@ -30,6 +32,7 @@ True False + vertical 8 @@ -91,24 +94,23 @@ - + True False 6 + vertical 6 True True - + True False 12 - 6 - 3 - 12 6 + 12 True @@ -120,11 +122,7 @@ 1 - 2 4 - 5 - GTK_FILL - GTK_FILL @@ -138,11 +136,7 @@ 1 - 2 5 - 6 - GTK_FILL - GTK_FILL @@ -158,11 +152,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 2 - 3 5 - 6 - GTK_FILL - @@ -178,11 +168,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 2 - 3 4 - 5 - GTK_FILL - @@ -191,6 +177,8 @@ You can use the mouse on the picture to select a region, or use these spinbutton False Referenced region of the image media object. Select a region with clicking and holding the mouse button on the top left corner of the region you want, dragging the mouse to the bottom right corner of the region, and then releasing the mouse button. + True + True 0 @@ -207,7 +195,9 @@ Select a region with clicking and holding the mouse button on the top left corne - 6 + 0 + 0 + 6 @@ -221,11 +211,7 @@ Select a region with clicking and holding the mouse button on the top left corne 1 - 2 2 - 3 - GTK_FILL - GTK_FILL @@ -244,11 +230,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 2 - 3 2 - 3 - GTK_FILL - @@ -264,11 +246,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 2 - 3 3 - 4 - GTK_FILL - @@ -282,11 +260,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 1 - 2 3 - 4 - GTK_FILL - GTK_FILL @@ -295,13 +269,12 @@ You can use the mouse on the picture to select a region, or use these spinbutton False + 1 4 - 5 - - + True False @@ -310,25 +283,25 @@ You can use the mouse on the picture to select a region, or use these spinbutton True True none - - - - Private - - True False gtk-dialog-authentication + 1 Privacy - 1 + + + Private + + + False @@ -340,30 +313,26 @@ You can use the mouse on the picture to select a region, or use these spinbutton 2 - 3 - GTK_FILL - + 0 - - - - - - True False + True 2 - 3 1 - 2 - + + + + + + @@ -397,26 +366,12 @@ You can use the mouse on the picture to select a region, or use these spinbutton True True - + True False 12 - 7 - 4 - 12 6 - - - - - - - - - - - - + 12 True @@ -429,11 +384,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 1 - 2 3 - 4 - GTK_FILL - @@ -448,9 +399,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 1 - 2 - GTK_FILL - + 0 @@ -465,11 +414,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 1 - 2 1 - 2 - GTK_FILL - GTK_FILL @@ -477,18 +422,16 @@ You can use the mouse on the picture to select a region, or use these spinbutton True True Descriptive title for this media object. + True ● 2 - 3 1 - 2 - - + False 6 12 @@ -497,7 +440,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton True False gtk-dialog-warning - 6 + 6 False @@ -525,11 +468,9 @@ You can use the mouse on the picture to select a region, or use these spinbutton - 3 + 0 6 - 7 - GTK_FILL - GTK_FILL + 3 @@ -566,9 +507,9 @@ You can use the mouse on the picture to select a region, or use these spinbutton - 5 - GTK_FILL - GTK_FILL + 0 + 0 + 5 @@ -581,11 +522,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 1 - 2 5 - 6 - GTK_FILL - @@ -597,11 +534,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton 2 - 3 5 - 6 - GTK_FILL - @@ -615,25 +548,19 @@ You can use the mouse on the picture to select a region, or use these spinbutton 1 - 2 2 - 3 - GTK_FILL - True True + True • 2 - 3 2 - 3 - @@ -644,15 +571,6 @@ You can use the mouse on the picture to select a region, or use these spinbutton True Invoke date editor none - - - - - - - Date - - True @@ -665,14 +583,19 @@ You can use the mouse on the picture to select a region, or use these spinbutton + + + + + + Date + + + 3 - 4 2 - 3 - GTK_FILL - @@ -681,42 +604,40 @@ You can use the mouse on the picture to select a region, or use these spinbutton True True none - - - Private - - True False gtk-dialog-authentication + 1 Privacy - 1 + + + + + Private 3 - 4 - GTK_FILL - GTK_FILL + 0 True True + True • 2 - 3 - GTK_FILL + 0 @@ -727,6 +648,19 @@ You can use the mouse on the picture to select a region, or use these spinbutton True Select a file none + + + True + False + gtk-open + 1 + + + Folder + + + + @@ -735,41 +669,22 @@ You can use the mouse on the picture to select a region, or use these spinbutton Path - - - True - False - gtk-open - - - Folder - - - 1 - - 3 - 4 3 - 4 - GTK_FILL - GTK_FILL True True + True • 2 - 3 3 - 4 - GTK_FILL @@ -783,24 +698,18 @@ You can use the mouse on the picture to select a region, or use these spinbutton 1 - 2 4 - 5 - GTK_FILL - True False + True 2 - 3 4 - 5 - GTK_FILL @@ -819,13 +728,21 @@ You can use the mouse on the picture to select a region, or use these spinbutton 3 - 4 4 - 5 - GTK_FILL - GTK_FILL + + + + + + + + + + + + False diff --git a/gramps/gui/glade/editname.glade b/gramps/gui/glade/editname.glade index b3411a697..a5b7f6f56 100644 --- a/gramps/gui/glade/editname.glade +++ b/gramps/gui/glade/editname.glade @@ -1,6 +1,8 @@ + - + + False 600 @@ -9,6 +11,7 @@ True False + vertical True @@ -25,7 +28,6 @@ True Abandon changes and close window Abandon changes and close window - False True @@ -45,7 +47,6 @@ True Accept changes and close window Accept changes and close window - False True @@ -62,7 +63,6 @@ True True True - False True @@ -80,15 +80,17 @@ - + True False + vertical - + True False + vertical - + True False @@ -128,51 +130,38 @@ 1 - - - - - - - - - - - - False True True True - False none - - - - Private - - True False gtk-dialog-authentication + 1 Privacy - 1 + + + Private + + + False False end - 6 + 2 @@ -194,13 +183,11 @@ False 12 - + True False - 2 - 6 - 6 6 + 6 True @@ -212,8 +199,8 @@ given_name - GTK_FILL - + 0 + 0 @@ -226,10 +213,8 @@ title_field + 0 1 - 2 - GTK_FILL - @@ -243,11 +228,7 @@ 2 - 3 1 - 2 - GTK_FILL - @@ -261,9 +242,7 @@ 4 - 5 - GTK_FILL - + 0 @@ -273,12 +252,13 @@ True True The person's given names + True ● 1 - 4 - + 0 + 3 @@ -292,11 +272,7 @@ 4 - 5 1 - 2 - GTK_FILL - @@ -304,11 +280,12 @@ True True Part of the Given name that is the normally used name. If background is red, call name is not part of Given name and will not be printed underlined in some reports. + True ● 5 - 6 + 0 @@ -316,13 +293,12 @@ True True A title used to refer to the person, such as 'Dr.' or 'Rev.' + True ● 1 - 2 1 - 2 @@ -330,13 +306,12 @@ True True An optional suffix to the name, such as "Jr." or "III" + True ● 3 - 4 1 - 2 @@ -344,13 +319,12 @@ True True A descriptive name given in place of or in addition to the official given name. + True ● 5 - 6 1 - 2 @@ -388,16 +362,16 @@ False 12 - + True False + vertical - + True False - - - + True + vertical @@ -409,7 +383,7 @@ - + True False @@ -484,30 +458,14 @@ True True + True - + True False 12 - 4 - 4 - 12 6 - - - - - - - - - - - - - - - + 12 True @@ -518,10 +476,8 @@ group_as - 1 - 2 - GTK_FILL - + 0 + 0 @@ -534,12 +490,8 @@ sort_as - 1 - 2 + 0 1 - 2 - GTK_FILL - @@ -552,12 +504,8 @@ display_as - 1 - 2 + 0 2 - 3 - GTK_FILL - @@ -566,6 +514,7 @@ False People are displayed according to the name format given in the Preferences (the default). Here you can make sure this person is displayed according to a custom name format (extra formats can be set in the Preferences). + True @@ -574,12 +523,9 @@ Here you can make sure this person is displayed according to a custom name forma - 2 - 3 + 1 2 - 3 - GTK_FILL - + 2 @@ -593,12 +539,8 @@ Here you can make sure this person is displayed according to a custom name forma date_entry - 1 - 2 + 0 3 - 4 - GTK_FILL - @@ -607,6 +549,7 @@ Here you can make sure this person is displayed according to a custom name forma False People are sorted according to the name format given in the Preferences (the default). Here you can make sure this person is sorted according to a custom name format (extra formats can be set in the Preferences). + True @@ -615,11 +558,9 @@ Here you can make sure this person is sorted according to a custom name format ( - 2 - 3 + 1 1 - 2 - + 2 @@ -631,17 +572,7 @@ Here you can make sure this person is sorted according to a custom name format ( True Invoke date editor Invoke date editor - False none - - - - - - - Date - - True @@ -654,18 +585,23 @@ Here you can make sure this person is sorted according to a custom name format ( + + + + + + Date + + + - 3 - 4 + 2 3 - 4 - GTK_FILL - - + True False 6 @@ -676,6 +612,7 @@ Here you can make sure this person is sorted according to a custom name format ( True The Person Tree view groups people under the primary surname. You can override this by setting here a group value. You will be asked if you want to group this person only, or all people with this specific primary surname. + True False ● @@ -692,7 +629,6 @@ You will be asked if you want to group this person only, or all people with this True True False - False True 0.5 True @@ -705,10 +641,9 @@ You will be asked if you want to group this person only, or all people with this - 2 - 4 - GTK_FILL - + 1 + 0 + 2 @@ -716,44 +651,18 @@ You will be asked if you want to group this person only, or all people with this True True A Date associated with this name. Eg. for a Married Name, date the name is first used or marriage date. + True ● - 2 - 3 + 1 3 - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - + True False diff --git a/gramps/gui/glade/editnote.glade b/gramps/gui/glade/editnote.glade index 9ea955cb3..21f92eaed 100644 --- a/gramps/gui/glade/editnote.glade +++ b/gramps/gui/glade/editnote.glade @@ -1,6 +1,8 @@ + - + + False 500 @@ -24,7 +26,6 @@ True True True - False True @@ -41,7 +42,6 @@ True True True - False True @@ -58,7 +58,6 @@ True True True - False True @@ -80,14 +79,16 @@ True True - + True False + vertical - + True False 6 + vertical 6 @@ -120,17 +121,12 @@ - + True False 6 - 3 - 5 - 6 6 - - - + 6 True @@ -142,11 +138,7 @@ 2 - 3 1 - 2 - GTK_FILL - @@ -154,6 +146,7 @@ True False A type to classify the note. + True True @@ -164,10 +157,7 @@ 3 - 4 1 - 2 - @@ -180,10 +170,8 @@ id + 0 1 - 2 - GTK_FILL - @@ -191,14 +179,12 @@ True True A unique ID to identify the note. + True ● 1 - 2 1 - 2 - @@ -215,16 +201,13 @@ When not checked, notes are automatically cleaned in the reports, which will imp When not checked, notes are automatically cleaned in the reports, which will improve the report layout. Use monospace font to keep preformatting. end - False True 0.5 True 3 - 4 - GTK_FILL - + 0 @@ -233,33 +216,30 @@ Use monospace font to keep preformatting. True True True - False none - - - - Private - - True False gtk-dialog-authentication + 1 Privacy - 1 + + + Private + + + 4 - 5 - GTK_FILL - + 0 @@ -272,20 +252,19 @@ Use monospace font to keep preformatting. tag_button + 0 2 - 3 - GTK_FILL - - + True False True False + True True @@ -299,7 +278,6 @@ Use monospace font to keep preformatting. True True True - False @@ -318,10 +296,8 @@ Use monospace font to keep preformatting. 1 - 5 2 - 3 - + 4 @@ -336,24 +312,6 @@ Use monospace font to keep preformatting. - - - - - - - - - - - - - - - - - - False diff --git a/gramps/gui/glade/editperson.glade b/gramps/gui/glade/editperson.glade index feae29ed0..232afa5d3 100644 --- a/gramps/gui/glade/editperson.glade +++ b/gramps/gui/glade/editperson.glade @@ -1,6 +1,28 @@ + - + + + + True + False + gtk-edit + + + Edit + + + + + True + False + gtk-add + + + Add + + + False True @@ -28,7 +50,6 @@ True False Abandon changes and close window - False True @@ -47,7 +68,6 @@ True False Accept changes and close window - False True @@ -65,7 +85,6 @@ True True False - False True @@ -89,18 +108,19 @@ False start - + True False start 3 + vertical - + True False start - 8 - 9 + 4 + 3 True @@ -114,13 +134,8 @@ given_name - 1 - 2 + 2 3 - 4 - GTK_FILL - - 3 @@ -131,17 +146,12 @@ True The person's given names ● - + - 2 - 7 + 3 3 - 4 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - 3 - 3 + 4 @@ -155,12 +165,7 @@ 6 - 7 2 - 3 - GTK_FILL - - 3 @@ -173,11 +178,8 @@ 7 - 9 2 - 3 - - 3 + 2 @@ -192,13 +194,8 @@ title - 1 - 2 + 2 2 - 3 - GTK_FILL - - 3 @@ -207,17 +204,12 @@ True True A title used to refer to the person, such as 'Dr.' or 'Rev.' + True ● - 2 - 3 + 3 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - 3 - 3 @@ -235,11 +227,7 @@ 7 - 8 3 - 4 - - 3 @@ -253,12 +241,8 @@ nickname - 3 - 4 + 4 2 - 3 - GTK_FILL - @@ -267,15 +251,12 @@ True True A descriptive name given in place of or in addition to the official given name. + True ● - 4 - 6 + 5 2 - 3 - - 3 @@ -285,11 +266,6 @@ True False 2.2351741291171123e-10 - - - Image - - True @@ -313,34 +289,17 @@ + + + Image + + - 4 - - - 3 - - - - - True - False - 0 - 3 - 3 - _Type: - True - center - ntype - - - 6 - 7 - 1 - 2 - GTK_FILL - - 3 + 0 + 0 + 2 + 4 @@ -359,16 +318,12 @@ 7 - 9 1 - 2 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - 3 + 2 - + True False Click on a table cell to edit. @@ -380,13 +335,9 @@ - 9 + 2 5 - 6 - GTK_FILL - - 3 - 3 + 6 @@ -397,27 +348,22 @@ True Use Multiple Surnames Indicate that the surname consists of different parts. Every surname has its own prefix and a possible connector to the next surname. Eg., the surname Ramón y Cajal can be stored as Ramón, which is inherited from the father, the connector y, and Cajal, which is inherited from the mother. - False image2 True - Add + 8 - 9 4 - 5 - GTK_SHRINK - - + True False @@ -444,15 +390,8 @@ Indicate that the surname consists of different parts. Every surname has its own True True Set person as private data - False none 1 - - - - Private - - True @@ -466,6 +405,12 @@ Indicate that the surname consists of different parts. Every surname has its own + + + Private + + + False @@ -476,48 +421,13 @@ Indicate that the surname consists of different parts. Every surname has its own - 9 + 0 6 - 7 - GTK_FILL - - 3 + 9 - - True - False - - - True - False - 0 - 3 - Preferred Name - - - - - - True - True - 0 - - - - - - - - 1 - 5 - GTK_FILL - - - - - + True False 6 @@ -526,6 +436,8 @@ Indicate that the surname consists of different parts. Every surname has its own True False 0 + 6 + 3 _Surname: True surname @@ -562,6 +474,7 @@ Indicate that the surname consists of different parts. Every surname has its own True True Part of a person's name indicating the family to which the person belongs + True ● @@ -575,31 +488,9 @@ Indicate that the surname consists of different parts. Every surname has its own - 6 + 0 4 - 5 - - 3 - 3 - - - - - True - False - 0 - 3 - 3 - True - end - - - 1 - 6 - 1 - 2 - - 3 + 6 @@ -609,27 +500,22 @@ Indicate that the surname consists of different parts. Every surname has its own True True Go to Name Editor to add more information about this name - False image1 - + Edit - + 8 - 9 3 - 4 - GTK_SHRINK - - + True False 6 @@ -671,15 +557,12 @@ Indicate that the surname consists of different parts. Every surname has its own 6 - 8 4 - 5 - - 3 + 2 - + True False 6 @@ -780,7 +663,6 @@ Indicate that the surname consists of different parts. Every surname has its own True True True - False 1 @@ -800,12 +682,76 @@ Indicate that the surname consists of different parts. Every surname has its own - 9 + 0 7 - 8 - + 9 + + + True + False + 0 + 3 + Preferred Name + + + + + + 2 + 0 + + + + + True + False + 0 + 3 + 3 + _Type: + True + center + ntype + + + 6 + 1 + + + + + True + False + True + 0 + 3 + 3 + True + end + + + 2 + 1 + 4 + + + + + + + + + + + + + + + + + @@ -843,24 +789,4 @@ Indicate that the surname consists of different parts. Every surname has its own button134 - - True - False - gtk-edit - - - Edit - - - - - True - False - gtk-add - - - Add - - - diff --git a/gramps/gui/glade/editpersonref.glade b/gramps/gui/glade/editpersonref.glade index fbfc6defa..7e653a33a 100644 --- a/gramps/gui/glade/editpersonref.glade +++ b/gramps/gui/glade/editpersonref.glade @@ -1,6 +1,8 @@ + - + + False dialog @@ -8,6 +10,7 @@ True False + vertical True @@ -21,7 +24,6 @@ True True True - False True @@ -42,7 +44,6 @@ True Accept changes and close window Accept changes and close window - False True @@ -59,7 +60,6 @@ True True True - False True @@ -77,18 +77,17 @@ - + True False + vertical - + True False 12 - 2 - 7 - 12 6 + 12 True @@ -100,8 +99,8 @@ person - GTK_FILL - + 0 + 0 @@ -115,10 +114,8 @@ relationship + 0 1 - 2 - GTK_FILL - @@ -128,14 +125,12 @@ Description of the association, eg. Godfather, Friend, ... Note: Use Events instead for relations connected to specific time frames or occasions. Events can be shared between people, each indicating their role in the event. + True ● 1 - 6 1 - 2 - @@ -144,54 +139,49 @@ Note: Use Events instead for relations connected to specific time frames or occa True True True - False none - - - - Private - - True False gtk-dialog-authentication + 1 Privacy - 1 + + + Private + + + - 6 - 7 + 2 1 - 2 - - - False + False + False True False Use the select button to choose a person that has an association to the edited person. + True 0 1 - 6 - GTK_FILL - + 0 @@ -201,16 +191,6 @@ Note: Use Events instead for relations connected to specific time frames or occa True True Select a person that has an association to the edited person. - False - - - - - - - Person - - True @@ -223,12 +203,19 @@ Note: Use Events instead for relations connected to specific time frames or occa + + + + + + Person + + + - 6 - 7 - GTK_FILL - + 2 + 0 diff --git a/gramps/gui/glade/editplace.glade b/gramps/gui/glade/editplace.glade index faa228b6f..1d3ae4645 100644 --- a/gramps/gui/glade/editplace.glade +++ b/gramps/gui/glade/editplace.glade @@ -1,8 +1,8 @@ - + - + False dialog @@ -10,6 +10,7 @@ True False + vertical True @@ -70,21 +71,17 @@ - + True False + vertical - + True False 12 - 4 - 5 - 6 4 - - - + 6 True @@ -96,8 +93,8 @@ place_title - GTK_FILL - + 0 + 0 @@ -111,10 +108,8 @@ lat_entry + 0 2 - 3 - GTK_FILL - @@ -129,11 +124,7 @@ 2 - 3 2 - 3 - GTK_FILL - @@ -141,12 +132,13 @@ True True Full title of this place. + True ● 1 - 5 - + 0 + 4 @@ -159,10 +151,8 @@ gid + 0 3 - 4 - GTK_FILL - @@ -172,14 +162,12 @@ Latitude (position above the Equator) of the place in decimal or degree notation. Eg, valid values are 12.0154, 50°52′21.92″N, N50°52′21.92″ or 50:52:21.92 You can set these values via the Geography View by searching the place, or via a map service in the place view. + True ● 1 - 2 2 - 3 - @@ -189,14 +177,12 @@ You can set these values via the Geography View by searching the place, or via a Longitude (position relative to the Prime, or Greenwich, Meridian) of the place in decimal or degree notation. Eg, valid values are -124.3647, 124°52′21.92″E, E124°52′21.92″ or 124:52:21.92 You can set these values via the Geography View by searching the place, or via a map service in the place view. + True ● 3 - 4 2 - 3 - @@ -250,10 +236,7 @@ You can set these values via the Geography View by searching the place, or via a 1 - 2 3 - 4 - GTK_FILL @@ -283,11 +266,7 @@ You can set these values via the Geography View by searching the place, or via a 4 - 5 2 - 3 - - @@ -299,11 +278,7 @@ You can set these values via the Geography View by searching the place, or via a 4 - 5 3 - 4 - - @@ -314,10 +289,8 @@ You can set these values via the Geography View by searching the place, or via a place|Name: + 0 1 - 2 - GTK_FILL - @@ -329,11 +302,7 @@ You can set these values via the Geography View by searching the place, or via a 2 - 3 1 - 2 - GTK_FILL - @@ -341,14 +310,12 @@ You can set these values via the Geography View by searching the place, or via a True True The name of this place. + True ● 1 - 2 1 - 2 - @@ -360,16 +327,14 @@ You can set these values via the Geography View by searching the place, or via a True + True True 3 - 4 1 - 2 - @@ -381,27 +346,24 @@ You can set these values via the Geography View by searching the place, or via a 2 - 3 3 - 4 - GTK_FILL - True False + True 0 3 - 4 3 - 4 - + + + False diff --git a/gramps/gui/glade/editplaceref.glade b/gramps/gui/glade/editplaceref.glade index 4f44ee397..a44fe62db 100644 --- a/gramps/gui/glade/editplaceref.glade +++ b/gramps/gui/glade/editplaceref.glade @@ -1,8 +1,8 @@ - + - + False 600 @@ -11,6 +11,7 @@ True False + vertical True @@ -98,13 +99,12 @@ True 6 - + True False 12 - 4 - 12 6 + 12 True @@ -116,8 +116,8 @@ center - GTK_FILL - + 0 + 0 @@ -127,9 +127,7 @@ 1 - 3 - GTK_FILL - + 0 @@ -146,10 +144,8 @@ - 3 - 4 - GTK_FILL - + 2 + 0 @@ -187,23 +183,12 @@ True False - + True False 12 - 5 - 5 - 12 6 - - - - - - - - - + 12 True @@ -214,8 +199,8 @@ center - GTK_FILL - + 0 + 0 @@ -228,10 +213,8 @@ center + 0 1 - 2 - GTK_FILL - @@ -245,10 +228,8 @@ center + 0 3 - 4 - GTK_FILL - @@ -260,14 +241,12 @@ True + 0 2 - 3 - GTK_FILL - - + False 6 12 @@ -305,10 +284,9 @@ - 4 + 0 4 - 5 - GTK_SHRINK + 5 @@ -322,11 +300,7 @@ 2 - 3 1 - 2 - GTK_FILL - @@ -340,17 +314,14 @@ 2 - 3 2 - 3 - GTK_FILL - True False + True True @@ -360,10 +331,7 @@ 3 - 4 1 - 2 - @@ -393,11 +361,7 @@ 4 - 5 2 - 3 - - @@ -405,12 +369,13 @@ True True Full title of this place. + True ● 1 - 4 - + 0 + 4 @@ -418,14 +383,12 @@ True True The name of this place. + True ● 1 - 2 1 - 2 - @@ -435,14 +398,12 @@ Latitude (position above the Equator) of the place in decimal or degree notation. Eg, valid values are 12.0154, 50°52′21.92″N, N50°52′21.92″ or 50:52:21.92 You can set these values via the Geography View by searching the place, or via a map service in the place view. + True ● 1 - 2 2 - 3 - @@ -452,14 +413,12 @@ You can set these values via the Geography View by searching the place, or via a Longitude (position relative to the Prime, or Greenwich, Meridian) of the place in decimal or degree notation. Eg, valid values are -124.3647, 124°52′21.92″E, E124°52′21.92″ or 124:52:21.92 You can set these values via the Geography View by searching the place, or via a map service in the place view. + True ● 3 - 4 2 - 3 - @@ -513,10 +472,7 @@ You can set these values via the Geography View by searching the place, or via a 1 - 2 3 - 4 - GTK_FILL @@ -528,25 +484,19 @@ You can set these values via the Geography View by searching the place, or via a 2 - 3 3 - 4 - GTK_FILL - True False + True 0 3 - 4 3 - 4 - @@ -558,20 +508,19 @@ You can set these values via the Geography View by searching the place, or via a 4 - 5 3 - 4 - - + + + False - + True False 6 diff --git a/gramps/gui/glade/editreporef.glade b/gramps/gui/glade/editreporef.glade index 234dbe71c..72700387f 100644 --- a/gramps/gui/glade/editreporef.glade +++ b/gramps/gui/glade/editreporef.glade @@ -1,6 +1,8 @@ + - + + False dialog @@ -8,6 +10,7 @@ True False + vertical 8 @@ -25,7 +28,6 @@ True Abandon changes and close window Abandon changes and close window - False True @@ -46,7 +48,6 @@ True Accept changes and close window Accept changes and close window - False True @@ -63,7 +64,6 @@ True True True - False True @@ -81,9 +81,10 @@ - + True False + vertical True @@ -110,14 +111,12 @@ True 6 - + True False 12 - 2 - 3 - 12 6 + 12 True @@ -129,8 +128,8 @@ media_type - GTK_FILL - + 0 + 0 @@ -144,10 +143,8 @@ call_number + 0 1 - 2 - GTK_FILL - @@ -155,6 +152,7 @@ True False On what type of media this source is available in the repository. + True True @@ -165,8 +163,7 @@ 1 - 2 - + 0 @@ -178,14 +175,7 @@ True Indicates if the record is private Indicates if the record is private - False none - - - - Private - - True @@ -198,12 +188,16 @@ + + + Private + + + 2 - 3 - GTK_SHRINK - GTK_SHRINK + 0 @@ -211,14 +205,13 @@ True True Id number of the source in the repository. + True ● 1 - 3 1 - 2 - + 2 @@ -252,16 +245,15 @@ True True + True 6 - + True False 12 - 4 - 2 - 12 6 + 12 True @@ -273,8 +265,8 @@ repo_name - GTK_FILL - + 0 + 0 @@ -288,10 +280,8 @@ repo_type + 0 1 - 2 - GTK_FILL - @@ -299,16 +289,16 @@ True True Name of the repository (where sources are stored). + True ● 1 - 2 - + 0 - + False 6 12 @@ -317,7 +307,7 @@ True False gtk-dialog-warning - 6 + 6 True @@ -345,10 +335,9 @@ - 2 + 0 3 - 4 - GTK_FILL + 2 @@ -361,14 +350,12 @@ gid + 0 2 - 3 - GTK_FILL - - + True False 12 @@ -377,6 +364,7 @@ True True A unique ID to identify the repository. + True ● @@ -394,13 +382,7 @@ True Indicates if the record is private Indicates if the record is private - False none - - - Private - - True @@ -413,6 +395,11 @@ + + + Private + + False @@ -423,11 +410,7 @@ 1 - 2 2 - 3 - GTK_FILL - GTK_FILL @@ -435,6 +418,7 @@ True False Type of repository, eg., 'Library', 'Album', ... + True True @@ -445,11 +429,7 @@ 1 - 2 1 - 2 - GTK_FILL - GTK_FILL diff --git a/gramps/gui/glade/editrepository.glade b/gramps/gui/glade/editrepository.glade index 85762530d..2b392d17b 100644 --- a/gramps/gui/glade/editrepository.glade +++ b/gramps/gui/glade/editrepository.glade @@ -1,6 +1,8 @@ + - + + False dialog @@ -8,6 +10,7 @@ True False + vertical 8 @@ -75,18 +78,17 @@ - + True False + vertical - + True False 12 - 3 - 2 - 4 4 + 4 True @@ -98,8 +100,8 @@ repository_name - GTK_FILL - + 0 + 0 @@ -113,10 +115,8 @@ repository_type + 0 1 - 2 - GTK_FILL - @@ -124,16 +124,16 @@ True True Name of the repository (where sources are stored). + True ● 1 - 2 - + 0 - + True False 12 @@ -146,6 +146,7 @@ True + True True @@ -176,6 +177,7 @@ True True A unique ID to identify the repository. + False ● @@ -193,12 +195,6 @@ Indicates if the record is private Indicates if the record is private none - - - - Private - - True @@ -211,6 +207,12 @@ + + + Private + + + False @@ -221,11 +223,7 @@ 1 - 2 1 - 2 - GTK_FILL - GTK_FILL @@ -237,10 +235,8 @@ right + 0 2 - 3 - GTK_FILL - @@ -251,6 +247,7 @@ True False + True 0 @@ -275,12 +272,18 @@ 1 - 2 2 - 3 - GTK_FILL + + + + + + + + + False diff --git a/gramps/gui/glade/editsource.glade b/gramps/gui/glade/editsource.glade index 9c64145e8..90081f9b8 100644 --- a/gramps/gui/glade/editsource.glade +++ b/gramps/gui/glade/editsource.glade @@ -1,6 +1,8 @@ + - + + False dialog @@ -9,6 +11,7 @@ True False + vertical 8 @@ -75,18 +78,17 @@ - + True False + vertical - + True False 12 - 5 - 3 - 4 4 + 4 True @@ -98,8 +100,8 @@ source_title - GTK_FILL - + 0 + 0 @@ -113,10 +115,8 @@ author + 0 1 - 2 - GTK_FILL - @@ -125,11 +125,12 @@ True True Title of the source. + True 1 - 3 - + 0 + 2 @@ -137,13 +138,12 @@ True True Authors of the source. + True 1 - 3 1 - 2 - + 2 @@ -157,10 +157,8 @@ pubinfo + 0 2 - 3 - GTK_FILL - @@ -168,13 +166,12 @@ True True Publication Information, such as city and year of publication, name of publisher, ... + True 1 - 3 2 - 3 - + 2 @@ -182,13 +179,11 @@ True True Provide a short title used for sorting, filing, and retrieving source records. + True 1 - 2 3 - 4 - @@ -202,14 +197,12 @@ abbrev + 0 3 - 4 - GTK_FILL - - + True False 12 @@ -245,6 +238,7 @@ True False + True 0 2 @@ -257,11 +251,7 @@ 1 - 2 4 - 5 - GTK_FILL - GTK_FILL @@ -274,10 +264,8 @@ gid + 0 4 - 5 - GTK_FILL - GTK_FILL @@ -289,12 +277,6 @@ Indicates if the record is private Indicates if the record is private none - - - - Private - - True @@ -307,14 +289,16 @@ + + + Private + + + 2 - 3 3 - 4 - - @@ -326,11 +310,7 @@ 2 - 3 4 - 5 - - diff --git a/gramps/gui/glade/editurl.glade b/gramps/gui/glade/editurl.glade index c1363a560..97e008bd3 100644 --- a/gramps/gui/glade/editurl.glade +++ b/gramps/gui/glade/editurl.glade @@ -1,6 +1,8 @@ + - + + False 600 @@ -9,6 +11,7 @@ True False + vertical True @@ -22,7 +25,6 @@ True True True - False True @@ -43,7 +45,6 @@ True Accept changes and close window Accept changes and close window - False True @@ -60,7 +61,6 @@ True True True - False True @@ -78,18 +78,17 @@ - + True False + vertical - + True False 12 - 3 - 3 - 12 6 + 12 True @@ -101,10 +100,8 @@ url_addr + 0 1 - 2 - GTK_FILL - @@ -118,10 +115,8 @@ url_des + 0 2 - 3 - GTK_FILL - @@ -134,8 +129,8 @@ type - GTK_FILL - + 0 + 0 @@ -144,14 +139,7 @@ True True True - False none - - - - Private - - True @@ -164,12 +152,16 @@ + + + Private + + + 2 - 3 - GTK_FILL - + 0 @@ -177,6 +169,7 @@ True False Type of internet address, eg. E-mail, Web Page, ... + True True @@ -187,9 +180,7 @@ 1 - 2 - GTK_FILL - + 0 @@ -197,15 +188,12 @@ True True The internet address as needed to navigate to it, eg. http://gramps-project.org + True ● 1 - 2 1 - 2 - - 3 @@ -216,16 +204,11 @@ True True Open the web address in the default browser. - False True 2 - 3 1 - 2 - GTK_FILL - @@ -233,16 +216,17 @@ True True A descriptive caption of the Internet location you are storing. + True ● 1 - 3 2 - 3 - + + + False diff --git a/gramps/gui/glade/grampletpane.glade b/gramps/gui/glade/grampletpane.glade index c2f530c00..5a0bd0394 100644 --- a/gramps/gui/glade/grampletpane.glade +++ b/gramps/gui/glade/grampletpane.glade @@ -1,14 +1,16 @@ + - + False GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK - window2 + window2 - + True False + vertical True @@ -18,9 +20,10 @@ 0 in - + True False + vertical @@ -46,7 +49,7 @@ - + True False @@ -58,12 +61,6 @@ True Drag to move; click to detach Drag to move; click to detach - False - - - Detach - - True @@ -76,6 +73,11 @@ + + + Detach + + False @@ -92,12 +94,6 @@ True Click to expand/collapse Click to expand/collapse - False - - - Remove - - True @@ -110,6 +106,11 @@ + + + Remove + + False @@ -126,12 +127,6 @@ True Click to delete gramplet from view Click to delete gramplet from view - False - - - Delete - - True @@ -144,6 +139,11 @@ + + + Delete + + False @@ -158,7 +158,6 @@ True True True - False none diff --git a/gramps/gui/glade/mergecitation.glade b/gramps/gui/glade/mergecitation.glade index 26d1fe0c4..046e7590b 100644 --- a/gramps/gui/glade/mergecitation.glade +++ b/gramps/gui/glade/mergecitation.glade @@ -1,6 +1,7 @@ + - + False True @@ -24,7 +25,6 @@ True True False - False True @@ -41,7 +41,6 @@ True True False - False True @@ -58,7 +57,6 @@ True True False - False True @@ -76,9 +74,10 @@ - + True False + vertical True @@ -106,16 +105,16 @@ primary data for the merged citation. - + True False + vertical False True True False - False 0.5 True @@ -139,7 +138,6 @@ primary data for the merged citation. True True False - False 0.5 True handle_btn1 @@ -171,30 +169,17 @@ primary data for the merged citation. True True - + True False + vertical - + True False 6 - 6 - 4 - 6 6 - - - - - - - - - - - - + 6 True @@ -205,8 +190,8 @@ primary data for the merged citation. - GTK_FILL - + 0 + 0 @@ -220,9 +205,7 @@ primary data for the merged citation. 2 - 3 - GTK_FILL - + 0 @@ -232,16 +215,13 @@ primary data for the merged citation. True True False - False True 0.5 True + 0 1 - 2 - GTK_FILL - @@ -251,7 +231,6 @@ primary data for the merged citation. True True False - False True 0.5 True @@ -259,11 +238,7 @@ primary data for the merged citation. 2 - 3 1 - 2 - GTK_FILL - @@ -273,16 +248,13 @@ primary data for the merged citation. True True False - False True 0.5 True + 0 2 - 3 - GTK_FILL - @@ -292,7 +264,6 @@ primary data for the merged citation. True True False - False True 0.5 True @@ -300,11 +271,7 @@ primary data for the merged citation. 2 - 3 2 - 3 - GTK_FILL - @@ -314,16 +281,13 @@ primary data for the merged citation. True True False - False True 0.5 True + 0 3 - 4 - GTK_FILL - @@ -333,7 +297,6 @@ primary data for the merged citation. True True False - False True 0.5 True @@ -341,11 +304,7 @@ primary data for the merged citation. 2 - 3 3 - 4 - GTK_FILL - @@ -355,16 +314,13 @@ primary data for the merged citation. True True False - False True 0.5 True - 5 - 6 - GTK_FILL - + 0 + 4 @@ -374,7 +330,6 @@ primary data for the merged citation. True True False - False True 0.5 True @@ -382,131 +337,111 @@ primary data for the merged citation. 2 - 3 - 5 - 6 - GTK_FILL - + 4 True True + True False 1 - 2 1 - 2 - True True + True False 3 - 4 1 - 2 - True True + True False 1 - 2 2 - 3 - True True + True False 3 - 4 2 - 3 - True True + True False 1 - 2 3 - 4 - True True + True False 3 - 4 3 - 4 - True True + True False 1 - 2 - 5 - 6 - + 4 - - - True True + True False 3 - 4 - 5 - 6 - + 4 + + + True diff --git a/gramps/gui/glade/mergedata.glade b/gramps/gui/glade/mergedata.glade index e49696f16..c998ed768 100644 --- a/gramps/gui/glade/mergedata.glade +++ b/gramps/gui/glade/mergedata.glade @@ -1,6 +1,8 @@ + - + + False True @@ -26,7 +28,6 @@ True True False - False True @@ -45,7 +46,6 @@ True True False - False True @@ -63,7 +63,6 @@ True True False - False True @@ -81,7 +80,6 @@ True True False - False True @@ -100,9 +98,10 @@ - + True False + vertical True @@ -117,16 +116,16 @@ - + True False - 2 - 2 5 True True + True + True in @@ -140,11 +139,17 @@ + + 0 + 0 + True True + True + True in @@ -160,8 +165,7 @@ 1 - 2 - GTK_FILL + 0 @@ -171,18 +175,13 @@ True True False - False True 0.5 True 1 - 2 1 - 2 - - @@ -192,7 +191,6 @@ True True False - False True 0.5 True @@ -200,10 +198,8 @@ select2 + 0 1 - 2 - - @@ -253,7 +249,6 @@ True True False - False True @@ -270,7 +265,6 @@ True True False - False True @@ -287,7 +281,6 @@ True True False - False True @@ -305,10 +298,11 @@ - + True False 12 + vertical 6 @@ -336,39 +330,33 @@ - + True False - 2 - 2 True False + True 0 center - 1 - 2 - GTK_FILL - + 0 + 0 True False + True 0 center - 1 - 2 + 0 1 - 2 - GTK_FILL - @@ -377,17 +365,14 @@ True True False - False True 0.5 True True - GTK_FILL - - 5 - 5 + 1 + 0 @@ -396,19 +381,14 @@ True True False - False True 0.5 True person1 + 1 1 - 2 - GTK_FILL - - 5 - 5 @@ -457,7 +437,6 @@ True True False - False True @@ -475,7 +454,6 @@ True True False - False True @@ -493,7 +471,6 @@ True True False - False True @@ -512,9 +489,10 @@ - + True False + vertical True @@ -529,27 +507,17 @@ - + True False 6 - 4 - 3 - 6 6 - - - - - - - - - + 6 True True + True Other @@ -557,43 +525,35 @@ - 2 - 3 + 1 3 - 4 - True False + 1 + True 0 center - 2 - 3 + 1 1 - 2 - GTK_FILL - True False + True 0 center - 2 - 3 + 1 2 - 3 - GTK_FILL - @@ -607,9 +567,8 @@ - 3 - GTK_FILL - + 0 + 0 @@ -619,19 +578,14 @@ True True False - False True 0.5 True True - 1 - 2 + 0 1 - 2 - GTK_FILL - @@ -641,19 +595,14 @@ True True False - False True 0.5 True place1 - 1 - 2 + 0 2 - 3 - GTK_FILL - @@ -663,21 +612,19 @@ True True False - False True 0.5 True place1 - 1 - 2 + 0 3 - 4 - GTK_FILL - + + + True @@ -722,7 +669,6 @@ True True False - False True @@ -739,7 +685,6 @@ True True False - False True @@ -756,7 +701,6 @@ True True False - False True @@ -774,62 +718,12 @@ - + True False 6 - 7 - 7 - 6 6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 6 True @@ -841,11 +735,8 @@ - 3 + 0 1 - 2 - GTK_FILL - @@ -859,12 +750,8 @@ - 4 - 7 + 2 1 - 2 - GTK_FILL - @@ -874,18 +761,13 @@ True True False - False True 0.5 True - 1 - 2 + 0 2 - 3 - GTK_FILL - @@ -895,19 +777,14 @@ True True False - False True 0.5 True title_btn1 - 5 - 6 + 2 2 - 3 - GTK_FILL - @@ -917,18 +794,13 @@ True True False - False True 0.5 True - 1 - 2 + 0 3 - 4 - GTK_FILL - @@ -938,19 +810,14 @@ True True False - False True 0.5 True author_btn1 - 5 - 6 + 2 3 - 4 - GTK_FILL - @@ -960,18 +827,13 @@ True True False - False True 0.5 True - 1 - 2 + 0 4 - 5 - GTK_FILL - @@ -981,19 +843,14 @@ True True False - False True 0.5 True abbrev_btn1 - 5 - 6 + 2 4 - 5 - GTK_FILL - @@ -1003,18 +860,13 @@ True True False - False True 0.5 True - 1 - 2 + 0 5 - 6 - GTK_FILL - @@ -1024,19 +876,14 @@ True True False - False True 0.5 True pub_btn1 - 5 - 6 + 2 5 - 6 - GTK_FILL - @@ -1046,18 +893,13 @@ True True False - False True 0.5 True - 1 - 2 + 0 6 - 7 - GTK_FILL - @@ -1067,19 +909,14 @@ True True False - False True 0.5 True gramps_btn1 - 5 - 6 + 2 6 - 7 - GTK_FILL - @@ -1089,160 +926,147 @@ True - 7 - + 0 + 0 + 4 True True + True False ● - 2 - 3 + 1 2 - 3 - True True + True False ● - 6 - 7 + 3 2 - 3 - True True + True False ● - 2 - 3 + 1 3 - 4 - True True + True False ● - 6 - 7 + 3 3 - 4 - True True + True False ● - 2 - 3 + 1 4 - 5 - True True + True False ● - 6 - 7 + 3 4 - 5 - True True + True False ● - 2 - 3 + 1 5 - 6 - True True + True False ● - 6 - 7 + 3 5 - 6 - True True + True False ● - 2 - 3 + 1 6 - 7 - True True + True False ● - 6 - 7 + 3 6 - 7 - + + + + + + False diff --git a/gramps/gui/glade/mergeevent.glade b/gramps/gui/glade/mergeevent.glade index af4833dd6..1d579869f 100644 --- a/gramps/gui/glade/mergeevent.glade +++ b/gramps/gui/glade/mergeevent.glade @@ -1,6 +1,7 @@ + - + False True @@ -24,7 +25,6 @@ True True False - False True @@ -41,7 +41,6 @@ True True False - False True @@ -58,7 +57,6 @@ True True False - False True @@ -76,9 +74,10 @@ - + True False + vertical True @@ -106,16 +105,16 @@ primary data for the merged event. - + True False + vertical False True True False - False 0.5 True @@ -139,7 +138,6 @@ primary data for the merged event. True True False - False 0.5 True handle_btn1 @@ -171,18 +169,17 @@ primary data for the merged event. True True - + True False + vertical - + True False 6 - 6 - 4 - 6 6 + 6 True @@ -193,8 +190,8 @@ primary data for the merged event. - GTK_FILL - + 0 + 0 @@ -208,9 +205,7 @@ primary data for the merged event. 2 - 3 - GTK_FILL - + 0 @@ -220,16 +215,13 @@ primary data for the merged event. True True False - False True 0.5 True + 0 1 - 2 - GTK_FILL - @@ -239,7 +231,6 @@ primary data for the merged event. True True False - False True 0.5 True @@ -247,11 +238,7 @@ primary data for the merged event. 2 - 3 1 - 2 - GTK_FILL - @@ -261,16 +248,13 @@ primary data for the merged event. True True False - False True 0.5 True + 0 2 - 3 - GTK_FILL - @@ -280,7 +264,6 @@ primary data for the merged event. True True False - False True 0.5 True @@ -288,11 +271,7 @@ primary data for the merged event. 2 - 3 2 - 3 - GTK_FILL - @@ -302,16 +281,13 @@ primary data for the merged event. True True False - False True 0.5 True + 0 3 - 4 - GTK_FILL - @@ -321,7 +297,6 @@ primary data for the merged event. True True False - False True 0.5 True @@ -329,11 +304,7 @@ primary data for the merged event. 2 - 3 3 - 4 - GTK_FILL - @@ -343,16 +314,13 @@ primary data for the merged event. True True False - False True 0.5 True + 0 4 - 5 - GTK_FILL - @@ -362,7 +330,6 @@ primary data for the merged event. True True False - False True 0.5 True @@ -370,11 +337,7 @@ primary data for the merged event. 2 - 3 4 - 5 - GTK_FILL - @@ -384,16 +347,13 @@ primary data for the merged event. True True False - False True 0.5 True + 0 5 - 6 - GTK_FILL - @@ -403,7 +363,6 @@ primary data for the merged event. True True False - False True 0.5 True @@ -411,159 +370,135 @@ primary data for the merged event. 2 - 3 5 - 6 - GTK_FILL - True True + True False 1 - 2 1 - 2 - True True + True False 3 - 4 1 - 2 - True True + True False 1 - 2 2 - 3 - True True + True False 3 - 4 2 - 3 - True True + True False 1 - 2 3 - 4 - True True + True False 3 - 4 3 - 4 - True True + True False 1 - 2 4 - 5 - True True + True False 3 - 4 4 - 5 - True True + True False 1 - 2 5 - 6 - - - - True True + True False 3 - 4 5 - 6 - + + + True diff --git a/gramps/gui/glade/mergefamily.glade b/gramps/gui/glade/mergefamily.glade index 4e1398a12..e26c628c1 100644 --- a/gramps/gui/glade/mergefamily.glade +++ b/gramps/gui/glade/mergefamily.glade @@ -1,6 +1,7 @@ + - + False True @@ -24,7 +25,6 @@ True True False - False True @@ -41,7 +41,6 @@ True True False - False True @@ -58,7 +57,6 @@ True True False - False True @@ -76,9 +74,10 @@ - + True False + vertical True @@ -107,9 +106,10 @@ primary data for the merged family. - + True False + vertical False @@ -117,7 +117,6 @@ primary data for the merged family. True False True - False 0.5 True @@ -142,7 +141,6 @@ primary data for the merged family. True False True - False 0.5 True handle_btn1 @@ -174,18 +172,245 @@ primary data for the merged family. True True - + True False + vertical - + True False 6 - 5 - 4 - 6 6 + 6 + + + Father: + False + True + True + False + True + 0.5 + True + + + 0 + 1 + + + + + Father: + False + True + True + False + True + 0.5 + True + father_btn1 + + + 2 + 1 + + + + + Mother: + False + True + True + False + True + 0.5 + True + + + 0 + 2 + + + + + Mother: + False + True + True + False + True + 0.5 + True + mother_btn1 + + + 2 + 2 + + + + + Relationship: + False + True + True + False + True + 0.5 + True + + + 0 + 3 + + + + + Relationship: + False + True + True + False + True + 0.5 + True + rel_btn1 + + + 2 + 3 + + + + + Gramps ID: + False + True + True + False + True + 0.5 + True + + + 0 + 4 + + + + + Gramps ID: + False + True + True + False + True + 0.5 + True + gramps_btn1 + + + 2 + 4 + + + + + True + True + True + False + + + 1 + 1 + + + + + True + True + True + False + + + 3 + 1 + + + + + True + True + True + False + + + 1 + 2 + + + + + True + True + True + False + + + 3 + 2 + + + + + True + True + True + False + + + 1 + 3 + + + + + True + True + True + False + + + 3 + 3 + + + + + True + True + True + False + + + 1 + 4 + + + + + True + True + True + False + + + 3 + 4 + + True @@ -196,8 +421,8 @@ primary data for the merged family. - GTK_FILL - + 0 + 0 @@ -211,290 +436,12 @@ primary data for the merged family. 2 - 3 - GTK_FILL - - - - - - Father: - False - True - True - False - False - True - 0.5 - True - - - 1 - 2 - GTK_FILL - - - - - - Father: - False - True - True - False - False - True - 0.5 - True - father_btn1 - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - Mother: - False - True - True - False - False - True - 0.5 - True - - - 2 - 3 - GTK_FILL - - - - - - Mother: - False - True - True - False - False - True - 0.5 - True - mother_btn1 - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - Relationship: - False - True - True - False - False - True - 0.5 - True - - - 3 - 4 - GTK_FILL - - - - - - Relationship: - False - True - True - False - False - True - 0.5 - True - rel_btn1 - - - 2 - 3 - 3 - 4 - GTK_FILL - - - - - - Gramps ID: - False - True - True - False - False - True - 0.5 - True - - - 4 - 5 - GTK_FILL - - - - - - Gramps ID: - False - True - True - False - False - True - 0.5 - True - gramps_btn1 - - - 2 - 3 - 4 - 5 - GTK_FILL - - - - - - True - True - False - - - 1 - 2 - 1 - 2 - - - - - - True - True - False - - - 3 - 4 - 1 - 2 - - - - - - True - True - False - - - 1 - 2 - 2 - 3 - - - - - - True - True - False - - - 3 - 4 - 2 - 3 - - - - - - True - True - False - - - 1 - 2 - 3 - 4 - - - - - - True - True - False - - - 3 - 4 - 3 - 4 - - - - - - True - True - False - - - 1 - 2 - 4 - 5 - + 0 - - - True - True - False - - - 3 - 4 - 4 - 5 - - - diff --git a/gramps/gui/glade/mergemedia.glade b/gramps/gui/glade/mergemedia.glade index a766eb71a..3290220aa 100644 --- a/gramps/gui/glade/mergemedia.glade +++ b/gramps/gui/glade/mergemedia.glade @@ -1,6 +1,7 @@ + - + False True @@ -24,7 +25,6 @@ True True False - False True @@ -41,7 +41,6 @@ True True False - False True @@ -58,7 +57,6 @@ True True False - False True @@ -76,9 +74,10 @@ - + True False + vertical True @@ -106,16 +105,16 @@ primary data for the merged object. - + True False + vertical False True True False - False 0.5 True @@ -139,7 +138,6 @@ primary data for the merged object. True True False - False 0.5 True handle_btn1 @@ -171,18 +169,17 @@ primary data for the merged object. True True - + True False + vertical - + True False 6 - 5 - 4 - 6 6 + 6 True @@ -193,8 +190,8 @@ primary data for the merged object. - GTK_FILL - + 0 + 0 @@ -208,9 +205,7 @@ primary data for the merged object. 2 - 3 - GTK_FILL - + 0 @@ -220,16 +215,13 @@ primary data for the merged object. True True False - False True 0.5 True + 0 1 - 2 - GTK_FILL - @@ -239,7 +231,6 @@ primary data for the merged object. True True False - False True 0.5 True @@ -247,11 +238,7 @@ primary data for the merged object. 2 - 3 1 - 2 - GTK_FILL - @@ -261,16 +248,13 @@ primary data for the merged object. True True False - False True 0.5 True + 0 2 - 3 - GTK_FILL - @@ -280,7 +264,6 @@ primary data for the merged object. True True False - False True 0.5 True @@ -288,11 +271,7 @@ primary data for the merged object. 2 - 3 2 - 3 - GTK_FILL - @@ -302,16 +281,13 @@ primary data for the merged object. True True False - False True 0.5 True + 0 3 - 4 - GTK_FILL - @@ -321,7 +297,6 @@ primary data for the merged object. True True False - False True 0.5 True @@ -329,11 +304,7 @@ primary data for the merged object. 2 - 3 3 - 4 - GTK_FILL - @@ -343,16 +314,13 @@ primary data for the merged object. True True False - False True 0.5 True + 0 4 - 5 - GTK_FILL - @@ -362,7 +330,6 @@ primary data for the merged object. True True False - False True 0.5 True @@ -370,131 +337,111 @@ primary data for the merged object. 2 - 3 4 - 5 - GTK_FILL - True True + True False 1 - 2 1 - 2 - True True + True False 3 - 4 1 - 2 - True True + True False 1 - 2 2 - 3 - True True + True False 3 - 4 2 - 3 - True True + True False 1 - 2 3 - 4 - True True + True False 3 - 4 3 - 4 - True True + True False 1 - 2 4 - 5 - - - - True True + True False 3 - 4 4 - 5 - + + + True diff --git a/gramps/gui/glade/mergenote.glade b/gramps/gui/glade/mergenote.glade index e85271884..501f8f0bd 100644 --- a/gramps/gui/glade/mergenote.glade +++ b/gramps/gui/glade/mergenote.glade @@ -1,6 +1,7 @@ + - + False True @@ -24,7 +25,6 @@ True True False - False True @@ -41,7 +41,6 @@ True True False - False True @@ -58,7 +57,6 @@ True True False - False True @@ -76,9 +74,10 @@ - + True False + vertical True @@ -106,16 +105,16 @@ primary data for the merged note. - + True False + vertical False True True False - False 0.5 True @@ -139,7 +138,6 @@ primary data for the merged note. True True False - False 0.5 True handle_btn1 @@ -171,18 +169,17 @@ primary data for the merged note. True True - + True False + vertical - + True False 6 - 5 - 4 - 6 6 + 6 True @@ -193,8 +190,8 @@ primary data for the merged note. - GTK_FILL - + 0 + 0 @@ -208,9 +205,7 @@ primary data for the merged note. 2 - 3 - GTK_FILL - + 0 @@ -220,16 +215,13 @@ primary data for the merged note. True True False - False True 0.5 True + 0 1 - 2 - GTK_FILL - @@ -239,7 +231,6 @@ primary data for the merged note. True True False - False True 0.5 True @@ -247,11 +238,7 @@ primary data for the merged note. 2 - 3 1 - 2 - GTK_FILL - @@ -261,16 +248,13 @@ primary data for the merged note. True True False - False True 0.5 True + 0 2 - 3 - GTK_FILL - @@ -280,7 +264,6 @@ primary data for the merged note. True True False - False True 0.5 True @@ -288,11 +271,7 @@ primary data for the merged note. 2 - 3 2 - 3 - GTK_FILL - @@ -302,16 +281,13 @@ primary data for the merged note. True True False - False True 0.5 True + 0 3 - 4 - GTK_FILL - @@ -321,7 +297,6 @@ primary data for the merged note. True True False - False True 0.5 True @@ -329,11 +304,7 @@ primary data for the merged note. 2 - 3 3 - 4 - GTK_FILL - @@ -343,16 +314,13 @@ primary data for the merged note. True True False - False True 0.5 True + 0 4 - 5 - GTK_FILL - @@ -362,7 +330,6 @@ primary data for the merged note. True True False - False True 0.5 True @@ -370,17 +337,15 @@ primary data for the merged note. 2 - 3 4 - 5 - GTK_FILL - True True + True + True in @@ -392,16 +357,15 @@ primary data for the merged note. 1 - 2 1 - 2 - True True + True + True in @@ -413,102 +377,87 @@ primary data for the merged note. 3 - 4 1 - 2 - True True + True False 1 - 2 2 - 3 - True True + True False 3 - 4 2 - 3 - True True + True False 1 - 2 3 - 4 - True True + True False 3 - 4 3 - 4 - True True + True False 1 - 2 4 - 5 - - - - True True + True False 3 - 4 4 - 5 - + + + True diff --git a/gramps/gui/glade/mergeperson.glade b/gramps/gui/glade/mergeperson.glade index 1c73a3a81..0ee703e87 100644 --- a/gramps/gui/glade/mergeperson.glade +++ b/gramps/gui/glade/mergeperson.glade @@ -1,6 +1,7 @@ + - + False True @@ -25,7 +26,6 @@ True True False - False True @@ -42,7 +42,6 @@ True True False - False True @@ -59,7 +58,6 @@ True True False - False True @@ -77,9 +75,10 @@ - + True False + vertical 200 @@ -112,10 +111,11 @@ primary data for the merged person. - + True False True + vertical False @@ -123,7 +123,6 @@ primary data for the merged person. True False True - False 0.5 True @@ -149,7 +148,6 @@ primary data for the merged person. True False True - False 0.5 True handle_btn1 @@ -182,18 +180,17 @@ primary data for the merged person. True True - + True False + vertical - + True False 6 - 4 - 4 - 6 6 + 6 True @@ -204,8 +201,8 @@ primary data for the merged person. - - + 0 + 0 @@ -219,9 +216,7 @@ primary data for the merged person. 2 - 3 - - + 0 @@ -231,16 +226,13 @@ primary data for the merged person. True True False - False True 0.5 True + 0 1 - 2 - GTK_FILL - @@ -250,7 +242,6 @@ primary data for the merged person. True True False - False True 0.5 True @@ -258,11 +249,7 @@ primary data for the merged person. 2 - 3 1 - 2 - GTK_FILL - @@ -272,16 +259,13 @@ primary data for the merged person. True True False - False True 0.5 True + 0 2 - 3 - GTK_FILL - @@ -291,7 +275,6 @@ primary data for the merged person. True True False - False True 0.5 True @@ -299,11 +282,7 @@ primary data for the merged person. 2 - 3 2 - 3 - GTK_FILL - @@ -313,16 +292,13 @@ primary data for the merged person. True True False - False True 0.5 True + 0 3 - 4 - GTK_FILL - @@ -332,7 +308,6 @@ primary data for the merged person. True True False - False True 0.5 True @@ -340,103 +315,87 @@ primary data for the merged person. 2 - 3 3 - 4 - GTK_FILL - True True + True False 1 - 2 1 - 2 - True True + True False 3 - 4 1 - 2 - True True + True False 1 - 2 2 - 3 - True True + True False 3 - 4 2 - 3 - True True + True False 1 - 2 3 - 4 - - - - True True + True False 3 - 4 3 - 4 - + + + False @@ -480,7 +439,7 @@ primary data for the merged person. True True - + True False 5 @@ -488,6 +447,8 @@ primary data for the merged person. True True + True + True in @@ -511,6 +472,8 @@ primary data for the merged person. True True + True + True in diff --git a/gramps/gui/glade/mergeplace.glade b/gramps/gui/glade/mergeplace.glade index 95df28901..09ca7715f 100644 --- a/gramps/gui/glade/mergeplace.glade +++ b/gramps/gui/glade/mergeplace.glade @@ -1,6 +1,7 @@ + - + False True @@ -70,9 +71,10 @@ - + True False + vertical True @@ -100,9 +102,10 @@ primary data for the merged place. - + True False + vertical True @@ -161,18 +164,17 @@ primary data for the merged place. True True - + True False + vertical - + True False 6 - 8 - 4 - 6 6 + 6 True @@ -183,8 +185,8 @@ primary data for the merged place. - GTK_FILL - + 0 + 0 @@ -198,9 +200,7 @@ primary data for the merged place. 2 - 3 - GTK_FILL - + 0 @@ -214,10 +214,8 @@ primary data for the merged place. True + 0 1 - 2 - GTK_FILL - @@ -233,11 +231,7 @@ primary data for the merged place. 2 - 3 1 - 2 - GTK_FILL - @@ -251,10 +245,8 @@ primary data for the merged place. True + 0 5 - 6 - GTK_FILL - @@ -270,11 +262,7 @@ primary data for the merged place. 2 - 3 5 - 6 - GTK_FILL - @@ -288,10 +276,8 @@ primary data for the merged place. True + 0 6 - 7 - GTK_FILL - @@ -307,11 +293,7 @@ primary data for the merged place. 2 - 3 6 - 7 - GTK_FILL - @@ -325,10 +307,8 @@ primary data for the merged place. True + 0 7 - 8 - GTK_FILL - @@ -344,131 +324,105 @@ primary data for the merged place. 2 - 3 7 - 8 - GTK_FILL - True True + True False 1 - 2 1 - 2 - True True + True False 3 - 4 1 - 2 - True True + True False 1 - 2 5 - 6 - True True + True False 3 - 4 5 - 6 - True True + True False 1 - 2 6 - 7 - True True + True False 3 - 4 6 - 7 - True True + True False 1 - 2 7 - 8 - - - - True True + True False 3 - 4 7 - 8 - - - - place|Name: @@ -482,10 +436,8 @@ primary data for the merged place. True + 0 2 - 3 - GTK_FILL - @@ -502,43 +454,33 @@ primary data for the merged place. 2 - 3 2 - 3 - GTK_FILL - True True + True False • - True 1 - 2 2 - 3 - True True + True False • - True 3 - 4 2 - 3 - @@ -554,10 +496,8 @@ primary data for the merged place. True + 0 3 - 4 - GTK_FILL - @@ -574,43 +514,33 @@ primary data for the merged place. 2 - 3 3 - 4 - GTK_FILL - True True + True False • - True 1 - 2 3 - 4 - True True + True False • - True 3 - 4 3 - 4 - @@ -626,10 +556,8 @@ primary data for the merged place. True + 0 4 - 5 - GTK_FILL - @@ -645,45 +573,41 @@ primary data for the merged place. 2 - 3 4 - 5 - GTK_FILL - True True + True False • - True 1 - 2 4 - 5 - True True + True False • - True 3 - 4 4 - 5 - + + + + + + True diff --git a/gramps/gui/glade/mergerepository.glade b/gramps/gui/glade/mergerepository.glade index 52abe4cc5..e7d7ff600 100644 --- a/gramps/gui/glade/mergerepository.glade +++ b/gramps/gui/glade/mergerepository.glade @@ -1,6 +1,7 @@ + - + False True @@ -24,7 +25,6 @@ True True False - False True @@ -41,7 +41,6 @@ True True False - False True @@ -58,7 +57,6 @@ True True False - False True @@ -76,9 +74,10 @@ - + True False + vertical True @@ -106,16 +105,16 @@ primary data for the merged repository. - + True False + vertical False True True False - False 0.5 True @@ -139,7 +138,6 @@ primary data for the merged repository. True True False - False 0.5 True handle_btn1 @@ -171,18 +169,17 @@ primary data for the merged repository. True True - + True False + vertical - + True False 6 - 4 - 4 - 6 6 + 6 True @@ -193,8 +190,8 @@ primary data for the merged repository. - GTK_FILL - + 0 + 0 @@ -208,9 +205,7 @@ primary data for the merged repository. 2 - 3 - GTK_FILL - + 0 @@ -220,16 +215,13 @@ primary data for the merged repository. True True False - False True 0.5 True + 0 1 - 2 - GTK_FILL - @@ -239,7 +231,6 @@ primary data for the merged repository. True True False - False True 0.5 True @@ -247,11 +238,7 @@ primary data for the merged repository. 2 - 3 1 - 2 - GTK_FILL - @@ -261,16 +248,13 @@ primary data for the merged repository. True True False - False True 0.5 True + 0 2 - 3 - GTK_FILL - @@ -280,7 +264,6 @@ primary data for the merged repository. True True False - False True 0.5 True @@ -288,11 +271,7 @@ primary data for the merged repository. 2 - 3 2 - 3 - GTK_FILL - @@ -302,16 +281,13 @@ primary data for the merged repository. True True False - False True 0.5 True + 0 3 - 4 - GTK_FILL - @@ -321,7 +297,6 @@ primary data for the merged repository. True True False - False True 0.5 True @@ -329,103 +304,87 @@ primary data for the merged repository. 2 - 3 3 - 4 - GTK_FILL - True True + True False 1 - 2 1 - 2 - True True + True False 3 - 4 1 - 2 - True True + True False 1 - 2 2 - 3 - True True + True False 3 - 4 2 - 3 - True True + True False 1 - 2 3 - 4 - - - - True True + True False 3 - 4 3 - 4 - + + + True diff --git a/gramps/gui/glade/mergesource.glade b/gramps/gui/glade/mergesource.glade index 20c34c219..b4ecea0cb 100644 --- a/gramps/gui/glade/mergesource.glade +++ b/gramps/gui/glade/mergesource.glade @@ -1,6 +1,7 @@ + - + False True @@ -24,7 +25,6 @@ True True False - False True @@ -41,7 +41,6 @@ True True False - False True @@ -58,7 +57,6 @@ True True False - False True @@ -76,9 +74,10 @@ - + True False + vertical True @@ -106,16 +105,16 @@ primary data for the merged source. - + True False + vertical False True True False - False 0.5 True @@ -139,7 +138,6 @@ primary data for the merged source. True True False - False 0.5 True handle_btn1 @@ -171,18 +169,17 @@ primary data for the merged source. True True - + True False + vertical - + True False 6 - 6 - 4 - 6 6 + 6 True @@ -193,8 +190,8 @@ primary data for the merged source. - GTK_FILL - + 0 + 0 @@ -208,9 +205,7 @@ primary data for the merged source. 2 - 3 - GTK_FILL - + 0 @@ -220,16 +215,13 @@ primary data for the merged source. True True False - False True 0.5 True + 0 1 - 2 - GTK_FILL - @@ -239,7 +231,6 @@ primary data for the merged source. True True False - False True 0.5 True @@ -247,11 +238,7 @@ primary data for the merged source. 2 - 3 1 - 2 - GTK_FILL - @@ -261,16 +248,13 @@ primary data for the merged source. True True False - False True 0.5 True + 0 2 - 3 - GTK_FILL - @@ -280,7 +264,6 @@ primary data for the merged source. True True False - False True 0.5 True @@ -288,11 +271,7 @@ primary data for the merged source. 2 - 3 2 - 3 - GTK_FILL - @@ -302,16 +281,13 @@ primary data for the merged source. True True False - False True 0.5 True + 0 3 - 4 - GTK_FILL - @@ -321,7 +297,6 @@ primary data for the merged source. True True False - False True 0.5 True @@ -329,11 +304,7 @@ primary data for the merged source. 2 - 3 3 - 4 - GTK_FILL - @@ -343,16 +314,13 @@ primary data for the merged source. True True False - False True 0.5 True + 0 4 - 5 - GTK_FILL - @@ -362,7 +330,6 @@ primary data for the merged source. True True False - False True 0.5 True @@ -370,11 +337,7 @@ primary data for the merged source. 2 - 3 4 - 5 - GTK_FILL - @@ -384,16 +347,13 @@ primary data for the merged source. True True False - False True 0.5 True + 0 5 - 6 - GTK_FILL - @@ -403,7 +363,6 @@ primary data for the merged source. True True False - False True 0.5 True @@ -411,159 +370,135 @@ primary data for the merged source. 2 - 3 5 - 6 - GTK_FILL - True True + True False 1 - 2 1 - 2 - True True + True False 3 - 4 1 - 2 - True True + True False 1 - 2 2 - 3 - True True + True False 3 - 4 2 - 3 - True True + True False 1 - 2 3 - 4 - True True + True False 3 - 4 3 - 4 - True True + True False 1 - 2 4 - 5 - True True + True False 3 - 4 4 - 5 - True True + True False 1 - 2 5 - 6 - - - - True True + True False 3 - 4 5 - 6 - + + + True diff --git a/gramps/gui/glade/papermenu.glade b/gramps/gui/glade/papermenu.glade index 6ec066cdb..3d013c2fd 100644 --- a/gramps/gui/glade/papermenu.glade +++ b/gramps/gui/glade/papermenu.glade @@ -1,11 +1,13 @@ + - + + False Paper Settings - + True False 6 @@ -14,9 +16,10 @@ - + True False + vertical True @@ -36,20 +39,12 @@ False 12 - + True False 6 - 4 - 3 - 6 6 - - - - - - + 6 True @@ -58,8 +53,8 @@ Size: - GTK_FILL - + 0 + 0 @@ -72,10 +67,8 @@ pwidth + 0 1 - 2 - GTK_FILL - @@ -88,10 +81,8 @@ pheight + 0 2 - 3 - GTK_FILL - @@ -102,10 +93,8 @@ Orientation: + 0 3 - 4 - GTK_FILL - @@ -113,14 +102,12 @@ True False True + True • 1 - 2 2 - 3 - @@ -133,11 +120,7 @@ 2 - 3 1 - 2 - GTK_FILL - @@ -150,34 +133,34 @@ 2 - 3 2 - 3 - GTK_FILL - - - - True False True + True • 1 - 2 1 - 2 - + + + + + + + + + @@ -195,9 +178,10 @@ - + True False + vertical True @@ -217,14 +201,12 @@ False 12 - + True False 6 - 4 - 3 - 6 6 + 6 True @@ -235,8 +217,8 @@ lmargin - GTK_FILL - + 0 + 0 @@ -249,10 +231,8 @@ rmargin + 0 1 - 2 - GTK_FILL - @@ -265,10 +245,8 @@ tmargin + 0 2 - 3 - GTK_FILL - @@ -281,10 +259,8 @@ bmargin + 0 3 - 4 - GTK_FILL - @@ -297,9 +273,7 @@ 2 - 3 - GTK_FILL - + 0 @@ -312,11 +286,7 @@ 2 - 3 2 - 3 - GTK_FILL - @@ -329,69 +299,59 @@ 2 - 3 3 - 4 - GTK_FILL - True True + True • 2.54 1 - 2 - + 0 True True + True • 2.54 1 - 2 1 - 2 - True True + True • 2.54 1 - 2 2 - 3 - True True + True • 2.54 1 - 2 3 - 4 - @@ -404,11 +364,7 @@ 2 - 3 1 - 2 - GTK_FILL - @@ -428,9 +384,10 @@ - + True False + vertical @@ -441,7 +398,6 @@ True True False - False True 0.5 True diff --git a/gramps/gui/glade/plugins.glade b/gramps/gui/glade/plugins.glade index f6d52ab25..f2a5f829f 100644 --- a/gramps/gui/glade/plugins.glade +++ b/gramps/gui/glade/plugins.glade @@ -1,6 +1,7 @@ + - + True False @@ -8,11 +9,12 @@ 400 - + True False + vertical - + True False 6 @@ -25,7 +27,6 @@ True True False - False True @@ -43,14 +44,13 @@ True False Perform selected action - False True + Run - False @@ -68,7 +68,7 @@ - + True True @@ -94,11 +94,12 @@ - + True False + vertical - + True False @@ -143,23 +144,21 @@ - + False - 3 - 2 True False 1 - 3 + 6 3 Status: center - GTK_FILL - + 0 + 0 @@ -171,8 +170,7 @@ 1 - 2 - + 0 @@ -180,15 +178,13 @@ True False 1 - 3 + 6 3 Author: + 0 1 - 2 - GTK_FILL - @@ -196,15 +192,13 @@ True False 1 - 3 + 6 3 Author's email: + 0 2 - 3 - GTK_FILL - @@ -216,11 +210,7 @@ 1 - 2 1 - 2 - GTK_FILL - @@ -232,11 +222,7 @@ 1 - 2 2 - 3 - GTK_FILL - diff --git a/gramps/gui/glade/reorder.glade b/gramps/gui/glade/reorder.glade index 0468ff3dc..bfbbf36df 100644 --- a/gramps/gui/glade/reorder.glade +++ b/gramps/gui/glade/reorder.glade @@ -1,6 +1,7 @@ + - + True False @@ -12,6 +13,7 @@ True False + vertical True @@ -25,7 +27,6 @@ True True True - False True @@ -42,7 +43,6 @@ True True True - False True @@ -60,28 +60,11 @@ - + True False - 5 - 3 - 6 6 - - - - - - - - - - - - - - - + 6 True @@ -93,26 +76,21 @@ - 3 - + 0 + 0 - + True False + vertical False True True True - False - - - Move parent up - - True @@ -125,6 +103,11 @@ + + + Move parent up + + False @@ -138,12 +121,6 @@ True True True - False - - - Move parent down - - True @@ -156,6 +133,11 @@ + + + Move parent down + + False @@ -168,18 +150,17 @@ - 2 - 3 + 1 1 - 2 - GTK_FILL - GTK_FILL True True + 6 + True + True in @@ -192,10 +173,8 @@ - 1 - 2 + 0 1 - 2 @@ -209,17 +188,17 @@ - 3 - 3 - 4 - GTK_FILL - + 0 + 2 True True + 6 + True + True in @@ -232,29 +211,21 @@ - 1 - 2 - 4 - 5 - GTK_FILL + 0 + 3 - + True False + vertical False True True True - False - - - Move family up - - True @@ -267,6 +238,11 @@ + + + Move family up + + False @@ -280,12 +256,6 @@ True True True - False - - - Move family down - - True @@ -298,6 +268,11 @@ + + + Move family down + + False @@ -310,14 +285,16 @@ - 2 - 3 - 4 - 5 - GTK_FILL - GTK_FILL + 1 + 3 + + + + + + False diff --git a/gramps/gui/glade/rule.glade b/gramps/gui/glade/rule.glade index 8075fed3c..f74b21b67 100644 --- a/gramps/gui/glade/rule.glade +++ b/gramps/gui/glade/rule.glade @@ -1,8 +1,8 @@ - + - + False 400 @@ -64,9 +64,10 @@ - + True False + vertical True @@ -81,7 +82,7 @@ - + True False 6 @@ -108,9 +109,10 @@ - + True False + vertical 6 @@ -372,9 +374,10 @@ - + True False + vertical True @@ -389,42 +392,17 @@ - + True False 12 - 8 - 4 - 12 6 + 12 - - - - - - - - - - - - - - - - - - - - - - - - - + True False + vertical 6 @@ -532,12 +510,8 @@ - 3 - 4 + 2 4 - 5 - GTK_SHRINK - GTK_FILL @@ -551,11 +525,8 @@ - 4 + 0 5 - 6 - GTK_FILL - @@ -569,11 +540,8 @@ - 4 + 0 3 - 4 - GTK_FILL - @@ -587,9 +555,8 @@ - 4 - GTK_FILL - + 0 + 0 @@ -597,28 +564,28 @@ True False 0 + 6 Co_mment: True comment - 1 - 2 + 0 2 - 3 - GTK_FILL - True False + 6 in True True + True + True @@ -626,28 +593,9 @@ - 1 - 3 + 0 4 - 5 - - - - - True - False - 0 - _Name: - True - filter_name - - - 1 - 2 - 1 - 2 - GTK_FILL - + 2 @@ -657,23 +605,22 @@ True True False + 6 True 0.5 True - 1 - 4 + 0 7 - 8 - GTK_FILL - + 2 True False + 6 model1 @@ -683,42 +630,79 @@ - 1 - 3 + 0 6 - 7 - GTK_FILL - - - - - - True - True - - - - 2 - 3 - 1 - 2 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - + 2 True True + True - 2 - 3 + 1 2 - 3 - + + + True + False + 0 + 6 + _Name: + True + filter_name + + + 0 + 1 + + + + + True + True + True + + + + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True @@ -817,10 +801,11 @@ - + True False 6 + vertical True @@ -835,7 +820,7 @@ - + True True 6 @@ -863,9 +848,11 @@ - + True False + True + vertical 6 diff --git a/gramps/gui/glade/styleeditor.glade b/gramps/gui/glade/styleeditor.glade index 28d228e79..bfd19f3bd 100644 --- a/gramps/gui/glade/styleeditor.glade +++ b/gramps/gui/glade/styleeditor.glade @@ -1,8 +1,8 @@ - + - + 100 0.20000000000000001 @@ -125,9 +125,10 @@ - + True False + vertical True @@ -145,7 +146,7 @@ - + True False @@ -195,7 +196,7 @@ - + True True 12 @@ -227,10 +228,11 @@ True False - + True False 12 + vertical 12 @@ -271,38 +273,12 @@ - + True False 12 - 11 - 4 - 12 6 - - - - - - - - - - - - - - - - - - - - - - - - + 12 True @@ -317,9 +293,8 @@ - 4 - GTK_FILL - + 0 + 0 @@ -329,17 +304,14 @@ True True False + 12 True 0.5 True - 1 - 4 + 0 1 - 2 - GTK_FILL - @@ -349,18 +321,15 @@ True True False + 12 True 0.5 True roman - 1 - 4 + 0 2 - 3 - GTK_FILL - @@ -376,28 +345,22 @@ - 4 + 0 3 - 4 - GTK_FILL - True True + 12 adjustment7 1 True - 1 - 3 + 0 4 - 5 - GTK_FILL - @@ -409,12 +372,8 @@ center - 3 - 4 + 1 4 - 5 - GTK_FILL - @@ -430,11 +389,8 @@ - 4 + 0 5 - 6 - GTK_FILL - @@ -451,11 +407,8 @@ - 4 + 0 7 - 8 - GTK_FILL - GTK_FILL @@ -465,17 +418,14 @@ True True False + 12 True 0.5 True - 1 - 4 + 0 8 - 9 - GTK_FILL - @@ -485,17 +435,14 @@ True True False + 12 True 0.5 True - 1 - 4 + 0 9 - 10 - GTK_FILL - @@ -505,17 +452,14 @@ True True False + 12 True 0.5 True - 1 - 4 + 0 10 - 11 - GTK_FILL - @@ -526,12 +470,8 @@ True - 2 - 3 + 1 6 - 7 - GTK_FILL - @@ -540,16 +480,40 @@ True True False + 12 - 1 - 2 + 0 6 - 7 - GTK_FILL - + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 @@ -570,47 +534,12 @@ - + True False 12 - 14 - 5 - 12 6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 12 _Left @@ -618,17 +547,14 @@ True True False + 12 True 0.5 True - 1 - 2 + 0 1 - 2 - GTK_FILL - @@ -644,12 +570,8 @@ lalign - 2 - 3 + 1 1 - 2 - GTK_FILL - @@ -665,12 +587,8 @@ lalign - 4 - 5 + 2 1 - 2 - GTK_FILL - @@ -687,11 +605,7 @@ 3 - 4 1 - 2 - GTK_FILL - @@ -709,9 +623,8 @@ - 5 - GTK_FILL - GTK_FILL + 0 + 0 @@ -727,17 +640,15 @@ - 5 + 0 2 - 3 - GTK_FILL - True False + 12 0 First li_ne: True @@ -745,12 +656,8 @@ indent - 1 - 2 + 0 7 - 8 - GTK_FILL - @@ -762,12 +669,8 @@ center - 4 - 5 + 2 5 - 6 - GTK_FILL - @@ -779,12 +682,8 @@ center - 4 - 5 + 2 6 - 7 - GTK_FILL - @@ -796,18 +695,15 @@ center - 4 - 5 + 2 7 - 8 - GTK_FILL - True False + 12 0 R_ight: True @@ -815,18 +711,15 @@ rmargin - 1 - 2 + 0 6 - 7 - GTK_FILL - True False + 12 0 L_eft: True @@ -834,12 +727,8 @@ lmargin - 1 - 2 + 0 5 - 6 - GTK_FILL - @@ -856,17 +745,15 @@ - 5 + 0 8 - 9 - GTK_FILL - True False + 12 0 Abo_ve: True @@ -874,18 +761,15 @@ tmargin - 1 - 2 + 0 9 - 10 - GTK_FILL - True False + 12 0 Belo_w: True @@ -893,12 +777,8 @@ bmargin - 1 - 2 + 0 10 - 11 - GTK_FILL - @@ -910,12 +790,8 @@ center - 4 - 5 + 2 9 - 10 - GTK_FILL - @@ -927,12 +803,8 @@ center - 4 - 5 + 2 10 - 11 - GTK_FILL - @@ -949,11 +821,8 @@ - 5 + 0 11 - 12 - GTK_FILL - @@ -966,11 +835,8 @@ True - 2 - 4 + 1 6 - 7 - @@ -983,11 +849,8 @@ True - 2 - 4 + 1 7 - 8 - @@ -1000,11 +863,8 @@ True - 2 - 4 + 1 5 - 6 - @@ -1017,11 +877,8 @@ True - 2 - 4 + 1 9 - 10 - @@ -1034,11 +891,8 @@ True - 2 - 4 + 1 10 - 11 - @@ -1048,17 +902,14 @@ True True False + 12 True 0.5 True - 1 - 2 + 0 13 - 14 - GTK_FILL - @@ -1073,12 +924,8 @@ True - 2 - 3 + 1 13 - 14 - GTK_FILL - @@ -1093,18 +940,15 @@ True - 3 - 4 + 2 13 - 14 - GTK_FILL - True False + 12 0 _Padding: True @@ -1112,12 +956,8 @@ pad - 1 - 2 + 0 12 - 13 - GTK_FILL - @@ -1130,11 +970,8 @@ True - 2 - 4 + 1 12 - 13 - @@ -1146,12 +983,8 @@ center - 4 - 5 + 2 12 - 13 - GTK_FILL - @@ -1166,12 +999,8 @@ True - 4 - 5 + 3 13 - 14 - GTK_FILL - @@ -1182,12 +1011,8 @@ True - 2 - 3 + 1 3 - 4 - GTK_FILL - @@ -1201,11 +1026,8 @@ - 5 + 0 4 - 5 - GTK_FILL - @@ -1214,16 +1036,82 @@ True True False + 12 - 1 - 2 + 0 3 - 4 - GTK_FILL - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 @@ -1244,47 +1132,12 @@ - + True False 12 - 6 - 4 - 12 6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 12 True @@ -1296,9 +1149,8 @@ - 4 - GTK_FILL - + 0 + 0 @@ -1312,46 +1164,37 @@ - 4 + 0 2 - 3 - GTK_FILL - True False + 12 vertical - 1 - 4 + 0 3 - 4 - GTK_FILL - True True + 12 etched-out adjustment8 True - 1 - 2 + 0 1 - 2 - GTK_FILL - @@ -1363,14 +1206,19 @@ center - 2 - 3 + 1 1 - 2 - GTK_FILL - + + + + + + + + + 3 @@ -1413,8 +1261,7 @@ 0 0 - 5 - 1 + 3 @@ -1427,23 +1274,20 @@ True - 2 + 1 2 - 1 - 1 True False + 12 Padding: - 1 + 0 2 - 1 - 1 @@ -1453,10 +1297,8 @@ cm - 3 + 2 2 - 1 - 1 @@ -1470,6 +1312,7 @@ True True False + 12 0 True @@ -1526,21 +1369,11 @@ - 1 + 0 1 - 4 - 1 + 3 - - - - - - - - - 4 @@ -1582,8 +1415,7 @@ 0 0 - 4 - 1 + 3 @@ -1603,64 +1435,59 @@ 0 3 - 4 - 1 + 3 True False + 12 0 Style: - 1 + 0 1 - 1 - 1 True False + 12 0 Width: - 1 + 0 2 - 1 - 1 True False + 12 0 Line: - 1 + 0 4 - 1 - 1 True False + 12 0 Fill: - 1 + 0 5 - 1 - 1 @@ -1680,8 +1507,7 @@ 0 6 - 4 - 1 + 3 @@ -1691,10 +1517,8 @@ True - 2 + 1 4 - 1 - 1 @@ -1704,10 +1528,8 @@ True - 2 + 1 5 - 1 - 1 @@ -1717,10 +1539,8 @@ 0 - 3 + 2 4 - 1 - 1 @@ -1730,10 +1550,8 @@ 0 - 3 + 2 5 - 1 - 1 @@ -1746,10 +1564,8 @@ 1 - 2 + 1 2 - 1 - 1 @@ -1760,10 +1576,8 @@ pt - 3 + 2 2 - 1 - 1 @@ -1772,24 +1586,21 @@ False - 2 + 1 1 - 1 - 1 True False + 12 0 Spacing: - 1 + 0 8 - 1 - 1 @@ -1801,10 +1612,8 @@ True - 2 + 1 8 - 1 - 1 @@ -1817,10 +1626,8 @@ True - 2 + 1 7 - 1 - 1 @@ -1831,10 +1638,8 @@ cm - 3 + 2 8 - 1 - 1 @@ -1846,24 +1651,6 @@ - - - - - - - - - - - - - - - - - - 5 @@ -1966,9 +1753,10 @@ - + True False + vertical True @@ -1984,7 +1772,7 @@ - + True False 6 @@ -2012,9 +1800,10 @@ - + True False + vertical 10 start diff --git a/gramps/gui/glade/tipofday.glade b/gramps/gui/glade/tipofday.glade index 82a2737e5..7d068b994 100644 --- a/gramps/gui/glade/tipofday.glade +++ b/gramps/gui/glade/tipofday.glade @@ -1,5 +1,5 @@ - + @@ -11,9 +11,10 @@ window1 center - + True False + vertical True @@ -36,7 +37,6 @@ 0 2 2 - 1 @@ -51,7 +51,6 @@ 0 0 2 - 1 @@ -70,8 +69,6 @@ 1 1 - 1 - 1 @@ -86,8 +83,6 @@ 0 1 - 1 - 1 @@ -98,7 +93,7 @@ - + True False end diff --git a/gramps/gui/glade/updateaddons.glade b/gramps/gui/glade/updateaddons.glade index e584b530b..65068e671 100644 --- a/gramps/gui/glade/updateaddons.glade +++ b/gramps/gui/glade/updateaddons.glade @@ -1,6 +1,7 @@ + - + False 5 @@ -27,7 +28,6 @@ True True True - False True @@ -44,7 +44,6 @@ True True True - False True @@ -63,9 +62,10 @@ - + True False + vertical True @@ -97,7 +97,7 @@ - + True False start @@ -108,7 +108,6 @@ True True True - False True @@ -124,7 +123,6 @@ True True True - False True diff --git a/gramps/gui/plug/report/_papermenu.py b/gramps/gui/plug/report/_papermenu.py index 8f90d4e51..3a0a9f167 100644 --- a/gramps/gui/plug/report/_papermenu.py +++ b/gramps/gui/plug/report/_papermenu.py @@ -138,7 +138,7 @@ class PaperFrame(Gtk.HBox): GObject.GObject.__init__(self) glade_xml = Glade() - self.paper_table = glade_xml.get_object('paper_table') + self.paper_grid = glade_xml.get_object('paper_grid') # get all the widgets @@ -155,11 +155,9 @@ class PaperFrame(Gtk.HBox): self.metric.set_active(default_metric) # connect all widgets - format_table = glade_xml.get_object('format_table') - format_table.attach(self.papersize_menu, 1, 3, 0, 1, - yoptions=Gtk.AttachOptions.SHRINK) - format_table.attach(self.orientation_menu, 1, 3, 3, 4, - yoptions=Gtk.AttachOptions.SHRINK) + format_grid = glade_xml.get_object('format_grid') + format_grid.attach(self.papersize_menu, 1, 0, 1, 1) + format_grid.attach(self.orientation_menu, 1, 3, 1, 1) # connect signals self.papersize_menu.connect('changed',self.size_changed) @@ -176,8 +174,8 @@ class PaperFrame(Gtk.HBox): self.tmargin.set_text("%.2f" % margins[2]) self.bmargin.set_text("%.2f" % margins[3]) - self.paper_table.show_all() - self.paper_table.reparent(self) + self.paper_grid.show_all() + self.paper_grid.reparent(self) self.units_changed(self.metric) self.size_changed(None)