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

More HIG changes.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12987 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton 2006-01-27 05:13:46 +00:00
parent f30362eaa3
commit df317905f4
5 changed files with 744 additions and 619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2006-01-26 David Hampton <hampton@employees.org> 2006-01-26 David Hampton <hampton@employees.org>
* src/gnome/window-reconcile.c:
* src/gnome/glade/tax.glade:
* src/gnome/glade/reconcile.glade:
* src/gnome/dialog-tax-info.c: More HIG changes.
* src/report/report-system/gnc-report.[ch]: * src/report/report-system/gnc-report.[ch]:
* src/report/report-gnome/window-report.[ch]: * src/report/report-gnome/window-report.[ch]:
* src/gnome/top-level.c: Fix compilation warnings. * src/gnome/top-level.c: Fix compilation warnings.

143
src/gnome/dialog-tax-info.c
View File

@ -24,6 +24,7 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libguile.h> #include <libguile.h>
#include "Account.h" #include "Account.h"
@ -68,7 +69,7 @@ typedef struct
GtkWidget * select_button; GtkWidget * select_button;
GtkWidget * tax_related_button; GtkWidget * tax_related_button;
GtkWidget * txf_category_clist; GtkWidget * txf_category_view;
GtkWidget * txf_help_text; GtkWidget * txf_help_text;
GtkWidget * current_account_button; GtkWidget * current_account_button;
GtkWidget * parent_account_button; GtkWidget * parent_account_button;
@ -219,35 +220,44 @@ tax_infos (TaxInfoDialog *ti_dialog)
static void static void
load_category_list (TaxInfoDialog *ti_dialog) load_category_list (TaxInfoDialog *ti_dialog)
{ {
GtkCList *clist = GTK_CLIST (ti_dialog->txf_category_clist); GtkTreeView *view;
char *text[2]; GtkListStore *store;
GtkTreeIter iter;
GList *codes; GList *codes;
gtk_clist_freeze (clist); view = GTK_TREE_VIEW(ti_dialog->txf_category_view);
gtk_clist_clear (clist); store = GTK_LIST_STORE(gtk_tree_view_get_model(view));
gtk_tree_view_set_model(view, NULL);
gtk_list_store_clear(store);
codes = tax_infos (ti_dialog); codes = tax_infos (ti_dialog);
for ( ; codes; codes = codes->next) for ( ; codes; codes = codes->next)
{ {
TXFInfo *txf_info = codes->data; TXFInfo *txf_info = codes->data;
text[0] = txf_info->form; gtk_list_store_append(store, &iter);
text[1] = txf_info->description; gtk_list_store_set(store, &iter,
0, txf_info->form,
gtk_clist_append (clist, text); 1, txf_info->description,
-1);
} }
gtk_clist_thaw (clist); gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
} }
static void static void
clear_gui (TaxInfoDialog *ti_dialog) clear_gui (TaxInfoDialog *ti_dialog)
{ {
GtkTreeView *view;
GtkTreeSelection *selection;
gtk_toggle_button_set_active gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (ti_dialog->tax_related_button), FALSE); (GTK_TOGGLE_BUTTON (ti_dialog->tax_related_button), FALSE);
gtk_clist_select_row (GTK_CLIST (ti_dialog->txf_category_clist), 0, 0); view = GTK_TREE_VIEW(ti_dialog->txf_category_view);
selection = gtk_tree_view_get_selection(view);
gtk_tree_selection_unselect_all(selection);
gtk_toggle_button_set_active gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (ti_dialog->current_account_button), TRUE); (GTK_TOGGLE_BUTTON (ti_dialog->current_account_button), TRUE);
@ -279,6 +289,9 @@ txf_infos_find_code (GList *infos, const char *code)
static void static void
account_to_gui (TaxInfoDialog *ti_dialog, Account *account) account_to_gui (TaxInfoDialog *ti_dialog, Account *account)
{ {
GtkTreeView *view;
GtkTreeSelection *selection;
GtkTreePath *path;
gboolean tax_related; gboolean tax_related;
const char *str; const char *str;
TXFInfo *info; TXFInfo *info;
@ -306,11 +319,12 @@ account_to_gui (TaxInfoDialog *ti_dialog, Account *account)
if (index < 0) if (index < 0)
index = 0; index = 0;
gtk_clist_select_row (GTK_CLIST (ti_dialog->txf_category_clist), index, 0); view = GTK_TREE_VIEW(ti_dialog->txf_category_view);
if (gtk_clist_row_is_visible (GTK_CLIST (ti_dialog->txf_category_clist), selection = gtk_tree_view_get_selection(view);
index) != GTK_VISIBILITY_FULL) path = gtk_tree_path_new_from_indices(index, -1);
gtk_clist_moveto (GTK_CLIST (ti_dialog->txf_category_clist), gtk_tree_selection_select_path(selection, path);
index, 0, 0.5, 0.0); gtk_tree_view_scroll_to_cell(view, path, NULL, FALSE, 0, 0);
gtk_tree_path_free(path);
str = xaccAccountGetTaxUSPayerNameSource (account); str = xaccAccountGetTaxUSPayerNameSource (account);
if (safe_strcmp (str, "parent") == 0) if (safe_strcmp (str, "parent") == 0)
@ -324,6 +338,12 @@ account_to_gui (TaxInfoDialog *ti_dialog, Account *account)
static void static void
gui_to_accounts (TaxInfoDialog *ti_dialog) gui_to_accounts (TaxInfoDialog *ti_dialog)
{ {
GtkTreeView *view;
GtkTreeModel *model;
GtkTreeSelection *selection;
GtkTreePath *path;
GtkTreeIter iter;
gint *indices;
gboolean tax_related; gboolean tax_related;
const char *code; const char *code;
const char *pns; const char *pns;
@ -337,8 +357,14 @@ gui_to_accounts (TaxInfoDialog *ti_dialog)
infos = tax_infos (ti_dialog); infos = tax_infos (ti_dialog);
info = g_list_nth_data view = GTK_TREE_VIEW(ti_dialog->txf_category_view);
(infos, GTK_CLIST (ti_dialog->txf_category_clist)->focus_row); selection = gtk_tree_view_get_selection(view);
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
path = gtk_tree_model_get_path(model, &iter);
indices = gtk_tree_path_get_indices(path);
info = g_list_nth_data (infos, indices[0]);
gtk_tree_path_free(path);
g_return_if_fail (info != NULL); g_return_if_fail (info != NULL);
code = tax_related ? info->code : NULL; code = tax_related ? info->code : NULL;
@ -465,7 +491,7 @@ gnc_tax_info_update_accounts (TaxInfoDialog *ti_dialog)
GncTreeViewAccount *tree; GncTreeViewAccount *tree;
GtkTreeSelection* selection; GtkTreeSelection* selection;
GtkWidget *label; GtkWidget *label;
GtkWidget *frame; GtkWidget *vbox;
int num_accounts; int num_accounts;
char *string; char *string;
@ -474,13 +500,13 @@ gnc_tax_info_update_accounts (TaxInfoDialog *ti_dialog)
num_accounts = gtk_tree_selection_count_selected_rows (selection); num_accounts = gtk_tree_selection_count_selected_rows (selection);
label = gnc_glade_lookup_widget (ti_dialog->dialog, "num_accounts_label"); label = gnc_glade_lookup_widget (ti_dialog->dialog, "num_accounts_label");
frame = gnc_glade_lookup_widget (ti_dialog->dialog, "tax_info_frame"); vbox = gnc_glade_lookup_widget (ti_dialog->dialog, "tax_info_vbox");
string = g_strdup_printf ("%d", num_accounts); string = g_strdup_printf ("%d", num_accounts);
gtk_label_set_text (GTK_LABEL (label), string); gtk_label_set_text (GTK_LABEL (label), string);
g_free (string); g_free (string);
gtk_widget_set_sensitive (frame, num_accounts > 0); gtk_widget_set_sensitive (vbox, num_accounts > 0);
return num_accounts; return num_accounts;
} }
@ -539,40 +565,47 @@ gnc_tax_info_account_changed_cb (GtkTreeSelection *selection,
} }
static void static void
txf_code_select_row_cb (GtkCList *clist, txf_code_select_row_cb (GtkTreeSelection *selection,
gint row, gpointer user_data)
gint column,
GdkEventButton *event,
gpointer user_data)
{ {
TaxInfoDialog *ti_dialog = user_data; TaxInfoDialog *ti_dialog = user_data;
GtkTreeModel *model;
GtkTreePath *path;
GtkTreeIter iter;
gint *indices;
TXFInfo *txf_info; TXFInfo *txf_info;
GtkAdjustment *adj; GtkAdjustment *adj;
GtkWidget *scroll; GtkWidget *scroll;
GtkWidget *frame; GtkWidget *vbox;
GtkTextBuffer *tb; GtkTextBuffer *tb;
const char *text; const char *text;
txf_info = g_list_nth_data (tax_infos (ti_dialog), row); if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
path = gtk_tree_model_get_path(model, &iter);
indices = gtk_tree_path_get_indices(path);
txf_info = g_list_nth_data (tax_infos (ti_dialog), indices[0]);
gtk_tree_path_free(path);
tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ti_dialog->txf_help_text)); tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ti_dialog->txf_help_text));
text = (txf_info && txf_info->help) ? txf_info->help : ""; text = (txf_info && txf_info->help) ? txf_info->help : "";
gtk_text_buffer_set_text (tb, text, -1); gtk_text_buffer_set_text (tb, text, -1);
scroll = gnc_glade_lookup_widget (GTK_WIDGET (clist), "help_scroll"); scroll = gnc_glade_lookup_widget (GTK_WIDGET (ti_dialog->dialog),
"help_scroll");
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scroll)); adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scroll));
gtk_adjustment_set_value (adj, 0.0); gtk_adjustment_set_value (adj, 0.0);
frame = gnc_glade_lookup_widget (GTK_WIDGET (clist), vbox = gnc_glade_lookup_widget (GTK_WIDGET (ti_dialog->dialog),
"payer_name_source_frame"); "payer_name_source_vbox");
if (txf_info && txf_info->payer_name_source) if (txf_info && txf_info->payer_name_source)
{ {
gboolean current; gboolean current;
gtk_widget_set_sensitive (frame, TRUE); gtk_widget_set_sensitive (vbox, TRUE);
current = (strcmp ("current", txf_info->payer_name_source) == 0); current = (strcmp ("current", txf_info->payer_name_source) == 0);
@ -585,7 +618,7 @@ txf_code_select_row_cb (GtkCList *clist,
} }
else else
{ {
gtk_widget_set_sensitive (frame, FALSE); gtk_widget_set_sensitive (vbox, FALSE);
gtk_toggle_button_set_active gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (ti_dialog->current_account_button), TRUE); (GTK_TOGGLE_BUTTON (ti_dialog->current_account_button), TRUE);
} }
@ -598,14 +631,14 @@ tax_related_toggled_cb (GtkToggleButton *togglebutton,
gpointer user_data) gpointer user_data)
{ {
TaxInfoDialog *ti_dialog = user_data; TaxInfoDialog *ti_dialog = user_data;
GtkWidget *frame; GtkWidget *vbox;
gboolean on; gboolean on;
on = gtk_toggle_button_get_active (togglebutton); on = gtk_toggle_button_get_active (togglebutton);
frame = gnc_glade_lookup_widget (GTK_WIDGET (togglebutton), vbox = gnc_glade_lookup_widget (GTK_WIDGET (togglebutton),
"txf_categories_frame"); "txf_categories_vbox");
gtk_widget_set_sensitive (frame, on); gtk_widget_set_sensitive (vbox, on);
gnc_tax_info_set_changed (ti_dialog, TRUE); gnc_tax_info_set_changed (ti_dialog, TRUE);
} }
@ -625,6 +658,9 @@ gnc_tax_info_dialog_create (GtkWidget * parent, TaxInfoDialog *ti_dialog)
GtkWidget *dialog; GtkWidget *dialog;
GtkObject *tido; GtkObject *tido;
GladeXML *xml; GladeXML *xml;
GtkTreeView *tree_view;
GtkTreeSelection *selection;
GtkWidget *label;
xml = gnc_glade_xml_new ("tax.glade", "Tax Information Dialog"); xml = gnc_glade_xml_new ("tax.glade", "Tax Information Dialog");
@ -651,8 +687,10 @@ gnc_tax_info_dialog_create (GtkWidget * parent, TaxInfoDialog *ti_dialog)
/* tax information */ /* tax information */
{ {
GtkListStore *store;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkWidget *button; GtkWidget *button;
GtkWidget *clist;
GtkWidget *text; GtkWidget *text;
button = glade_xml_get_widget (xml, "tax_related_button"); button = glade_xml_get_widget (xml, "tax_related_button");
@ -677,13 +715,26 @@ gnc_tax_info_dialog_create (GtkWidget * parent, TaxInfoDialog *ti_dialog)
gtk_widget_set_size_request (text, -1, (font->ascent + font->descent) * 5 + 6); gtk_widget_set_size_request (text, -1, (font->ascent + font->descent) * 5 + 6);
} }
clist = glade_xml_get_widget (xml, "txf_category_clist"); tree_view = GTK_TREE_VIEW(glade_xml_get_widget(xml, "txf_category_view"));
gtk_clist_column_titles_passive (GTK_CLIST (clist)); store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
ti_dialog->txf_category_clist = clist; gtk_tree_view_set_model(tree_view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(_("Form"), renderer, "text", 0, NULL);
gtk_tree_view_append_column(tree_view, GTK_TREE_VIEW_COLUMN(column));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(_("Description"), renderer, "text", 1, NULL);
gtk_tree_view_append_column(tree_view, GTK_TREE_VIEW_COLUMN(column));
ti_dialog->txf_category_view = GTK_WIDGET(tree_view);
g_signal_connect (G_OBJECT (clist), "select-row", selection = gtk_tree_view_get_selection(tree_view);
g_signal_connect (G_OBJECT (selection), "changed",
G_CALLBACK (txf_code_select_row_cb), ti_dialog); G_CALLBACK (txf_code_select_row_cb), ti_dialog);
label = glade_xml_get_widget(xml, "txf_category_label");
gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(tree_view));
button = glade_xml_get_widget (xml, "current_account_button"); button = glade_xml_get_widget (xml, "current_account_button");
ti_dialog->current_account_button = button; ti_dialog->current_account_button = button;
@ -698,11 +749,10 @@ gnc_tax_info_dialog_create (GtkWidget * parent, TaxInfoDialog *ti_dialog)
/* account tree */ /* account tree */
{ {
GtkWidget *income_radio, *expense_radio, *box; GtkWidget *income_radio, *expense_radio, *box;
GtkTreeView *tree_view;
GtkTreeSelection *selection;
box = glade_xml_get_widget (xml, "account_hbox"); box = glade_xml_get_widget (xml, "account_hbox");
tree_view = gnc_tree_view_account_new (FALSE); tree_view = gnc_tree_view_account_new (FALSE);
gnc_tree_view_configure_columns (GNC_TREE_VIEW(tree_view), NULL);
gnc_tree_view_account_set_filter (GNC_TREE_VIEW_ACCOUNT(tree_view), gnc_tree_view_account_set_filter (GNC_TREE_VIEW_ACCOUNT(tree_view),
gnc_tax_info_dialog_account_filter_func, gnc_tax_info_dialog_account_filter_func,
ti_dialog, NULL); ti_dialog, NULL);
@ -717,6 +767,9 @@ gnc_tax_info_dialog_create (GtkWidget * parent, TaxInfoDialog *ti_dialog)
gtk_widget_show (ti_dialog->account_treeview); gtk_widget_show (ti_dialog->account_treeview);
gtk_container_add (GTK_CONTAINER (box), ti_dialog->account_treeview); gtk_container_add (GTK_CONTAINER (box), ti_dialog->account_treeview);
label = glade_xml_get_widget(xml, "accounts_label");
gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(tree_view));
income_radio = glade_xml_get_widget (xml, "income_radio"); income_radio = glade_xml_get_widget (xml, "income_radio");
expense_radio = glade_xml_get_widget (xml, "expense_radio"); expense_radio = glade_xml_get_widget (xml, "expense_radio");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(expense_radio), TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(expense_radio), TRUE);

