IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-25 10:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

In the print check dialog, the notes field has always incorrectly been

Browse Source 
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
This commit is contained in:
David Hampton 2007-03-15 00:55:52 +00:00
parent 3d76b0fdde
commit 19fdc8ff94
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
checks/deluxe.chk
View File

@ -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

2
checks/gnomeprint/deluxe.chk
View File

@ -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

2
checks/gnomeprint/quicken.chk
View File

@ -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

4
checks/gnomeprint/quicken_wallet.chk
View File

@ -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

2
checks/quicken.chk
View File

@ -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

4
checks/quicken_wallet.chk
View File

@ -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

38
src/gnome/dialog-print-check.c
View File

@ -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);
}

8
src/gnome/glade/print.glade
View File

@ -438,7 +438,7 @@ Custom</property>
<child>
<widget class="GtkLabel" id="label708">
<property name="visible">True</property>
<property name="label" translatable="yes">_Memo:</property>
<property name="label" translatable="yes">_Notes:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@ -448,7 +448,7 @@ Custom</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">memo_x_entry</property>
<property name="mnemonic_widget">notes_x_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -553,7 +553,7 @@ Custom</property>
</child>
<child>
<widget class="GtkSpinButton" id="memo_x_entry">
<widget class="GtkSpinButton" id="notes_x_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
@ -663,7 +663,7 @@ Custom</property>
</child>
<child>
<widget class="GtkSpinButton" id="memo_y_entry">
<widget class="GtkSpinButton" id="notes_y_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>