GNOME.org
 

[glom/gtkmm4v4] gtkmm4: Glade files: Use GtkWidget margin instead of GtkContainer border-width.

commit 0a7bdd17efb917dee82421d3521d8f41832aaf4e
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Apr 17 13:21:13 2017 +0200

    gtkmm4: Glade files: Use GtkWidget margin instead of GtkContainer border-width.

 data/ui/developer/box_formatting.glade             |    6 +++---
 data/ui/developer/box_print_layouts.glade          |    2 +-
 data/ui/developer/box_reports.glade                |    2 +-
 data/ui/developer/dialog_add_related_table.glade   |    4 ++--
 data/ui/developer/dialog_change_language.glade     |    4 ++--
 data/ui/developer/dialog_choose_field.glade        |    4 ++--
 data/ui/developer/dialog_choose_relationship.glade |    4 ++--
 data/ui/developer/dialog_choose_user.glade         |    4 ++--
 .../ui/developer/dialog_database_preferences.glade |   12 ++++++------
 data/ui/developer/dialog_field_summary.glade       |    4 ++--
 data/ui/developer/dialog_fieldslist.glade          |    2 +-
 data/ui/developer/dialog_flowtable.glade           |    4 ++--
 data/ui/developer/dialog_group_by.glade            |    6 +++---
 data/ui/developer/dialog_initial_password.glade    |    4 ++--
 .../developer/dialog_layout_field_properties.glade |    6 +++---
 data/ui/developer/dialog_line.glade                |    4 ++--
 data/ui/developer/dialog_new_group.glade           |    6 +++---
 data/ui/developer/dialog_new_library_script.glade  |    6 +++---
 data/ui/developer/dialog_notebook.glade            |    4 ++--
 data/ui/developer/dialog_script_library.glade      |    4 ++--
 data/ui/developer/dialog_sort_fields.glade         |    4 ++--
 data/ui/developer/dialog_translation_copy.glade    |    4 ++--
 .../dialog_translation_identify_original.glade     |    2 +-
 data/ui/developer/dialog_user.glade                |    4 ++--
 data/ui/developer/window_button_script.glade       |    4 ++--
 data/ui/developer/window_data_layout.glade         |    2 +-
 data/ui/developer/window_data_layout_export.glade  |    2 +-
 data/ui/developer/window_default_formatting.glade  |    2 +-
 data/ui/developer/window_design.glade              |    8 ++++----
 data/ui/developer/window_field_calculation.glade   |    4 ++--
 .../developer/window_field_definition_edit.glade   |   10 +++++-----
 data/ui/developer/window_groups.glade              |    4 ++--
 data/ui/developer/window_imageobject.glade         |    4 ++--
 data/ui/developer/window_print_layout_edit.glade   |    8 ++++----
 .../developer/window_relationships_overview.glade  |    6 +++---
 data/ui/developer/window_report_layout.glade       |    2 +-
 data/ui/developer/window_text_format.glade         |    2 +-
 data/ui/developer/window_textobject.glade          |    4 ++--
 data/ui/developer/window_translations.glade        |    2 +-
 data/ui/developer/window_users.glade               |    4 ++--
 data/ui/operator/box_navigation_tables.glade       |    2 +-
 data/ui/operator/dialog_choose_date.glade          |    6 +++---
 data/ui/operator/dialog_connection.glade           |    4 ++--
 data/ui/operator/dialog_data_invalid_format.glade  |    4 ++--
 data/ui/operator/dialog_existing_or_new.glade      |    4 ++--
 data/ui/operator/dialog_find_id.glade              |    4 ++--
 data/ui/operator/dialog_image_load_progress.glade  |    2 +-
 data/ui/operator/dialog_image_save_progress.glade  |    2 +-
 data/ui/operator/dialog_import_csv.glade           |    4 ++--
 data/ui/operator/dialog_import_csv_progress.glade  |    4 ++--
 data/ui/operator/dialog_new_record.glade           |    4 ++--
 data/ui/operator/window_main.glade                 |    4 ++--
 52 files changed, 109 insertions(+), 109 deletions(-)