407
src/gnome/glade/reconcile.glade
View File

@ -24,7 +24,7 @@
<widget class="GtkVBox" id="dialog-vbox6"> <widget class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">6</property>
<child internal-child="action_area"> <child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area6"> <widget class="GtkHButtonBox" id="dialog-action_area6">
@ -66,212 +66,239 @@
</child> </child>
<child> <child>
<widget class="GtkFrame" id="frame5"> <widget class="GtkVBox" id="vbox1">
<property name="border_width">5</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="label_xalign">0</property> <property name="homogeneous">False</property>
<property name="label_yalign">0.5</property> <property name="spacing">6</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkTable" id="table1">
<property name="border_width">10</property>
<property name="visible">True</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">4</property>
<child>
<widget class="GtkLabel" id="start_value">
<property name="visible">True</property>
<property name="label" translatable="yes">$15.00</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>
</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="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">Statement Date:</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">1</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes">Starting Balance:</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">1</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</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>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">Ending Balance:</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">1</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</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>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="subaccount_check">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Include Subaccounts</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>
<signal name="toggled" handler="gnc_start_recn_children_changed" last_modification_time="Thu, 24 Jul 2003 20:43:16 GMT"/>
</widget>
<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>
<widget class="GtkHBox" id="date_value_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="ending_value_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<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">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
</widget>
</child>
<child> <child>
<widget class="GtkLabel" id="label1"> <widget class="GtkLabel" id="label1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Reconcile Information</property> <property name="label" translatable="yes">&lt;b&gt;Reconcile Information&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property> <property name="wrap">False</property>
<property name="selectable">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="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
</widget> </widget>
<packing> <packing>
<property name="type">label_item</property> <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing> </packing>
</child> </child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child> <child>
<widget class="GtkButton" id="interest_button"> <widget class="GtkAlignment" id="alignment1">
<property name="border_width">8</property> <property name="visible">True</property>
<property name="visible">True</property> <property name="xalign">0.5</property>
<property name="can_focus">True</property> <property name="yalign">0.5</property>
<property name="label" translatable="yes">Enter Interest Payment...</property> <property name="xscale">1</property>
<property name="use_underline">True</property> <property name="yscale">1</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="top_padding">0</property>
<property name="focus_on_click">True</property> <property name="bottom_padding">0</property>
<signal name="clicked" handler="gnc_start_recn_interest_clicked_cb" last_modification_time="Thu, 24 Jul 2003 21:02:28 GMT"/> <property name="left_padding">12</property>
<property name="right_padding">0</property>
<child>
<widget class="GtkTable" id="table1">
<property name="border_width">10</property>
<property name="visible">True</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">4</property>
<child>
<widget class="GtkLabel" id="start_value">
<property name="visible">True</property>
<property name="label" translatable="yes">$15.00</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>
</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="GtkLabel" id="date_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Statement _Date:</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>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="start_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Starting Balance:</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>
</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>
</packing>
</child>
<child>
<widget class="GtkLabel" id="end_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Ending Balance:</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>
</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>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="subaccount_check">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Include _subaccounts</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>
<signal name="toggled" handler="gnc_start_recn_children_changed" last_modification_time="Thu, 24 Jul 2003 20:43:16 GMT"/>
</widget>
<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>
<widget class="GtkHBox" id="date_value_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="ending_value_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<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">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<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="interest_button">
<property name="border_width">8</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enter _Interest Payment...</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="gnc_start_recn_interest_clicked_cb" last_modification_time="Thu, 24 Jul 2003 21:02:28 GMT"/>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">5</property> <property name="padding">5</property>

