diff --git a/gramps/gui/glade/dbman.glade b/gramps/gui/glade/dbman.glade index f1ed43581..a7931aa78 100644 --- a/gramps/gui/glade/dbman.glade +++ b/gramps/gui/glade/dbman.glade @@ -114,6 +114,7 @@ True False + 6 end @@ -123,43 +124,35 @@ True False - + True False - 0 - 0 - 2 + center + 2 - + True False - 2 - - - True - False - gtk-close - - - False - False - 0 - - - - - True - False - _Close Window - True - - - False - False - 1 - - + gtk-close + + False + False + 0 + + + + + True + False + _Close Window + True + + + False + False + 1 + @@ -178,42 +171,35 @@ True False - + True False - 0 - 0 + center + 2 - + True False - 2 - - - True - False - gtk-apply - - - False - False - 0 - - - - - True - False - _Load Family Tree - True - - - False - False - 1 - - + gtk-apply + + False + False + 0 + + + + + True + False + _Load Family Tree + True + + + False + False + 1 + @@ -233,53 +219,29 @@ - + True False - vertical - 6 - + True False + vertical - + True - False - vertical + True + in - + True True - in - - - True - True - - - - + True + True + + - - True - True - 0 - - - - - True - False - center - - - False - False - 6 - 1 - @@ -289,130 +251,14 @@ - + True False - vertical - - - True - False - 12 - - - True - False - vertical - 6 - start - - - gtk-new - False - True - True - True - False - True - - - False - False - 0 - - - - - gtk-copy - True - True - True - True - True - - - False - False - 1 - - - - - gtk-delete - False - True - True - True - False - True - - - False - False - 2 - - - - - _Rename - False - True - True - True - False - True - - - False - False - 3 - - - - - Re_pair - False - True - True - True - False - True - - - False - False - 4 - - - - - _Archive - False - True - True - True - False - True - - - False - False - 5 - - - - - - - True - True - 0 - - + center False - True + False 6 1 @@ -424,9 +270,120 @@ 0 + + + True + False + 12 + immediate + vertical + 6 + start + + + gtk-new + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-copy + True + True + True + True + True + + + False + False + 1 + + + + + gtk-delete + False + True + True + True + False + True + + + False + False + 2 + + + + + _Rename + False + True + True + True + False + True + + + False + False + 3 + + + + + Re_pair + False + True + True + True + False + True + + + False + False + 4 + + + + + _Archive + False + True + True + True + False + True + + + False + False + 5 + + + + + False + True + 1 + + - True + False True 1 diff --git a/gramps/gui/glade/dialog.glade b/gramps/gui/glade/dialog.glade index a41887bb3..9ee495b46 100644 --- a/gramps/gui/glade/dialog.glade +++ b/gramps/gui/glade/dialog.glade @@ -252,42 +252,35 @@ False Remove object and all references to it from the database - + True False - 0 - 0 + center + 2 - + True False - 2 - - - True - False - gtk-delete - - - False - False - 0 - - - - - True - False - _Remove Object - True - - - False - False - 1 - - + gtk-delete + + False + False + 0 + + + + + True + False + _Remove Object + True + + + False + False + 1 + @@ -324,42 +317,35 @@ False Select replacement for the missing file - + True False - 0 - 0 + center + 2 - + True False - 2 - - - True - False - gtk-find - - - False - False - 0 - - - - - True - False - _Select File - True - - - False - False - 1 - - + gtk-find + + False + False + 0 + + + + + True + False + _Select File + True + + + False + False + 1 + diff --git a/gramps/gui/glade/editname.glade b/gramps/gui/glade/editname.glade index a5b7f6f56..53917c4ce 100644 --- a/gramps/gui/glade/editname.glade +++ b/gramps/gui/glade/editname.glade @@ -2,6 +2,7 @@ + False @@ -178,156 +179,150 @@ False 0.029999999329447746 - + True False - 12 + 12 + 6 + 6 - + True False - 6 - 6 - - - True - False - 0 - _Given: - True - center - given_name - - - 0 - 0 - - - - - True - False - 0 - T_itle: - True - title_field - - - 0 - 1 - - - - - True - False - 0 - Suffi_x: - True - suffix - - - 2 - 1 - - - - - True - False - 0 - C_all Name: - True - call - - - 4 - 0 - - - - - True - True - True - True - The person's given names - True - ā— - - - 1 - 0 - 3 - - - - - True - False - 0 - _Nick Name: - True - nickname - - - 4 - 1 - - - - - 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 - 0 - - - - - True - True - A title used to refer to the person, such as 'Dr.' or 'Rev.' - True - ā— - - - 1 - 1 - - - - - True - True - An optional suffix to the name, such as "Jr." or "III" - True - ā— - - - 3 - 1 - - - - - True - True - A descriptive name given in place of or in addition to the official given name. - True - ā— - - - 5 - 1 - - + 0 + _Given: + True + center + given_name + + 0 + 0 + + + + + True + False + 0 + T_itle: + True + title_field + + + 0 + 1 + + + + + True + False + 0 + Suffi_x: + True + suffix + + + 2 + 1 + + + + + True + False + 0 + C_all Name: + True + call + + + 4 + 0 + + + + + True + True + True + True + The person's given names + True + ā— + + + 1 + 0 + 3 + + + + + True + False + 0 + _Nick Name: + True + nickname + + + 4 + 1 + + + + + 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 + 0 + + + + + True + True + A title used to refer to the person, such as 'Dr.' or 'Rev.' + True + ā— + + + 1 + 1 + + + + + True + True + An optional suffix to the name, such as "Jr." or "III" + True + ā— + + + 3 + 1 + + + + + True + True + A descriptive name given in place of or in addition to the official given name. + True + ā— + + + 5 + 1 + @@ -357,65 +352,53 @@ 0.029999999329447746 none - + True False - 12 + 12 + vertical - + True False + True vertical - + + + + + True + True + 0 + + + + + True + False + + True False - True - vertical - - - + 0 + _Family Nick Name: + True + familynickname - True - True + False + False 0 - + True - False - - - True - False - 0 - _Family Nick Name: - True - familynickname - - - False - False - 0 - - - - - True - True - A non official name given to a family to distinguish them of people with the same family name. Often referred to as eg. Farm name. - ā— - 25 - - - False - False - 3 - 1 - - + True + A non official name given to a family to distinguish them of people with the same family name. Often referred to as eg. Farm name. + ā— + 25 False @@ -425,6 +408,12 @@ + + False + False + 3 + 1 + diff --git a/gramps/gui/glade/papermenu.glade b/gramps/gui/glade/papermenu.glade index 3d013c2fd..0442b8f16 100644 --- a/gramps/gui/glade/papermenu.glade +++ b/gramps/gui/glade/papermenu.glade @@ -34,138 +34,132 @@ - + True False - 12 + 12 + 6 + 6 + 6 - + True False - 6 - 6 - 6 - - - True - False - 0 - Size: - - - 0 - 0 - - - - - True - False - 0 - _Width: - True - pwidth - - - 0 - 1 - - - - - True - False - 0 - _Height: - True - pheight - - - 0 - 2 - - - - - True - False - 0 - Orientation: - - - 0 - 3 - - - - - True - False - True - True - ā€¢ - - - 1 - 2 - - - - - True - False - 0 - cm - 3 - - - 2 - 1 - - - - - True - False - 0 - cm - 3 - - - 2 - 2 - - - - - True - False - True - True - ā€¢ - - - 1 - 1 - - - - - - - - - - - - - - + 0 + Size: + + 0 + 0 + + + + + True + False + 0 + _Width: + True + pwidth + + + 0 + 1 + + + + + True + False + 0 + _Height: + True + pheight + + + 0 + 2 + + + + + True + False + 0 + Orientation: + + + 0 + 3 + + + + + True + False + True + True + ā€¢ + + + 1 + 2 + + + + + True + False + 0 + cm + 3 + + + 2 + 1 + + + + + True + False + 0 + cm + 3 + + + 2 + 2 + + + + + True + False + True + True + ā€¢ + + + 1 + 1 + + + + + + + + + + + + + - True + False True 1 @@ -196,182 +190,176 @@ - + True False - 12 + 12 + 6 + 6 + 6 - + True False - 6 - 6 - 6 - - - True - False - 0 - _Left: - True - lmargin - - - 0 - 0 - - - - - True - False - 0 - _Right: - True - rmargin - - - 0 - 1 - - - - - True - False - 0 - _Top: - True - tmargin - - - 0 - 2 - - - - - True - False - 0 - _Bottom: - True - bmargin - - - 0 - 3 - - - - - True - False - 0 - cm - 3 - - - 2 - 0 - - - - - True - False - 0 - cm - 3 - - - 2 - 2 - - - - - True - False - 0 - cm - 3 - - - 2 - 3 - - - - - True - True - True - ā€¢ - 2.54 - - - 1 - 0 - - - - - True - True - True - ā€¢ - 2.54 - - - 1 - 1 - - - - - True - True - True - ā€¢ - 2.54 - - - 1 - 2 - - - - - True - True - True - ā€¢ - 2.54 - - - 1 - 3 - - - - - True - False - 0 - cm - 3 - - - 2 - 1 - - + 0 + _Left: + True + lmargin + + 0 + 0 + + + + + True + False + 0 + _Right: + True + rmargin + + + 0 + 1 + + + + + True + False + 0 + _Top: + True + tmargin + + + 0 + 2 + + + + + True + False + 0 + _Bottom: + True + bmargin + + + 0 + 3 + + + + + True + False + 0 + cm + 3 + + + 2 + 0 + + + + + True + False + 0 + cm + 3 + + + 2 + 2 + + + + + True + False + 0 + cm + 3 + + + 2 + 3 + + + + + True + True + True + ā€¢ + 2.54 + + + 1 + 0 + + + + + True + True + True + ā€¢ + 2.54 + + + 1 + 1 + + + + + True + True + True + ā€¢ + 2.54 + + + 1 + 2 + + + + + True + True + True + ā€¢ + 2.54 + + + 1 + 3 + + + + + True + False + 0 + cm + 3 + + + 2 + 1 + - True + False True 1 diff --git a/gramps/gui/logger/_errorreportassistant.py b/gramps/gui/logger/_errorreportassistant.py index 1363fcb65..a39c83bbe 100644 --- a/gramps/gui/logger/_errorreportassistant.py +++ b/gramps/gui/logger/_errorreportassistant.py @@ -293,17 +293,16 @@ class ErrorReportAssistant(Gtk.Assistant): error_details_box.pack_start(label, False, False, 0) error_details_box.pack_start(sw_frame, True, True, 0) error_details_box.pack_start(button_box, False, False, 0) - - error_details_align = Gtk.Alignment.new(0, 0, 1, 1) - error_details_align.set_padding(0, 0, 11, 0) - error_details_align.add(error_details_box) + error_details_box.set_hexpand(True) + error_details_box.set_vexpand(True) + error_details_box.set_margin_start(12) error_details_frame = Gtk.Frame() error_details_frame.set_border_width(3) error_details_frame.set_label("%s" % _("Error Details")) error_details_frame.get_label_widget().set_use_markup(True) - error_details_frame.add(error_details_align) + error_details_frame.add(error_details_box) side_label = Gtk.Label(_("This is the detailed Gramps error " "information, don't worry if you do not " @@ -374,17 +373,16 @@ class ErrorReportAssistant(Gtk.Assistant): sys_information_box.pack_start(label, False, False, 0) sys_information_box.pack_start(sw_frame, True, True, 0) sys_information_box.pack_start(button_box, False, False, 0) + sys_information_box.set_hexpand(True) + sys_information_box.set_vexpand(True) + sys_information_box.set_margin_start(12) - sys_information_align = Gtk.Alignment.new(0, 0, 1, 1) - sys_information_align.set_padding(0, 0, 11, 0) - sys_information_align.add(sys_information_box) - sys_information_frame = Gtk.Frame() sys_information_frame.set_border_width(3) sys_information_frame.set_label("%s" % _("System Information")) sys_information_frame.get_label_widget().set_use_markup(True) - sys_information_frame.add(sys_information_align) + sys_information_frame.add(sys_information_box) side_label = Gtk.Label(label=_("This is the information about your system " "that will help the developers to fix the " @@ -447,17 +445,16 @@ class ErrorReportAssistant(Gtk.Assistant): user_information_box.pack_start(label, False, False, 0) user_information_box.pack_start(sw_frame, True, True, 0) user_information_box.pack_start(button_box, False, False, 0) + user_information_box.set_hexpand(True) + user_information_box.set_vexpand(True) + user_information_box.set_margin_start(12) - user_information_align = Gtk.Alignment.new(0, 0, 1, 1) - user_information_align.set_padding(0, 0, 11, 0) - user_information_align.add(user_information_box) - user_information_frame = Gtk.Frame() user_information_frame.set_border_width(3) user_information_frame.set_label("%s" % _("Further Information")) user_information_frame.get_label_widget().set_use_markup(True) - user_information_frame.add(user_information_align) + user_information_frame.add(user_information_box) side_label = Gtk.Label(label=_("This is your opportunity to describe what " "you were doing when the error occured.")) @@ -512,17 +509,16 @@ class ErrorReportAssistant(Gtk.Assistant): summary_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) summary_box.pack_start(label, False, False, 0) summary_box.pack_start(sw_frame, True, True, 0) + summary_box.set_hexpand(True) + summary_box.set_vexpand(True) + summary_box.set_margin_start(12) - summary_align = Gtk.Alignment.new(0, 0, 1, 1) - summary_align.set_padding(0, 0, 11, 0) - summary_align.add(summary_box) - summary_frame = Gtk.Frame() summary_frame.set_border_width(3) summary_frame.set_label("%s" % _("Bug Report Summary")) summary_frame.get_label_widget().set_use_markup(True) - summary_frame.add(summary_align) + summary_frame.add(summary_box) side_label = Gtk.Label(label=_("This is the completed bug report. The next " "page of the assistant will help you to file " @@ -580,14 +576,11 @@ class ErrorReportAssistant(Gtk.Assistant): url_box = Gtk.Box() url_box.pack_start(url_label, True, True, 0) url_box.pack_start(url_button_vbox, False, False, 0) - - - url_align = Gtk.Alignment.new(0, 0, 1, 1) - url_align.set_padding(0, 0, 11, 0) - url_align.add(url_box) + url_box.set_hexpand(True) + url_box.set_margin_start(12) url_frame = Gtk.Frame() - url_frame.add(url_align) + url_frame.add(url_box) clip_label = Gtk.Label(_("Use this button " "to copy the bug report onto the clipboard. " @@ -607,31 +600,24 @@ class ErrorReportAssistant(Gtk.Assistant): clip_box = Gtk.Box() clip_box.pack_start(clip_label, True, True, 0) clip_box.pack_start(clip_button_vbox, False, False, 0) - - - clip_align = Gtk.Alignment.new(0, 0, 1, 1) - clip_align.set_padding(0, 0, 11, 0) - clip_align.add(clip_box) + clip_box.set_hexpand(True) + clip_box.set_margin_start(12) clip_frame = Gtk.Frame() - clip_frame.add(clip_align) - + clip_frame.add(clip_box) inner_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) inner_box.pack_start(label, False, False, 0) inner_box.pack_start(clip_frame, False, False, 0) inner_box.pack_start(url_frame, False, False, 0) + inner_box.set_margin_start(12) - inner_align = Gtk.Alignment.new(0, 0, 1, 1) - inner_align.set_padding(0, 0, 11, 0) - inner_align.add(inner_box) - outer_frame = Gtk.Frame() outer_frame.set_border_width(3) outer_frame.set_label("%s" % _("Send Bug Report")) outer_frame.get_label_widget().set_use_markup(True) - outer_frame.add(inner_align) + outer_frame.add(inner_box) side_label = Gtk.Label(label=_("This is the final step. Use the buttons on " "this page to start a web browser and file a " diff --git a/gramps/plugins/lib/maps/placeselection.py b/gramps/plugins/lib/maps/placeselection.py index 7cf4e8347..45b5f0839 100644 --- a/gramps/plugins/lib/maps/placeselection.py +++ b/gramps/plugins/lib/maps/placeselection.py @@ -115,7 +115,6 @@ class PlaceSelection(ManagedWindow, OsmGps): self.function = function self.selection_layer = layer self.layer = layer - alignment = Gtk.Alignment.new(0, 1, 0, 0) self.set_window( Gtk.Dialog(_('Place Selection in a region'), buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)), @@ -123,8 +122,8 @@ class PlaceSelection(ManagedWindow, OsmGps): label = Gtk.Label(label=_('Choose the radius of the selection.\n' 'On the map you should see a circle or an' ' oval depending on the latitude.')) - alignment.add(label) - self.window.vbox.pack_start(alignment, False, True, 0) + label.set_valign(Gtk.Align.END) + self.window.vbox.pack_start(label, False, True, 0) adj = Gtk.Adjustment(1.0, 0.1, 3.0, 0.1, 0, 0) # default value is 1.0, minimum is 0.1 and max is 3.0 slider = Gtk.Scale(orientation=Gtk.Orientation.HORIZONTAL, @@ -156,9 +155,8 @@ class PlaceSelection(ManagedWindow, OsmGps): '>%s' % _('The green values in the row correspond ' 'to the current place values.')) - alignment = Gtk.Alignment.new(0, 1, 0, 0) - alignment.add(self.label2) - self.window.vbox.pack_start(alignment, False, True, 0) + self.label2.set_valign(Gtk.Align.END) + self.window.vbox.pack_start(self.label2, False, True, 0) self.window.set_default_size(400, 300) self.choices.connect('row-activated', self.selection, function) self.window.connect('response', self.close) diff --git a/gramps/plugins/tool/notrelated.glade b/gramps/plugins/tool/notrelated.glade index 354d0a8cc..cd5312dbd 100644 --- a/gramps/plugins/tool/notrelated.glade +++ b/gramps/plugins/tool/notrelated.glade @@ -116,51 +116,44 @@ 0 in - + True False - 6 - 12 + 12 + 3 - + True False - 3 - - - True - False - True - - - True - True - - - - - - True - True - 0 - - - - - gtk-apply - False - True + True + + True - False - True + True - - False - False - 1 - + + + True + True + 0 + + + + + gtk-apply + False + True + True + False + True + + + False + False + 1 + diff --git a/gramps/plugins/tool/patchnames.glade b/gramps/plugins/tool/patchnames.glade index 8b59c7fb4..627a9297d 100644 --- a/gramps/plugins/tool/patchnames.glade +++ b/gramps/plugins/tool/patchnames.glade @@ -62,42 +62,35 @@ False - + True False - 0 - 0 + center + 2 - + True False - 2 - - - True - False - gtk-ok - - - False - False - 0 - - - - - True - False - _Accept and close - True - - - False - False - 1 - - + gtk-ok + + False + False + 0 + + + + + True + False + _Accept and close + True + + + False + False + 1 +