From e203c637a6afb357b1415d2d5f5a5687aa4fd44a Mon Sep 17 00:00:00 2001
From: Robert Fewell <14uBobIT@gmail.com>
Date: Tue, 20 Jun 2017 14:15:11 +0100
Subject: [PATCH] Files linked to dialog-customer-import-gui.glade

---
 .../dialog-customer-import-gui.c              |  4 +-
 .../dialog-customer-import-gui.glade          | 62 +++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/plugins/customer_import/dialog-customer-import-gui.c b/src/plugins/customer_import/dialog-customer-import-gui.c
index d2e0fb7d95..1114412701 100644
--- a/src/plugins/customer_import/dialog-customer-import-gui.c
+++ b/src/plugins/customer_import/dialog-customer-import-gui.c
@@ -98,8 +98,8 @@ gnc_plugin_customer_import_showGUI(void)
     gui = g_new0 (CustomerImportGui, 1);
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "dialog-customer-import-gui.glade", "customer_import Dialog");
-    gui->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "customer_import Dialog"));
+    gnc_builder_add_from_file (builder, "dialog-customer-import-gui.glade", "customer_import_dialog");
+    gui->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "customer_import_dialog"));
     gui->tree_view = GTK_WIDGET(gtk_builder_get_object (builder, "treeview1"));
     gui->entryFilename = GTK_WIDGET(gtk_builder_get_object (builder, "entryFilename"));
     gui->type = "CUSTOMER"; // Set a default type to import
diff --git a/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade b/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
index 3cfad08cc7..2b126d09d2 100644
--- a/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
+++ b/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="2.20"/>
-  <object class="GtkDialog" id="customer_import Dialog">
+  <requires lib="gtk+" version="3.10"/>
+  <object class="GtkDialog" id="customer_import_dialog">
     <property name="width_request">500</property>
     <property name="height_request">500</property>
     <property name="visible">True</property>
@@ -22,12 +23,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="helpbutton">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="yes">_Help</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <property name="image_position">top</property>
                 <signal name="clicked" handler="gnc_customer_import_gui_help_cb" swapped="no"/>
               </object>
@@ -39,13 +39,12 @@
             </child>
             <child>
               <object class="GtkButton" id="cancelbutton">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="gnc_customer_import_gui_cancel_cb" swapped="no"/>
               </object>
               <packing>
@@ -56,14 +55,13 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="gnc_customer_import_gui_ok_cb" swapped="no"/>
               </object>
               <packing>
@@ -90,9 +88,12 @@
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_right">10</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -109,12 +110,11 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="buttonOpen">
-                        <property name="label">gtk-open</property>
+                        <property name="label" translatable="yes">_Open</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_stock">True</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="gnc_customer_import_gui_buttonOpen_cb" swapped="no"/>
                       </object>
                       <packing>
@@ -155,9 +155,10 @@
                 <property name="can_focus">False</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkVBox" id="box1">
+                  <object class="GtkBox" id="box1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="halign">start</property>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton_customer">
                         <property name="label" translatable="yes">Customer</property>
@@ -165,8 +166,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">For importing customer lists.</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">start</property>
                         <property name="draw_indicator">True</property>
                         <signal name="clicked" handler="gnc_customer_import_gui_type_cb" swapped="no"/>
                       </object>
@@ -183,8 +183,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">For importing vendor lists.</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">start</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton_customer</property>
                         <signal name="clicked" handler="gnc_customer_import_gui_type_cb" swapped="no"/>
@@ -226,18 +225,18 @@
                 <property name="can_focus">False</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkVBox" id="vbox1">
+                  <object class="GtkBox" id="vbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton1">
                         <property name="label" translatable="yes">Semicolon separated</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="halign">start</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="gnc_customer_import_gui_option1_cb" swapped="no"/>
                       </object>
@@ -253,9 +252,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="halign">start</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton1</property>
                         <signal name="toggled" handler="gnc_customer_import_gui_option2_cb" swapped="no"/>
@@ -272,9 +270,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="halign">start</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton1</property>
                         <signal name="toggled" handler="gnc_customer_import_gui_option3_cb" swapped="no"/>
@@ -291,9 +288,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="halign">start</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton1</property>
                         <signal name="toggled" handler="gnc_customer_import_gui_option4_cb" swapped="no"/>
@@ -310,9 +306,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="halign">start</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton1</property>
                         <signal name="clicked" handler="gnc_customer_import_gui_option5_cb" swapped="no"/>
@@ -352,11 +347,16 @@
               <object class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_right">10</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="treeview1">