---
diff --git a/data/ui/developer/box_formatting.glade b/data/ui/developer/box_formatting.glade
index 8583616..fd16e5a 100644
--- a/data/ui/developer/box_formatting.glade
+++ b/data/ui/developer/box_formatting.glade
@@ -21,7 +21,7 @@
               <object class="GtkBox" id="vbox_numeric_format">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -159,7 +159,7 @@
               <object class="GtkBox" id="vbox_text_format">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -410,7 +410,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
diff --git a/data/ui/developer/box_print_layouts.glade b/data/ui/developer/box_print_layouts.glade
index 8ffa421..efb4571 100644
--- a/data/ui/developer/box_print_layouts.glade
+++ b/data/ui/developer/box_print_layouts.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkWindow" id="window_print_layouts">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Print Layouts</property>
     <child>
       <object class="GtkBox" id="box_print_layouts">
diff --git a/data/ui/developer/box_reports.glade b/data/ui/developer/box_reports.glade
index 89439fa..02cf94a 100644
--- a/data/ui/developer/box_reports.glade
+++ b/data/ui/developer/box_reports.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkWindow" id="window_reports">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Reports</property>
     <child>
       <object class="GtkBox" id="box_reports">
diff --git a/data/ui/developer/dialog_add_related_table.glade 
b/data/ui/developer/dialog_add_related_table.glade
index 7eb23bb..145b249 100644
--- a/data/ui/developer/dialog_add_related_table.glade
+++ b/data/ui/developer/dialog_add_related_table.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_add_related_table">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Add Related Table</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -62,7 +62,7 @@
           <object class="GtkBox" id="vbox104">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
diff --git a/data/ui/developer/dialog_change_language.glade b/data/ui/developer/dialog_change_language.glade
index e21e75c..a1a9d19 100644
--- a/data/ui/developer/dialog_change_language.glade
+++ b/data/ui/developer/dialog_change_language.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_change_language">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Test Translation</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -73,7 +73,7 @@
           <object class="GtkBox" id="hbox84">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkImage" id="image34">
diff --git a/data/ui/developer/dialog_choose_field.glade b/data/ui/developer/dialog_choose_field.glade
index e8e7f27..47fa5b6 100644
--- a/data/ui/developer/dialog_choose_field.glade
+++ b/data/ui/developer/dialog_choose_field.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_choose_field">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Select Field</property>
     <property name="default_width">300</property>
     <property name="default_height">500</property>
@@ -65,7 +65,7 @@
           <object class="GtkBox" id="vbox24">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/data/ui/developer/dialog_choose_relationship.glade 
b/data/ui/developer/dialog_choose_relationship.glade
index d6e9895..6566190 100644
--- a/data/ui/developer/dialog_choose_relationship.glade
+++ b/data/ui/developer/dialog_choose_relationship.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_choose_relationship">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Select Relationship</property>
     <property name="default_width">300</property>
     <property name="default_height">500</property>
@@ -62,7 +62,7 @@
           <object class="GtkBox" id="vbox36">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/developer/dialog_choose_user.glade b/data/ui/developer/dialog_choose_user.glade
index 06a6265..3259c11 100644
--- a/data/ui/developer/dialog_choose_user.glade
+++ b/data/ui/developer/dialog_choose_user.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_choose_user">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Choose User</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -77,7 +77,7 @@
           <object class="GtkBox" id="vbox47">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/developer/dialog_database_preferences.glade 
b/data/ui/developer/dialog_database_preferences.glade
index 30409ee..9892cf1 100644
--- a/data/ui/developer/dialog_database_preferences.glade
+++ b/data/ui/developer/dialog_database_preferences.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_database_preferences">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Database Preferences</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -74,7 +74,7 @@
           <object class="GtkBox" id="vbox61">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
@@ -120,7 +120,7 @@
                   <object class="GtkBox" id="vbox62">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
@@ -343,7 +343,7 @@
                   <object class="GtkBox" id="vbox98">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
