Remove deprecated Gtk Alignment widgets
This commit is contained in:
Nick Hall
parent
fab7afd2a3
commit
9713b08bf0
@ -114,6 +114,7 @@
|
||||
<object class="GtkButtonBox" id="dialog-action_area25">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_top">6</property>
|
||||
<property name="layout_style">end</property>
|
||||
<child>
|
||||
<object class="GtkButton" id="cancel">
|
||||
@ -122,17 +123,11 @@
|
||||
<property name="can_focus">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment5">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="right_padding">2</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="hbox139">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="spacing">2</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image2718">
|
||||
@ -162,8 +157,6 @@
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
@ -177,16 +170,11 @@
|
||||
<property name="can_focus">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment8">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="hbox140">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="spacing">2</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image2719">
|
||||
@ -216,8 +204,6 @@
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
@ -232,12 +218,6 @@
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="vbox132">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="spacing">6</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="hbox138">
|
||||
<property name="visible">True</property>
|
||||
@ -256,6 +236,8 @@
|
||||
<object class="GtkTreeView" id="dblist">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="vexpand">True</property>
|
||||
<child internal-child="selection">
|
||||
<object class="GtkTreeSelection" id="treeview-selection1"/>
|
||||
</child>
|
||||
@ -288,20 +270,12 @@
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="vbox134">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment7">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="left_padding">12</property>
|
||||
<child>
|
||||
<object class="GtkButtonBox" id="vbuttonbox2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_left">12</property>
|
||||
<property name="resize_mode">immediate</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="spacing">6</property>
|
||||
<property name="layout_style">start</property>
|
||||
@ -401,32 +375,15 @@
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="padding">6</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
|
||||
@ -251,16 +251,11 @@
|
||||
<property name="can_default">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Remove object and all references to it from the database</property>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment4">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="hbox4">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="spacing">2</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image11">
|
||||
@ -290,8 +285,6 @@
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
@ -323,16 +316,11 @@
|
||||
<property name="has_default">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Select replacement for the missing file</property>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment3">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="hbox3">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="spacing">2</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image10">
|
||||
@ -362,8 +350,6 @@
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
<!-- Generated with glade 3.18.3 -->
|
||||
<interface>
|
||||
<requires lib="gtk+" version="3.0"/>
|
||||
<requires lib="ðòa" version="3.0"/>
|
||||
<requires lib="grampswidgets" version="0.0"/>
|
||||
<object class="GtkDialog" id="editname">
|
||||
<property name="can_focus">False</property>
|
||||
@ -177,15 +178,11 @@
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label_xalign">0.029999999329447746</property>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="left_padding">12</property>
|
||||
<child>
|
||||
<object class="GtkGrid" id="table2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_left">12</property>
|
||||
<property name="row_spacing">6</property>
|
||||
<property name="column_spacing">6</property>
|
||||
<child>
|
||||
@ -329,8 +326,6 @@
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child type="label">
|
||||
<object class="GtkLabel" id="label3">
|
||||
<property name="visible">True</property>
|
||||
@ -356,15 +351,11 @@
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label_xalign">0.029999999329447746</property>
|
||||
<property name="shadow_type">none</property>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment3">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="left_padding">12</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="vbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_left">12</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="hboxmultsurnames">
|
||||
@ -426,8 +417,6 @@
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child type="label">
|
||||
<object class="GtkLabel" id="label5">
|
||||
<property name="visible">True</property>
|
||||
|
||||
@ -33,15 +33,11 @@
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="left_padding">12</property>
|
||||
<child>
|
||||
<object class="GtkGrid" id="format_grid">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_left">12</property>
|
||||
<property name="border_width">6</property>
|
||||
<property name="row_spacing">6</property>
|
||||
<property name="column_spacing">6</property>
|
||||
@ -162,10 +158,8 @@
|
||||
<placeholder/>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
@ -195,15 +189,11 @@
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="left_padding">12</property>
|
||||
<child>
|
||||
<object class="GtkGrid" id="table3">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_left">12</property>
|
||||
<property name="border_width">6</property>
|
||||
<property name="row_spacing">6</property>
|
||||
<property name="column_spacing">6</property>
|
||||
@ -368,10 +358,8 @@
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
|
||||
@ -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("<b>%s</b>" % _("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_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_box.set_hexpand(True)
|
||||
sys_information_box.set_vexpand(True)
|
||||
sys_information_box.set_margin_start(12)
|
||||
|
||||
sys_information_frame = Gtk.Frame()
|
||||
sys_information_frame.set_border_width(3)
|
||||
sys_information_frame.set_label("<b>%s</b>" % _("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_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_box.set_hexpand(True)
|
||||
user_information_box.set_vexpand(True)
|
||||
user_information_box.set_margin_start(12)
|
||||
|
||||
user_information_frame = Gtk.Frame()
|
||||
user_information_frame.set_border_width(3)
|
||||
user_information_frame.set_label("<b>%s</b>" % _("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_align = Gtk.Alignment.new(0, 0, 1, 1)
|
||||
summary_align.set_padding(0, 0, 11, 0)
|
||||
summary_align.add(summary_box)
|
||||
summary_box.set_hexpand(True)
|
||||
summary_box.set_vexpand(True)
|
||||
summary_box.set_margin_start(12)
|
||||
|
||||
summary_frame = Gtk.Frame()
|
||||
summary_frame.set_border_width(3)
|
||||
summary_frame.set_label("<b>%s</b>" % _("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_align = Gtk.Alignment.new(0, 0, 1, 1)
|
||||
inner_align.set_padding(0, 0, 11, 0)
|
||||
inner_align.add(inner_box)
|
||||
inner_box.set_margin_start(12)
|
||||
|
||||
outer_frame = Gtk.Frame()
|
||||
outer_frame.set_border_width(3)
|
||||
outer_frame.set_label("<b>%s</b>" % _("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 "
|
||||
|
||||
@ -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</span>' %
|
||||
_('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)
|
||||
|
||||
@ -115,16 +115,11 @@
|
||||
<property name="border_width">6</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="shadow_type">in</property>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="border_width">6</property>
|
||||
<property name="left_padding">12</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="hbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="border_width">12</property>
|
||||
<property name="spacing">3</property>
|
||||
<child>
|
||||
<object class="GtkComboBoxText" id="tagcombo">
|
||||
@ -162,8 +157,6 @@
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child type="label">
|
||||
<object class="GtkLabel" id="tag">
|
||||
<property name="visible">True</property>
|
||||
|
||||
@ -61,16 +61,11 @@
|
||||
<property name="can_default">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<signal name="clicked" handler="on_ok_clicked" object="patchnames" swapped="yes"/>
|
||||
<child>
|
||||
<object class="GtkAlignment" id="alignment1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="hbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="spacing">2</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image1">
|
||||
@ -100,8 +95,6 @@
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user