IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Files linked to window-reconcile.glade

Browse Source
This commit is contained in:
Robert Fewell 2017-06-20 09:27:57 +01:00
parent 296f739c0d
commit 8b7cd2f56c
3 changed files with 119 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
src/gnome/gtkbuilder/window-reconcile.glade
View File

@ -1,25 +1,73 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="Reconcile Start Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="reconcile_start_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox6">
<object class="GtkBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkVBox" id="vbox1">
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label" translatable="yes">_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_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;Reconcile Information&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@ -32,59 +80,60 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table1">
<object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">4</property>
<property name="row_spacing">6</property>
<property name="column_spacing">4</property>
<child>
<object class="GtkLabel" id="start_value">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label">$15.00</property>
</object>
<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>
<object class="GtkLabel" id="date_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Statement _Date:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="start_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Starting Balance:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="end_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Ending Balance:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
@ -93,47 +142,40 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Include all descendant accounts in the reconcile. All of them must use the same commodity as this one.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_start_recn_children_changed"/>
<property name="tooltip_text" translatable="yes">Include all descendant accounts in the reconcile. All of them must use the same commodity as this one.</property>
<signal name="toggled" handler="gnc_start_recn_children_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="date_value_box">
<object class="GtkBox" id="date_value_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="ending_value_box">
<object class="GtkBox" id="ending_value_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</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>
@ -143,12 +185,15 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
<object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="interest_button">
<property name="label" translatable="yes">Enter _Interest Payment...</property>
@ -157,7 +202,7 @@
<property name="receives_default">False</property>
<property name="border_width">8</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_start_recn_interest_clicked_cb"/>
<signal name="clicked" handler="gnc_start_recn_interest_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -167,6 +212,8 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@ -178,48 +225,6 @@
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
<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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton1">
<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="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>

23
src/gnome/window-reconcile.c
View File

@ -728,9 +728,9 @@ startRecnWindow(GtkWidget *parent, Account *account,
/* Create the dialog box */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "window-reconcile.glade", "Reconcile Start Dialog");
gnc_builder_add_from_file (builder, "window-reconcile.glade", "reconcile_start_dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Reconcile Start Dialog"));
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "reconcile_start_dialog"));
title = gnc_recn_make_window_name (account);
gtk_window_set_title(GTK_WINDOW(dialog), title);
@ -1786,7 +1786,7 @@ recnWindowWithBalance (GtkWidget *parent, Account *account,
{
GtkWidget *frame = gtk_frame_new(NULL);
GtkWidget *main_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
GtkWidget *debcred_area = gtk_table_new(1, 2, TRUE);
GtkWidget *debcred_area = gtk_grid_new ();
GtkWidget *debits_box;
GtkWidget *credits_box;
@ -1812,9 +1812,20 @@ recnWindowWithBalance (GtkWidget *parent, Account *account,
GNC_RECONCILE_VIEW(recnData->credit)->sibling = GNC_RECONCILE_VIEW(recnData->debit);
gtk_box_pack_start(GTK_BOX(main_area), debcred_area, TRUE, TRUE, 0);
gtk_table_set_col_spacings(GTK_TABLE(debcred_area), 15);
gtk_table_attach_defaults(GTK_TABLE(debcred_area), debits_box, 0, 1, 0, 1);
gtk_table_attach_defaults(GTK_TABLE(debcred_area), credits_box, 1, 2, 0, 1);
gtk_grid_set_column_homogeneous (GTK_GRID(debcred_area), TRUE);
gtk_grid_set_column_spacing (GTK_GRID(debcred_area), 15);
gtk_grid_attach (GTK_GRID(debcred_area), debits_box, 0, 0, 1, 1);
gtk_widget_set_hexpand (debits_box, TRUE);
gtk_widget_set_vexpand (debits_box, TRUE);
gtk_widget_set_halign (debits_box, GTK_ALIGN_FILL);
gtk_widget_set_valign (debits_box, GTK_ALIGN_FILL);
gtk_grid_attach (GTK_GRID(debcred_area), credits_box, 1, 0, 1, 1);
gtk_widget_set_hexpand (credits_box, TRUE);
gtk_widget_set_vexpand (credits_box, TRUE);
gtk_widget_set_halign (credits_box, GTK_ALIGN_FILL);
gtk_widget_set_valign (credits_box, GTK_ALIGN_FILL);
{
GtkWidget *hbox, *title_vbox, *value_vbox;

23
src/gnome/window-reconcile2.c
View File

@ -691,9 +691,9 @@ startRecnWindow (GtkWidget *parent, Account *account,
/* Create the dialog box */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "window-reconcile.glade", "Reconcile Start Dialog");
gnc_builder_add_from_file (builder, "window-reconcile.glade", "reconcile_start_dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Reconcile Start Dialog"));
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "reconcile_start_dialog"));
title = gnc_recn_make_window_name (account);
gtk_window_set_title (GTK_WINDOW (dialog), title);
@ -1746,7 +1746,7 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account,
{
GtkWidget *frame = gtk_frame_new (NULL);
GtkWidget *main_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
GtkWidget *debcred_area = gtk_table_new (1, 2, TRUE);
GtkWidget *debcred_area = gtk_grid_new ();
GtkWidget *debits_box;
GtkWidget *credits_box;
@ -1772,9 +1772,20 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account,
GNC_RECONCILE_VIEW (recnData->credit)->sibling = GNC_RECONCILE_VIEW (recnData->debit);
gtk_box_pack_start (GTK_BOX (main_area), debcred_area, TRUE, TRUE, 0);
gtk_table_set_col_spacings (GTK_TABLE (debcred_area), 15);
gtk_table_attach_defaults (GTK_TABLE (debcred_area), debits_box, 0, 1, 0, 1);
gtk_table_attach_defaults (GTK_TABLE (debcred_area), credits_box, 1, 2, 0, 1);
gtk_grid_set_column_homogeneous (GTK_GRID(debcred_area), TRUE);
gtk_grid_set_column_spacing (GTK_GRID(debcred_area), 15);
gtk_grid_attach (GTK_GRID(debcred_area), debits_box, 0, 0, 1, 1);
gtk_widget_set_hexpand (debits_box, TRUE);
gtk_widget_set_vexpand (debits_box, TRUE);
gtk_widget_set_halign (debits_box, GTK_ALIGN_FILL);
gtk_widget_set_valign (debits_box, GTK_ALIGN_FILL);
gtk_grid_attach (GTK_GRID(debcred_area), credits_box, 1, 0, 1, 1);
gtk_widget_set_hexpand (credits_box, TRUE);
gtk_widget_set_vexpand (credits_box, TRUE);
gtk_widget_set_halign (credits_box, GTK_ALIGN_FILL);
gtk_widget_set_valign (credits_box, GTK_ALIGN_FILL);
{
GtkWidget *hbox, *title_vbox, *value_vbox;