@@ -408,7 +408,7 @@
                   <object class="GtkBox" id="vbox63">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
@@ -454,7 +454,7 @@
                   <object class="GtkBox" id="vbox21">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <child>
diff --git a/data/ui/developer/dialog_field_summary.glade b/data/ui/developer/dialog_field_summary.glade
index 2304076..e7b764a 100644
--- a/data/ui/developer/dialog_field_summary.glade
+++ b/data/ui/developer/dialog_field_summary.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_field_summary">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Field Summary</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -60,7 +60,7 @@
           <object class="GtkBox" id="vbox76">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/developer/dialog_fieldslist.glade b/data/ui/developer/dialog_fieldslist.glade
index fecd7b8..445e7de 100644
--- a/data/ui/developer/dialog_fieldslist.glade
+++ b/data/ui/developer/dialog_fieldslist.glade
@@ -72,7 +72,7 @@
           <object class="GtkBox" id="vbox78">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
diff --git a/data/ui/developer/dialog_flowtable.glade b/data/ui/developer/dialog_flowtable.glade
index 6ac6241..ed14ae8 100644
--- a/data/ui/developer/dialog_flowtable.glade
+++ b/data/ui/developer/dialog_flowtable.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_flowtable">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="margin">5</property>
     <property name="title" translatable="yes">Group Properties</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
@@ -61,7 +61,7 @@
           <object class="GtkGrid" id="table2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
diff --git a/data/ui/developer/dialog_group_by.glade b/data/ui/developer/dialog_group_by.glade
index 404f382..79a9742 100644
--- a/data/ui/developer/dialog_group_by.glade
+++ b/data/ui/developer/dialog_group_by.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_group_by">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Group By</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -60,7 +60,7 @@
           <object class="GtkBox" id="vbox73">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
@@ -250,7 +250,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="comboboxentry_border_width">
+                      <object class="GtkComboBox" id="comboboxentry_margin">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_entry">True</property>
diff --git a/data/ui/developer/dialog_initial_password.glade b/data/ui/developer/dialog_initial_password.glade
index 8b2309b..7dae852 100644
--- a/data/ui/developer/dialog_initial_password.glade
+++ b/data/ui/developer/dialog_initial_password.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_initial_password">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Database User</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -76,7 +76,7 @@
           <object class="GtkBox" id="vbox28">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/developer/dialog_layout_field_properties.glade 
b/data/ui/developer/dialog_layout_field_properties.glade
index a9b7b4b..dfc7359 100644
--- a/data/ui/developer/dialog_layout_field_properties.glade
+++ b/data/ui/developer/dialog_layout_field_properties.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_layout_field_properties">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Field Layout</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -136,7 +136,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_start">12</property>
-                        <property name="border_width">6</property>
+                        <property name="margin">6</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
@@ -255,7 +255,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
diff --git a/data/ui/developer/dialog_line.glade b/data/ui/developer/dialog_line.glade
index d444309..d2d962e 100644
--- a/data/ui/developer/dialog_line.glade
+++ b/data/ui/developer/dialog_line.glade
@@ -9,7 +9,7 @@
   </object>
   <object class="GtkDialog" id="dialog_line">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Text Object</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
@@ -84,7 +84,7 @@
           <object class="GtkGrid" id="table1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
diff --git a/data/ui/developer/dialog_new_group.glade b/data/ui/developer/dialog_new_group.glade
index 1d82154..3db02c1 100644
--- a/data/ui/developer/dialog_new_group.glade
+++ b/data/ui/developer/dialog_new_group.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_new_group">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Create Group</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -83,7 +83,7 @@
               <object class="GtkBox" id="hbox39">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkImage" id="image23">
@@ -141,7 +141,7 @@ What name should this group have?</property>
               <object class="GtkBox" id="hbox40">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="Group Name">
