gnucash maint: Multiple changes pushed

Christopher Lam clam at code.gnucash.org
Sun Sep 6 10:13:16 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/99101c19 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/979a050a (commit)
	from  https://github.com/Gnucash/gnucash/commit/cbf2a7b9 (commit)



commit 99101c191c59a41d426382c33a8884169bc4e75e
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Sep 6 22:09:46 2020 +0800

    [gnc-main-window] enable show_text for progressbar
    
    This will allow gtk_progress_bar_set_text to actually display the
    progress text.

diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index 6b1a896b9..c3552f221 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -3587,6 +3587,7 @@ gnc_main_window_setup_window (GncMainWindow *window)
                         FALSE, TRUE, 0);
 
     priv->progressbar = gtk_progress_bar_new ();
+    gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR(priv->progressbar), TRUE);
     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(priv->progressbar), " ");
     gtk_widget_show (priv->progressbar);
     gtk_box_pack_start (GTK_BOX (priv->statusbar), priv->progressbar,

commit 979a050ae9bd53555414bd5b5548a59c3bae057a
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Sep 6 22:10:37 2020 +0800

    Set parent window properly to gnc_verify_dialog, and i18n string

diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c
index 1c7554bf2..e71f5b769 100644
--- a/gnucash/gnome/gnc-plugin-page-account-tree.c
+++ b/gnucash/gnome/gnc-plugin-page-account-tree.c
@@ -425,7 +425,7 @@ finish (GncPluginPage* page)
 {
     if (gnc_get_ongoing_scrub ())
     {
-        gboolean ret = gnc_verify_dialog (NULL, FALSE, "%s", "A scrubbing operation is currently pending, do you want to abort it?");
+        gboolean ret = gnc_verify_dialog (GTK_WINDOW (gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (page))), FALSE, _("A scrubbing operation is currently pending, do you want to abort it?"));
         if (ret)
         {
             gnc_set_abort_scrub (TRUE);
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 235bf1323..b8a25b9a2 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -1920,7 +1920,7 @@ finish_scrub (GncPluginPage* page)
 {
     if (is_scrubbing)
     {
-        gboolean ret = gnc_verify_dialog (NULL, FALSE, "%s", "A scrubbing operation is currently pending, do you want to abort it?");
+        gboolean ret = gnc_verify_dialog (GTK_WINDOW (gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (page))), FALSE, _("A scrubbing operation is currently pending, do you want to abort it?"));
         if (ret)
         {
             abort_scrub = TRUE;



Summary of changes:
 gnucash/gnome-utils/gnc-main-window.c        | 1 +
 gnucash/gnome/gnc-plugin-page-account-tree.c | 2 +-
 gnucash/gnome/gnc-plugin-page-register.c     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)



More information about the gnucash-changes mailing list