gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/4fd52725 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/71a2429c (commit)
	from  https://github.com/Gnucash/gnucash/commit/ec3ca043 (commit)



commit 4fd52725bf64086344dec8551178578e4de403e0
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jan 26 14:40:53 2018 -0800

    Fix no transient for warnings from reconcile dialogs.

diff --git a/gnucash/gnome/gtkbuilder/window-reconcile.glade b/gnucash/gnome/gtkbuilder/window-reconcile.glade
index 8acdedf..1cb7f19 100644
--- a/gnucash/gnome/gtkbuilder/window-reconcile.glade
+++ b/gnucash/gnome/gtkbuilder/window-reconcile.glade
@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="reconcile_start_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
index 744fa1c..c1190d8 100644
--- a/gnucash/gnome/window-reconcile.c
+++ b/gnucash/gnome/window-reconcile.c
@@ -1918,7 +1918,8 @@ recnWindowWithBalance (GtkWidget *parent, Account *account,
 
     /* Allow resize */
     gtk_window_set_resizable(GTK_WINDOW(recnData->window), TRUE);
-
+    gtk_window_set_transient_for(GTK_WINDOW(recnData->window),
+                                 GTK_WINDOW (parent));
     gtk_widget_show_all(recnData->window);
 
     gnc_reconcile_window_set_titles(recnData);

commit 71a2429c13bdf80b6088976b90dce0baa72f4cdf
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jan 26 14:40:21 2018 -0800

    [MacOS] Put the reconcile window menu on the screen menubar.

diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
index 90444f8..744fa1c 100644
--- a/gnucash/gnome/window-reconcile.c
+++ b/gnucash/gnome/window-reconcile.c
@@ -58,6 +58,9 @@
 #include "guile-util.h"
 #include "reconcile-view.h"
 #include "window-reconcile.h"
+#ifdef MAC_INTEGRATION
+#include <gtkmacintegration/gtkosxapplication.h>
+#endif
 
 #define WINDOW_RECONCILE_CM_CLASS "window-reconcile"
 #define GNC_PREF_AUTO_INTEREST_TRANSFER "auto-interest-transfer"
@@ -1920,6 +1923,19 @@ recnWindowWithBalance (GtkWidget *parent, Account *account,
 
     gnc_reconcile_window_set_titles(recnData);
 
+#ifdef MAC_INTEGRATION
+    {
+        GtkWidget *menubar = gtk_ui_manager_get_widget (recnData->ui_merge,
+                                                        "/menubar");
+        GtkosxApplication *theApp = g_object_new (GTKOSX_TYPE_APPLICATION,
+                                                  NULL);
+        if (GTK_IS_MENU_ITEM (menubar))
+            menubar = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menubar));
+        gtk_widget_hide (menubar);
+        gtkosx_application_set_menu_bar (theApp, GTK_MENU_SHELL (menubar));
+        g_object_unref (theApp);
+    }
+#endif
     recnRecalculateBalance(recnData);
 
     gnc_window_adjust_for_screen(GTK_WINDOW(recnData->window));



Summary of changes:
 gnucash/gnome/gtkbuilder/window-reconcile.glade |  2 +-
 gnucash/gnome/window-reconcile.c                | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)