diff --git a/src/gnome/dialog-transfer.c b/src/gnome/dialog-transfer.c index 96bd494e8a..44bbb5e0c4 100644 --- a/src/gnome/dialog-transfer.c +++ b/src/gnome/dialog-transfer.c @@ -33,10 +33,11 @@ #include "window-reconcile.h" #include "query-user.h" #include "account-tree.h" +#include "glade-gnc-dialogs.h" #include "gnc-amount-edit.h" #include "gnc-dateedit.h" #include "gnc-exp-parser.h" -#include "enriched-messages.h" +#include "messages.h" #include "ui-callbacks.h" #include "util.h" @@ -83,37 +84,40 @@ gnc_xfer_dialog_toggle_cb(GtkToggleButton *button, gpointer data) } -static GtkWidget * -gnc_xfer_dialog_create_tree_frame(gchar *title, - GNCAccountTree **set_tree, - GtkWidget **set_show_button, - GtkTooltips *tooltips) +static void +gnc_xfer_dialog_fill_tree_frame(XferDialog *xferData, + XferDirection direction, + GtkTooltips *tooltips) { - GtkWidget *frame, *scrollWin, *accountTree, *vbox, *button; + GNCAccountTree *atree; + GtkWidget *scroll_win; + GtkWidget *button; + GtkWidget *tree; + GtkObject *tdo; - frame = gtk_frame_new(title); + tdo = GTK_OBJECT (xferData->dialog); - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 10); + tree = gnc_account_tree_new(); + atree = GNC_ACCOUNT_TREE (tree); - accountTree = gnc_account_tree_new(); - *set_tree = GNC_ACCOUNT_TREE(accountTree); - gtk_clist_column_titles_hide(GTK_CLIST(accountTree)); - gnc_account_tree_hide_all_but_name(GNC_ACCOUNT_TREE(accountTree)); - gnc_account_tree_hide_income_expense(GNC_ACCOUNT_TREE(accountTree)); - gnc_account_tree_refresh(GNC_ACCOUNT_TREE(accountTree)); + if (direction == XFER_DIALOG_TO) + xferData->to = atree; + else + xferData->from = atree; - scrollWin = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrollWin), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); + gtk_clist_column_titles_hide(GTK_CLIST(tree)); + gnc_account_tree_hide_all_but_name(GNC_ACCOUNT_TREE(tree)); + gnc_account_tree_hide_income_expense(GNC_ACCOUNT_TREE(tree)); + gnc_account_tree_refresh(GNC_ACCOUNT_TREE(tree)); - gtk_box_pack_start(GTK_BOX(vbox), scrollWin, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(scrollWin), accountTree); + scroll_win = gtk_object_get_data (tdo, + (direction == XFER_DIALOG_TO) ? + "to_window" : "from_window"); + + gtk_container_add(GTK_CONTAINER(scroll_win), tree); { - GtkStyle *st = gtk_widget_get_style(accountTree); + GtkStyle *st = gtk_widget_get_style(tree); GdkFont *font = NULL; gint height; @@ -123,20 +127,24 @@ gnc_xfer_dialog_create_tree_frame(gchar *title, if (font != NULL) { height = gdk_char_height(font, 'X'); - gtk_widget_set_usize(scrollWin, 0, (height + 6) * 10); + gtk_widget_set_usize(scroll_win, 0, (height + 6) * 10); } } - button = gtk_check_button_new_with_label(SHOW_INC_EXP_STR); - *set_show_button = button; + button = gtk_object_get_data (tdo, + (direction == XFER_DIALOG_TO) ? + "to_show_button" : "from_show_button"); + + if (direction == XFER_DIALOG_TO) + xferData->to_show_button = button; + else + xferData->from_show_button = button; + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE); - gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(tooltips, button, SHOW_INC_EXP_MSG, NULL); gtk_signal_connect(GTK_OBJECT(button), "toggled", - GTK_SIGNAL_FUNC(gnc_xfer_dialog_toggle_cb), accountTree); - - return frame; + GTK_SIGNAL_FUNC(gnc_xfer_dialog_toggle_cb), tree); } @@ -422,13 +430,11 @@ gnc_xfer_dialog_create(GtkWidget * parent, XferDialog *xferData) { GtkWidget *dialog; GtkTooltips *tooltips; - - dialog = gnome_dialog_new(TRANSFER_STR, - GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, - NULL); + GtkObject *tdo; + dialog = create_Transfer_Dialog(); xferData->dialog = dialog; + tdo = GTK_OBJECT (dialog); /* parent */ if (parent != NULL) @@ -437,12 +443,6 @@ gnc_xfer_dialog_create(GtkWidget * parent, XferDialog *xferData) /* default to ok */ gnome_dialog_set_default(GNOME_DIALOG(dialog), 0); - /* destroy on close */ - gnome_dialog_close_hides(GNOME_DIALOG(dialog), FALSE); - - /* allow grow and shrink, no auto-shrink */ - gtk_window_set_policy(GTK_WINDOW(dialog), TRUE, TRUE, FALSE); - gnome_dialog_button_connect(GNOME_DIALOG(dialog), 0, GTK_SIGNAL_FUNC(gnc_xfer_dialog_ok_cb), xferData); @@ -456,133 +456,52 @@ gnc_xfer_dialog_create(GtkWidget * parent, XferDialog *xferData) tooltips = gtk_tooltips_new(); - /* contains amount, date, num, description, and memo */ + /* amount & date widgets */ { - GtkWidget *frame, *vbox, *hbox, *label; + GtkWidget *amount; + GtkWidget *entry; + GtkWidget *date; + GtkWidget *hbox; - frame = gtk_frame_new(XFER_INFO); - gtk_container_set_border_width(GTK_CONTAINER(frame), 5); + amount = gnc_amount_edit_new(); + gnc_amount_edit_set_print_flags (GNC_AMOUNT_EDIT(amount), PRTSEP); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), - frame, TRUE, TRUE, 0); + hbox = gtk_object_get_data(tdo, "amount_hbox"); + gtk_box_pack_end(GTK_BOX(hbox), amount, TRUE, TRUE, 0); + xferData->amount_edit = amount; - vbox = gtk_vbox_new(FALSE, 6); - gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 10); + entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (amount)); - /* Contains amount and date */ - hbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(entry), "focus-out-event", + GTK_SIGNAL_FUNC(gnc_xfer_update_cb), xferData); - { - GtkWidget *amount; - GtkWidget *entry; + gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); - label = gtk_label_new(AMOUNT_C_STR); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - amount = gnc_amount_edit_new(); - gnc_amount_edit_set_print_flags (GNC_AMOUNT_EDIT(amount), PRTSEP); - gtk_box_pack_start(GTK_BOX(hbox), amount, TRUE, TRUE, 0); - xferData->amount_edit = amount; - - entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (amount)); - - gtk_signal_connect(GTK_OBJECT(entry), "focus-out-event", - GTK_SIGNAL_FUNC(gnc_xfer_update_cb), xferData); - - gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); - } - - { - GtkWidget *date; - - label = gtk_label_new(DATE_C_STR); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - date = gnc_date_edit_new(time(NULL), FALSE, FALSE); - gtk_box_pack_start(GTK_BOX(hbox), date, TRUE, TRUE, 0); - xferData->date_entry = date; - } - - { - GtkWidget *sep; - - sep = gtk_hseparator_new(); - gtk_box_pack_start(GTK_BOX(vbox), sep, TRUE, TRUE, 3); - } - - /* Contains num, description, and memo */ - hbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); - - { - GtkWidget *vbox; - gchar *string; - - vbox = gtk_vbox_new(TRUE, 5); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); - - string = g_strconcat(NUM_STR, ":", NULL); - label = gtk_label_new(string); - g_free(string); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - - label = gtk_label_new(DESC_C_STR); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - - label = gtk_label_new(MEMO_C_STR); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - } - - { - GtkWidget *vbox, *entry; - - vbox = gtk_vbox_new(TRUE, 5); - gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0); - - entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0); - xferData->num_entry = entry; - gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); - - entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0); - xferData->description_entry = entry; - gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); - - entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0); - xferData->memo_entry = entry; - gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); - } + date = gnc_date_edit_new(time(NULL), FALSE, FALSE); + hbox = gtk_object_get_data(tdo, "date_hbox"); + gtk_box_pack_end(GTK_BOX(hbox), date, TRUE, TRUE, 0); + xferData->date_entry = date; } - /* Contains from and to */ { - GtkWidget *hbox, *tree; + GtkWidget *entry; - hbox = gtk_hbox_new(TRUE, 5); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), - hbox, TRUE, TRUE, 0); + entry = gtk_object_get_data(tdo, "num_entry"); + xferData->num_entry = entry; + gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); - tree = gnc_xfer_dialog_create_tree_frame(XFRM_STR, - &xferData->from, - &xferData->from_show_button, - tooltips); - gtk_box_pack_start(GTK_BOX(hbox), tree, TRUE, TRUE, 0); + entry = gtk_object_get_data(tdo, "description_entry"); + xferData->description_entry = entry; + gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); - tree = gnc_xfer_dialog_create_tree_frame(XFTO_STR, - &xferData->to, - &xferData->to_show_button, - tooltips); - gtk_box_pack_start(GTK_BOX(hbox), tree, TRUE, TRUE, 0); + entry = gtk_object_get_data(tdo, "memo_entry"); + xferData->memo_entry = entry; + gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); } + + /* from and to */ + gnc_xfer_dialog_fill_tree_frame(xferData, XFER_DIALOG_TO, tooltips); + gnc_xfer_dialog_fill_tree_frame(xferData, XFER_DIALOG_FROM, tooltips); } diff --git a/src/gnome/glade-cb-gnc-dialogs.h b/src/gnome/glade-cb-gnc-dialogs.h index f0d5a1de5d..49fff42314 100644 --- a/src/gnome/glade-cb-gnc-dialogs.h +++ b/src/gnome/glade-cb-gnc-dialogs.h @@ -144,19 +144,3 @@ gnc_ui_select_date_dialog_ok_cb (GtkButton *button, void gnc_ui_select_date_dialog_cancel_cb (GtkButton *button, gpointer user_data); - -void -gnc_ui_qif_import_account_line_select_cb - (GtkCList *clist, - gint row, - gint column, - GdkEvent *event, - gpointer user_data); - -void -gnc_ui_qif_import_category_line_select_cb - (GtkCList *clist, - gint row, - gint column, - GdkEvent *event, - gpointer user_data); diff --git a/src/gnome/glade-gnc-dialogs.c b/src/gnome/glade-gnc-dialogs.c index dc92a312fd..5ff5281977 100644 --- a/src/gnome/glade-gnc-dialogs.c +++ b/src/gnome/glade-gnc-dialogs.c @@ -4114,7 +4114,6 @@ create_Account_Dialog (void) (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox65); gtk_box_pack_start (GTK_BOX (vbox75), hbox65, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (hbox65), 3); frame29 = gtk_frame_new (_("Account Type")); gtk_widget_ref (frame29); @@ -4249,3 +4248,259 @@ create_Account_Dialog (void) return Account_Dialog; } +GtkWidget* +create_Transfer_Dialog (void) +{ + GtkWidget *Transfer_Dialog; + GtkWidget *dialog_vbox13; + GtkWidget *vbox78; + GtkWidget *frame33; + GtkWidget *hbox70; + GtkWidget *vbox80; + GtkWidget *label814; + GtkWidget *label816; + GtkWidget *label817; + GtkWidget *label818; + GtkWidget *vbox81; + GtkWidget *amount_big_hbox; + GtkWidget *amount_hbox; + GtkWidget *date_hbox; + GtkWidget *label815; + GtkWidget *num_entry; + GtkWidget *description_entry; + GtkWidget *memo_entry; + GtkWidget *hbox66; + GtkWidget *frame34; + GtkWidget *vbox82; + GtkWidget *from_window; + GtkWidget *from_show_button; + GtkWidget *frame35; + GtkWidget *vbox83; + GtkWidget *to_window; + GtkWidget *to_show_button; + GtkWidget *dialog_action_area13; + GtkWidget *button66; + GtkWidget *button68; + + Transfer_Dialog = gnome_dialog_new (NULL, NULL); + gtk_object_set_data (GTK_OBJECT (Transfer_Dialog), "Transfer_Dialog", Transfer_Dialog); + gtk_window_set_policy (GTK_WINDOW (Transfer_Dialog), TRUE, TRUE, FALSE); + + dialog_vbox13 = GNOME_DIALOG (Transfer_Dialog)->vbox; + gtk_object_set_data (GTK_OBJECT (Transfer_Dialog), "dialog_vbox13", dialog_vbox13); + gtk_widget_show (dialog_vbox13); + + vbox78 = gtk_vbox_new (FALSE, 0); + gtk_widget_ref (vbox78); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "vbox78", vbox78, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (vbox78); + gtk_box_pack_start (GTK_BOX (dialog_vbox13), vbox78, TRUE, TRUE, 0); + + frame33 = gtk_frame_new (_("Transfer Information")); + gtk_widget_ref (frame33); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "frame33", frame33, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (frame33); + gtk_box_pack_start (GTK_BOX (vbox78), frame33, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (frame33), 3); + + hbox70 = gtk_hbox_new (FALSE, 0); + gtk_widget_ref (hbox70); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "hbox70", hbox70, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (hbox70); + gtk_container_add (GTK_CONTAINER (frame33), hbox70); + + vbox80 = gtk_vbox_new (TRUE, 0); + gtk_widget_ref (vbox80); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "vbox80", vbox80, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (vbox80); + gtk_box_pack_start (GTK_BOX (hbox70), vbox80, FALSE, FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox80), 3); + + label814 = gtk_label_new (_("Amount:")); + gtk_widget_ref (label814); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "label814", label814, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label814); + gtk_box_pack_start (GTK_BOX (vbox80), label814, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label814), 1, 0.5); + + label816 = gtk_label_new (_("Num:")); + gtk_widget_ref (label816); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "label816", label816, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label816); + gtk_box_pack_start (GTK_BOX (vbox80), label816, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label816), 1, 0.5); + + label817 = gtk_label_new (_("Description:")); + gtk_widget_ref (label817); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "label817", label817, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label817); + gtk_box_pack_start (GTK_BOX (vbox80), label817, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label817), 1, 0.5); + + label818 = gtk_label_new (_("Memo:")); + gtk_widget_ref (label818); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "label818", label818, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label818); + gtk_box_pack_start (GTK_BOX (vbox80), label818, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label818), 1, 0.5); + + vbox81 = gtk_vbox_new (TRUE, 0); + gtk_widget_ref (vbox81); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "vbox81", vbox81, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (vbox81); + gtk_box_pack_start (GTK_BOX (hbox70), vbox81, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox81), 3); + + amount_big_hbox = gtk_hbox_new (FALSE, 5); + gtk_widget_ref (amount_big_hbox); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "amount_big_hbox", amount_big_hbox, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (amount_big_hbox); + gtk_box_pack_start (GTK_BOX (vbox81), amount_big_hbox, TRUE, TRUE, 0); + + amount_hbox = gtk_hbox_new (FALSE, 0); + gtk_widget_ref (amount_hbox); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "amount_hbox", amount_hbox, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (amount_hbox); + gtk_box_pack_start (GTK_BOX (amount_big_hbox), amount_hbox, TRUE, TRUE, 0); + + date_hbox = gtk_hbox_new (FALSE, 3); + gtk_widget_ref (date_hbox); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "date_hbox", date_hbox, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (date_hbox); + gtk_box_pack_start (GTK_BOX (amount_big_hbox), date_hbox, FALSE, FALSE, 0); + + label815 = gtk_label_new (_("Date:")); + gtk_widget_ref (label815); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "label815", label815, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label815); + gtk_box_pack_start (GTK_BOX (date_hbox), label815, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label815), 1, 0.5); + + num_entry = gtk_entry_new (); + gtk_widget_ref (num_entry); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "num_entry", num_entry, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (num_entry); + gtk_box_pack_start (GTK_BOX (vbox81), num_entry, FALSE, FALSE, 0); + + description_entry = gtk_entry_new (); + gtk_widget_ref (description_entry); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "description_entry", description_entry, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (description_entry); + gtk_box_pack_start (GTK_BOX (vbox81), description_entry, FALSE, FALSE, 0); + + memo_entry = gtk_entry_new (); + gtk_widget_ref (memo_entry); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "memo_entry", memo_entry, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (memo_entry); + gtk_box_pack_start (GTK_BOX (vbox81), memo_entry, FALSE, FALSE, 0); + + hbox66 = gtk_hbox_new (FALSE, 0); + gtk_widget_ref (hbox66); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "hbox66", hbox66, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (hbox66); + gtk_box_pack_start (GTK_BOX (vbox78), hbox66, TRUE, TRUE, 0); + + frame34 = gtk_frame_new (_("Transfer From")); + gtk_widget_ref (frame34); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "frame34", frame34, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (frame34); + gtk_box_pack_start (GTK_BOX (hbox66), frame34, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (frame34), 3); + + vbox82 = gtk_vbox_new (FALSE, 0); + gtk_widget_ref (vbox82); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "vbox82", vbox82, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (vbox82); + gtk_container_add (GTK_CONTAINER (frame34), vbox82); + gtk_container_set_border_width (GTK_CONTAINER (vbox82), 3); + + from_window = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_ref (from_window); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "from_window", from_window, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (from_window); + gtk_box_pack_start (GTK_BOX (vbox82), from_window, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (from_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + from_show_button = gtk_check_button_new_with_label (_("Show Income/Expense")); + gtk_widget_ref (from_show_button); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "from_show_button", from_show_button, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (from_show_button); + gtk_box_pack_start (GTK_BOX (vbox82), from_show_button, FALSE, FALSE, 0); + + frame35 = gtk_frame_new (_("Transfer To")); + gtk_widget_ref (frame35); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "frame35", frame35, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (frame35); + gtk_box_pack_start (GTK_BOX (hbox66), frame35, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (frame35), 3); + + vbox83 = gtk_vbox_new (FALSE, 0); + gtk_widget_ref (vbox83); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "vbox83", vbox83, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (vbox83); + gtk_container_add (GTK_CONTAINER (frame35), vbox83); + gtk_container_set_border_width (GTK_CONTAINER (vbox83), 3); + + to_window = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_ref (to_window); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "to_window", to_window, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (to_window); + gtk_box_pack_start (GTK_BOX (vbox83), to_window, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (to_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + to_show_button = gtk_check_button_new_with_label (_("Show Income/Expense")); + gtk_widget_ref (to_show_button); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "to_show_button", to_show_button, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (to_show_button); + gtk_box_pack_start (GTK_BOX (vbox83), to_show_button, FALSE, FALSE, 0); + + dialog_action_area13 = GNOME_DIALOG (Transfer_Dialog)->action_area; + gtk_object_set_data (GTK_OBJECT (Transfer_Dialog), "dialog_action_area13", dialog_action_area13); + gtk_widget_show (dialog_action_area13); + gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area13), GTK_BUTTONBOX_END); + gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area13), 8); + + gnome_dialog_append_button (GNOME_DIALOG (Transfer_Dialog), GNOME_STOCK_BUTTON_OK); + button66 = g_list_last (GNOME_DIALOG (Transfer_Dialog)->buttons)->data; + gtk_widget_ref (button66); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "button66", button66, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (button66); + GTK_WIDGET_SET_FLAGS (button66, GTK_CAN_DEFAULT); + + gnome_dialog_append_button (GNOME_DIALOG (Transfer_Dialog), GNOME_STOCK_BUTTON_CANCEL); + button68 = g_list_last (GNOME_DIALOG (Transfer_Dialog)->buttons)->data; + gtk_widget_ref (button68); + gtk_object_set_data_full (GTK_OBJECT (Transfer_Dialog), "button68", button68, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (button68); + GTK_WIDGET_SET_FLAGS (button68, GTK_CAN_DEFAULT); + + return Transfer_Dialog; +} + diff --git a/src/gnome/glade-gnc-dialogs.h b/src/gnome/glade-gnc-dialogs.h index 229eaca80f..50b3e08af9 100644 --- a/src/gnome/glade-gnc-dialogs.h +++ b/src/gnome/glade-gnc-dialogs.h @@ -14,3 +14,4 @@ GtkWidget* create_Budget_Dialog (void); GtkWidget* create_Financial_Calculator_Dialog (void); GtkWidget* create_Amortization_Schedule_Dialog (void); GtkWidget* create_Account_Dialog (void); +GtkWidget* create_Transfer_Dialog (void); diff --git a/src/gnome/gnc-dialogs.glade b/src/gnome/gnc-dialogs.glade index 609738d542..b1b7bac5a0 100644 --- a/src/gnome/gnc-dialogs.glade +++ b/src/gnome/gnc-dialogs.glade @@ -6051,7 +6051,6 @@ Daily (365) GtkHBox hbox65 - 3 False 0 @@ -6215,4 +6214,417 @@ Daily (365) + + GnomeDialog + Transfer Dialog + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox13 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area13 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button66 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button68 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkVBox + vbox78 + False + 0 + + 0 + True + True + + + + GtkFrame + frame33 + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkHBox + hbox70 + False + 0 + + + GtkVBox + vbox80 + 3 + True + 0 + + 0 + False + False + + + + GtkLabel + label814 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label816 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label817 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label818 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + GtkVBox + vbox81 + 3 + True + 0 + + 0 + True + True + + + + GtkHBox + amount_big_hbox + False + 5 + + 0 + True + True + + + + GtkHBox + amount_hbox + False + 0 + + 0 + True + True + + + + Placeholder + + + + + GtkHBox + date_hbox + False + 3 + + 0 + False + False + + + + GtkLabel + label815 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 0 + 0 + + 0 + False + False + + + + + Placeholder + + + + + + GtkEntry + num_entry + True + True + True + 0 + + + 0 + False + False + + + + + GtkEntry + description_entry + True + True + True + 0 + + + 0 + False + False + + + + + GtkEntry + memo_entry + True + True + True + 0 + + + 0 + False + False + + + + + + + + GtkHBox + hbox66 + False + 0 + + 0 + True + True + + + + GtkFrame + frame34 + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVBox + vbox82 + 3 + False + 0 + + + GtkScrolledWindow + from_window + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + Placeholder + + + + + GtkCheckButton + from_show_button + True + + False + True + + 0 + False + False + + + + + + + GtkFrame + frame35 + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVBox + vbox83 + 3 + False + 0 + + + GtkScrolledWindow + to_window + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + Placeholder + + + + + GtkCheckButton + to_show_button + True + + False + True + + 0 + False + False + + + + + + + + +