r20780 - gnucash/trunk/src/gnome - Convert loan repayment calculator to gtkbuilder format
Geert Janssens
gjanssens at code.gnucash.org
Mon Jun 20 17:34:41 EDT 2011
Author: gjanssens
Date: 2011-06-20 17:34:41 -0400 (Mon, 20 Jun 2011)
New Revision: 20780
Trac: http://svn.gnucash.org/trac/changeset/20780
Removed:
gnucash/trunk/src/gnome/glade/fincalc.glade
Modified:
gnucash/trunk/src/gnome/dialog-fincalc.c
gnucash/trunk/src/gnome/glade/Makefile.am
gnucash/trunk/src/gnome/gtkbuilder/fincalc.glade
Log:
Convert loan repayment calculator to gtkbuilder format
Modified: gnucash/trunk/src/gnome/dialog-fincalc.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-fincalc.c 2011-06-20 21:34:32 UTC (rev 20779)
+++ gnucash/trunk/src/gnome/dialog-fincalc.c 2011-06-20 21:34:41 UTC (rev 20780)
@@ -58,7 +58,6 @@
/** Datatypes ***********************************************************/
struct _FinCalcDialog
{
- GladeXML *xml;
GtkWidget *dialog;
GtkWidget *amounts[NUM_FIN_CALC_VALUES];
@@ -99,7 +98,7 @@
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_amount_clear_clicked_cb(GtkButton *button, FinCalcDialog *fcd);
void fincalc_response_cb (GtkDialog *dialog, gint response, FinCalcDialog *fcd);
/** Implementations *****************************************************/
@@ -253,7 +252,6 @@
gnc_unregister_gui_component_by_data (DIALOG_FINCALC_CM_CLASS, fcd);
- g_object_unref(fcd->xml);
g_free(fcd);
}
@@ -274,9 +272,12 @@
}
void
-fincalc_amount_clear_clicked_cb(GtkButton *button, GNCAmountEdit *edit)
+fincalc_amount_clear_clicked_cb(GtkButton *button, FinCalcDialog *fcd)
{
- gtk_entry_set_text(GTK_ENTRY (edit), "");
+ GtkEntry * edit = GTK_ENTRY(g_object_get_data(G_OBJECT(button), "edit"));
+
+ if (edit && GTK_IS_ENTRY(edit))
+ gtk_entry_set_text(edit, "");
}
static void
@@ -554,7 +555,8 @@
GtkWidget *button;
GtkWidget *combo;
GtkWidget *edit;
- GladeXML *xml;
+ GtkWidget *hbox;
+ GtkBuilder *builder;
if (gnc_forall_gui_components (DIALOG_FINCALC_CM_CLASS,
show_handler, NULL))
@@ -563,10 +565,12 @@
fcd = g_new0(FinCalcDialog, 1);
- xml = gnc_glade_xml_new ("fincalc.glade", "Financial Calculator Dialog");
+ builder = gtk_builder_new();
+ gnc_builder_add_from_file (builder, "fincalc.glade", "liststore1");
+ gnc_builder_add_from_file (builder, "fincalc.glade", "liststore2");
+ gnc_builder_add_from_file (builder, "fincalc.glade", "Financial Calculator Dialog");
- fcd->xml = xml;
- fcd->dialog = glade_xml_get_widget (xml, "Financial Calculator Dialog");
+ fcd->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Financial Calculator Dialog"));
gnc_register_gui_component (DIALOG_FINCALC_CM_CLASS,
NULL, close_handler, fcd);
@@ -575,49 +579,84 @@
G_CALLBACK (fincalc_dialog_destroy), fcd);
- edit = glade_xml_get_widget (xml, "payment_periods_edit");
+ hbox = GTK_WIDGET(gtk_builder_get_object (builder, "payment_periods_hbox"));
+ edit = gnc_amount_edit_new();
fincalc_init_gae (GNC_AMOUNT_EDIT (edit), 0, 0, 1);
fcd->amounts[PAYMENT_PERIODS] = edit;
+ gtk_box_pack_end(GTK_BOX(hbox), edit, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT(edit), "changed",
+ G_CALLBACK (fincalc_update_calc_button_cb), fcd);
- edit = glade_xml_get_widget (xml, "interest_rate_edit");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "payment_periods_clear_button"));
+ g_object_set_data(G_OBJECT(button), "edit", edit);
+
+ hbox = GTK_WIDGET(gtk_builder_get_object (builder, "interest_rate_hbox"));
+ edit = gnc_amount_edit_new();
fincalc_init_gae (GNC_AMOUNT_EDIT (edit), 2, 5, 100000);
fcd->amounts[INTEREST_RATE] = edit;
+ gtk_box_pack_end(GTK_BOX(hbox), edit, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT(edit), "changed",
+ G_CALLBACK (fincalc_update_calc_button_cb), fcd);
- edit = glade_xml_get_widget (xml, "present_value_edit");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "interest_rate_clear_button"));
+ g_object_set_data(G_OBJECT(button), "edit", edit);
+
+ hbox = GTK_WIDGET(gtk_builder_get_object (builder, "present_value_hbox"));
+ edit = gnc_amount_edit_new();
fincalc_init_commodity_gae (GNC_AMOUNT_EDIT (edit));
fcd->amounts[PRESENT_VALUE] = edit;
+ gtk_box_pack_end(GTK_BOX(hbox), edit, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT(edit), "changed",
+ G_CALLBACK (fincalc_update_calc_button_cb), fcd);
- edit = glade_xml_get_widget (xml, "period_payment_edit");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "present_value_clear_button"));
+ g_object_set_data(G_OBJECT(button), "edit", edit);
+
+ hbox = GTK_WIDGET(gtk_builder_get_object (builder, "periodic_payment_hbox"));
+ edit = gnc_amount_edit_new();
fincalc_init_commodity_gae (GNC_AMOUNT_EDIT (edit));
fcd->amounts[PERIODIC_PAYMENT] = edit;
+ gtk_box_pack_end(GTK_BOX(hbox), edit, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT(edit), "changed",
+ G_CALLBACK (fincalc_update_calc_button_cb), fcd);
- edit = glade_xml_get_widget (xml, "future_value_edit");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "periodic_payment_clear_button"));
+ g_object_set_data(G_OBJECT(button), "edit", edit);
+
+ hbox = GTK_WIDGET(gtk_builder_get_object (builder, "future_value_hbox"));
+ edit = gnc_amount_edit_new();
fincalc_init_commodity_gae (GNC_AMOUNT_EDIT (edit));
fcd->amounts[FUTURE_VALUE] = edit;
+ gtk_box_pack_end(GTK_BOX(hbox), edit, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT(edit), "changed",
+ G_CALLBACK (fincalc_update_calc_button_cb), fcd);
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "future_value_clear_button"));
+ g_object_set_data(G_OBJECT(button), "edit", edit);
- fcd->calc_button = glade_xml_get_widget (xml, "calc_button");
+ fcd->calc_button = GTK_WIDGET(gtk_builder_get_object (builder, "calc_button"));
- combo = glade_xml_get_widget (xml, "compounding_combo");
+
+ combo = GTK_WIDGET(gtk_builder_get_object (builder, "compounding_combo"));
fcd->compounding_combo = combo;
g_signal_connect(fcd->compounding_combo, "changed",
G_CALLBACK (fincalc_update_calc_button_cb), fcd);
- combo = glade_xml_get_widget (xml, "payment_combo");
+ combo = GTK_WIDGET(gtk_builder_get_object (builder, "payment_combo"));
fcd->payment_combo = combo;
g_signal_connect(fcd->compounding_combo, "changed",
G_CALLBACK (fincalc_update_calc_button_cb), fcd);
- button = glade_xml_get_widget (xml, "period_payment_radio");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "period_payment_radio"));
fcd->end_of_period_radio = button;
- button = glade_xml_get_widget (xml, "discrete_compounding_radio");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "discrete_compounding_radio"));
fcd->discrete_compounding_radio = button;
- fcd->payment_total_label = glade_xml_get_widget (xml, "payment_total_label");
+ fcd->payment_total_label = GTK_WIDGET(gtk_builder_get_object (builder, "payment_total_label"));
- button = glade_xml_get_widget (xml, "schedule_button");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "schedule_button"));
gtk_widget_hide (button);
init_fi(fcd);
@@ -627,9 +666,8 @@
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);
+ gtk_builder_connect_signals(builder, fcd);
+ g_object_unref(G_OBJECT(builder));
gnc_restore_window_size(GCONF_SECTION, GTK_WINDOW(fcd->dialog));
gtk_widget_show(fcd->dialog);
Modified: gnucash/trunk/src/gnome/glade/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/glade/Makefile.am 2011-06-20 21:34:32 UTC (rev 20779)
+++ gnucash/trunk/src/gnome/glade/Makefile.am 2011-06-20 21:34:41 UTC (rev 20780)
@@ -1,7 +1,6 @@
gladedir = $(GNC_GLADE_DIR)
glade_DATA = \
budget.glade \
- fincalc.glade \
lots.glade \
newuser.glade \
price.glade \
Deleted: gnucash/trunk/src/gnome/glade/fincalc.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/fincalc.glade 2011-06-20 21:34:32 UTC (rev 20779)
+++ gnucash/trunk/src/gnome/glade/fincalc.glade 2011-06-20 21:34:41 UTC (rev 20780)
@@ -1,1061 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.10 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkDialog" id="Financial Calculator Dialog">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Loan Repayment Calculator</property>
- <property name="resizable">False</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <signal name="response" handler="fincalc_response_cb"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox10">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkHBox" id="hbox79">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox75">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label808">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Calculations</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment18">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox77">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkVBox" id="vbox78">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label790">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.75</property>
- <property name="label" translatable="yes">Payment periods</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox85">
- <property name="visible">True</property>
- <property name="spacing">6</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>
- <signal name="changed" handler="fincalc_update_calc_button_cb"/>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="payment_periods_clear_button">
- <property name="label">gtk-clear</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="payment_periods_edit"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox79">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label799">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.75</property>
- <property name="label" translatable="yes">Interest rate</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox86">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="Custom" id="interest_rate_edit">
- <property name="visible">True</property>
- <property name="creation_function">gnc_amount_edit_new</property>
- <signal name="changed" handler="fincalc_update_calc_button_cb"/>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="interest_rate_clear_button">
- <property name="label">gtk-clear</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="interest_rate_edit"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox80">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label800">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.75</property>
- <property name="label" translatable="yes">Present value</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox87">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="Custom" id="present_value_edit">
- <property name="visible">True</property>
- <property name="creation_function">gnc_amount_edit_new</property>
- <signal name="changed" handler="fincalc_update_calc_button_cb"/>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="present_value_clear_button">
- <property name="label">gtk-clear</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="present_value_edit"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox81">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label817">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.75</property>
- <property name="label" translatable="yes">Periodic payment</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox88">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="Custom" id="period_payment_edit">
- <property name="visible">True</property>
- <property name="creation_function">gnc_amount_edit_new</property>
- <signal name="changed" handler="fincalc_update_calc_button_cb"/>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="periodic_payment_clear_button">
- <property name="label">gtk-clear</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="period_payment_edit"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox82">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label802">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.75</property>
- <property name="label" translatable="yes">Future value</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox89">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="Custom" id="future_value_edit">
- <property name="visible">True</property>
- <property name="creation_function">gnc_amount_edit_new</property>
- <signal name="changed" handler="fincalc_update_calc_button_cb"/>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="future_value_clear_button">
- <property name="label">gtk-clear</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Clear the entry</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="future_value_edit"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment31">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkButton" id="calc_button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Recalculate the (single) blank entry in the above fields.</property>
- <signal name="clicked" handler="fincalc_calc_clicked_cb"/>
- <child>
- <widget class="GtkAlignment" id="alignment30">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox84">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</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>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVSeparator" id="vseparator2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">6</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox76">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label809">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Payment Options</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment19">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkTable" id="table9">
- <property name="visible">True</property>
- <property name="n_rows">9</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <child>
- <widget class="GtkLabel" id="some_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Payment Total:</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="payment_total_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">total</property>
- <property name="justify">center</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">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label818">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label819">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="discrete_compounding_radio">
- <property name="label" translatable="yes">Discrete</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="fincalc_compounding_radio_toggled"/>
- </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">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton6">
- <property name="label" translatable="yes">Continuous</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</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">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment23">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkLabel" id="label816">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Type:</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment22">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkLabel" id="label815">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Frequency:</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment24">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkLabel" id="label811">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Frequency:</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment25">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkLabel" id="label812">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">When paid:</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton4">
- <property name="label" translatable="yes">Beginning</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <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">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="period_payment_radio">
- <property name="label" translatable="yes">End</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton4</property>
- <signal name="toggled" handler="fincalc_update_calc_button_cb"/>
- </widget>
- <packing>
- <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">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label797">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Compounding:</b></property>
- <property name="use_markup">True</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label813">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Period:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="payment_combo">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Annual
-Semi-annual
-Tri-annual
-Quarterly
-Bi-monthly
-Monthly
-Semi-monthly
-Bi-weekly
-Weekly
-Daily (360)
-Daily (365)</property>
- </widget>
- <packing>
- <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">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="compounding_combo">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Annual
-Semi-annual
-Tri-annual
-Quarterly
-Bi-monthly
-Monthly
-Semi-monthly
-Bi-weekly
-Weekly
-Daily (360)
-Daily (365)</property>
- </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">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area10">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="close_button">
- <property name="label">gtk-close</property>
- <property name="response_id">-7</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="hidden_button">
- <property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="schedule_button">
- <property name="response_id">-5</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <child>
- <widget class="GtkAlignment" id="alignment32">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox90">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image8">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label825">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Schedule</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="Amortization Schedule Dialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Account Information</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox11">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkHBox" id="hbox59">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox73">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkLabel" id="label803">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">1</property>
- <property name="label" translatable="yes">_Effective Date:</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label804">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">1</property>
- <property name="label" translatable="yes">_Initial Payment:</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label805">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">1</property>
- <property name="label" translatable="yes">Co_mpounding:</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label806">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">1</property>
- <property name="label" translatable="yes">_Payments:</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox74">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkHBox" id="hbox60">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox61">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combobox1">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combobox2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area11">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="button60">
- <property name="label">gtk-apply</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button61">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button62">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
Modified: gnucash/trunk/src/gnome/gtkbuilder/fincalc.glade
===================================================================
--- gnucash/trunk/src/gnome/gtkbuilder/fincalc.glade 2011-06-20 21:34:32 UTC (rev 20779)
+++ gnucash/trunk/src/gnome/gtkbuilder/fincalc.glade 2011-06-20 21:34:41 UTC (rev 20780)
@@ -62,7 +62,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox85">
+ <object class="GtkHBox" id="payment_periods_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
@@ -76,11 +76,12 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="payment_periods_edit"/>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -112,7 +113,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox86">
+ <object class="GtkHBox" id="interest_rate_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
@@ -126,11 +127,12 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="interest_rate_edit"/>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -162,7 +164,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox87">
+ <object class="GtkHBox" id="present_value_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
@@ -176,11 +178,12 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="present_value_edit"/>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -212,7 +215,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox88">
+ <object class="GtkHBox" id="periodic_payment_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
@@ -226,11 +229,12 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="period_payment_edit"/>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -262,7 +266,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox89">
+ <object class="GtkHBox" id="future_value_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
@@ -276,11 +280,12 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="fincalc_amount_clear_clicked_cb" object="future_value_edit"/>
+ <signal name="clicked" handler="fincalc_amount_clear_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -1021,7 +1026,7 @@
</object>
<object class="GtkListStore" id="liststore1">
<columns>
- <!-- column-name item text -->
+ <!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
@@ -1062,7 +1067,7 @@
</object>
<object class="GtkListStore" id="liststore2">
<columns>
- <!-- column-name item text -->
+ <!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
More information about the gnucash-changes
mailing list