diff --git a/data/ui/developer/dialog_new_library_script.glade 
b/data/ui/developer/dialog_new_library_script.glade
index 0908d8b..92e8fd6 100644
--- a/data/ui/developer/dialog_new_library_script.glade
+++ b/data/ui/developer/dialog_new_library_script.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_new_library_script">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Create Group</property>
     <property name="default_width">311</property>
     <property name="default_height">179</property>
@@ -86,7 +86,7 @@
               <object class="GtkBox" id="hbox4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkImage" id="image1">
@@ -145,7 +145,7 @@ What name should this module have?</property>
               <object class="GtkBox" id="hbox6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="Group Name1">
diff --git a/data/ui/developer/dialog_notebook.glade b/data/ui/developer/dialog_notebook.glade
index 0162066..dee73eb 100644
--- a/data/ui/developer/dialog_notebook.glade
+++ b/data/ui/developer/dialog_notebook.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_notebook">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Notebook Tabs</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -74,7 +74,7 @@
           <object class="GtkFrame" id="frame21">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">4</property>
+            <property name="margin">4</property>
             
             <property name="shadow_type">none</property>
             <child>
diff --git a/data/ui/developer/dialog_script_library.glade b/data/ui/developer/dialog_script_library.glade
index c274b69..05f1e7e 100644
--- a/data/ui/developer/dialog_script_library.glade
+++ b/data/ui/developer/dialog_script_library.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_script_library">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Script Library</property>
     <property name="default_width">500</property>
     <property name="default_height">600</property>
@@ -63,7 +63,7 @@
           <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/developer/dialog_sort_fields.glade b/data/ui/developer/dialog_sort_fields.glade
index 3a9ab46..273d3ed 100644
--- a/data/ui/developer/dialog_sort_fields.glade
+++ b/data/ui/developer/dialog_sort_fields.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_sort_fields">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Group By - Sort Fields</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -77,7 +77,7 @@
           <object class="GtkBox" id="vbox78">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/data/ui/developer/dialog_translation_copy.glade b/data/ui/developer/dialog_translation_copy.glade
index 174fb25..7db38d5 100644
--- a/data/ui/developer/dialog_translation_copy.glade
+++ b/data/ui/developer/dialog_translation_copy.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_translation_copy">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Identify Original</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -75,7 +75,7 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">False</property>
-            <property name="border_width">12</property>
+            <property name="margin">12</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkImage" id="image38">
diff --git a/data/ui/developer/dialog_translation_identify_original.glade 
b/data/ui/developer/dialog_translation_identify_original.glade
index 75d9138..e3c3447 100644
--- a/data/ui/developer/dialog_translation_identify_original.glade
+++ b/data/ui/developer/dialog_translation_identify_original.glade
@@ -72,7 +72,7 @@
           <object class="GtkBox" id="hbox93">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">12</property>
+            <property name="margin">12</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkImage" id="image38">
diff --git a/data/ui/developer/dialog_user.glade b/data/ui/developer/dialog_user.glade
index 079f24d..2d22306 100644
--- a/data/ui/developer/dialog_user.glade
+++ b/data/ui/developer/dialog_user.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_user">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">User</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -77,7 +77,7 @@
           <object class="GtkBox" id="vbox42">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/developer/window_button_script.glade b/data/ui/developer/window_button_script.glade
index 891f12c..d716490 100644
--- a/data/ui/developer/window_button_script.glade
+++ b/data/ui/developer/window_button_script.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="window_button_script">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Button Script</property>
     <property name="default_width">500</property>
     <property name="default_height">600</property>
@@ -77,7 +77,7 @@
           <object class="GtkBox" id="vbox21">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/data/ui/developer/window_data_layout.glade b/data/ui/developer/window_data_layout.glade
index 96cef98..841a89d 100644
--- a/data/ui/developer/window_data_layout.glade
+++ b/data/ui/developer/window_data_layout.glade
@@ -14,7 +14,7 @@
   </object>
   <object class="GtkWindow" id="window_data_layout">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Layout</property>
     <property name="default_width">400</property>
     <property name="default_height">500</property>
