IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qif import assistant: Use Enter and Leave macros

Browse Source 
Instead of "Visibility Page" and "Builder Page" which don't
communicate well what function is running.
This commit is contained in:
John Ralls 2023-11-12 10:40:43 -08:00
parent dcb24a2460
commit b7f231030f
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gnucash/import-export/qif-imp/assistant-qif-import.c
View File

@ -1488,62 +1488,64 @@ static gboolean
gnc_ui_qif_import_assistant_skip_page (GtkAssistant *assistant, GtkWidget *page, QIFImportWindow *wind) gnc_ui_qif_import_assistant_skip_page (GtkAssistant *assistant, GtkWidget *page, QIFImportWindow *wind)
{ {
const char *pagename = gtk_buildable_get_name (GTK_BUILDABLE(page)); const char *pagename = gtk_buildable_get_name (GTK_BUILDABLE(page));
gboolean rv = FALSE;
PINFO ("Visibility page name is %s", gtk_buildable_get_name (GTK_BUILDABLE(page))); ENTER("Page %s", pagename);
if (!g_strcmp0 (pagename, "date_format_page")) if (!g_strcmp0 (pagename, "date_format_page"))
{ {
/* Current page is date page */ /* Current page is date page */
return gnc_ui_qif_import_skip_date_format (assistant, wind); rv = gnc_ui_qif_import_skip_date_format (assistant, wind);
} }
else if (!g_strcmp0 (pagename, "account_name_page")) else if (!g_strcmp0 (pagename, "account_name_page"))
{ {
/* Current page is account page */ /* Current page is account page */
return gnc_ui_qif_import_skip_account (assistant, wind); rv = gnc_ui_qif_import_skip_account (assistant, wind);
} }
else if (!g_strcmp0 (pagename, "account_doc_page")) else if (!g_strcmp0 (pagename, "account_doc_page"))
{ {
/* Current page is Account Doc. page */ /* Current page is Account Doc. page */
return gnc_ui_qif_import_skip_account_doc (wind); rv = gnc_ui_qif_import_skip_account_doc (wind);
} }
else if (!g_strcmp0 (pagename, "category_doc_page")) else if (!g_strcmp0 (pagename, "category_doc_page"))
{ {
/* Current page is Category Doc. page */ /* Current page is Category Doc. page */
return gnc_ui_qif_import_skip_category_doc (wind); rv = gnc_ui_qif_import_skip_category_doc (wind);
} }
else if (!g_strcmp0 (pagename, "category_match_page")) else if (!g_strcmp0 (pagename, "category_match_page"))
{ {
/* Current page is Category Match page */ /* Current page is Category Match page */
return gnc_ui_qif_import_skip_category_match (wind); rv = gnc_ui_qif_import_skip_category_match (wind);
} }
else if (!g_strcmp0 (pagename, "memo_doc_page")) else if (!g_strcmp0 (pagename, "memo_doc_page"))
{ {
/* Current page is Memo Doc. page */ /* Current page is Memo Doc. page */
return gnc_ui_qif_import_skip_memo_doc (wind); rv = gnc_ui_qif_import_skip_memo_doc (wind);
} }
else if (!g_strcmp0 (pagename, "memo_match_page")) else if (!g_strcmp0 (pagename, "memo_match_page"))
{ {
/* Current page is Memo Match page */ /* Current page is Memo Match page */
return gnc_ui_qif_import_skip_memo_match (wind); rv = gnc_ui_qif_import_skip_memo_match (wind);
} }
else if (!g_strcmp0 (pagename, "commodity_page")) else if (!g_strcmp0 (pagename, "commodity_page"))
{ {
/* Current page is Commodity page */ /* Current page is Commodity page */
return gnc_ui_qif_import_skip_commodity (wind); rv = gnc_ui_qif_import_skip_commodity (wind);
} }
else if (!g_strcmp0 (pagename, "duplicates_doc_page")) else if (!g_strcmp0 (pagename, "duplicates_doc_page"))
{ {
/* Current page is Duplicates Doc page */ /* Current page is Duplicates Doc page */
return gnc_ui_qif_import_skip_duplicates_doc (wind); rv = gnc_ui_qif_import_skip_duplicates_doc (wind);
} }
else if (!g_strcmp0 (pagename, "duplicates_match_page")) else if (!g_strcmp0 (pagename, "duplicates_match_page"))
{ {
/* Current page is Duplicates Match page */ /* Current page is Duplicates Match page */
return gnc_ui_qif_import_skip_duplicates_match (wind); rv = gnc_ui_qif_import_skip_duplicates_match (wind);
} }
/* By default, we do not skip */ /* By default, we do not skip */
return FALSE; LEAVE("%s", rv ? "Skipped" : "Not Skipped");
return rv;
} }
@ -2520,7 +2522,6 @@ gnc_ui_qif_import_account_doc_prepare (GtkAssistant *assistant,
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num); GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
gtk_assistant_update_buttons_state (assistant); gtk_assistant_update_buttons_state (assistant);
PINFO ("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
/* Enable the Assistant "Next" Button */ /* Enable the Assistant "Next" Button */
gtk_assistant_set_page_complete (assistant, page, TRUE); gtk_assistant_set_page_complete (assistant, page, TRUE);
@ -2603,8 +2604,6 @@ gnc_ui_qif_import_category_doc_prepare (GtkAssistant *assistant,
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num); GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
gtk_assistant_update_buttons_state (assistant); gtk_assistant_update_buttons_state (assistant);
PINFO ("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
/* Enable the Assistant "Next" Button */ /* Enable the Assistant "Next" Button */
gtk_assistant_set_page_complete (assistant, page, TRUE); gtk_assistant_set_page_complete (assistant, page, TRUE);
} }
@ -2702,8 +2701,6 @@ gnc_ui_qif_import_memo_doc_prepare (GtkAssistant *assistant, gpointer user_data)
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num); GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
gtk_assistant_update_buttons_state (assistant); gtk_assistant_update_buttons_state (assistant);
PINFO ("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
/* Enable the Assistant "Next" Button */ /* Enable the Assistant "Next" Button */
gtk_assistant_set_page_complete (assistant, page, TRUE); gtk_assistant_set_page_complete (assistant, page, TRUE);
@ -2953,8 +2950,6 @@ gnc_ui_qif_import_commodity_prepare (GtkAssistant *assistant, gpointer user_data
gtk_assistant_update_buttons_state (assistant); gtk_assistant_update_buttons_state (assistant);
PINFO ("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
/* Enable the Assistant "Next" Button */ /* Enable the Assistant "Next" Button */
gtk_assistant_set_page_complete (assistant, page, gtk_assistant_set_page_complete (assistant, page,
gnc_ui_qif_import_commodity_all_notebook_pages_complete (wind)); gnc_ui_qif_import_commodity_all_notebook_pages_complete (wind));
@ -3417,8 +3412,6 @@ gnc_ui_qif_import_duplicates_doc_prepare (GtkAssistant *assistant,
GtkWidget *page = gtk_assistant_get_nth_page (assistant, num); GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
gtk_assistant_update_buttons_state (assistant); gtk_assistant_update_buttons_state (assistant);
PINFO ("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
/* Enable the Assistant "Next" Button */ /* Enable the Assistant "Next" Button */
gtk_assistant_set_page_complete (assistant, page, TRUE); gtk_assistant_set_page_complete (assistant, page, TRUE);
@ -3658,7 +3651,7 @@ void gnc_ui_qif_import_prepare_cb (GtkAssistant *assistant, GtkWidget *page,
GtkWidget *mypage = gtk_assistant_get_nth_page (assistant, currentpage); GtkWidget *mypage = gtk_assistant_get_nth_page (assistant, currentpage);
const char *pagename = gtk_buildable_get_name (GTK_BUILDABLE(mypage)); const char *pagename = gtk_buildable_get_name (GTK_BUILDABLE(mypage));
PINFO ("Builder Page Name is %s", gtk_buildable_get_name (GTK_BUILDABLE(mypage))); ENTER("Page %s", pagename);
if (!g_strcmp0 (pagename, "start_page")) if (!g_strcmp0 (pagename, "start_page"))
{ {
@ -3755,6 +3748,7 @@ void gnc_ui_qif_import_prepare_cb (GtkAssistant *assistant, GtkWidget *page,
/* Current page is the summary page */ /* Current page is the summary page */
gnc_ui_qif_import_summary_page_prepare (assistant, user_data); gnc_ui_qif_import_summary_page_prepare (assistant, user_data);
} }
LEAVE("");
} }
@ -4016,15 +4010,17 @@ gnc_ui_qif_import_assistant_make (QIFImportWindow *qif_win)
/* Get all interesting builder-defined widgets. */ /* Get all interesting builder-defined widgets. */
get_assistant_widgets (qif_win, builder); get_assistant_widgets (qif_win, builder);
GtkAssistant *assistant = GTK_ASSISTANT(qif_win->window);
/* Make this window stay on top */ /* Make this window stay on top */
gtk_window_set_transient_for (GTK_WINDOW(qif_win->window), gnc_ui_get_main_window (NULL)); gtk_window_set_transient_for (GTK_WINDOW(qif_win->window), gnc_ui_get_main_window (NULL));
/* Build the details of all GtkTreeView widgets. */ /* Build the details of all GtkTreeView widgets. */
build_views (qif_win); build_views (qif_win);
PINFO ("Total Number of Assistant Pages is %d", gtk_assistant_get_n_pages (assistant));
/* Establish a custom next page function. */ /* Establish a custom next page function. */
gtk_assistant_set_forward_page_func(GTK_ASSISTANT(qif_win->window), gtk_assistant_set_forward_page_func(assistant,
gnc_ui_qif_import_assistant_page_forward, qif_win, NULL); gnc_ui_qif_import_assistant_page_forward, qif_win, NULL);
/* Currency Page */ /* Currency Page */