From 189a2fbbe55fb4b1f4bdd0e1da5564420ddd1f8f Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Tue, 16 Jan 2001 00:06:08 +0000 Subject: [PATCH] Change Tax Info dialog layout. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3475 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome/.cvsignore | 2 + src/gnome/dialog-tax-info.c | 2 +- src/gnome/glade-gnc-dialogs.c | 148 +++++++++++++++++-------------- src/gnome/gnc-dialogs.glade | 161 +++++++++++++++------------------- src/gnome/window-main.c | 2 +- 5 files changed, 160 insertions(+), 155 deletions(-) diff --git a/src/gnome/.cvsignore b/src/gnome/.cvsignore index acfedfc60d..99f2eebb17 100644 --- a/src/gnome/.cvsignore +++ b/src/gnome/.cvsignore @@ -4,6 +4,8 @@ Makefile.in *.diff backup.glade glade-cb-gnc-dialogs.c +glade-support-gnc-dialogs.c +glade-support-gnc-dialogs.h #glade-gnc-dialogs.c #glade-cb-gnc-dialogs.h #glade-gnc-dialogs.h diff --git a/src/gnome/dialog-tax-info.c b/src/gnome/dialog-tax-info.c index 08d890f45b..89ca9a0d85 100644 --- a/src/gnome/dialog-tax-info.c +++ b/src/gnome/dialog-tax-info.c @@ -44,7 +44,7 @@ typedef struct GtkWidget * account_tree; GtkWidget * tax_related_button; - GtkWidget * txf_category_combo; + GtkWidget * txf_category_clist; GtkWidget * txf_help_text; GtkWidget * current_account_button; } TaxInfoDialog; diff --git a/src/gnome/glade-gnc-dialogs.c b/src/gnome/glade-gnc-dialogs.c index a5fec2a5b0..2de251d6f3 100644 --- a/src/gnome/glade-gnc-dialogs.c +++ b/src/gnome/glade-gnc-dialogs.c @@ -15,6 +15,7 @@ #include "glade-cb-gnc-dialogs.h" #include "glade-gnc-dialogs.h" +#include "glade-support-gnc-dialogs.h" GtkWidget* create_QIF_Import_Account_Picker (void) @@ -197,7 +198,7 @@ create_QIF_Import_Account_Picker (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 8); gnome_dialog_append_button (GNOME_DIALOG (QIF_Import_Account_Picker), GNOME_STOCK_BUTTON_OK); - button1 = GTK_WIDGET (g_list_last (GNOME_DIALOG (QIF_Import_Account_Picker)->buttons)->data); + button1 = g_list_last (GNOME_DIALOG (QIF_Import_Account_Picker)->buttons)->data; gtk_widget_ref (button1); gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "button1", button1, (GtkDestroyNotify) gtk_widget_unref); @@ -205,7 +206,7 @@ create_QIF_Import_Account_Picker (void) GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (QIF_Import_Account_Picker), GNOME_STOCK_BUTTON_CANCEL); - button2 = GTK_WIDGET (g_list_last (GNOME_DIALOG (QIF_Import_Account_Picker)->buttons)->data); + button2 = g_list_last (GNOME_DIALOG (QIF_Import_Account_Picker)->buttons)->data; gtk_widget_ref (button2); gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "button2", button2, (GtkDestroyNotify) gtk_widget_unref); @@ -712,7 +713,7 @@ create_Print_Check_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area6), 8); gnome_dialog_append_button (GNOME_DIALOG (Print_Check_Dialog), GNOME_STOCK_BUTTON_OK); - button21 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Print_Check_Dialog)->buttons)->data); + button21 = g_list_last (GNOME_DIALOG (Print_Check_Dialog)->buttons)->data; gtk_widget_ref (button21); gtk_object_set_data_full (GTK_OBJECT (Print_Check_Dialog), "button21", button21, (GtkDestroyNotify) gtk_widget_unref); @@ -720,7 +721,7 @@ create_Print_Check_Dialog (void) GTK_WIDGET_SET_FLAGS (button21, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Print_Check_Dialog), GNOME_STOCK_BUTTON_CANCEL); - button22 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Print_Check_Dialog)->buttons)->data); + button22 = g_list_last (GNOME_DIALOG (Print_Check_Dialog)->buttons)->data; gtk_widget_ref (button22); gtk_object_set_data_full (GTK_OBJECT (Print_Check_Dialog), "button22", button22, (GtkDestroyNotify) gtk_widget_unref); @@ -728,7 +729,7 @@ create_Print_Check_Dialog (void) GTK_WIDGET_SET_FLAGS (button22, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Print_Check_Dialog), GNOME_STOCK_BUTTON_HELP); - button23 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Print_Check_Dialog)->buttons)->data); + button23 = g_list_last (GNOME_DIALOG (Print_Check_Dialog)->buttons)->data; gtk_widget_ref (button23); gtk_object_set_data_full (GTK_OBJECT (Print_Check_Dialog), "button23", button23, (GtkDestroyNotify) gtk_widget_unref); @@ -1747,7 +1748,7 @@ create_Find_Transactions (void) gnome_dialog_append_button_with_pixmap (GNOME_DIALOG (Find_Transactions), _("Find"), GNOME_STOCK_PIXMAP_SEARCH); - button26 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Find_Transactions)->buttons)->data); + button26 = g_list_last (GNOME_DIALOG (Find_Transactions)->buttons)->data; gtk_widget_ref (button26); gtk_object_set_data_full (GTK_OBJECT (Find_Transactions), "button26", button26, (GtkDestroyNotify) gtk_widget_unref); @@ -1755,7 +1756,7 @@ create_Find_Transactions (void) GTK_WIDGET_SET_FLAGS (button26, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Find_Transactions), GNOME_STOCK_BUTTON_CANCEL); - button27 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Find_Transactions)->buttons)->data); + button27 = g_list_last (GNOME_DIALOG (Find_Transactions)->buttons)->data; gtk_widget_ref (button27); gtk_object_set_data_full (GTK_OBJECT (Find_Transactions), "button27", button27, (GtkDestroyNotify) gtk_widget_unref); @@ -1763,7 +1764,7 @@ create_Find_Transactions (void) GTK_WIDGET_SET_FLAGS (button27, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Find_Transactions), GNOME_STOCK_BUTTON_HELP); - button28 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Find_Transactions)->buttons)->data); + button28 = g_list_last (GNOME_DIALOG (Find_Transactions)->buttons)->data; gtk_widget_ref (button28); gtk_object_set_data_full (GTK_OBJECT (Find_Transactions), "button28", button28, (GtkDestroyNotify) gtk_widget_unref); @@ -2300,7 +2301,7 @@ create_Budget_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area9), 8); gnome_dialog_append_button (GNOME_DIALOG (Budget_Dialog), GNOME_STOCK_BUTTON_OK); - ok_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (Budget_Dialog)->buttons)->data); + ok_button = g_list_last (GNOME_DIALOG (Budget_Dialog)->buttons)->data; gtk_widget_ref (ok_button); gtk_object_set_data_full (GTK_OBJECT (Budget_Dialog), "ok_button", ok_button, (GtkDestroyNotify) gtk_widget_unref); @@ -2308,7 +2309,7 @@ create_Budget_Dialog (void) GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Budget_Dialog), GNOME_STOCK_BUTTON_APPLY); - apply_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (Budget_Dialog)->buttons)->data); + apply_button = g_list_last (GNOME_DIALOG (Budget_Dialog)->buttons)->data; gtk_widget_ref (apply_button); gtk_object_set_data_full (GTK_OBJECT (Budget_Dialog), "apply_button", apply_button, (GtkDestroyNotify) gtk_widget_unref); @@ -2316,7 +2317,7 @@ create_Budget_Dialog (void) GTK_WIDGET_SET_FLAGS (apply_button, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Budget_Dialog), GNOME_STOCK_BUTTON_CANCEL); - cancel_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (Budget_Dialog)->buttons)->data); + cancel_button = g_list_last (GNOME_DIALOG (Budget_Dialog)->buttons)->data; gtk_widget_ref (cancel_button); gtk_object_set_data_full (GTK_OBJECT (Budget_Dialog), "cancel_button", cancel_button, (GtkDestroyNotify) gtk_widget_unref); @@ -2324,7 +2325,7 @@ create_Budget_Dialog (void) GTK_WIDGET_SET_FLAGS (cancel_button, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Budget_Dialog), GNOME_STOCK_BUTTON_HELP); - help_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (Budget_Dialog)->buttons)->data); + help_button = g_list_last (GNOME_DIALOG (Budget_Dialog)->buttons)->data; gtk_widget_ref (help_button); gtk_object_set_data_full (GTK_OBJECT (Budget_Dialog), "help_button", help_button, (GtkDestroyNotify) gtk_widget_unref); @@ -2875,7 +2876,7 @@ create_Financial_Calculator_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area10), 8); gnome_dialog_append_button (GNOME_DIALOG (Financial_Calculator_Dialog), _("Schedule")); - schedule_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (Financial_Calculator_Dialog)->buttons)->data); + schedule_button = g_list_last (GNOME_DIALOG (Financial_Calculator_Dialog)->buttons)->data; gtk_widget_ref (schedule_button); gtk_object_set_data_full (GTK_OBJECT (Financial_Calculator_Dialog), "schedule_button", schedule_button, (GtkDestroyNotify) gtk_widget_unref); @@ -2883,7 +2884,7 @@ create_Financial_Calculator_Dialog (void) GTK_WIDGET_SET_FLAGS (schedule_button, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Financial_Calculator_Dialog), GNOME_STOCK_BUTTON_CLOSE); - close_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (Financial_Calculator_Dialog)->buttons)->data); + close_button = g_list_last (GNOME_DIALOG (Financial_Calculator_Dialog)->buttons)->data; gtk_widget_ref (close_button); gtk_object_set_data_full (GTK_OBJECT (Financial_Calculator_Dialog), "close_button", close_button, (GtkDestroyNotify) gtk_widget_unref); @@ -3089,7 +3090,7 @@ create_Amortization_Schedule_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area11), 8); gnome_dialog_append_button (GNOME_DIALOG (Amortization_Schedule_Dialog), GNOME_STOCK_BUTTON_OK); - button60 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Amortization_Schedule_Dialog)->buttons)->data); + button60 = g_list_last (GNOME_DIALOG (Amortization_Schedule_Dialog)->buttons)->data; gtk_widget_ref (button60); gtk_object_set_data_full (GTK_OBJECT (Amortization_Schedule_Dialog), "button60", button60, (GtkDestroyNotify) gtk_widget_unref); @@ -3097,7 +3098,7 @@ create_Amortization_Schedule_Dialog (void) GTK_WIDGET_SET_FLAGS (button60, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Amortization_Schedule_Dialog), GNOME_STOCK_BUTTON_APPLY); - button61 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Amortization_Schedule_Dialog)->buttons)->data); + button61 = g_list_last (GNOME_DIALOG (Amortization_Schedule_Dialog)->buttons)->data; gtk_widget_ref (button61); gtk_object_set_data_full (GTK_OBJECT (Amortization_Schedule_Dialog), "button61", button61, (GtkDestroyNotify) gtk_widget_unref); @@ -3105,7 +3106,7 @@ create_Amortization_Schedule_Dialog (void) GTK_WIDGET_SET_FLAGS (button61, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Amortization_Schedule_Dialog), GNOME_STOCK_BUTTON_CANCEL); - button62 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Amortization_Schedule_Dialog)->buttons)->data); + button62 = g_list_last (GNOME_DIALOG (Amortization_Schedule_Dialog)->buttons)->data; gtk_widget_ref (button62); gtk_object_set_data_full (GTK_OBJECT (Amortization_Schedule_Dialog), "button62", button62, (GtkDestroyNotify) gtk_widget_unref); @@ -3217,7 +3218,7 @@ create_Commodity_Selector_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area12), 8); gnome_dialog_append_button (GNOME_DIALOG (Commodity_Selector_Dialog), GNOME_STOCK_BUTTON_OK); - button63 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Commodity_Selector_Dialog)->buttons)->data); + button63 = g_list_last (GNOME_DIALOG (Commodity_Selector_Dialog)->buttons)->data; gtk_widget_ref (button63); gtk_object_set_data_full (GTK_OBJECT (Commodity_Selector_Dialog), "button63", button63, (GtkDestroyNotify) gtk_widget_unref); @@ -3225,7 +3226,7 @@ create_Commodity_Selector_Dialog (void) GTK_WIDGET_SET_FLAGS (button63, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Commodity_Selector_Dialog), _("New...")); - button64 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Commodity_Selector_Dialog)->buttons)->data); + button64 = g_list_last (GNOME_DIALOG (Commodity_Selector_Dialog)->buttons)->data; gtk_widget_ref (button64); gtk_object_set_data_full (GTK_OBJECT (Commodity_Selector_Dialog), "button64", button64, (GtkDestroyNotify) gtk_widget_unref); @@ -3233,7 +3234,7 @@ create_Commodity_Selector_Dialog (void) GTK_WIDGET_SET_FLAGS (button64, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Commodity_Selector_Dialog), GNOME_STOCK_BUTTON_CANCEL); - button65 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Commodity_Selector_Dialog)->buttons)->data); + button65 = g_list_last (GNOME_DIALOG (Commodity_Selector_Dialog)->buttons)->data; gtk_widget_ref (button65); gtk_object_set_data_full (GTK_OBJECT (Commodity_Selector_Dialog), "button65", button65, (GtkDestroyNotify) gtk_widget_unref); @@ -3421,7 +3422,7 @@ create_New_Commodity_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area13), 8); gnome_dialog_append_button (GNOME_DIALOG (New_Commodity_Dialog), GNOME_STOCK_BUTTON_OK); - button66 = GTK_WIDGET (g_list_last (GNOME_DIALOG (New_Commodity_Dialog)->buttons)->data); + button66 = g_list_last (GNOME_DIALOG (New_Commodity_Dialog)->buttons)->data; gtk_widget_ref (button66); gtk_object_set_data_full (GTK_OBJECT (New_Commodity_Dialog), "button66", button66, (GtkDestroyNotify) gtk_widget_unref); @@ -3429,7 +3430,7 @@ create_New_Commodity_Dialog (void) GTK_WIDGET_SET_FLAGS (button66, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (New_Commodity_Dialog), GNOME_STOCK_BUTTON_CANCEL); - button67 = GTK_WIDGET (g_list_last (GNOME_DIALOG (New_Commodity_Dialog)->buttons)->data); + button67 = g_list_last (GNOME_DIALOG (New_Commodity_Dialog)->buttons)->data; gtk_widget_ref (button67); gtk_object_set_data_full (GTK_OBJECT (New_Commodity_Dialog), "button67", button67, (GtkDestroyNotify) gtk_widget_unref); @@ -3437,7 +3438,7 @@ create_New_Commodity_Dialog (void) GTK_WIDGET_SET_FLAGS (button67, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (New_Commodity_Dialog), GNOME_STOCK_BUTTON_HELP); - button68 = GTK_WIDGET (g_list_last (GNOME_DIALOG (New_Commodity_Dialog)->buttons)->data); + button68 = g_list_last (GNOME_DIALOG (New_Commodity_Dialog)->buttons)->data; gtk_widget_ref (button68); gtk_object_set_data_full (GTK_OBJECT (New_Commodity_Dialog), "button68", button68, (GtkDestroyNotify) gtk_widget_unref); @@ -3744,7 +3745,7 @@ create_Account_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area12), 8); gnome_dialog_append_button (GNOME_DIALOG (Account_Dialog), GNOME_STOCK_BUTTON_OK); - button63 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data); + button63 = g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data; gtk_widget_ref (button63); gtk_object_set_data_full (GTK_OBJECT (Account_Dialog), "button63", button63, (GtkDestroyNotify) gtk_widget_unref); @@ -3752,7 +3753,7 @@ create_Account_Dialog (void) GTK_WIDGET_SET_FLAGS (button63, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Account_Dialog), GNOME_STOCK_BUTTON_CANCEL); - cancel_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data); + cancel_button = g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data; gtk_widget_ref (cancel_button); gtk_object_set_data_full (GTK_OBJECT (Account_Dialog), "cancel_button", cancel_button, (GtkDestroyNotify) gtk_widget_unref); @@ -3760,7 +3761,7 @@ create_Account_Dialog (void) GTK_WIDGET_SET_FLAGS (cancel_button, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Account_Dialog), GNOME_STOCK_BUTTON_HELP); - button72 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data); + button72 = g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data; gtk_widget_ref (button72); gtk_object_set_data_full (GTK_OBJECT (Account_Dialog), "button72", button72, (GtkDestroyNotify) gtk_widget_unref); @@ -4898,7 +4899,7 @@ create_Transfer_Dialog (void) 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 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Transfer_Dialog)->buttons)->data); + 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); @@ -4906,7 +4907,7 @@ create_Transfer_Dialog (void) GTK_WIDGET_SET_FLAGS (button66, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Transfer_Dialog), GNOME_STOCK_BUTTON_CANCEL); - button68 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Transfer_Dialog)->buttons)->data); + 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); @@ -5360,7 +5361,7 @@ create_New_Style_Sheet_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area15), 8); gnome_dialog_append_button (GNOME_DIALOG (New_Style_Sheet_Dialog), GNOME_STOCK_BUTTON_OK); - button73 = GTK_WIDGET (g_list_last (GNOME_DIALOG (New_Style_Sheet_Dialog)->buttons)->data); + button73 = g_list_last (GNOME_DIALOG (New_Style_Sheet_Dialog)->buttons)->data; gtk_widget_ref (button73); gtk_object_set_data_full (GTK_OBJECT (New_Style_Sheet_Dialog), "button73", button73, (GtkDestroyNotify) gtk_widget_unref); @@ -5368,7 +5369,7 @@ create_New_Style_Sheet_Dialog (void) GTK_WIDGET_SET_FLAGS (button73, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (New_Style_Sheet_Dialog), GNOME_STOCK_BUTTON_CANCEL); - button75 = GTK_WIDGET (g_list_last (GNOME_DIALOG (New_Style_Sheet_Dialog)->buttons)->data); + button75 = g_list_last (GNOME_DIALOG (New_Style_Sheet_Dialog)->buttons)->data; gtk_widget_ref (button75); gtk_object_set_data_full (GTK_OBJECT (New_Style_Sheet_Dialog), "button75", button75, (GtkDestroyNotify) gtk_widget_unref); @@ -5392,10 +5393,12 @@ create_Tax_Information_Dialog (void) GtkWidget *vbox92; GtkWidget *tax_related_button; GtkWidget *hseparator1; - GtkWidget *hbox82; - GtkWidget *label847667; - GtkWidget *txf_category_combo; - GtkWidget *combo_entry1; + GtkWidget *frame42; + GtkWidget *hbox85; + GtkWidget *scrolledwindow18; + GtkWidget *txf_category_clist; + GtkWidget *label847671; + GtkWidget *scrolledwindow19; GtkWidget *txf_help_text; GtkWidget *payer_name_source_frame; GtkWidget *vbox97; @@ -5482,44 +5485,59 @@ create_Tax_Information_Dialog (void) gtk_widget_show (hseparator1); gtk_box_pack_start (GTK_BOX (vbox92), hseparator1, FALSE, FALSE, 6); - hbox82 = gtk_hbox_new (FALSE, 2); - gtk_widget_ref (hbox82); - gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "hbox82", hbox82, + frame42 = gtk_frame_new (_("TXF Categories")); + gtk_widget_ref (frame42); + gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "frame42", frame42, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (hbox82); - gtk_box_pack_start (GTK_BOX (vbox92), hbox82, FALSE, FALSE, 0); + gtk_widget_show (frame42); + gtk_box_pack_start (GTK_BOX (vbox92), frame42, TRUE, TRUE, 0); - label847667 = gtk_label_new (_("TXF Category:")); - gtk_widget_ref (label847667); - gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "label847667", label847667, + hbox85 = gtk_hbox_new (FALSE, 0); + gtk_widget_ref (hbox85); + gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "hbox85", hbox85, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label847667); - gtk_box_pack_start (GTK_BOX (hbox82), label847667, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label847667), 1, 0.5); + gtk_widget_show (hbox85); + gtk_container_add (GTK_CONTAINER (frame42), hbox85); + gtk_container_set_border_width (GTK_CONTAINER (hbox85), 3); - txf_category_combo = gtk_combo_new (); - gtk_widget_ref (txf_category_combo); - gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "txf_category_combo", txf_category_combo, + scrolledwindow18 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_ref (scrolledwindow18); + gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "scrolledwindow18", scrolledwindow18, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (txf_category_combo); - gtk_box_pack_start (GTK_BOX (hbox82), txf_category_combo, TRUE, TRUE, 0); - gtk_combo_set_value_in_list (GTK_COMBO (txf_category_combo), TRUE, FALSE); - gtk_combo_set_use_arrows_always (GTK_COMBO (txf_category_combo), TRUE); + gtk_widget_show (scrolledwindow18); + gtk_box_pack_start (GTK_BOX (hbox85), scrolledwindow18, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow18), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - combo_entry1 = GTK_COMBO (txf_category_combo)->entry; - gtk_widget_ref (combo_entry1); - gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "combo_entry1", combo_entry1, + txf_category_clist = gtk_clist_new (1); + gtk_widget_ref (txf_category_clist); + gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "txf_category_clist", txf_category_clist, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (combo_entry1); - gtk_entry_set_editable (GTK_ENTRY (combo_entry1), FALSE); + gtk_widget_show (txf_category_clist); + gtk_container_add (GTK_CONTAINER (scrolledwindow18), txf_category_clist); + gtk_clist_set_column_width (GTK_CLIST (txf_category_clist), 0, 80); + gtk_clist_column_titles_hide (GTK_CLIST (txf_category_clist)); - txf_help_text = gtk_entry_new (); + label847671 = gtk_label_new (_("label847671")); + gtk_widget_ref (label847671); + gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "label847671", label847671, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label847671); + gtk_clist_set_column_widget (GTK_CLIST (txf_category_clist), 0, label847671); + + scrolledwindow19 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_ref (scrolledwindow19); + gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "scrolledwindow19", scrolledwindow19, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (scrolledwindow19); + gtk_box_pack_start (GTK_BOX (hbox85), scrolledwindow19, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow19), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); + + txf_help_text = gtk_text_new (NULL, NULL); gtk_widget_ref (txf_help_text); gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "txf_help_text", txf_help_text, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (txf_help_text); - gtk_box_pack_start (GTK_BOX (vbox92), txf_help_text, TRUE, TRUE, 0); - gtk_entry_set_editable (GTK_ENTRY (txf_help_text), FALSE); + gtk_container_add (GTK_CONTAINER (scrolledwindow19), txf_help_text); payer_name_source_frame = gtk_frame_new (_("Payer Name Source")); gtk_widget_ref (payer_name_source_frame); @@ -5559,7 +5577,7 @@ create_Tax_Information_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area14), 8); gnome_dialog_append_button (GNOME_DIALOG (Tax_Information_Dialog), GNOME_STOCK_BUTTON_OK); - button73 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Tax_Information_Dialog)->buttons)->data); + button73 = g_list_last (GNOME_DIALOG (Tax_Information_Dialog)->buttons)->data; gtk_widget_ref (button73); gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "button73", button73, (GtkDestroyNotify) gtk_widget_unref); @@ -5567,7 +5585,7 @@ create_Tax_Information_Dialog (void) GTK_WIDGET_SET_FLAGS (button73, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Tax_Information_Dialog), GNOME_STOCK_BUTTON_APPLY); - button74 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Tax_Information_Dialog)->buttons)->data); + button74 = g_list_last (GNOME_DIALOG (Tax_Information_Dialog)->buttons)->data; gtk_widget_ref (button74); gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "button74", button74, (GtkDestroyNotify) gtk_widget_unref); @@ -5575,7 +5593,7 @@ create_Tax_Information_Dialog (void) GTK_WIDGET_SET_FLAGS (button74, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Tax_Information_Dialog), GNOME_STOCK_BUTTON_CANCEL); - button75 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Tax_Information_Dialog)->buttons)->data); + button75 = g_list_last (GNOME_DIALOG (Tax_Information_Dialog)->buttons)->data; gtk_widget_ref (button75); gtk_object_set_data_full (GTK_OBJECT (Tax_Information_Dialog), "button75", button75, (GtkDestroyNotify) gtk_widget_unref); @@ -5680,7 +5698,7 @@ create_Duplicate_Transaction_Dialog (void) gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area15), 8); gnome_dialog_append_button (GNOME_DIALOG (Duplicate_Transaction_Dialog), GNOME_STOCK_BUTTON_OK); - button76 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Duplicate_Transaction_Dialog)->buttons)->data); + button76 = g_list_last (GNOME_DIALOG (Duplicate_Transaction_Dialog)->buttons)->data; gtk_widget_ref (button76); gtk_object_set_data_full (GTK_OBJECT (Duplicate_Transaction_Dialog), "button76", button76, (GtkDestroyNotify) gtk_widget_unref); @@ -5688,7 +5706,7 @@ create_Duplicate_Transaction_Dialog (void) GTK_WIDGET_SET_FLAGS (button76, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (Duplicate_Transaction_Dialog), GNOME_STOCK_BUTTON_CANCEL); - button77 = GTK_WIDGET (g_list_last (GNOME_DIALOG (Duplicate_Transaction_Dialog)->buttons)->data); + button77 = g_list_last (GNOME_DIALOG (Duplicate_Transaction_Dialog)->buttons)->data; gtk_widget_ref (button77); gtk_object_set_data_full (GTK_OBJECT (Duplicate_Transaction_Dialog), "button77", button77, (GtkDestroyNotify) gtk_widget_unref); diff --git a/src/gnome/gnc-dialogs.glade b/src/gnome/gnc-dialogs.glade index 787c0d0d39..db0288ead6 100644 --- a/src/gnome/gnc-dialogs.glade +++ b/src/gnome/gnc-dialogs.glade @@ -2956,7 +2956,6 @@ Exactly True True - GTK_RELIEF_NORMAL @@ -2966,7 +2965,6 @@ Exactly True True - GTK_RELIEF_NORMAL @@ -2987,7 +2985,6 @@ Exactly Move the selected item up True - GTK_RELIEF_NORMAL 0 False @@ -3001,7 +2998,6 @@ Exactly Move the selected item down True - GTK_RELIEF_NORMAL 0 False @@ -3155,7 +3151,6 @@ No Total match_button True - GTK_RELIEF_NORMAL 0 True @@ -3577,7 +3572,6 @@ Contingency Clear the entry True - GTK_RELIEF_NORMAL 0 False @@ -3591,7 +3585,6 @@ Contingency payment_periods_calc_button True - GTK_RELIEF_NORMAL 0 False @@ -3663,7 +3656,6 @@ Contingency Clear the entry True - GTK_RELIEF_NORMAL 0 False @@ -3677,7 +3669,6 @@ Contingency interest_rate_calc_button True - GTK_RELIEF_NORMAL 0 False @@ -3749,7 +3740,6 @@ Contingency Clear the entry True - GTK_RELIEF_NORMAL 0 False @@ -3763,7 +3753,6 @@ Contingency present_value_calc_button True - GTK_RELIEF_NORMAL 0 False @@ -3835,7 +3824,6 @@ Contingency Clear the entry True - GTK_RELIEF_NORMAL 0 False @@ -3849,7 +3837,6 @@ Contingency periodic_payment_calc_button True - GTK_RELIEF_NORMAL 0 False @@ -3921,7 +3908,6 @@ Contingency Clear the entry True - GTK_RELIEF_NORMAL 0 False @@ -3935,7 +3921,6 @@ Contingency future_value_calc_button True - GTK_RELIEF_NORMAL 0 False @@ -5729,7 +5714,6 @@ worry if your data is in multiple files. Wed, 30 Aug 2000 17:33:50 GMT - GTK_RELIEF_NORMAL 3 False @@ -6043,7 +6027,6 @@ of the QIF import process. Wed, 30 Aug 2000 15:32:12 GMT - GTK_RELIEF_NORMAL 0 True @@ -6062,7 +6045,6 @@ of the QIF import process. Wed, 30 Aug 2000 15:34:33 GMT - GTK_RELIEF_NORMAL 0 True @@ -7329,7 +7311,6 @@ Click "Cancel" to abort the QIF import process. True True GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL @@ -7339,7 +7320,6 @@ Click "Cancel" to abort the QIF import process. True True GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL @@ -7552,7 +7532,6 @@ words. Fri, 15 Dec 2000 18:13:53 GMT - GTK_RELIEF_NORMAL 0 True @@ -7571,7 +7550,6 @@ words. Fri, 15 Dec 2000 18:14:21 GMT - GTK_RELIEF_NORMAL 0 True @@ -8053,7 +8031,6 @@ words. 3 True - GTK_RELIEF_NORMAL 0 False @@ -8107,74 +8084,84 @@ words. - GtkHBox - hbox82 - False - 2 - - 0 - False - False - - - - GtkLabel - label847667 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkCombo - txf_category_combo - True - False - False - True - True - - - 0 - True - True - - - - GtkEntry - GtkCombo:entry - combo-entry1 - True - False - True - 0 - - - - - - - GtkEntry - txf_help_text - True - False - True - 0 - + GtkFrame + frame42 + + 0 + GTK_SHADOW_ETCHED_IN 0 True True + + + GtkHBox + hbox85 + 3 + False + 0 + + + GtkScrolledWindow + scrolledwindow18 + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkCList + txf_category_clist + True + 1 + 80 + GTK_SELECTION_SINGLE + False + GTK_SHADOW_IN + + + GtkLabel + CList:title + label847671 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + GtkScrolledWindow + scrolledwindow19 + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkText + txf_help_text + True + False + + + + @@ -8501,7 +8488,6 @@ words. new_button True - GTK_RELIEF_NORMAL 0 True @@ -8514,7 +8500,6 @@ words. delete_button True - GTK_RELIEF_NORMAL 0 True diff --git a/src/gnome/window-main.c b/src/gnome/window-main.c index 1c96575f48..8f7ab0535d 100644 --- a/src/gnome/window-main.c +++ b/src/gnome/window-main.c @@ -1251,7 +1251,7 @@ gnc_main_create_menus(GnomeApp *app, GtkWidget *account_tree, N_("Tax Information"), N_("Setup tax information for all income and expense accounts"), gnc_tax_info_cb, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_REMOVE, + GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL }, GNOMEUIINFO_END