diff --git a/data/ui/developer/window_data_layout_export.glade 
b/data/ui/developer/window_data_layout_export.glade
index e5c3546..6b4acad 100644
--- a/data/ui/developer/window_data_layout_export.glade
+++ b/data/ui/developer/window_data_layout_export.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window_data_layout_export">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Export Format</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">600</property>
diff --git a/data/ui/developer/window_default_formatting.glade 
b/data/ui/developer/window_default_formatting.glade
index 0405e6c..86be317 100644
--- a/data/ui/developer/window_default_formatting.glade
+++ b/data/ui/developer/window_default_formatting.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window_default_formatting">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Default Formatting</property>
     <property name="window_position">center-on-parent</property>
     <child>
diff --git a/data/ui/developer/window_design.glade b/data/ui/developer/window_design.glade
index 0f6088f..88c96aa 100644
--- a/data/ui/developer/window_design.glade
+++ b/data/ui/developer/window_design.glade
@@ -12,7 +12,7 @@
       <object class="GtkBox" id="vbox14">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="border_width">6</property>
+        <property name="margin">6</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
@@ -24,7 +24,7 @@
               <object class="GtkBox" id="hbox10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label45">
@@ -62,7 +62,7 @@
               <object class="GtkBox" id="vbox_placeholder">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <placeholder/>
@@ -85,7 +85,7 @@
           <object class="GtkButtonBox" id="hbuttonbox11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="spacing">6</property>
             <property name="layout_style">end</property>
             <child>
diff --git a/data/ui/developer/window_field_calculation.glade 
b/data/ui/developer/window_field_calculation.glade
index 6521e57..e57cdf9 100644
--- a/data/ui/developer/window_field_calculation.glade
+++ b/data/ui/developer/window_field_calculation.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="window_field_calculation">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Field Calculation</property>
     <property name="default_width">398</property>
     <property name="default_height">400</property>
@@ -77,7 +77,7 @@
           <object class="GtkBox" id="vbox21">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/developer/window_field_definition_edit.glade 
b/data/ui/developer/window_field_definition_edit.glade
index 6e395d2..c14e1ac 100644
--- a/data/ui/developer/window_field_definition_edit.glade
+++ b/data/ui/developer/window_field_definition_edit.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkWindow" id="window_field_definition_edit">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Field Definition</property>
     <property name="window_position">center-on-parent</property>
     <child>
@@ -21,14 +21,14 @@
               <object class="GtkBox" id="vbox13">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="table4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <child>
@@ -122,7 +122,7 @@
                   <object class="GtkBox" id="vbox12">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
@@ -200,7 +200,7 @@
               <object class="GtkBox" id="box_default_value">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">12</property>
+                <property name="margin">12</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">18</property>
                 <child>
diff --git a/data/ui/developer/window_groups.glade b/data/ui/developer/window_groups.glade
index ee04eae..028265e 100644
--- a/data/ui/developer/window_groups.glade
+++ b/data/ui/developer/window_groups.glade
@@ -5,7 +5,7 @@
   <object class="GtkDialog" id="window_groups">
     <property name="height_request">400</property>
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Groups</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -62,7 +62,7 @@
           <object class="GtkBox" id="vbox40">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/developer/window_imageobject.glade b/data/ui/developer/window_imageobject.glade
index e04aee1..02ef878 100644
--- a/data/ui/developer/window_imageobject.glade
+++ b/data/ui/developer/window_imageobject.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="window_imageobject">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Image Object</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">300</property>
@@ -78,7 +78,7 @@
           <object class="GtkBox" id="vbox21">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/data/ui/developer/window_print_layout_edit.glade 
b/data/ui/developer/window_print_layout_edit.glade
index 8f87eb1..8fca19a 100644
--- a/data/ui/developer/window_print_layout_edit.glade
+++ b/data/ui/developer/window_print_layout_edit.glade
@@ -206,13 +206,13 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="vbox_inner">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
@@ -440,7 +440,7 @@
                   <object class="GtkButtonBox" id="hbuttonbox43">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="button_close">
@@ -478,7 +478,7 @@
                 <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="vexpand">True</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <placeholder/>