797
src/gnome/glade/tax.glade
View File

@ -23,7 +23,7 @@
<widget class="GtkVBox" id="dialog-vbox14"> <widget class="GtkVBox" id="dialog-vbox14">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">8</property> <property name="spacing">6</property>
<child internal-child="action_area"> <child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area14"> <widget class="GtkHButtonBox" id="dialog-action_area14">
@ -67,18 +67,394 @@
<child> <child>
<widget class="GtkTable" id="table1"> <widget class="GtkTable" id="table1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="n_rows">1</property> <property name="n_rows">2</property>
<property name="n_columns">3</property> <property name="n_columns">3</property>
<property name="homogeneous">True</property> <property name="homogeneous">False</property>
<property name="row_spacing">0</property> <property name="row_spacing">0</property>
<property name="column_spacing">0</property> <property name="column_spacing">0</property>
<child> <child>
<widget class="GtkFrame" id="account_frame"> <widget class="GtkLabel" id="label847734">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label_xalign">0</property> <property name="label" translatable="yes">&lt;b&gt;Tax Information&lt;/b&gt;</property>
<property name="label_yalign">0.5</property> <property name="use_underline">False</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</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>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment3">
<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">6</property>
<property name="right_padding">6</property>
<child>
<widget class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property>
</widget>
</child>
</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">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="tax_info_vbox">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkAlignment" id="alignment4">
<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="GtkCheckButton" id="tax_related_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Tax _Related</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>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label847738">
<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.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="GtkVBox" id="txf_categories_vbox">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="txf_category_label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;_TXF Categories&lt;/b&gt;</property>
<property name="use_underline">True</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>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment5">
<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="GtkScrolledWindow" id="scrolledwindow28">
<property name="visible">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="txf_category_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">True</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
<property name="hover_selection">False</property>
<property name="hover_expand">False</property>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment6">
<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="GtkScrolledWindow" id="help_scroll">
<property name="visible">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTextView" id="txf_help_text">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="editable">False</property>
<property name="overwrite">False</property>
<property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
<property name="cursor_visible">True</property>
<property name="pixels_above_lines">0</property>
<property name="pixels_below_lines">0</property>
<property name="pixels_inside_wrap">0</property>
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes"></property>
</widget>
</child>
</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="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label847739">
<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.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="GtkVBox" id="payer_name_source_vbox">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label847736">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Payer Name Source&lt;/b&gt;</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>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment7">
<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="GtkRadioButton" id="current_account_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">C_urrent Account</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>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment8">
<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="GtkRadioButton" id="parent_account_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Parent Account</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">current_account_button</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
</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">fill</property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment2">
<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> <child>
<widget class="GtkVBox" id="vbox96"> <widget class="GtkVBox" id="vbox96">
@ -87,17 +463,17 @@
<property name="spacing">0</property> <property name="spacing">0</property>
<child> <child>
<widget class="GtkHBox" id="hbox97"> <widget class="GtkHButtonBox" id="hbox97">
<property name="border_width">3</property> <property name="border_width">3</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
<property name="spacing">0</property> <property name="spacing">0</property>
<child> <child>
<widget class="GtkRadioButton" id="income_radio"> <widget class="GtkRadioButton" id="income_radio">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">Income</property> <property name="label" translatable="yes">_Income</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property> <property name="focus_on_click">True</property>
@ -105,18 +481,13 @@
<property name="inconsistent">False</property> <property name="inconsistent">False</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">False</property>
</packing>
</child> </child>
<child> <child>
<widget class="GtkRadioButton" id="expense_radio"> <widget class="GtkRadioButton" id="expense_radio">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">Expense</property> <property name="label" translatable="yes">_Expense</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property> <property name="focus_on_click">True</property>
@ -125,11 +496,6 @@
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">income_radio</property> <property name="group">income_radio</property>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">False</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>
@ -143,7 +509,7 @@
<widget class="GtkScrolledWindow" id="account_scroll"> <widget class="GtkScrolledWindow" id="account_scroll">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property> <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
@ -268,37 +634,16 @@
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox99"> <widget class="GtkHButtonBox" id="hbox99">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
<property name="spacing">0</property> <property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label44">
<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.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">True</property>
<property name="fill">False</property>
</packing>
</child>
<child> <child>
<widget class="GtkButton" id="select_subaccounts_button"> <widget class="GtkButton" id="select_subaccounts_button">
<property name="border_width">3</property> <property name="border_width">3</property>
@ -345,7 +690,7 @@
<child> <child>
<widget class="GtkLabel" id="label847737"> <widget class="GtkLabel" id="label847737">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Select Subaccounts</property> <property name="label" translatable="yes">_Select Subaccounts</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@ -367,32 +712,6 @@
</widget> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label45">
<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.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">True</property>
<property name="fill">False</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>
@ -403,321 +722,37 @@
</child> </child>
</widget> </widget>
</child> </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>
</packing>
</child>
<child> <child>
<widget class="GtkLabel" id="label1"> <widget class="GtkLabel" id="accounts_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Accounts</property> <property name="label" translatable="yes">&lt;b&gt;_Accounts&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">True</property>
<property name="use_markup">False</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property> <property name="wrap">False</property>
<property name="selectable">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="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="right_attach">1</property> <property name="right_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="bottom_attach">1</property> <property name="bottom_attach">1</property>
</packing> <property name="x_options">fill</property>
</child> <property name="y_options"></property>
<child>
<widget class="GtkFrame" id="tax_info_frame">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkVBox" id="vbox92">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">3</property>
<child>
<widget class="GtkCheckButton" id="tax_related_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Tax Related</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>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
</widget>
<packing>
<property name="padding">6</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="txf_categories_frame">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
<widget class="GtkVBox" id="vbox113">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow28">
<property name="visible">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkCList" id="txf_category_clist">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="n_columns">2</property>
<property name="column_widths">80,80</property>
<property name="selection_mode">GTK_SELECTION_BROWSE</property>
<property name="show_titles">True</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
<widget class="GtkLabel" id="label847734">
<property name="label" translatable="yes">Form</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>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label847735">
<property name="label" translatable="yes">Description</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>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="help_scroll">
<property name="visible">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTextView" id="txf_help_text">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="overwrite">False</property>
<property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
<property name="cursor_visible">True</property>
<property name="pixels_above_lines">0</property>
<property name="pixels_below_lines">0</property>
<property name="pixels_inside_wrap">0</property>
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes"></property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label847735">
<property name="visible">True</property>
<property name="label" translatable="yes">TXF Categories</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="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</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="GtkFrame" id="payer_name_source_frame">
<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>
<child>
<widget class="GtkVBox" id="vbox97">
<property name="border_width">3</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkRadioButton" id="current_account_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Current Account</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>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="parent_account_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Parent Account</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">current_account_button</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label847736">
<property name="visible">True</property>
<property name="label" translatable="yes">Payer Name Source</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="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label847734">
<property name="visible">True</property>
<property name="label" translatable="yes">Tax Information</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="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
</packing> </packing>
</child> </child>
</widget> </widget>

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

