r23618 - gnucash/trunk/src - Make "New Book Options" dialog transient for its caller where possible
Geert Janssens
gjanssens at code.gnucash.org
Thu Dec 26 08:47:22 EST 2013
Author: gjanssens
Date: 2013-12-26 08:47:22 -0500 (Thu, 26 Dec 2013)
New Revision: 23618
Trac: http://svn.gnucash.org/trac/changeset/23618
Modified:
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome-utils/dialog-utils.h
gnucash/trunk/src/gnome/assistant-hierarchy.c
gnucash/trunk/src/import-export/aqb/gnc-file-aqb-import.c
gnucash/trunk/src/import-export/csv-imp/assistant-csv-account-import.c
gnucash/trunk/src/import-export/csv-imp/assistant-csv-trans-import.c
gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
gnucash/trunk/src/import-export/qif-imp/assistant-qif-import.c
Log:
Make "New Book Options" dialog transient for its caller where possible
Modified: gnucash/trunk/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c 2013-12-25 18:54:07 UTC (rev 23617)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c 2013-12-26 13:47:22 UTC (rev 23618)
@@ -460,7 +460,7 @@
/* Before creating transactions, if this is a new book, let user specify
* book options, since they affect how transactions are created */
if (data->new_book)
- data->new_book = gnc_new_book_option_display ();
+ data->new_book = gnc_new_book_option_display (data->dialog);
if (!data->account_list_added)
{
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2013-12-25 18:54:07 UTC (rev 23617)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2013-12-26 13:47:22 UTC (rev 23618)
@@ -578,12 +578,15 @@
* imported/entered, since they can affect how transactions are created
* Note: This dialog is modal! */
gboolean
-gnc_new_book_option_display (void)
+gnc_new_book_option_display (GtkWidget *parent)
{
GtkWidget *window;
gint result = GTK_RESPONSE_HELP;
window = gnc_book_options_dialog_cb (TRUE, _( "New Book Options"));
+ if (parent)
+ gtk_window_set_transient_for (GTK_WINDOW(window), GTK_WINDOW(parent));
+
if (window)
{
/* close dialog and proceed unless help button selected */
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.h 2013-12-25 18:54:07 UTC (rev 23617)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.h 2013-12-26 13:47:22 UTC (rev 23618)
@@ -103,6 +103,6 @@
* dialog so user can specify options, before any transactions can be
* imported/entered, since they can affect how transactions are created
* Note: This dialog is modal! */
-gboolean gnc_new_book_option_display (void);
+gboolean gnc_new_book_option_display (GtkWidget *parent);
#endif /* DIALOG_UTILS_H */
Modified: gnucash/trunk/src/import-export/aqb/gnc-file-aqb-import.c
===================================================================
--- gnucash/trunk/src/import-export/aqb/gnc-file-aqb-import.c 2013-12-25 18:54:07 UTC (rev 23617)
+++ gnucash/trunk/src/import-export/aqb/gnc-file-aqb-import.c 2013-12-26 13:47:22 UTC (rev 23618)
@@ -224,7 +224,7 @@
/* Before importing the results, if this is a new book, let user specify
* book options, since they affect how transactions are created */
if (gnc_is_new_book())
- gnc_new_book_option_display();
+ gnc_new_book_option_display(gnc_ui_get_toplevel());
/* Import the results */
ieci = gnc_ab_import_context(context, AWAIT_TRANSACTIONS,
Modified: gnucash/trunk/src/import-export/csv-imp/assistant-csv-account-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv-imp/assistant-csv-account-import.c 2013-12-25 18:54:07 UTC (rev 23617)
+++ gnucash/trunk/src/import-export/csv-imp/assistant-csv-account-import.c 2013-12-26 13:47:22 UTC (rev 23618)
@@ -437,7 +437,7 @@
/* Before creating accounts, if this is a new book, let user specify
* book options, since they affect how transactions are created */
if (info->new_book)
- info->new_book = gnc_new_book_option_display();
+ info->new_book = gnc_new_book_option_display(info->window);
if (!g_strcmp0(info->error, "") == 0)
{
Modified: gnucash/trunk/src/import-export/csv-imp/assistant-csv-trans-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv-imp/assistant-csv-trans-import.c 2013-12-25 18:54:07 UTC (rev 23617)
+++ gnucash/trunk/src/import-export/csv-imp/assistant-csv-trans-import.c 2013-12-26 13:47:22 UTC (rev 23618)
@@ -1445,7 +1445,7 @@
/* Before creating transactions, if this is a new book, let user specify
* book options, since they affect how transactions are created */
if (info->new_book)
- info->new_book = gnc_new_book_option_display();
+ info->new_book = gnc_new_book_option_display(info->window);
/* Create transactions from the parsed data, first time with FALSE
Subsequent times with TRUE */
Modified: gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c 2013-12-25 18:54:07 UTC (rev 23617)
+++ gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c 2013-12-26 13:47:22 UTC (rev 23618)
@@ -901,7 +901,7 @@
* calling 'gnc_import_select_account', allow the user to set book
* options. */
if (new_book)
- new_book = gnc_new_book_option_display();
+ new_book = gnc_new_book_option_display(gnc_ui_get_toplevel());
gnc_utf8_strip_invalid(data.account_name);
gnc_utf8_strip_invalid(data.account_id);
Modified: gnucash/trunk/src/import-export/qif-imp/assistant-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-imp/assistant-qif-import.c 2013-12-25 18:54:07 UTC (rev 23617)
+++ gnucash/trunk/src/import-export/qif-imp/assistant-qif-import.c 2013-12-26 13:47:22 UTC (rev 23618)
@@ -2996,7 +2996,7 @@
/* Before creating transactions, if this is a new book, let user specify
* book options, since they affect how transactions are created */
if (wind->new_book)
- wind->new_book = gnc_new_book_option_display();
+ wind->new_book = gnc_new_book_option_display(wind->window);
}
More information about the gnucash-changes
mailing list