[Gnucash-changes] r12930 - gnucash/trunk - Overhaul the financial
calculator dialog. Comments on the new layout
David Hampton
hampton at cvs.gnucash.org
Sat Jan 21 22:50:54 EST 2006
Author: hampton
Date: 2006-01-21 22:50:52 -0500 (Sat, 21 Jan 2006)
New Revision: 12930
Trac: http://svn.gnucash.org/trac/changeset/12930
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
gnucash/trunk/src/gnome/dialog-fincalc.c
gnucash/trunk/src/gnome/glade/fincalc.glade
Log:
Overhaul the financial calculator dialog. Comments on the new layout
are welcome.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-01-22 00:32:08 UTC (rev 12929)
+++ gnucash/trunk/ChangeLog 2006-01-22 03:50:52 UTC (rev 12930)
@@ -1,3 +1,10 @@
+2006-01-21 David Hampton <hampton at employees.org>
+
+ * src/gnome-utils/gnc-amount-edit.c:
+ * src/gnome/dialog-fincalc.c:
+ * src/gnome/glade/fincalc.glade: Overhaul the financial calculator
+ dialog.
+
2006-01-21 Derek Atkins <derek at ihtfp.com>
* src/bin/gnucash-bin.c: update splash screen while loading modules.
Modified: gnucash/trunk/src/gnome/dialog-fincalc.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-fincalc.c 2006-01-22 00:32:08 UTC (rev 12929)
+++ gnucash/trunk/src/gnome/dialog-fincalc.c 2006-01-22 03:50:52 UTC (rev 12930)
@@ -40,6 +40,7 @@
#define DIALOG_FINCALC_CM_CLASS "dialog-fincalc"
+#define GCONF_SECTION "dialogs/fincalc"
typedef enum
{
@@ -55,10 +56,13 @@
/** Datatypes ***********************************************************/
struct _FinCalcDialog
{
+ GladeXML *xml;
GtkWidget *dialog;
GtkWidget *amounts[NUM_FIN_CALC_VALUES];
+ GtkWidget *calc_button;
+
GtkWidget *compounding_menu;
GtkWidget *payment_menu;
@@ -68,8 +72,6 @@
GtkWidget *payment_total_label;
financial_info financial_info;
-
- GList *calc_buttons;
};
static unsigned int periods[] =
@@ -92,8 +94,12 @@
/** Prototypes **********************************************************/
+void fincalc_update_calc_button_cb(GtkWidget *unused, FinCalcDialog *fcd);
+void fincalc_calc_clicked_cb(GtkButton *button, FinCalcDialog *fcd);
+void fincalc_compounding_radio_toggled(GtkToggleButton *togglebutton, gpointer data);
+void fincalc_amount_clear_clicked_cb(GtkButton *button, GNCAmountEdit *edit);
+void fincalc_response_cb (GtkDialog *dialog, gint response, FinCalcDialog *fcd);
-
/** Implementations *****************************************************/
/* Ensure the given argument is one of the values in the periods array
@@ -212,16 +218,24 @@
}
/* Set the sensitivity of the calculation buttons based on the argument. */
-static void
-fincalc_allow_calc(FinCalcDialog *fcd, gboolean allow_calc)
+void
+fincalc_update_calc_button_cb(GtkWidget *unused, FinCalcDialog *fcd)
{
- GList *node;
+ const gchar *text;
+ gint i;
if (fcd == NULL)
return;
- for (node = fcd->calc_buttons; node != NULL; node = node->next)
- gtk_widget_set_sensitive(GTK_WIDGET(node->data), allow_calc);
+ for (i = 0; i < NUM_FIN_CALC_VALUES; i++) {
+ text = gtk_entry_get_text(GTK_ENTRY(fcd->amounts[i]));
+ if ((text == NULL) || (*text == '\0')) {
+ gtk_widget_set_sensitive(GTK_WIDGET(fcd->calc_button), TRUE);
+ return;
+ }
+ }
+
+ gtk_widget_set_sensitive(GTK_WIDGET(fcd->calc_button), FALSE);
}
/* Free the calc button list and free the FinCalcDialog structure. */
@@ -235,51 +249,18 @@
gnc_unregister_gui_component_by_data (DIALOG_FINCALC_CM_CLASS, fcd);
- g_list_free(fcd->calc_buttons);
- fcd->calc_buttons = NULL;
-
+ g_object_unref(fcd->xml);
g_free(fcd);
}
static void
-fincalc_entry_changed(GtkEditable *editable, gpointer data)
-{
- FinCalcDialog *fcd = data;
-
- if (fcd == NULL)
- return;
-
- fincalc_allow_calc(fcd, TRUE);
-}
-
-static void
-fincalc_menu_changed(GtkButton *button, FinCalcDialog *fcd)
-{
- if (fcd == NULL)
- return;
-
- fincalc_allow_calc(fcd, TRUE);
-}
-
-static void
connect_fincalc_menu_item(GtkWidget *item, gpointer data)
{
g_signal_connect (G_OBJECT (item), "activate",
- G_CALLBACK (fincalc_menu_changed), data);
+ G_CALLBACK (fincalc_update_calc_button_cb), data);
}
-static void
-fincalc_radio_toggled(GtkToggleButton *togglebutton, gpointer data)
-{
- FinCalcDialog *fcd = data;
-
- if (fcd == NULL)
- return;
-
- fincalc_allow_calc(fcd, TRUE);
-}
-
-static void
+void
fincalc_compounding_radio_toggled(GtkToggleButton *togglebutton, gpointer data)
{
FinCalcDialog *fcd = data;
@@ -288,22 +269,16 @@
if (fcd == NULL)
return;
- fincalc_allow_calc(fcd, TRUE);
+ fincalc_update_calc_button_cb(GTK_WIDGET(togglebutton), fcd);
sensitive = gtk_toggle_button_get_active (togglebutton);
gtk_widget_set_sensitive (fcd->compounding_menu, sensitive);
}
-static void
-close_button_clicked(GtkButton *button, FinCalcDialog *fcd)
+void
+fincalc_amount_clear_clicked_cb(GtkButton *button, GNCAmountEdit *edit)
{
- gnc_close_gui_component_by_data (DIALOG_FINCALC_CM_CLASS, fcd);
-}
-
-static void
-fincalc_amount_clear_clicked(GtkButton *button, GNCAmountEdit *edit)
-{
gtk_entry_set_text(GTK_ENTRY (edit), "");
}
@@ -336,8 +311,10 @@
static const char *
can_calc_value(FinCalcDialog *fcd, FinCalcValue value, int *error_item)
{
- const char *missing = _("You must enter values for the other quantities.");
- const char *bad_exp = _("You must enter a valid expression.");
+ const char *missing = _("This program can only calculate one value at a time. "
+ "You must enter values for all but one quantity.");
+ const char *bad_exp = _("Gnucash cannot determine the value in one of the fields. "
+ "You must enter a valid expression.");
const char *string;
gnc_numeric nvalue;
unsigned int i;
@@ -458,39 +435,46 @@
fi_to_gui(fcd);
- fincalc_allow_calc(fcd, FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(fcd->calc_button), FALSE);
}
-static void
-calc_payment_periods(GtkButton *button, FinCalcDialog *fcd)
+void
+fincalc_calc_clicked_cb(GtkButton *button, FinCalcDialog *fcd)
{
- calc_value(fcd, PAYMENT_PERIODS);
-}
+ const gchar *text;
+ gint i;
-static void
-calc_interest_rate(GtkButton *button, FinCalcDialog *fcd)
-{
- calc_value(fcd, INTEREST_RATE);
+ for (i = 0; i < NUM_FIN_CALC_VALUES; i++) {
+ text = gtk_entry_get_text(GTK_ENTRY(fcd->amounts[i]));
+ if ((text != NULL) && (*text != '\0'))
+ continue;
+ calc_value(fcd, i);
+ return;
+ }
}
-static void
-calc_present_value(GtkButton *button, FinCalcDialog *fcd)
+void fincalc_response_cb (GtkDialog *dialog,
+ gint response,
+ FinCalcDialog *fcd)
{
- calc_value(fcd, PRESENT_VALUE);
-}
+ switch (response) {
+ case GTK_RESPONSE_OK:
+ /* Do something here whenever the hidden schedule button is clicked. */
+ /* Fall through */
-static void
-calc_periodic_payment(GtkButton *button, FinCalcDialog *fcd)
-{
- calc_value(fcd, PERIODIC_PAYMENT);
-}
+ case GTK_RESPONSE_CLOSE:
+ gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(dialog));
+ break;
-static void
-calc_future_value(GtkButton *button, FinCalcDialog *fcd)
-{
- calc_value(fcd, FUTURE_VALUE);
+ default:
+ /* Cancel, destroy, etc. Do nothing. */
+ break;
+ }
+
+ gnc_close_gui_component_by_data (DIALOG_FINCALC_CM_CLASS, fcd);
}
+
static void
close_handler (gpointer user_data)
{
@@ -511,15 +495,65 @@
return(TRUE);
}
+
+/** Initialize an edit field that will display a general number.
+ *
+ * @param edit A pointer to the edit widget.
+ *
+ * @param min_places The minimum number of places after the decimal
+ * point.
+ *
+ * @param max_places The maximum number of places after the decimal
+ * point.
+ *
+ * @param fraction The fraction used to maintain numbers internally.
+ */
+static void
+fincalc_init_gae (GNCAmountEdit *edit,
+ gint min_places,
+ gint max_places,
+ gint fraction)
+{
+ GNCPrintAmountInfo print_info;
+
+ print_info = gnc_integral_print_info ();
+ print_info.min_decimal_places = min_places;
+ print_info.max_decimal_places = max_places;
+
+ gnc_amount_edit_set_print_info (edit, print_info);
+ gnc_amount_edit_set_fraction (edit, fraction);
+ gnc_amount_edit_set_evaluate_on_enter (edit, TRUE);
+ gtk_entry_set_alignment (GTK_ENTRY(edit), 1.0);
+}
+
+/** Initialize an edit field that will display a number in the users
+ * local currency.
+ *
+ * @param edit A pointer to the edit widget.
+ */
+static void
+fincalc_init_commodity_gae (GNCAmountEdit *edit)
+{
+ GNCPrintAmountInfo print_info;
+ gnc_commodity *commodity;
+ gint fraction;
+
+ commodity = gnc_default_currency();
+ fraction = gnc_commodity_get_fraction(commodity);
+ print_info = gnc_commodity_print_info (commodity, FALSE);
+
+ gnc_amount_edit_set_print_info (edit, print_info);
+ gnc_amount_edit_set_fraction (edit, fraction);
+ gnc_amount_edit_set_evaluate_on_enter (edit, TRUE);
+ gtk_entry_set_alignment (GTK_ENTRY(edit), 1.0);
+}
+
void
gnc_ui_fincalc_dialog_create(void)
{
- gnc_commodity *commodity;
- GNCPrintAmountInfo print_info;
FinCalcDialog *fcd;
GtkWidget *button;
GtkWidget *menu;
- GtkWidget *hbox;
GtkWidget *edit;
GladeXML *xml;
@@ -527,12 +561,12 @@
show_handler, NULL))
return;
- commodity = gnc_default_currency ();
fcd = g_new0(FinCalcDialog, 1);
xml = gnc_glade_xml_new ("fincalc.glade", "Financial Calculator Dialog");
+ fcd->xml = xml;
fcd->dialog = glade_xml_get_widget (xml, "Financial Calculator Dialog");
gnc_register_gui_component (DIALOG_FINCALC_CM_CLASS,
@@ -542,133 +576,30 @@
G_CALLBACK (fincalc_dialog_destroy), fcd);
- edit = gnc_amount_edit_new();
- gnc_amount_edit_set_evaluate_on_enter (GNC_AMOUNT_EDIT (edit), TRUE);
- print_info = gnc_integral_print_info ();
- gnc_amount_edit_set_print_info (GNC_AMOUNT_EDIT (edit), print_info);
- gnc_amount_edit_set_fraction (GNC_AMOUNT_EDIT (edit), 1);
+ edit = glade_xml_get_widget (xml, "payment_periods_edit");
+ fincalc_init_gae (GNC_AMOUNT_EDIT (edit), 0, 0, 1);
fcd->amounts[PAYMENT_PERIODS] = edit;
- gtk_widget_show (edit);
- hbox = glade_xml_get_widget (xml, "payment_periods_hbox");
- gtk_box_pack_start (GTK_BOX (hbox), edit, TRUE, TRUE, 0);
-
- g_signal_connect (G_OBJECT (edit), "changed",
- G_CALLBACK (fincalc_entry_changed), fcd);
-
-
- edit = gnc_amount_edit_new();
- gnc_amount_edit_set_evaluate_on_enter (GNC_AMOUNT_EDIT (edit), TRUE);
- print_info.max_decimal_places = 5;
- gnc_amount_edit_set_print_info (GNC_AMOUNT_EDIT (edit), print_info);
- gnc_amount_edit_set_fraction (GNC_AMOUNT_EDIT (edit), 100000);
+ edit = glade_xml_get_widget (xml, "interest_rate_edit");
+ fincalc_init_gae (GNC_AMOUNT_EDIT (edit), 2, 5, 100000);
fcd->amounts[INTEREST_RATE] = edit;
- gtk_widget_show (edit);
- hbox = glade_xml_get_widget (xml, "interest_rate_hbox");
- gtk_box_pack_start (GTK_BOX (hbox), edit, TRUE, TRUE, 0);
-
- g_signal_connect (G_OBJECT (edit), "changed",
- G_CALLBACK (fincalc_entry_changed), fcd);
-
-
- print_info = gnc_commodity_print_info (commodity, FALSE);
-
- edit = gnc_amount_edit_new();
- gnc_amount_edit_set_evaluate_on_enter (GNC_AMOUNT_EDIT (edit), TRUE);
- gnc_amount_edit_set_print_info (GNC_AMOUNT_EDIT (edit), print_info);
- gnc_amount_edit_set_fraction (GNC_AMOUNT_EDIT (edit),
- gnc_commodity_get_fraction (commodity));
+ edit = glade_xml_get_widget (xml, "present_value_edit");
+ fincalc_init_commodity_gae (GNC_AMOUNT_EDIT (edit));
fcd->amounts[PRESENT_VALUE] = edit;
- gtk_widget_show (edit);
- hbox = glade_xml_get_widget (xml, "present_value_hbox");
- gtk_box_pack_start (GTK_BOX (hbox), edit, TRUE, TRUE, 0);
-
- g_signal_connect (G_OBJECT (edit), "changed",
- G_CALLBACK (fincalc_entry_changed), fcd);
-
-
- edit = gnc_amount_edit_new();
- gnc_amount_edit_set_evaluate_on_enter (GNC_AMOUNT_EDIT (edit), TRUE);
- gnc_amount_edit_set_print_info (GNC_AMOUNT_EDIT (edit), print_info);
- gnc_amount_edit_set_fraction (GNC_AMOUNT_EDIT (edit),
- gnc_commodity_get_fraction (commodity));
+ edit = glade_xml_get_widget (xml, "period_payment_edit");
+ fincalc_init_commodity_gae (GNC_AMOUNT_EDIT (edit));
fcd->amounts[PERIODIC_PAYMENT] = edit;
- gtk_widget_show (edit);
- hbox = glade_xml_get_widget (xml, "periodic_payment_hbox");
- gtk_box_pack_start (GTK_BOX (hbox), edit, TRUE, TRUE, 0);
-
- g_signal_connect (G_OBJECT (edit), "changed",
- G_CALLBACK (fincalc_entry_changed), fcd);
-
-
- edit = gnc_amount_edit_new();
- gnc_amount_edit_set_evaluate_on_enter (GNC_AMOUNT_EDIT (edit), TRUE);
- gnc_amount_edit_set_print_info (GNC_AMOUNT_EDIT (edit), print_info);
- gnc_amount_edit_set_fraction (GNC_AMOUNT_EDIT (edit),
- gnc_commodity_get_fraction (commodity));
+ edit = glade_xml_get_widget (xml, "future_value_edit");
+ fincalc_init_commodity_gae (GNC_AMOUNT_EDIT (edit));
fcd->amounts[FUTURE_VALUE] = edit;
- gtk_widget_show (edit);
- hbox = glade_xml_get_widget (xml, "future_value_hbox");
- gtk_box_pack_start (GTK_BOX (hbox), edit, TRUE, TRUE, 0);
- g_signal_connect (G_OBJECT (edit), "changed",
- G_CALLBACK (fincalc_entry_changed), fcd);
+ fcd->calc_button = glade_xml_get_widget (xml, "calc_button");
- button = glade_xml_get_widget (xml, "payment_periods_calc_button");
- fcd->calc_buttons = g_list_prepend(fcd->calc_buttons, button);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (calc_payment_periods), fcd);
-
- button = glade_xml_get_widget (xml, "interest_rate_calc_button");
- fcd->calc_buttons = g_list_prepend(fcd->calc_buttons, button);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (calc_interest_rate), fcd);
-
- button = glade_xml_get_widget (xml, "present_value_calc_button");
- fcd->calc_buttons = g_list_prepend(fcd->calc_buttons, button);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (calc_present_value), fcd);
-
- button = glade_xml_get_widget (xml, "periodic_payment_calc_button");
- fcd->calc_buttons = g_list_prepend(fcd->calc_buttons, button);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (calc_periodic_payment), fcd);
-
- button = glade_xml_get_widget (xml, "future_value_calc_button");
- fcd->calc_buttons = g_list_prepend(fcd->calc_buttons, button);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (calc_future_value), fcd);
-
- button = glade_xml_get_widget (xml, "payment_periods_clear_button");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (fincalc_amount_clear_clicked),
- fcd->amounts[PAYMENT_PERIODS]);
-
- button = glade_xml_get_widget (xml, "interest_rate_clear_button");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (fincalc_amount_clear_clicked),
- fcd->amounts[INTEREST_RATE]);
-
- button = glade_xml_get_widget (xml, "present_value_clear_button");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (fincalc_amount_clear_clicked),
- fcd->amounts[PRESENT_VALUE]);
-
- button = glade_xml_get_widget (xml, "periodic_payment_clear_button");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (fincalc_amount_clear_clicked),
- fcd->amounts[PERIODIC_PAYMENT]);
-
- button = glade_xml_get_widget (xml, "future_value_clear_button");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (fincalc_amount_clear_clicked),
- fcd->amounts[FUTURE_VALUE]);
-
menu = glade_xml_get_widget (xml, "compounding_menu");
fcd->compounding_menu = menu;
gnc_option_menu_init(menu);
@@ -683,17 +614,10 @@
button = glade_xml_get_widget (xml, "period_payment_radio");
fcd->end_of_period_radio = button;
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (fincalc_radio_toggled), fcd);
button = glade_xml_get_widget (xml, "discrete_compounding_radio");
fcd->discrete_compounding_radio = button;
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (fincalc_compounding_radio_toggled), fcd);
- button = glade_xml_get_widget (xml, "close_button");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (close_button_clicked), fcd);
fcd->payment_total_label = glade_xml_get_widget (xml, "payment_total_label");
button = glade_xml_get_widget (xml, "schedule_button");
@@ -703,10 +627,14 @@
fi_to_gui(fcd);
- fincalc_allow_calc(fcd, FALSE);
-
gtk_widget_grab_focus(fcd->amounts[PAYMENT_PERIODS]);
+ /* Connect all signals specified in glade. */
+ glade_xml_signal_autoconnect_full( xml,
+ gnc_glade_autoconnect_full_func,
+ fcd);
+
+ gnc_restore_window_size(GCONF_SECTION, GTK_WINDOW(fcd->dialog));
gtk_widget_show(fcd->dialog);
}
Modified: gnucash/trunk/src/gnome/glade/fincalc.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/fincalc.glade 2006-01-22 00:32:08 UTC (rev 12929)
+++ gnucash/trunk/src/gnome/glade/fincalc.glade 2006-01-22 03:50:52 UTC (rev 12930)
@@ -5,25 +5,27 @@
<requires lib="gnome"/>
<widget class="GtkDialog" id="Financial Calculator Dialog">
- <property name="visible">True</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Financial Calculator</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
- <property name="resizable">True</property>
+ <property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="has_separator">True</property>
+ <property name="focus_on_map">True</property>
+ <property name="has_separator">False</property>
+ <signal name="response" handler="fincalc_response_cb" last_modification_time="Sun, 22 Jan 2006 03:12:48 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox10">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area10">
@@ -39,21 +41,32 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">0</property>
+ <property name="response_id">-7</property>
</widget>
</child>
<child>
+ <widget class="GtkButton" id="hidden_button">
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkButton" id="schedule_button">
- <property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">0</property>
+ <property name="response_id">-5</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkAlignment" id="alignment32">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -65,13 +78,13 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox77">
+ <widget class="GtkHBox" id="hbox90">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image1">
+ <widget class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
<property name="icon_size">4</property>
@@ -88,9 +101,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label807">
+ <widget class="GtkLabel" id="label825">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Schedule</property>
+ <property name="label" translatable="yes">Schedule</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -100,6 +113,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -123,51 +140,83 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox54">
+ <widget class="GtkHBox" id="hbox79">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkFrame" id="frame26">
- <property name="border_width">3</property>
+ <widget class="GtkVBox" id="vbox75">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox62">
- <property name="border_width">5</property>
+ <widget class="GtkLabel" id="label808">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="label" translatable="yes"><b>Calculations</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment18">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
<child>
- <widget class="GtkVBox" id="vbox66">
+ <widget class="GtkVBox" id="vbox77">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox46">
+ <widget class="GtkVBox" id="vbox78">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label790">
<property name="visible">True</property>
- <property name="label" translatable="yes">Payment Periods</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">Payment periods</property>
+ <property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.75</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -177,37 +226,51 @@
</child>
<child>
- <widget class="GtkButton" id="payment_periods_clear_button">
+ <widget class="GtkHBox" id="hbox85">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Clear</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="payment_periods_calc_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Calculate</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <child>
+ <widget class="Custom" id="payment_periods_edit">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="has_focus">True</property>
+ <property name="creation_function">gnc_amount_edit_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Sat, 21 Jan 2006 20:30:26 GMT</property>
+ <signal name="changed" handler="fincalc_update_calc_button_cb" last_modification_time="Sat, 21 Jan 2006 21:00:33 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="payment_periods_clear_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Clear the entry</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="payment_periods_edit" last_modification_time="Sat, 21 Jan 2006 21:03:12 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -219,54 +282,28 @@
</child>
<child>
- <widget class="GtkHBox" id="payment_periods_hbox">
+ <widget class="GtkVBox" id="vbox79">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox67">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkHBox" id="hbox55">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
<widget class="GtkLabel" id="label799">
<property name="visible">True</property>
- <property name="label" translatable="yes">Interest Rate</property>
+ <property name="label" translatable="yes">Interest rate</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.75</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -276,37 +313,49 @@
</child>
<child>
- <widget class="GtkButton" id="interest_rate_clear_button">
+ <widget class="GtkHBox" id="hbox86">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Clear</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="interest_rate_calc_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Calculate</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <child>
+ <widget class="Custom" id="interest_rate_edit">
+ <property name="visible">True</property>
+ <property name="creation_function">gnc_amount_edit_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Sat, 21 Jan 2006 21:00:10 GMT</property>
+ <signal name="changed" handler="fincalc_update_calc_button_cb" last_modification_time="Sat, 21 Jan 2006 21:00:51 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="interest_rate_clear_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Clear the entry</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="interest_rate_edit" last_modification_time="Sat, 21 Jan 2006 21:02:19 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -318,54 +367,28 @@
</child>
<child>
- <widget class="GtkHBox" id="interest_rate_hbox">
+ <widget class="GtkVBox" id="vbox80">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox68">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkHBox" id="hbox56">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
<widget class="GtkLabel" id="label800">
<property name="visible">True</property>
- <property name="label" translatable="yes">Present Value</property>
+ <property name="label" translatable="yes">Present value</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.75</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -375,37 +398,49 @@
</child>
<child>
- <widget class="GtkButton" id="present_value_clear_button">
+ <widget class="GtkHBox" id="hbox87">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Clear</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="present_value_calc_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Calculate</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <child>
+ <widget class="Custom" id="present_value_edit">
+ <property name="visible">True</property>
+ <property name="creation_function">gnc_amount_edit_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Sat, 21 Jan 2006 21:34:30 GMT</property>
+ <signal name="changed" handler="fincalc_update_calc_button_cb" last_modification_time="Sat, 21 Jan 2006 21:36:16 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="present_value_clear_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Clear the entry</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="present_value_edit" last_modification_time="Sat, 21 Jan 2006 21:37:27 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -417,54 +452,28 @@
</child>
<child>
- <widget class="GtkHBox" id="present_value_hbox">
+ <widget class="GtkVBox" id="vbox81">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox69">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkHBox" id="hbox57">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label801">
+ <widget class="GtkLabel" id="label817">
<property name="visible">True</property>
- <property name="label" translatable="yes">Periodic Payment</property>
+ <property name="label" translatable="yes">Periodic payment</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.75</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -474,37 +483,49 @@
</child>
<child>
- <widget class="GtkButton" id="periodic_payment_clear_button">
+ <widget class="GtkHBox" id="hbox88">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Clear</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="periodic_payment_calc_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Calculate</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <child>
+ <widget class="Custom" id="period_payment_edit">
+ <property name="visible">True</property>
+ <property name="creation_function">gnc_amount_edit_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Sat, 21 Jan 2006 21:34:50 GMT</property>
+ <signal name="changed" handler="fincalc_update_calc_button_cb" last_modification_time="Sat, 21 Jan 2006 21:36:26 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="periodic_payment_clear_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Clear the entry</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="period_payment_edit" last_modification_time="Sat, 21 Jan 2006 21:37:51 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -516,54 +537,28 @@
</child>
<child>
- <widget class="GtkHBox" id="periodic_payment_hbox">
+ <widget class="GtkVBox" id="vbox82">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox70">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkHBox" id="hbox58">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
<widget class="GtkLabel" id="label802">
<property name="visible">True</property>
- <property name="label" translatable="yes">Future Value</property>
+ <property name="label" translatable="yes">Future value</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.75</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -573,37 +568,49 @@
</child>
<child>
- <widget class="GtkButton" id="future_value_clear_button">
+ <widget class="GtkHBox" id="hbox89">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Clear</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="future_value_calc_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Calculate</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <child>
+ <widget class="Custom" id="future_value_edit">
+ <property name="visible">True</property>
+ <property name="creation_function">gnc_amount_edit_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Sat, 21 Jan 2006 21:35:04 GMT</property>
+ <signal name="changed" handler="fincalc_update_calc_button_cb" last_modification_time="Sat, 21 Jan 2006 21:36:41 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="future_value_clear_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Clear the entry</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="future_value_edit" last_modification_time="Sat, 21 Jan 2006 21:38:11 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -615,29 +622,116 @@
</child>
<child>
- <widget class="GtkHBox" id="future_value_hbox">
+ <widget class="GtkAlignment" id="alignment31">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">6</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
<child>
- <placeholder/>
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkButton" id="calc_button">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="tooltip" translatable="yes">Recalculate the (single) blank entry in the above fields.</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="fincalc_calc_clicked_cb" last_modification_time="Sat, 21 Jan 2006 20:17:04 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment30">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox84">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="stock">gtk-execute</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label824">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Calculate</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
<packing>
@@ -648,337 +742,502 @@
</child>
<child>
- <widget class="GtkFrame" id="frame27">
- <property name="border_width">3</property>
+ <widget class="GtkVSeparator" id="vseparator2">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ </widget>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox76">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
<child>
- <widget class="GtkVBox" id="vbox65">
- <property name="border_width">5</property>
+ <widget class="GtkLabel" id="label809">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">10</property>
+ <property name="label" translatable="yes"><b>Payment Options</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment19">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
<child>
- <widget class="GtkHBox" id="hbox51">
+ <widget class="GtkTable" id="table9">
<property name="visible">True</property>
+ <property name="n_rows">9</property>
+ <property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="spacing">3</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox63">
+ <widget class="GtkLabel" id="some_label">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">2</property>
+ <property name="label" translatable="yes">Payment Total:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkLabel" id="label797">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Compounding:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="payment_total_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">total</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkLabel" id="label798">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Payments:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="label818">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox64">
+ <widget class="GtkLabel" id="label819">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">2</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">expand</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkOptionMenu" id="compounding_menu">
+ <child>
+ <widget class="GtkRadioButton" id="discrete_compounding_radio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Discrete</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="fincalc_compounding_radio_toggled" last_modification_time="Sun, 22 Jan 2006 03:10:15 GMT"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Continuous</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">discrete_compounding_radio</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkOptionMenu" id="compounding_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="history">0</property>
+
+ <child internal-child="menu">
+ <widget class="GtkMenu" id="convertwidget1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">0</property>
- <child internal-child="menu">
- <widget class="GtkMenu" id="convertwidget1">
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget2">
<property name="visible">True</property>
+ <property name="label" translatable="yes">Annual</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Annual</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Semi-annual</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Semi-annual</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Tri-annual</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Tri-annual</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Quarterly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Quarterly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Bi-monthly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bi-monthly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Monthly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Monthly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Semi-monthly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Semi-monthly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Bi-weekly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bi-weekly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Weekly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Weekly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Daily (360)</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Daily (360)</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Daily (365)</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Daily (365)</property>
+ <property name="use_underline">True</property>
</widget>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment23">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
<child>
- <widget class="GtkOptionMenu" id="payment_menu">
+ <widget class="GtkLabel" id="label816">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">0</property>
+ <property name="label" translatable="yes">Type:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
- <child internal-child="menu">
- <widget class="GtkMenu" id="convertwidget13">
- <property name="visible">True</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment22">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
- <child>
- <widget class="GtkMenuItem" id="convertwidget14">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Annual</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkLabel" id="label815">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Frequency:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">payment_menu</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget15">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Semi-annual</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment24">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
- <child>
- <widget class="GtkMenuItem" id="convertwidget16">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Tri-annual</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget17">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Quarterly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget18">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bi-monthly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget19">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Monthly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget20">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Semi-monthly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget21">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bi-weekly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget22">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Weekly</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget23">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Daily (360)</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget24">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Daily (365)</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
- </widget>
- </child>
+ <child>
+ <widget class="GtkLabel" id="label811">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Frequency:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">payment_menu</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox71">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
<child>
- <widget class="GtkRadioButton" id="period_payment_radio">
+ <widget class="GtkAlignment" id="alignment25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">End of Period Payments</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label812">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">When paid:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
</packing>
</child>
@@ -986,137 +1245,221 @@
<widget class="GtkRadioButton" id="radiobutton4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Beginning of Period Payments</property>
+ <property name="label" translatable="yes">Beginning</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">period_payment_radio</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox72">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
<child>
- <widget class="GtkRadioButton" id="discrete_compounding_radio">
+ <widget class="GtkRadioButton" id="period_payment_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Discrete Compounding</property>
+ <property name="label" translatable="yes">End</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+ <property name="group">radiobutton4</property>
+ <signal name="toggled" handler="fincalc_update_calc_button_cb" last_modification_time="Sun, 22 Jan 2006 03:18:47 GMT"/>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton6">
+ <widget class="GtkOptionMenu" id="payment_menu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Continuous Compounding</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">discrete_compounding_radio</property>
+ <property name="history">0</property>
+
+ <child internal-child="menu">
+ <widget class="GtkMenu" id="convertwidget13">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget14">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Annual</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget15">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Semi-annual</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget16">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Tri-annual</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget17">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Quarterly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget18">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Bi-monthly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget19">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Monthly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget20">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Semi-monthly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget21">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Bi-weekly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget22">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Weekly</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget23">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Daily (360)</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget24">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Daily (365)</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox76">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">3</property>
-
<child>
- <widget class="GtkLabel" id="some_label">
+ <widget class="GtkLabel" id="label797">
<property name="visible">True</property>
- <property name="label" translatable="yes">Payment Total:</property>
+ <property name="label" translatable="yes"><b>Compounding:</b></property>
<property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="payment_total_label">
+ <widget class="GtkLabel" id="label813">
<property name="visible">True</property>
- <property name="label" translatable="yes">total</property>
+ <property name="label" translatable="yes"><b>Period:</b></property>
<property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1149,6 +1492,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -1224,16 +1568,20 @@
<child>
<widget class="GtkLabel" id="label803">
<property name="visible">True</property>
- <property name="label" translatable="yes">Effective Date:</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">_Effective Date:</property>
+ <property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">1</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1245,16 +1593,20 @@
<child>
<widget class="GtkLabel" id="label804">
<property name="visible">True</property>
- <property name="label" translatable="yes">Initial Payment:</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">_Initial Payment:</property>
+ <property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">1</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1266,16 +1618,20 @@
<child>
<widget class="GtkLabel" id="label805">
<property name="visible">True</property>
- <property name="label" translatable="yes">Compounding:</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">Co_mpounding:</property>
+ <property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">1</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1287,16 +1643,20 @@
<child>
<widget class="GtkLabel" id="label806">
<property name="visible">True</property>
- <property name="label" translatable="yes">Payments:</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">_Payments:</property>
+ <property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">1</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1307,7 +1667,7 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
Modified: gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-amount-edit.c 2006-01-22 00:32:08 UTC (rev 12929)
+++ gnucash/trunk/src/gnome-utils/gnc-amount-edit.c 2006-01-22 03:50:52 UTC (rev 12930)
@@ -195,6 +195,7 @@
GNCAmountEdit *gae;
gae = g_object_new (GNC_TYPE_AMOUNT_EDIT, NULL);
+ gtk_widget_show (GTK_WIDGET(gae));
return GTK_WIDGET (gae);
}
More information about the gnucash-changes
mailing list