@ -663,7 +663,7 @@ startRecnWindow(GtkWidget *parent, Account *account,
{ {
GtkWidget *start_value, *box; GtkWidget *start_value, *box;
GtkWidget *entry; GtkWidget *entry, *label;
GtkWidget *interest = NULL; GtkWidget *interest = NULL;
start_value = glade_xml_get_widget(xml, "start_value"); start_value = glade_xml_get_widget(xml, "start_value");
@ -678,6 +678,8 @@ startRecnWindow(GtkWidget *parent, Account *account,
data.date_value = date_value; data.date_value = date_value;
box = glade_xml_get_widget(xml, "date_value_box"); box = glade_xml_get_widget(xml, "date_value_box");
gtk_box_pack_start(GTK_BOX(box), date_value, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(box), date_value, TRUE, TRUE, 0);
label = glade_xml_get_widget(xml, "date_label");
gnc_date_make_mnemonic_target(GNC_DATE_EDIT(date_value), label);
end_value = gnc_amount_edit_new (); end_value = gnc_amount_edit_new ();
data.end_value = GNC_AMOUNT_EDIT(end_value); data.end_value = GNC_AMOUNT_EDIT(end_value);
@ -685,6 +687,9 @@ startRecnWindow(GtkWidget *parent, Account *account,
data.user_set_value = FALSE; data.user_set_value = FALSE;
box = glade_xml_get_widget(xml, "ending_value_box"); box = glade_xml_get_widget(xml, "ending_value_box");
gtk_box_pack_start(GTK_BOX(box), end_value, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(box), end_value, TRUE, TRUE, 0);
label = glade_xml_get_widget(xml, "end_label");
gtk_label_set_mnemonic_widget(GTK_LABEL(label), end_value);
/* need to get a callback on date changes to update the recn balance */ /* need to get a callback on date changes to update the recn balance */
g_signal_connect ( G_OBJECT (date_value), "date_changed", g_signal_connect ( G_OBJECT (date_value), "date_changed",
@ -710,9 +715,9 @@ startRecnWindow(GtkWidget *parent, Account *account,
*/ */
interest = glade_xml_get_widget(xml, "interest_button"); interest = glade_xml_get_widget(xml, "interest_button");
if( account_type_has_auto_interest_payment( data.account_type ) ) if( account_type_has_auto_interest_payment( data.account_type ) )
gtk_button_set_label(GTK_BUTTON(interest), _("Enter Interest Payment...") ); gtk_button_set_label(GTK_BUTTON(interest), _("Enter _Interest Payment...") );
else if( account_type_has_auto_interest_charge( data.account_type ) ) else if( account_type_has_auto_interest_charge( data.account_type ) )
gtk_button_set_label(GTK_BUTTON(interest), _("Enter Interest Charge...") ); gtk_button_set_label(GTK_BUTTON(interest), _("Enter _Interest Charge...") );
else { else {
gtk_widget_hide(interest); gtk_widget_hide(interest);
interest = NULL; interest = NULL;