r15717 - gnucash/trunk - In the print check dialog, the notes field has always incorrectly been
David Hampton
hampton at cvs.gnucash.org
Wed Mar 14 20:55:54 EDT 2007
Author: hampton
Date: 2007-03-14 20:55:52 -0400 (Wed, 14 Mar 2007)
New Revision: 15717
Trac: http://svn.gnucash.org/trac/changeset/15717
Modified:
gnucash/trunk/checks/deluxe.chk
gnucash/trunk/checks/gnomeprint/deluxe.chk
gnucash/trunk/checks/gnomeprint/quicken.chk
gnucash/trunk/checks/gnomeprint/quicken_wallet.chk
gnucash/trunk/checks/quicken.chk
gnucash/trunk/checks/quicken_wallet.chk
gnucash/trunk/src/gnome/dialog-print-check.c
gnucash/trunk/src/gnome/glade/print.glade
Log:
In the print check dialog, the notes field has always incorrectly been
called the memo field. This fix corrects that misnaming.
Modified: gnucash/trunk/checks/deluxe.chk
===================================================================
--- gnucash/trunk/checks/deluxe.chk 2007-03-14 20:05:24 UTC (rev 15716)
+++ gnucash/trunk/checks/deluxe.chk 2007-03-15 00:55:52 UTC (rev 15717)
@@ -18,5 +18,5 @@
Type_4 = DATE
Coords_4 = 343.0;54.0
-Type_5 = MEMO
+Type_5 = NOTES
Coords_5 = 100.0;159.0
Modified: gnucash/trunk/checks/gnomeprint/deluxe.chk
===================================================================
--- gnucash/trunk/checks/gnomeprint/deluxe.chk 2007-03-14 20:05:24 UTC (rev 15716)
+++ gnucash/trunk/checks/gnomeprint/deluxe.chk 2007-03-15 00:55:52 UTC (rev 15717)
@@ -18,5 +18,5 @@
Type_4 = DATE
Coords_4 = 343.0;178.0
-Type_5 = MEMO
+Type_5 = NOTES
Coords_5 = 100.0;73.0
Modified: gnucash/trunk/checks/gnomeprint/quicken.chk
===================================================================
--- gnucash/trunk/checks/gnomeprint/quicken.chk 2007-03-14 20:05:24 UTC (rev 15716)
+++ gnucash/trunk/checks/gnomeprint/quicken.chk 2007-03-15 00:55:52 UTC (rev 15717)
@@ -24,5 +24,5 @@
Type_4 = DATE
Coords_4 = 500.0;185.0
-Type_5 = MEMO
+Type_5 = NOTES
Coords_5 = 50.0;40.0
Modified: gnucash/trunk/checks/gnomeprint/quicken_wallet.chk
===================================================================
--- gnucash/trunk/checks/gnomeprint/quicken_wallet.chk 2007-03-14 20:05:24 UTC (rev 15716)
+++ gnucash/trunk/checks/gnomeprint/quicken_wallet.chk 2007-03-15 00:55:52 UTC (rev 15717)
@@ -24,7 +24,7 @@
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 @@
Type_8 = AMOUNT_NUMBER
Coords_8 = 50.0;90.0
-Type_9 = MEMO
+Type_9 = NOTES
Coords_9 = 28.0;65.0
Modified: gnucash/trunk/checks/quicken.chk
===================================================================
--- gnucash/trunk/checks/quicken.chk 2007-03-14 20:05:24 UTC (rev 15716)
+++ gnucash/trunk/checks/quicken.chk 2007-03-15 00:55:52 UTC (rev 15717)
@@ -24,5 +24,5 @@
Type_4 = DATE
Coords_4 = 500.0;67.0
-Type_5 = MEMO
+Type_5 = NOTES
Coords_5 = 50.0;212.0
Modified: gnucash/trunk/checks/quicken_wallet.chk
===================================================================
--- gnucash/trunk/checks/quicken_wallet.chk 2007-03-14 20:05:24 UTC (rev 15716)
+++ gnucash/trunk/checks/quicken_wallet.chk 2007-03-15 00:55:52 UTC (rev 15717)
@@ -24,7 +24,7 @@
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 @@
Type_8 = AMOUNT_NUMBER
Coords_8 = 50.0;114.0
-Type_9 = MEMO
+Type_9 = NOTES
Coords_9 = 28.0;139.0
Modified: gnucash/trunk/src/gnome/dialog-print-check.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.c 2007-03-14 20:05:24 UTC (rev 15716)
+++ gnucash/trunk/src/gnome/dialog-print-check.c 2007-03-15 00:55:52 UTC (rev 15717)
@@ -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 @@
_(NONE,) \
_(PAYEE,) \
_(DATE,) \
- _(MEMO,) \
+ _(NOTES,) \
_(AMOUNT_NUMBER,) \
_(AMOUNT_WORDS,) \
_(TEXT,) \
@@ -196,7 +196,7 @@
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 @@
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 @@
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 @@
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 @@
const char *payee,
gnc_numeric amount,
time_t date,
- const char *memo)
+ const char *notes)
{
PrintCheckDialog * pcd;
GladeXML *xml;
@@ -854,7 +854,7 @@
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 @@
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_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_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);
}
Modified: gnucash/trunk/src/gnome/glade/print.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/print.glade 2007-03-14 20:05:24 UTC (rev 15716)
+++ gnucash/trunk/src/gnome/glade/print.glade 2007-03-15 00:55:52 UTC (rev 15717)
@@ -438,7 +438,7 @@
<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 @@
<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 @@
</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 @@
</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>
More information about the gnucash-changes
mailing list