r21733 - gnucash/trunk/src - Bug #665996 - Minor changes to existing Assistants.
Mike Evans
mikee at code.gnucash.org
Fri Dec 16 09:57:20 EST 2011
Author: mikee
Date: 2011-12-16 09:57:20 -0500 (Fri, 16 Dec 2011)
New Revision: 21733
Trac: http://svn.gnucash.org/trac/changeset/21733
Modified:
gnucash/trunk/src/core-utils/gnc-gconf-utils.h
gnucash/trunk/src/gnome-utils/assistant-utils.h
gnucash/trunk/src/gnome-utils/ui/osx_accel_map
gnucash/trunk/src/gnome/assistant-hierarchy.c
gnucash/trunk/src/gnome/assistant-loan.c
gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
Log:
Bug #665996 - Minor changes to existing Assistants.
Patch supplied by Bob.
Modified: gnucash/trunk/src/core-utils/gnc-gconf-utils.h
===================================================================
--- gnucash/trunk/src/core-utils/gnc-gconf-utils.h 2011-12-16 14:36:00 UTC (rev 21732)
+++ gnucash/trunk/src/core-utils/gnc-gconf-utils.h 2011-12-16 14:57:20 UTC (rev 21733)
@@ -880,7 +880,7 @@
/** 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.
Modified: gnucash/trunk/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c 2011-12-16 14:36:00 UTC (rev 21732)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c 2011-12-16 14:57:20 UTC (rev 21733)
@@ -1108,11 +1108,6 @@
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;
Modified: gnucash/trunk/src/gnome/assistant-loan.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-loan.c 2011-12-16 14:36:00 UTC (rev 21732)
+++ gnucash/trunk/src/gnome/assistant-loan.c 2011-12-16 14:57:20 UTC (rev 21733)
@@ -207,7 +207,7 @@
} 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 @@
}
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;
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2011-12-16 14:36:00 UTC (rev 21732)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2011-12-16 14:57:20 UTC (rev 21733)
@@ -162,7 +162,7 @@
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* readonly_inactive_actions[] =
{
"FileNewAccountAction",
- "FileAddAccountHierarchyDruidAction",
+ "FileAddAccountHierarchyAssistantAction",
"EditEditAccountAction",
"EditDeleteAccountAction",
"EditRenumberSubaccountsAction",
Modified: gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml 2011-12-16 14:36:00 UTC (rev 21732)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml 2011-12-16 14:57:20 UTC (rev 21733)
@@ -14,7 +14,7 @@
<placeholder name="ActionsPlaceholder">
<separator name="ActionsSep1"/>
<menuitem name="FileNewAccount" action="FileNewAccountAction"/>
- <menuitem name="FileAddAccountHierarchyDruid" action="FileAddAccountHierarchyDruidAction"/>
+ <menuitem name="FileAddAccountHierarchyAssistant" action="FileAddAccountHierarchyAssistantAction"/>
<separator name="ActionsSep2"/>
<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
<menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
Modified: gnucash/trunk/src/gnome-utils/assistant-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/assistant-utils.h 2011-12-16 14:36:00 UTC (rev 21732)
+++ gnucash/trunk/src/gnome-utils/assistant-utils.h 2011-12-16 14:57:20 UTC (rev 21733)
@@ -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 *
* *
Modified: gnucash/trunk/src/gnome-utils/ui/osx_accel_map
===================================================================
--- gnucash/trunk/src/gnome-utils/ui/osx_accel_map 2011-12-16 14:36:00 UTC (rev 21732)
+++ gnucash/trunk/src/gnome-utils/ui/osx_accel_map 2011-12-16 14:57:20 UTC (rev 21733)
@@ -164,7 +164,7 @@
; (gtk_accel_path "<Actions>/MainWindowActions/ViewToolbarAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile7Action" "")
; (gtk_accel_path "<Actions>/gnc-plugin-aqbanking-actions/ABGetBalanceAction" "")
-; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/FileAddAccountHierarchyDruidAction" "")
+; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/FileAddAccountHierarchyAssistantAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/WindowNewAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile9Action" "")
; (gtk_accel_path "<Actions>/MainWindowActions/ViewSortByAction" "")
Modified: gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c 2011-12-16 14:36:00 UTC (rev 21732)
+++ gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c 2011-12-16 14:57:20 UTC (rev 21733)
@@ -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 @@
gboolean ask_date_format;
gboolean busy;
gboolean load_stop;
+ gboolean acct_tree_found;
SCM imported_files;
SCM selected_file;
@@ -1335,6 +1337,10 @@
{
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_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 @@
/* 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);
More information about the gnucash-changes
mailing list