From 19fdc8ff948350673980a5a18db3c17f760c6d2b Mon Sep 17 00:00:00 2001 From: David Hampton Date: Thu, 15 Mar 2007 00:55:52 +0000 Subject: [PATCH] In the print check dialog, the notes field has always incorrectly been called the memo field. This fix corrects that misnaming. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15717 57a11ea4-9604-0410-9ed3-97b8803252fd --- checks/deluxe.chk | 2 +- checks/gnomeprint/deluxe.chk | 2 +- checks/gnomeprint/quicken.chk | 2 +- checks/gnomeprint/quicken_wallet.chk | 4 +-- checks/quicken.chk | 2 +- checks/quicken_wallet.chk | 4 +-- src/gnome/dialog-print-check.c | 38 ++++++++++++++-------------- src/gnome/glade/print.glade | 8 +++--- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/checks/deluxe.chk b/checks/deluxe.chk index 618bd6a560..529132b9a0 100644 --- a/checks/deluxe.chk +++ b/checks/deluxe.chk @@ -18,5 +18,5 @@ Coords_3 = 395.0;85.0 Type_4 = DATE Coords_4 = 343.0;54.0 -Type_5 = MEMO +Type_5 = NOTES Coords_5 = 100.0;159.0 diff --git a/checks/gnomeprint/deluxe.chk b/checks/gnomeprint/deluxe.chk index b8a7d43bda..bc1be76026 100644 --- a/checks/gnomeprint/deluxe.chk +++ b/checks/gnomeprint/deluxe.chk @@ -18,5 +18,5 @@ Coords_3 = 395.0;147.0 Type_4 = DATE Coords_4 = 343.0;178.0 -Type_5 = MEMO +Type_5 = NOTES Coords_5 = 100.0;73.0 diff --git a/checks/gnomeprint/quicken.chk b/checks/gnomeprint/quicken.chk index 375e30da33..f7e4e412f8 100644 --- a/checks/gnomeprint/quicken.chk +++ b/checks/gnomeprint/quicken.chk @@ -24,5 +24,5 @@ Coords_3 = 500.0;150.0 Type_4 = DATE Coords_4 = 500.0;185.0 -Type_5 = MEMO +Type_5 = NOTES Coords_5 = 50.0;40.0 diff --git a/checks/gnomeprint/quicken_wallet.chk b/checks/gnomeprint/quicken_wallet.chk index abf3294c44..5cb1621dfd 100644 --- a/checks/gnomeprint/quicken_wallet.chk +++ b/checks/gnomeprint/quicken_wallet.chk @@ -24,7 +24,7 @@ Coords_3 = 518.0;137.0 Type_4 = DATE Coords_4 = 504.0;151.0 -Type_5 = MEMO +Type_5 = NOTES Coords_5 = 216.0;37.0 Type_6 = DATE @@ -36,5 +36,5 @@ Coords_7 = 26.0;126.0 Type_8 = AMOUNT_NUMBER Coords_8 = 50.0;90.0 -Type_9 = MEMO +Type_9 = NOTES Coords_9 = 28.0;65.0 diff --git a/checks/quicken.chk b/checks/quicken.chk index 074f3c58f7..0029ac1f8f 100644 --- a/checks/quicken.chk +++ b/checks/quicken.chk @@ -24,5 +24,5 @@ Coords_3 = 500.0;102.0 Type_4 = DATE Coords_4 = 500.0;67.0 -Type_5 = MEMO +Type_5 = NOTES Coords_5 = 50.0;212.0 diff --git a/checks/quicken_wallet.chk b/checks/quicken_wallet.chk index cfb6c16a08..828289c748 100644 --- a/checks/quicken_wallet.chk +++ b/checks/quicken_wallet.chk @@ -24,7 +24,7 @@ Coords_3 = 518.0;67.0 Type_4 = DATE Coords_4 = 504.0;53.0 -Type_5 = MEMO +Type_5 = NOTES Coords_5 = 216.0;167.0 Type_6 = DATE @@ -36,5 +36,5 @@ Coords_7 = 26.0;78.0 Type_8 = AMOUNT_NUMBER Coords_8 = 50.0;114.0 -Type_9 = MEMO +Type_9 = NOTES Coords_9 = 28.0;139.0 diff --git a/src/gnome/dialog-print-check.c b/src/gnome/dialog-print-check.c index 24b6276cc7..16bff355b2 100644 --- a/src/gnome/dialog-print-check.c +++ b/src/gnome/dialog-print-check.c @@ -59,7 +59,7 @@ #define KEY_CUSTOM_DATE "custom_date" #define KEY_CUSTOM_WORDS "custom_amount_words" #define KEY_CUSTOM_NUMBER "custom_amount_number" -#define KEY_CUSTOM_MEMO "custom_memo" +#define KEY_CUSTOM_NOTES "custom_memo" /* historically misnamed */ #define KEY_CUSTOM_TRANSLATION "custom_translation" #define KEY_CUSTOM_ROTATION "custom_rotation" #define KEY_CUSTOM_UNITS "custom_units" @@ -112,7 +112,7 @@ void gnc_ui_print_restore_dialog(PrintCheckDialog * pcd); _(NONE,) \ _(PAYEE,) \ _(DATE,) \ - _(MEMO,) \ + _(NOTES,) \ _(AMOUNT_NUMBER,) \ _(AMOUNT_WORDS,) \ _(TEXT,) \ @@ -196,7 +196,7 @@ struct _print_check_dialog { const char *payee; gnc_numeric amount; time_t date; - const char *memo; + const char *notes; GtkWidget * format_combobox; gint format_max; @@ -207,7 +207,7 @@ struct _print_check_dialog { GtkSpinButton * date_x, * date_y; GtkSpinButton * words_x, * words_y; GtkSpinButton * number_x, * number_y; - GtkSpinButton * memo_x, * memo_y; + GtkSpinButton * notes_x, * notes_y; GtkSpinButton * translation_x, * translation_y; GtkSpinButton * check_rotation; GtkWidget * translation_label; @@ -284,9 +284,9 @@ gnc_ui_print_save_dialog(PrintCheckDialog * pcd) save_float_pair(GCONF_SECTION, KEY_CUSTOM_NUMBER, gtk_spin_button_get_value(pcd->number_x), gtk_spin_button_get_value(pcd->number_y)); - save_float_pair(GCONF_SECTION, KEY_CUSTOM_MEMO, - gtk_spin_button_get_value(pcd->memo_x), - gtk_spin_button_get_value(pcd->memo_y)); + save_float_pair(GCONF_SECTION, KEY_CUSTOM_NOTES, + gtk_spin_button_get_value(pcd->notes_x), + gtk_spin_button_get_value(pcd->notes_y)); save_float_pair(GCONF_SECTION, KEY_CUSTOM_TRANSLATION, gtk_spin_button_get_value(pcd->translation_x), gtk_spin_button_get_value(pcd->translation_y)); @@ -333,9 +333,9 @@ gnc_ui_print_restore_dialog(PrintCheckDialog * pcd) get_float_pair(GCONF_SECTION, KEY_CUSTOM_NUMBER, &x, &y); gtk_spin_button_set_value(pcd->number_x, x); gtk_spin_button_set_value(pcd->number_y, y); - get_float_pair(GCONF_SECTION, KEY_CUSTOM_MEMO, &x, &y); - gtk_spin_button_set_value(pcd->memo_x, x); - gtk_spin_button_set_value(pcd->memo_y, y); + get_float_pair(GCONF_SECTION, KEY_CUSTOM_NOTES, &x, &y); + gtk_spin_button_set_value(pcd->notes_x, x); + gtk_spin_button_set_value(pcd->notes_y, y); get_float_pair(GCONF_SECTION, KEY_CUSTOM_TRANSLATION, &x, &y); gtk_spin_button_set_value(pcd->translation_x, x); gtk_spin_button_set_value(pcd->translation_y, y); @@ -840,7 +840,7 @@ gnc_ui_print_check_dialog_create(GncPluginPageRegister *plugin_page, const char *payee, gnc_numeric amount, time_t date, - const char *memo) + const char *notes) { PrintCheckDialog * pcd; GladeXML *xml; @@ -854,7 +854,7 @@ gnc_ui_print_check_dialog_create(GncPluginPageRegister *plugin_page, pcd->payee = payee; pcd->amount = amount; pcd->date = date; - pcd->memo = memo; + pcd->notes = notes; xml = gnc_glade_xml_new ("print.glade", "Print Check Dialog"); glade_xml_signal_autoconnect_full(xml, gnc_glade_autoconnect_full_func, pcd); @@ -881,8 +881,8 @@ gnc_ui_print_check_dialog_create(GncPluginPageRegister *plugin_page, GTK_SPIN_BUTTON(glade_xml_get_widget (xml, "amount_numbers_x_entry")); pcd->number_y = GTK_SPIN_BUTTON(glade_xml_get_widget (xml, "amount_numbers_y_entry")); - pcd->memo_x = GTK_SPIN_BUTTON(glade_xml_get_widget (xml, "memo_x_entry")); - pcd->memo_y = GTK_SPIN_BUTTON(glade_xml_get_widget (xml, "memo_y_entry")); + pcd->notes_x = GTK_SPIN_BUTTON(glade_xml_get_widget (xml, "notes_x_entry")); + pcd->notes_y = GTK_SPIN_BUTTON(glade_xml_get_widget (xml, "notes_y_entry")); pcd->translation_x = GTK_SPIN_BUTTON(glade_xml_get_widget (xml, "translation_x_entry")); pcd->translation_y = GTK_SPIN_BUTTON(glade_xml_get_widget (xml, "translation_y_entry")); pcd->translation_label = glade_xml_get_widget (xml, "translation_label"); @@ -1258,8 +1258,8 @@ draw_page_items(GncPrintContext * context, draw_text(context, pcd->payee, item, default_desc); break; - case MEMO: - draw_text(context, pcd->memo, item, default_desc); + case NOTES: + draw_text(context, pcd->notes, item, default_desc); break; case AMOUNT_NUMBER: @@ -1488,9 +1488,9 @@ draw_page_custom(GncPrintContext * context, gint page_nr, gpointer user_data) draw_text(context, text, &item, desc); g_free(text); - item.x = multip * gtk_spin_button_get_value(pcd->memo_x); - item.y = multip * gtk_spin_button_get_value(pcd->memo_y); - draw_text(context, pcd->memo, &item, desc); + item.x = multip * gtk_spin_button_get_value(pcd->notes_x); + item.y = multip * gtk_spin_button_get_value(pcd->notes_y); + draw_text(context, pcd->notes, &item, desc); pango_font_description_free(desc); } diff --git a/src/gnome/glade/print.glade b/src/gnome/glade/print.glade index bec93895ad..7839880296 100644 --- a/src/gnome/glade/print.glade +++ b/src/gnome/glade/print.glade @@ -438,7 +438,7 @@ Custom True - _Memo: + _Notes: True False GTK_JUSTIFY_CENTER @@ -448,7 +448,7 @@ Custom 0.5 0 0 - memo_x_entry + notes_x_entry PANGO_ELLIPSIZE_NONE -1 False @@ -553,7 +553,7 @@ Custom - + True True 1 @@ -663,7 +663,7 @@ Custom - + True True 1