gnucash master: Multiple changes pushed

[Robert Fewell]

Updated	 via  https://github.com/Gnucash/gnucash/commit/75cc9b30 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/46655996 (commit)
	from  https://github.com/Gnucash/gnucash/commit/240cbbe8 (commit)



commit 75cc9b3087f11b0101cc660883b8499eb140d967
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Jun 9 16:03:29 2020 +0100

    Add some top / bottom margin to the existing association label

diff --git a/gnucash/gtkbuilder/dialog-assoc.glade b/gnucash/gtkbuilder/dialog-assoc.glade
index 17adead41..ee468fe47 100644
--- a/gnucash/gtkbuilder/dialog-assoc.glade
+++ b/gnucash/gtkbuilder/dialog-assoc.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="association_dialog">
@@ -152,6 +152,8 @@
                   <object class="GtkBox" id="existing_hbox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="margin_top">3</property>
+                    <property name="margin_bottom">3</property>
                     <child>
                       <placeholder/>
                     </child>

commit 46655996b6fe497559eccc0f277927bdce47fe6d
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Jun 9 15:54:46 2020 +0100

    Bug 797790 - Set the default folder for Associations
    
    When there is no association set, if the file option is chosen set the
    default folder for the file chooser to that of the path head preference.

diff --git a/gnucash/gnome/dialog-assoc.c b/gnucash/gnome/dialog-assoc.c
index 51a239d7b..cd761bcf6 100644
--- a/gnucash/gnome/dialog-assoc.c
+++ b/gnucash/gnome/dialog-assoc.c
@@ -299,11 +299,15 @@ gnc_assoc_get_uri_dialog (GtkWindow *parent, const gchar *title, const gchar *ur
     }
 
     // make sure we start with the right dialog
-    if (have_uri && !uri_is_file) // location
-        setup_location_dialog (builder, button_loc, uri);
-
-    if (have_uri && uri_is_file) // file
-         setup_file_dialog (builder, fcb, path_head, uri, scheme);
+    if (have_uri)
+    {
+        if (uri_is_file) // file
+            setup_file_dialog (builder, fcb, path_head, uri, scheme);
+        else // location
+            setup_location_dialog (builder, button_loc, uri);
+    }
+    else
+        gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER(fcb), path_head);
 
     g_free (scheme);
     g_object_unref (G_OBJECT(builder));



Summary of changes:
 gnucash/gnome/dialog-assoc.c          | 14 +++++++++-----
 gnucash/gtkbuilder/dialog-assoc.glade |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)