gnucash maint: Multiple changes pushed

[Robert Fewell]

Updated	 via  https://github.com/Gnucash/gnucash/commit/72d742e2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9d99ebe3 (commit)
	from  https://github.com/Gnucash/gnucash/commit/93f500bd (commit)



commit 72d742e29b7f1c101122b76f55b82da58f41676a
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sun Nov 22 10:57:12 2020 +0000

    Change the icons used for the file lock message

diff --git a/gnucash/gnome-utils/gnc-file.c b/gnucash/gnome-utils/gnc-file.c
index 37a0fc79b..dd22ea08c 100644
--- a/gnucash/gnome-utils/gnc-file.c
+++ b/gnucash/gnome-utils/gnc-file.c
@@ -847,11 +847,11 @@ RESTART:
         gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE);
 
         gnc_gtk_dialog_add_button(dialog, _("_Open Read-Only"),
-                                  "document-revert", RESPONSE_READONLY);
+                                  "emblem-readonly", RESPONSE_READONLY);
         gnc_gtk_dialog_add_button(dialog, _("_Open with No File"),
-                                  "document-new", RESPONSE_NO_FILE);
+                                  "document-new-symbolic", RESPONSE_NO_FILE);
         gnc_gtk_dialog_add_button(dialog, _("Open _Anyway"),
-                                  "document-open", RESPONSE_OPEN);
+                                  "document-open-symbolic", RESPONSE_OPEN);
         if (shutdown_cb)
             gtk_dialog_add_button(GTK_DIALOG(dialog),
                                   _("_Quit"), RESPONSE_QUIT);

commit 9d99ebe30cc1978ef769f4d19b25369b64f83c3b
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sun Nov 22 10:52:45 2020 +0000

    Bug 309943 - When unable to obtain a lock, no option to open another file
    
    Currently when you get the message that GnuCash could not obtain a lock
    for the file to be opened you have four options...
    
    Open Read-Only, Create New File, Open Anyway, Quit
    
    This commit changes the 'Create new File' to 'Open with No File' which
    allows the user to then select...
    'File->New' to create a new file,
    'File->Open' to open a different file or one chosen from the history or
    'File->Quit' to exit.

diff --git a/gnucash/gnome-utils/gnc-file.c b/gnucash/gnome-utils/gnc-file.c
index 86b45725e..37a0fc79b 100644
--- a/gnucash/gnome-utils/gnc-file.c
+++ b/gnucash/gnome-utils/gnc-file.c
@@ -695,7 +695,7 @@ gnc_file_query_save (GtkWindow *parent, gboolean can_cancel)
 
 /* private utilities for file open; done in two stages */
 
-#define RESPONSE_NEW  1
+#define RESPONSE_NO_FILE 1
 #define RESPONSE_OPEN 2
 #define RESPONSE_QUIT 3
 #define RESPONSE_READONLY 4
@@ -848,8 +848,8 @@ RESTART:
 
         gnc_gtk_dialog_add_button(dialog, _("_Open Read-Only"),
                                   "document-revert", RESPONSE_READONLY);
-        gnc_gtk_dialog_add_button(dialog, _("_Create New File"),
-                                  "document-new", RESPONSE_NEW);
+        gnc_gtk_dialog_add_button(dialog, _("_Open with No File"),
+                                  "document-new", RESPONSE_NO_FILE);
         gnc_gtk_dialog_add_button(dialog, _("Open _Anyway"),
                                   "document-open", RESPONSE_OPEN);
         if (shutdown_cb)
@@ -861,7 +861,7 @@ RESTART:
 
         if (rc == GTK_RESPONSE_DELETE_EVENT)
         {
-            rc = shutdown_cb ? RESPONSE_QUIT : RESPONSE_NEW;
+            rc = shutdown_cb ? RESPONSE_QUIT : RESPONSE_NO_FILE;
         }
         switch (rc)
         {
@@ -881,10 +881,9 @@ RESTART:
             break;
         default:
             /* Can't use the given file, so just create a new
-             * database so that the user will get a window that
-             * they can click "Exit" on.
+             * Gnucash window so they can choose File->New, File->Open
+             * or just "Exit".
              */
-            gnc_file_new (parent);
             break;
         }
     }



Summary of changes:
 gnucash/gnome-utils/gnc-file.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)