Commit 5fbf69f2 authored by Lubomir Rintel's avatar Lubomir Rintel

glade: get rid of GtkContainer.border-width

It's gone from Gtk4. We mostly use it to pad out the pages in the editor
and on a couple other places (where the use is probably incorrect).

The migration manual suggests that a margin of a child should be used
instead. This indeed works for us.

However, we need to set four properties from each side, which is not
nice. An alternative would be to use a CSS class, butthere's no sensible
class in the default theme for the job and it's perhaps not worth adding
a custom style sheet for us.
parent 48b47e88
......@@ -4,7 +4,10 @@
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="8021x_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="title" translatable="yes">802.1X authentication</property>
<property name="resizable">False</property>
<property name="modal">True</property>
......@@ -66,7 +69,10 @@
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image1">
......
......@@ -6,7 +6,10 @@
<property name="width_request">450</property>
<property name="height_request">250</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="icon_name">stock-peferences</property>
......@@ -62,7 +65,10 @@
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox5">
......
......@@ -6,7 +6,10 @@
<property name="width_request">450</property>
<property name="height_request">250</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="icon_name">stock-peferences</property>
......@@ -62,7 +65,10 @@
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox5">
......
......@@ -24,7 +24,10 @@
</object>
<object class="GtkDialog" id="new_connection_type_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="title"> </property>
<property name="resizable">False</property>
<property name="modal">True</property>
......@@ -84,7 +87,10 @@
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image2">
......
......@@ -5,7 +5,10 @@
<object class="GtkGrid" id="BluetoothPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -78,7 +78,10 @@
<object class="GtkGrid" id="BondPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -16,7 +16,10 @@
<object class="GtkGrid" id="BridgePortPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -48,7 +48,10 @@
<object class="GtkGrid" id="BridgePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -5,7 +5,10 @@
<object class="GtkGrid" id="DcbPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -6,7 +6,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -84,7 +84,10 @@
<object class="GtkGrid" id="EthernetPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -36,7 +36,10 @@
<object class="GtkGrid" id="GeneralPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -24,7 +24,10 @@
<object class="GtkGrid" id="InfinibandPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -46,7 +46,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
......
......@@ -28,7 +28,10 @@
<object class="GtkVBox" id="IP4Page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="spacing">18</property>
<child>
<object class="GtkHBox" id="hbox1">
......
......@@ -59,7 +59,10 @@
<object class="GtkVBox" id="IP6Page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="spacing">18</property>
<child>
<object class="GtkHBox" id="hbox1">
......
......@@ -43,7 +43,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
......
......@@ -6,7 +6,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="spacing">18</property>
<child>
<object class="GtkVBox" id="mobile_basic_vbox">
......
......@@ -5,7 +5,10 @@
<object class="GtkVBox" id="PppPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="spacing">18</property>
<child>
<object class="GtkVBox" id="vbox2">
......
......@@ -7,7 +7,10 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -7,7 +7,10 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">8</property>
<property name="column_spacing">6</property>
<child>
......@@ -208,7 +211,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......@@ -396,7 +402,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......@@ -770,7 +779,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">8</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -160,7 +160,10 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">8</property>
<property name="column_spacing">6</property>
<child>
......@@ -584,7 +587,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......@@ -775,7 +781,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<property name="column_homogeneous">True</property>
......@@ -1117,7 +1126,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......@@ -1491,7 +1503,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">8</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -15,7 +15,10 @@
<object class="GtkGrid" id="VlanPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -16,7 +16,10 @@
<object class="GtkGrid" id="WifiSecurityPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -59,7 +59,10 @@
<object class="GtkGrid" id="WifiPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
......
......@@ -4,7 +4,10 @@
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="auth_methods_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">400</property>
<property name="icon_name">stock-preferences</property>
......@@ -60,7 +63,10 @@
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label3">
......
......@@ -90,7 +90,10 @@
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox3">
......@@ -246,7 +249,10 @@
</object>
<object class="GtkDialog" id="relabel_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="title" translatable="yes">File Relabel</property>
<property name="modal">True</property>
<property name="default_width">500</property>
......
......@@ -42,7 +42,10 @@
<object class="GtkBox" id="connection_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
......
......@@ -4,7 +4,10 @@
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="unlock_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="window_position">center</property>
<property name="default_width">400</property>
<property name="icon_name">dialog-password</property>
......
......@@ -5,7 +5,10 @@
<object class="GtkDialog" id="info_dialog">
<property name="width_request">600</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="title" translatable="yes">Connection Information</property>
<property name="resizable">False</property>
<property name="window_position">center</property>
......@@ -55,7 +58,10 @@
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image6">
......
......@@ -27,7 +27,10 @@
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="margin_start">5</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image1">
......
......@@ -59,7 +59,10 @@
<object class="GtkBox" id="intro_page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
......@@ -175,7 +178,10 @@
<object class="GtkBox" id="country_page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
......@@ -228,7 +234,10 @@
<object class="GtkBox" id="providers_page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>