gnucash maint: Multiple changes pushed

[Robert Fewell]

Updated	 via  https://github.com/Gnucash/gnucash/commit/979f6acf (commit)
	 via  https://github.com/Gnucash/gnucash/commit/161ab691 (commit)
	from  https://github.com/Gnucash/gnucash/commit/72d742e2 (commit)



commit 979f6acf91555300cb57efa3f412ac0268ae4e81
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Nov 28 15:22:48 2020 +0000

    Change the mnemonic of '_Open with No File' to 'Open with _No File' to fix conflict.

diff --git a/gnucash/gnome-utils/gnc-file.c b/gnucash/gnome-utils/gnc-file.c
index dd22ea08c..1c20ea37b 100644
--- a/gnucash/gnome-utils/gnc-file.c
+++ b/gnucash/gnome-utils/gnc-file.c
@@ -848,7 +848,7 @@ RESTART:
 
         gnc_gtk_dialog_add_button(dialog, _("_Open Read-Only"),
                                   "emblem-readonly", RESPONSE_READONLY);
-        gnc_gtk_dialog_add_button(dialog, _("_Open with No File"),
+        gnc_gtk_dialog_add_button(dialog, _("Open with _No File"),
                                   "document-new-symbolic", RESPONSE_NO_FILE);
         gnc_gtk_dialog_add_button(dialog, _("Open _Anyway"),
                                   "document-open-symbolic", RESPONSE_OPEN);

commit 161ab691d68c80fa8b99b6250adbed2eda09040f
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Nov 28 14:10:29 2020 +0000

    Bug 343647 - Keep scrolled report location
    
    If you have a large report and have scrolled down to the bottom and
    decide to tab to a different page and come back the report is back at
    the top. This was due to reloading the report before focusing so change
    this so it only loads once, if the report needs refreshing then there
    is the reload toolbar button.

diff --git a/gnucash/gnome/gnc-plugin-page-report.c b/gnucash/gnome/gnc-plugin-page-report.c
index e7f260e57..8cebd4f73 100644
--- a/gnucash/gnome/gnc-plugin-page-report.c
+++ b/gnucash/gnome/gnc-plugin-page-report.c
@@ -124,6 +124,7 @@ typedef struct GncPluginPageReportPrivate
 
     /* The page is in the process of reloading the html */
     gboolean	reloading;
+    gboolean    loaded;
 
     /// the gnc_html abstraction this PluginPage contains
 //        gnc_html *html;
@@ -255,7 +256,8 @@ gnc_plugin_page_report_focus_widget (GncPluginPage *report_plugin_page)
         {
             GtkWidget *widget = gnc_html_get_webview (priv->html);
 
-            gnc_plugin_page_report_load_uri (report_plugin_page);
+            if (!priv->loaded) // so we only do the load once
+                gnc_plugin_page_report_load_uri (report_plugin_page);
 
             if (GTK_IS_WIDGET(widget))
             {
@@ -384,6 +386,8 @@ gnc_plugin_page_report_load_uri (GncPluginPage *page)
     gnc_html_show_url(priv->html, type, url_location, url_label, 0);
     g_free(url_location);
 
+    priv->loaded = TRUE;
+
     gnc_plugin_page_report_set_progressbar( page, FALSE );
 
     // this resets the window for the progressbar to NULL
@@ -460,6 +464,7 @@ gnc_plugin_page_report_create_widget( GncPluginPage *page )
 //        priv->html = gnc_html_new( topLvl );
     priv->html = gnc_html_factory_create_html();
     gnc_html_set_parent( priv->html, topLvl );
+    priv->loaded = FALSE;
 
     gnc_html_history_set_node_destroy_cb(gnc_html_get_history(priv->html),
                                          gnc_plugin_page_report_history_destroy_cb,



Summary of changes:
 gnucash/gnome-utils/gnc-file.c         | 2 +-
 gnucash/gnome/gnc-plugin-page-report.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)