diff --git a/data/ui/developer/window_relationships_overview.glade 
b/data/ui/developer/window_relationships_overview.glade
index a4e9faa..61029a9 100644
--- a/data/ui/developer/window_relationships_overview.glade
+++ b/data/ui/developer/window_relationships_overview.glade
@@ -71,7 +71,7 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButtonBox" id="hbuttonbox38">
@@ -79,7 +79,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">False</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="layout_style">end</property>
                 <child>
                   <object class="GtkButton" id="button_close">
@@ -111,7 +111,7 @@
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="border_width">6</property>
+                <property name="margin">6</property>
                 <property name="shadow_type">in</property>
                 <child>
                   <placeholder/>
diff --git a/data/ui/developer/window_report_layout.glade b/data/ui/developer/window_report_layout.glade
index 34737b0..57b1607 100644
--- a/data/ui/developer/window_report_layout.glade
+++ b/data/ui/developer/window_report_layout.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkWindow" id="window_report_layout">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Report Layout</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">600</property>
diff --git a/data/ui/developer/window_text_format.glade b/data/ui/developer/window_text_format.glade
index 5f16c00..f029334 100644
--- a/data/ui/developer/window_text_format.glade
+++ b/data/ui/developer/window_text_format.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window_text_format">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Text Format</property>
     <property name="default_width">700</property>
     <property name="default_height">500</property>
diff --git a/data/ui/developer/window_textobject.glade b/data/ui/developer/window_textobject.glade
index 321486e..c92e5e5 100644
--- a/data/ui/developer/window_textobject.glade
+++ b/data/ui/developer/window_textobject.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="window_textobject">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Text Object</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">300</property>
@@ -81,7 +81,7 @@
           <object class="GtkBox" id="vbox21">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/data/ui/developer/window_translations.glade b/data/ui/developer/window_translations.glade
index a2c33d4..fc73003 100644
--- a/data/ui/developer/window_translations.glade
+++ b/data/ui/developer/window_translations.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkWindow" id="window_translations">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Translations</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">500</property>
diff --git a/data/ui/developer/window_users.glade b/data/ui/developer/window_users.glade
index 05565ca..0514ac5 100644
--- a/data/ui/developer/window_users.glade
+++ b/data/ui/developer/window_users.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="window_users">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Users</property>
     <property name="default_width">400</property>
     <property name="default_height">400</property>
@@ -61,7 +61,7 @@
           <object class="GtkBox" id="vbox40">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/operator/box_navigation_tables.glade b/data/ui/operator/box_navigation_tables.glade
index 1f3722c..1a592ee 100644
--- a/data/ui/operator/box_navigation_tables.glade
+++ b/data/ui/operator/box_navigation_tables.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkWindow" id="window_tables">
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
+    <property name="margin">12</property>
     <property name="title" translatable="yes">Edit Tables</property>
     <child>
       <object class="GtkBox" id="box_navigation_tables">
diff --git a/data/ui/operator/dialog_choose_date.glade b/data/ui/operator/dialog_choose_date.glade
index f139118..9c43a37 100644
--- a/data/ui/operator/dialog_choose_date.glade
+++ b/data/ui/operator/dialog_choose_date.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_choose_date">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Choose Date</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -77,14 +77,14 @@
           <object class="GtkBox" id="vbox100">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="hbox119">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">12</property>
+                <property name="margin">12</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkImage" id="image50">
diff --git a/data/ui/operator/dialog_connection.glade b/data/ui/operator/dialog_connection.glade
index 22cd86c..a1245f5 100644
--- a/data/ui/operator/dialog_connection.glade
+++ b/data/ui/operator/dialog_connection.glade
@@ -3,7 +3,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_connection">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Connect to Server</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -81,7 +81,7 @@
             <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkLabel" id="connection_note">
