diff --git a/src/core-utils/gnc-gconf-utils.h b/src/core-utils/gnc-gconf-utils.h index 5b643d9ccd..ec65a520c6 100644 --- a/src/core-utils/gnc-gconf-utils.h +++ b/src/core-utils/gnc-gconf-utils.h @@ -880,7 +880,7 @@ GSList *gnc_gconf_client_all_entries (const gchar *section); /** Check gconf to see if the schema for one of the gnucash keys can * be found. This function is called to determine whether or not to - * launch a druid to help the user properly set up GConf for Gnucash. + * launch an assistant to help the user properly set up GConf for Gnucash. * * @return This function returns TRUE if it was able to find a * schema. diff --git a/src/gnome-utils/assistant-utils.h b/src/gnome-utils/assistant-utils.h index 397d87e3ce..3d3c247549 100644 --- a/src/gnome-utils/assistant-utils.h +++ b/src/gnome-utils/assistant-utils.h @@ -1,5 +1,5 @@ /********************************************************************\ - * assistant-utils.h -- utility functions for creating druids * + * assistant-utils.h -- utility functions for creating assistants * * Copyright (C) 2001 Jeremy Collins * * Copyright (C) 2010 Geert Janssens * * * diff --git a/src/gnome-utils/ui/osx_accel_map b/src/gnome-utils/ui/osx_accel_map index 1ecb7ab466..d564fa06b9 100644 --- a/src/gnome-utils/ui/osx_accel_map +++ b/src/gnome-utils/ui/osx_accel_map @@ -164,7 +164,7 @@ ; (gtk_accel_path "/MainWindowActions/ViewToolbarAction" "") ; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile7Action" "") ; (gtk_accel_path "/gnc-plugin-aqbanking-actions/ABGetBalanceAction" "") -; (gtk_accel_path "/GncPluginPageAccountTreeActions/FileAddAccountHierarchyDruidAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/FileAddAccountHierarchyAssistantAction" "") ; (gtk_accel_path "/MainWindowActions/WindowNewAction" "") ; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile9Action" "") ; (gtk_accel_path "/MainWindowActions/ViewSortByAction" "") diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c index 7289deca16..572b136c1a 100644 --- a/src/gnome/assistant-hierarchy.c +++ b/src/gnome/assistant-hierarchy.c @@ -1108,11 +1108,6 @@ gnc_create_hierarchy_assistant (gboolean use_defaults, GncHierarchyAssistantFini data->category_description = GTK_TEXT_VIEW(gtk_builder_get_object (builder, "account_types_description")); data->account_list_added = FALSE; - /* FIXME -- what is this ? - color = &GNOME_DRUID_PAGE_EDGE(start_page)->textbox_color; - gtk_widget_modify_base(GTK_WIDGET(data->category_description), GTK_STATE_INSENSITIVE, color); - */ - /* Final Accounts Page */ data->final_account_tree_container = GTK_WIDGET(gtk_builder_get_object (builder, "final_account_tree_box")); data->final_account_tree = NULL; diff --git a/src/gnome/assistant-loan.c b/src/gnome/assistant-loan.c index f0bf4c7f23..e96114a9a5 100644 --- a/src/gnome/assistant-loan.c +++ b/src/gnome/assistant-loan.c @@ -207,7 +207,7 @@ typedef struct LoanData_ } LoanData; /** - * The UI-side storage of the loan druid data. + * The UI-side storage of the loan assistant data. **/ typedef struct LoanAssistantData_ { @@ -3067,7 +3067,7 @@ loan_create_sxes( LoanAssistantData *ldd ) } tcSX->schedule = rod->schedule; /* So it won't get destroyed when the close the - * Druid. */ + * Assistant. */ tcSX->instNum = ld_calc_sx_instance_num(&tcSX->start, rod->schedule); rod->schedule = NULL; diff --git a/src/gnome/gnc-plugin-page-account-tree.c b/src/gnome/gnc-plugin-page-account-tree.c index 4d26a14f21..6f0de5ff25 100644 --- a/src/gnome/gnc-plugin-page-account-tree.c +++ b/src/gnome/gnc-plugin-page-account-tree.c @@ -162,7 +162,7 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] = G_CALLBACK (gnc_plugin_page_account_tree_cmd_new_account) }, { - "FileAddAccountHierarchyDruidAction", GNC_STOCK_NEW_ACCOUNT, N_("New Account _Hierarchy..."), NULL, + "FileAddAccountHierarchyAssistantAction", GNC_STOCK_NEW_ACCOUNT, N_("New Account _Hierarchy..."), NULL, N_("Extend the current book by merging with new account type categories"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_file_new_hierarchy) }, @@ -272,7 +272,7 @@ static const gchar *actions_requiring_account_always[] = static const gchar* readonly_inactive_actions[] = { "FileNewAccountAction", - "FileAddAccountHierarchyDruidAction", + "FileAddAccountHierarchyAssistantAction", "EditEditAccountAction", "EditDeleteAccountAction", "EditRenumberSubaccountsAction", diff --git a/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml b/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml index 5f1d9ed898..896c8c8af5 100644 --- a/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml +++ b/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml @@ -14,7 +14,7 @@ - + diff --git a/src/import-export/qif-import/assistant-qif-import.c b/src/import-export/qif-import/assistant-qif-import.c index 44b9497944..f8ecdafd3c 100644 --- a/src/import-export/qif-import/assistant-qif-import.c +++ b/src/import-export/qif-import/assistant-qif-import.c @@ -38,6 +38,7 @@ #include "dialog-commodity.h" #include "dialog-progress.h" #include "dialog-utils.h" +#include "dialog-file-access.h" #include "assistant-qif-import.h" #include "assistant-utils.h" #include "gnc-component-manager.h" @@ -155,6 +156,7 @@ struct _qifimportwindow gboolean ask_date_format; gboolean busy; gboolean load_stop; + gboolean acct_tree_found; SCM imported_files; SCM selected_file; @@ -1335,6 +1337,10 @@ gnc_ui_qif_import_close_cb(GtkAssistant *gtkassistant, gpointer user_data) { QIFImportWindow *wind = user_data; + /* If We did not have an account tree, lets save it */ + if(!wind->acct_tree_found) + gnc_ui_file_access_for_save_as(); + gnc_close_gui_component_by_data( ASSISTANT_QIF_IMPORT_CM_CLASS, wind ); } @@ -3219,6 +3225,7 @@ gnc_ui_qif_import_finish_cb (GtkAssistant *gtkassistant, gnc_main_window_foreach_page(gnc_ui_qif_import_check_acct_tree, &acct_tree_found); + wind->acct_tree_found = acct_tree_found; if (!acct_tree_found) { page = gnc_plugin_page_account_tree_new(); @@ -3581,6 +3588,9 @@ gnc_ui_qif_import_assistant_make(QIFImportWindow *qif_win) /* Get all interesting builder-defined widgets. */ get_assistant_widgets(qif_win, builder); + /* Make this window stay on top */ + gtk_window_set_keep_above (GTK_WINDOW(qif_win->window), TRUE); + /* Build the details of all GtkTreeView widgets. */ build_views(qif_win);