diff --git a/data/ui/operator/dialog_data_invalid_format.glade 
b/data/ui/operator/dialog_data_invalid_format.glade
index 09f7753..7e1cd8d 100644
--- a/data/ui/operator/dialog_data_invalid_format.glade
+++ b/data/ui/operator/dialog_data_invalid_format.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_data_invalid_format">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox17">
@@ -78,7 +78,7 @@
           <object class="GtkBox" id="hbox11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkImage" id="image4">
diff --git a/data/ui/operator/dialog_existing_or_new.glade b/data/ui/operator/dialog_existing_or_new.glade
index b9159ff..efd9db8 100644
--- a/data/ui/operator/dialog_existing_or_new.glade
+++ b/data/ui/operator/dialog_existing_or_new.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_existing_or_new">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Welcome to Glom</property>
     <property name="default_width">480</property>
     <property name="default_height">320</property>
@@ -78,7 +78,7 @@
           <object class="GtkBox" id="hbox8">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkImage" id="image3">
diff --git a/data/ui/operator/dialog_find_id.glade b/data/ui/operator/dialog_find_id.glade
index 7466163..865357a 100644
--- a/data/ui/operator/dialog_find_id.glade
+++ b/data/ui/operator/dialog_find_id.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_find_id">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Find Related Record</property>
     <property name="default_width">300</property>
     <property name="default_height">500</property>
@@ -47,7 +47,7 @@
           <object class="GtkBox" id="vbox82">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/data/ui/operator/dialog_image_load_progress.glade 
b/data/ui/operator/dialog_image_load_progress.glade
index 86b64e0..f38804d 100644
--- a/data/ui/operator/dialog_image_load_progress.glade
+++ b/data/ui/operator/dialog_image_load_progress.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_image_load_progress">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Loading image</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">640</property>
diff --git a/data/ui/operator/dialog_image_save_progress.glade 
b/data/ui/operator/dialog_image_save_progress.glade
index 7043fe8..342e4f9 100644
--- a/data/ui/operator/dialog_image_save_progress.glade
+++ b/data/ui/operator/dialog_image_save_progress.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_image_save_progress">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">Saving Image</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">640</property>
diff --git a/data/ui/operator/dialog_import_csv.glade b/data/ui/operator/dialog_import_csv.glade
index e453aec..e708b0a 100644
--- a/data/ui/operator/dialog_import_csv.glade
+++ b/data/ui/operator/dialog_import_csv.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_import_csv">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">bla.blub - Import from CSV</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">550</property>
@@ -80,7 +80,7 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/data/ui/operator/dialog_import_csv_progress.glade 
b/data/ui/operator/dialog_import_csv_progress.glade
index 55e1c8e..e2916e6 100644
--- a/data/ui/operator/dialog_import_csv_progress.glade
+++ b/data/ui/operator/dialog_import_csv_progress.glade
@@ -4,7 +4,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="dialog_import_csv_progress">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes" comments="This is a status message for a progress dialog. It 
says that importing is currently happenning.">Importing Data</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
@@ -61,7 +61,7 @@
           <object class="GtkBox" id="vbox3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
diff --git a/data/ui/operator/dialog_new_record.glade b/data/ui/operator/dialog_new_record.glade
index babd5d4..a2862b3 100644
--- a/data/ui/operator/dialog_new_record.glade
+++ b/data/ui/operator/dialog_new_record.glade
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="dialog_new_record">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="margin">6</property>
     <property name="title" translatable="yes">New Related Record</property>
     <property name="default_width">300</property>
     <property name="default_height">500</property>
@@ -49,7 +49,7 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="border_width">6</property>
+            <property name="margin">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/data/ui/operator/window_main.glade b/data/ui/operator/window_main.glade
index 2763e48..e479492 100644
--- a/data/ui/operator/window_main.glade
+++ b/data/ui/operator/window_main.glade
@@ -21,7 +21,7 @@
                 <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">12</property>
+                <property name="margin">12</property>
                 <property name="spacing">6</property>
                 <child>
                   <placeholder/>
@@ -94,7 +94,7 @@
                 <child internal-child="content_area">
                   <object class="GtkBox" id="infobar-content_area">
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
+                    <property name="margin">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]