From 82a04fbcb419e35c7132ade04c4a688b14c1f8dd Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 19 Dec 2002 02:24:24 +0000 Subject: pass NULL for parent_window for e_table_config_new. 2002-12-18 Chris Toshok * e-table-header-item.c (ethi_popup_customize_view): pass NULL for parent_window for e_table_config_new. * e-table-config.glade, e-table-config-no-group.glade: switch from GnomePropertyBox to GtkDialog, remove the extra notebook widget from the heirarchy, and set all the subdialogs modal. * e-table-config.h: add parent_window arg to e_table_config_{new,construct}. * e-table-config.c (config_dialog_changed): new function, not really needed yet since the apply/ok buttons are never insensitive. (config_get_property): handle the "state" read-only property. (config_class_init): put back in the "state" property that was deleted during the merge from the gal-2 branch (it looks like). (do_sort_and_group_config_dialog): set the sort/group dialog transient for the e-table-config dialog, and gnome_property_box_changed -> config_dialog_changed. (do_fields_config_dialog): same, but with the fields dialog. (dialog_response): response handler for the e-table-config dialog. (setup_gui): remote the hide button/notebook code, since neither of those widgets exist anymore in this dialog, and remove the "apply" signal and connect to "response", since we're a GtkDialog dialog instead of a GnomePropertyBox. (e_table_config_construct): take a parent_window arg, and set_transient_for if it's non-NULL. (e_table_config_new): take parent_window arg and pass to construct. svn path=/trunk/; revision=19165 --- widgets/table/e-table-config-no-group.glade | 3805 ++++++++++++++------------- widgets/table/e-table-config.c | 91 +- widgets/table/e-table-config.glade | 155 +- widgets/table/e-table-config.h | 7 +- widgets/table/e-table-header-item.c | 2 +- 5 files changed, 2199 insertions(+), 1861 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-table-config-no-group.glade b/widgets/table/e-table-config-no-group.glade index f73531cae3..5ba0b329ab 100644 --- a/widgets/table/e-table-config-no-group.glade +++ b/widgets/table/e-table-config-no-group.glade @@ -1,1774 +1,2039 @@ - + - - - - no - Show Fields - GTK_WINDOW_TOPLEVEL - no - no - yes - GTK_WIN_POS_NONE - - - - no - 8 - yes - - - - GTK_BUTTONBOX_END - 8 - yes - - - - yes - yes - yes - gtk-ok - yes - yes - - - - - - yes - yes - yes - gtk-cancel - yes - yes - - - - - 0 - no - yes - GTK_PACK_END - - - - - - no - 6 - yes - - - - yes - 6 - 6 - 1 - 5 - yes - - - - A_vailable Fields: - GTK_JUSTIFY_LEFT - no - 0 - 0.5 - 0 - 0 - yes - yes - - - 0 - 2 - 0 - 1 - 0 - 0 - expand|fill - fill - - - - - - Sh_ow these fields in order: - GTK_JUSTIFY_LEFT - no - 0 - 0.5 - 0 - 0 - yes - yes - - - 3 - 5 - 0 - 1 - 0 - 0 - expand|fill - fill - - - - - 0 - no - yes - - - - - - yes - 6 - 6 - 1 - 5 - yes - - - - no - 6 - yes - - - - e_table_proxy_etable_available_new - 0 - 0 - Thu, 21 Feb 2002 05:42:43 GMT - yes - - - 0 - yes - yes - - - - - 0 - 2 - 0 - 1 - 0 - 0 - expand|fill - expand|fill - - - - - - no - 6 - yes - - - - e_table_proxy_etable_shown_new - 0 - 0 - Thu, 21 Feb 2002 15:52:40 GMT - yes - - - 0 - yes - yes - - - - - - yes - 6 - yes - - - - yes - Move _Up - GTK_RELIEF_NORMAL - yes - yes - - - 0 - no - yes - - - - - - yes - Move _Down - GTK_RELIEF_NORMAL - yes - yes - - - 0 - no - yes - - - - - 0 - no - yes - - - - - 3 - 5 - 0 - 1 - 0 - 0 - expand|fill - expand|fill - - - - - - no - 6 - yes - - - - yes - _Add -> - GTK_RELIEF_NORMAL - yes - yes - - - 0 - no - no - - - - - - yes - <- _Remove - GTK_RELIEF_NORMAL - yes - yes - - - 0 - no - no - - - - - - - - - 2 - 3 - 0 - 1 - 0 - 0 - expand|fill - expand|fill - - - - - 0 - yes - yes - - - - - 0 - yes - yes - - - - - 4 - yes - yes - - - - - no - Group - GTK_WINDOW_TOPLEVEL - no - no - yes - GTK_WIN_POS_NONE - - - - no - 8 - yes - - - - GTK_BUTTONBOX_END - 8 - yes - - - - yes - yes - Clear All - yes - - - - - - yes - yes - yes - gtk-ok - yes - yes - - - - - - yes - yes - yes - gtk-cancel - yes - yes - - - - - 0 - no - yes - GTK_PACK_END - - - - - - no - 0 - yes - - - - no - 6 - yes - - - - Group Items By - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - no - 6 - yes - - - - no - 0 - yes - - - - e_table_proxy_gtk_combo_text_new - 0 - 0 - Fri, 19 Jan 2001 04:52:09 GMT - yes - - - 0 - no - no - - - - - - yes - Show field in View - no - yes - yes - - - 0 - no - no - - - - - 0 - yes - yes - - - - - - no - 0 - yes - - - - yes - Ascending - no - yes - yes - - - 0 - no - no - - - - - - yes - Descending - no - yes - yes - radiobutton-ascending-group-1 - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - 0 - yes - yes - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - 0 - yes - yes - - - - - - no - 6 - yes - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - Then By - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - no - 6 - yes - - - - no - 0 - yes - - - - e_table_proxy_gtk_combo_text_new - 0 - 0 - Fri, 19 Jan 2001 04:52:14 GMT - yes - - - 0 - no - no - - - - - - yes - Show field in View - no - yes - yes - - - 0 - no - no - - - - - 0 - yes - yes - - - - - - no - 0 - yes - - - - yes - Ascending - no - yes - yes - - - 0 - no - no - - - - - - yes - Descending - no - yes - yes - radiobutton-ascending-group-2 - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - 0 - yes - yes - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - 0 - yes - yes - - - - - - no - 6 - yes - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - Then By - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - no - 6 - yes - - - - no - 0 - yes - - - - e_table_proxy_gtk_combo_text_new - 0 - 0 - Fri, 19 Jan 2001 04:52:18 GMT - yes - - - 0 - no - no - - - - - - yes - Show field in View - no - yes - yes - - - 0 - no - no - - - - - 0 - yes - yes - - - - - - no - 0 - yes - - - - yes - Ascending - no - yes - yes - - - 0 - no - no - - - - - - yes - Descending - no - yes - yes - radiobutton-ascending-group-3 - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - 0 - yes - yes - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - 0 - yes - yes - - - - - - no - 6 - yes - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - - Then By - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - no - 6 - yes - - - - no - 0 - yes - - - - e_table_proxy_gtk_combo_text_new - 0 - 0 - Fri, 19 Jan 2001 04:52:21 GMT - yes - - - 0 - no - no - - - - - - yes - Show field in View - no - yes - yes - - - 0 - no - no - - - - - 0 - yes - yes - - - - - - no - 0 - yes - - - - yes - Ascending - no - yes - yes - - - 0 - no - no - - - - - - yes - Descending - no - yes - yes - radiobutton-ascending-group-4 - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - 0 - yes - yes - - - - - 0 - yes - yes - - - - - 0 - yes - yes - - - - - 4 - yes - yes - - - - - no - Sort - GTK_WINDOW_TOPLEVEL - no - no - yes - GTK_WIN_POS_NONE - - - - no - 8 - yes - - - - GTK_BUTTONBOX_END - 8 - yes - - - - yes - yes - Clear All - yes - - - - - - yes - yes - yes - yes - gtk-ok - yes - yes - - - - - - yes - yes - yes - gtk-cancel - yes - yes - - - - - 0 - no - yes - GTK_PACK_END - - - - - - no - 6 - 6 - 4 - 1 - yes - - - - Then By - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - no - 6 - yes - - - - 0.5 - 0.5 - 1 - 0 - yes - - - - e_table_proxy_gtk_combo_text_new - 0 - 0 - Tue, 16 Jan 2001 08:33:52 GMT - yes - - - - - 0 - yes - yes - - - - - - no - 0 - yes - - - - yes - Ascending - no - yes - yes - - - 0 - no - no - - - - - - yes - Descending - no - yes - yes - radiobutton-ascending-sort-4 - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - 0 - 1 - 3 - 4 - 0 - 0 - expand|fill - fill - - - - - - Then By - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - no - 6 - yes - - - - 0.5 - 0.5 - 1 - 0 - yes - - - - e_table_proxy_gtk_combo_text_new - 0 - 0 - Tue, 16 Jan 2001 05:22:22 GMT - yes - - - - - 0 - yes - yes - - - - - - no - 0 - yes - - - - yes - Ascending - no - yes - yes - - - 0 - no - no - - - - - - yes - Descending - no - yes - yes - radiobutton-ascending-sort-3 - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - 0 - 1 - 2 - 3 - 0 - 0 - expand|fill - fill - - - - - - Then By - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - no - 6 - yes - - - - 0.5 - 0.5 - 1 - 0 - yes - - - - e_table_proxy_gtk_combo_text_new - 0 - 0 - Tue, 16 Jan 2001 05:22:15 GMT - yes - - - - - 0 - yes - yes - - - - - - no - 0 - yes - - - - yes - Ascending - no - yes - yes - - - 0 - no - no - - - - - - yes - Descending - no - yes - yes - radiobutton-ascending-sort-2 - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - 0 - 1 - 1 - 2 - 0 - 0 - expand|fill - fill - - - - - - Sort Items By - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - no - 6 - yes - - - - 0.5 - 0.5 - 1 - 0 - yes - - - - yes - yes - e_table_proxy_gtk_combo_text_new - 0 - 0 - Tue, 16 Jan 2001 05:22:00 GMT - yes - - - - - 0 - yes - yes - - - - - - no - 0 - yes - - - - yes - Ascending - no - yes - yes - - - 0 - no - no - - - - - - yes - Descending - no - yes - yes - radiobutton-ascending-sort-1 - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - 0 - 1 - 0 - 1 - 0 - 0 - expand|fill - fill - - - - - 0 - yes - yes - - - - - 4 - yes - yes - - - - - no - no - no - no - GTK_WIN_POS_NONE - - - - no - yes - GTK_POS_TOP - no - 2 - 2 - no - yes - - - - 2 - Description - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - 2 - no - 2 - 4 - 2 - 3 - yes - - - - yes - yes - _Sort... - GTK_RELIEF_NORMAL - yes - yes - - - - - 0 - 1 - 1 - 2 - 0 - 0 - fill - - - - - - - - GTK_JUSTIFY_LEFT - yes - 0 - 0.5 - 0 - 0 - yes - - - 1 - 2 - 1 - 2 - 0 - 0 - expand|fill - fill - - - - - - - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - yes - - - 2 - 3 - 1 - 2 - 0 - 0 - fill - fill - - - - - - - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - yes - - - 2 - 3 - 0 - 1 - 0 - 0 - fill - fill - - - - - - - GTK_JUSTIFY_LEFT - yes - 0 - 0.5 - 0 - 0 - yes - - - 1 - 2 - 0 - 1 - 0 - 0 - expand|fill - fill - - - - - - yes - yes - _Fields Shown... - GTK_RELIEF_NORMAL - yes - yes - - - - - 0 - 1 - 0 - 1 - 0 - 0 - fill - - - - - - - - - - - label20 - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - tab - - - - - 0 - yes - yes - - - + + + Show Fields + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + False + 8 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 6 + + + + True + 1 + 5 + True + 6 + 6 + + + + True + A_vailable Fields: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + True + Sh_ow these fields in order: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 3 + 5 + 0 + 1 + fill + + + + + 0 + False + True + + + + + + True + 1 + 5 + True + 6 + 6 + + + + True + False + 6 + + + + True + e_table_proxy_etable_available_new + 0 + 0 + Thu, 21 Feb 2002 05:42:43 GMT + + + 0 + True + True + + + + + 0 + 2 + 0 + 1 + + + + + + True + False + 6 + + + + True + e_table_proxy_etable_shown_new + 0 + 0 + Thu, 21 Feb 2002 15:52:40 GMT + + + 0 + True + True + + + + + + True + True + 6 + + + + True + True + Move _Up + True + GTK_RELIEF_NORMAL + + + 0 + False + True + + + + + + True + True + Move _Down + True + GTK_RELIEF_NORMAL + + + 0 + False + True + + + + + 0 + False + True + + + + + 3 + 5 + 0 + 1 + + + + + + True + False + 6 + + + + True + True + _Add -> + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + True + True + <- _Remove + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + + + + 2 + 3 + 0 + 1 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + Group + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + False + 8 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + Clear All + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 + + + + True + False + 6 + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 6 + + + + True + False + 0 + + + + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Fri, 19 Jan 2001 04:52:09 GMT + + + 0 + False + False + + + + + + True + True + Show field in View + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + Ascending + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Descending + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton-ascending-group-1 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Group Items By + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 6 + + + + True + False + 0 + + + + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Fri, 19 Jan 2001 04:52:14 GMT + + + 0 + False + False + + + + + + True + True + Show field in View + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + Ascending + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Descending + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton-ascending-group-2 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Then By + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 6 + + + + True + False + 0 + + + + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Fri, 19 Jan 2001 04:52:18 GMT + + + 0 + False + False + + + + + + True + True + Show field in View + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + Ascending + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Descending + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton-ascending-group-3 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Then By + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 6 + + + + True + False + 0 + + + + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Fri, 19 Jan 2001 04:52:21 GMT + + + 0 + False + False + + + + + + True + True + Show field in View + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + Ascending + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Descending + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton-ascending-group-4 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Then By + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + Sort + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + False + 8 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + Clear All + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + 4 + 1 + False + 6 + 6 + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 6 + + + + True + 0.5 + 0.5 + 1 + 0 + + + + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Tue, 16 Jan 2001 08:33:52 GMT + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + Ascending + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Descending + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton-ascending-sort-4 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Then By + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + 1 + 3 + 4 + fill + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 6 + + + + True + 0.5 + 0.5 + 1 + 0 + + + + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Tue, 16 Jan 2001 05:22:22 GMT + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + Ascending + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Descending + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton-ascending-sort-3 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Then By + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + 1 + 2 + 3 + fill + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 6 + + + + True + 0.5 + 0.5 + 1 + 0 + + + + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Tue, 16 Jan 2001 05:22:15 GMT + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + Ascending + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Descending + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton-ascending-sort-2 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Then By + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + 1 + 1 + 2 + fill + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 6 + + + + True + 0.5 + 0.5 + 1 + 0 + + + + True + True + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Tue, 16 Jan 2001 05:22:00 GMT + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + Ascending + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Descending + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton-ascending-sort-1 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Sort Items By + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + 1 + 0 + 1 + fill + + + + + 0 + True + True + + + + + + + + True + dialog1 + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + True + False + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-apply + True + GTK_RELIEF_NORMAL + -10 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 2 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 2 + True + 2 + 3 + False + 2 + 4 + + + + True + True + True + _Sort... + True + GTK_RELIEF_NORMAL + + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 1 + 2 + fill + fill + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 0 + 1 + fill + fill + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + True + True + True + _Fields Shown... + True + GTK_RELIEF_NORMAL + + + + 0 + 1 + 0 + 1 + fill + + + + + + + + + True + Description + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 4894fdb6d8..76d11470d3 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -56,6 +55,11 @@ enum { LAST_SIGNAL }; +enum { + PROP_0, + PROP_STATE, +}; + static guint e_table_config_signals [LAST_SIGNAL] = { 0, }; static void @@ -97,6 +101,33 @@ e_table_config_changed (ETableConfig *config, ETableState *state) g_signal_emit(G_OBJECT(config), e_table_config_signals [CHANGED], 0, state); } +static void +config_dialog_changed (ETableConfig *config) +{ + /* enable the apply/ok buttons */ + gtk_dialog_set_response_sensitive (GTK_DIALOG (config->dialog_toplevel), + GTK_RESPONSE_APPLY, TRUE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (config->dialog_toplevel), + GTK_RESPONSE_OK, TRUE); +} + +static void +config_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + ETableConfig *config = E_TABLE_CONFIG (object); + + switch (prop_id) { + case PROP_STATE: + g_value_set_object (value, config->state); + break; + default: + break; + } +} + static void config_class_init (GObjectClass *object_class) { @@ -107,6 +138,7 @@ config_class_init (GObjectClass *object_class) klass->changed = NULL; object_class->finalize = config_finalize; + object_class->get_property = config_get_property; e_table_config_signals [CHANGED] = g_signal_new ("changed", @@ -117,6 +149,13 @@ config_class_init (GObjectClass *object_class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_object_class_install_property (object_class, PROP_STATE, + g_param_spec_object ("state", + _("State"), + /*_( */"XXX blurb" /*)*/, + E_TABLE_STATE_TYPE, + G_PARAM_READABLE)); + glade_gnome_init (); } @@ -386,6 +425,8 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) else dialog = GTK_DIALOG (config->dialog_group_by); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (config->dialog_toplevel)); + do { response = gtk_dialog_run (dialog); switch (response){ @@ -405,8 +446,7 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) config->state = config->temp_state; config->temp_state = 0; running = 0; - gnome_property_box_changed ( - GNOME_PROPERTY_BOX (config->dialog_toplevel)); + config_dialog_changed (config); break; case GTK_RESPONSE_CANCEL: @@ -434,6 +474,9 @@ do_fields_config_dialog (ETableConfig *config) setup_fields (config); + gtk_window_set_transient_for (GTK_WINDOW (config->dialog_show_fields), + GTK_WINDOW (config->dialog_toplevel)); + do { response = gtk_dialog_run (GTK_DIALOG(config->dialog_show_fields)); switch (response){ @@ -442,8 +485,7 @@ do_fields_config_dialog (ETableConfig *config) config->state = config->temp_state; config->temp_state = 0; running = 0; - gnome_property_box_changed ( - GNOME_PROPERTY_BOX (config->dialog_toplevel)); + config_dialog_changed (config); break; /* CANCEL */ @@ -543,13 +585,18 @@ dialog_destroyed (gpointer data, GObject *where_object_was) } static void -dialog_apply (GnomePropertyBox *pbox, gint page_num, ETableConfig *config) +dialog_response (GtkWidget *dialog, int response_id, ETableConfig *config) { - if (page_num != -1) - return; + if (response_id == GTK_RESPONSE_APPLY + || response_id == GTK_RESPONSE_OK) { + e_table_config_changed (config, config->state); + } - e_table_config_changed (config, config->state); -} + if (response_id == GTK_RESPONSE_CANCEL + || response_id == GTK_RESPONSE_OK) { + gtk_widget_destroy (dialog); + } +} /* * Invoked by the Glade auto-connect code @@ -1007,13 +1054,6 @@ setup_gui (ETableConfig *config) if (config->header) gtk_window_set_title (GTK_WINDOW (config->dialog_toplevel), config->header); - gtk_widget_hide (GNOME_PROPERTY_BOX(config->dialog_toplevel)->help_button); - - gtk_notebook_set_show_tabs ( - GTK_NOTEBOOK (GNOME_PROPERTY_BOX ( - config->dialog_toplevel)->notebook), - FALSE); - config->dialog_show_fields = glade_xml_get_widget ( gui, "dialog-show-fields"); config->dialog_group_by = glade_xml_get_widget ( @@ -1039,9 +1079,8 @@ setup_gui (ETableConfig *config) g_object_weak_ref (G_OBJECT (config->dialog_toplevel), dialog_destroyed, config); - g_signal_connect ( - G_OBJECT (config->dialog_toplevel), "apply", - G_CALLBACK (dialog_apply), config); + g_signal_connect (config->dialog_toplevel, "response", + G_CALLBACK (dialog_response), config); g_object_unref (gui); } @@ -1056,7 +1095,8 @@ ETableConfig * e_table_config_construct (ETableConfig *config, const char *header, ETableSpecification *spec, - ETableState *state) + ETableState *state, + GtkWindow *parent_window) { ETableColumnSpecification **column; @@ -1088,6 +1128,10 @@ e_table_config_construct (ETableConfig *config, setup_gui (config); + if (parent_window) + gtk_window_set_transient_for (GTK_WINDOW (config->dialog_toplevel), + parent_window); + config_sort_info_update (config); config_group_info_update (config); config_fields_info_update (config); @@ -1108,11 +1152,12 @@ e_table_config_construct (ETableConfig *config, ETableConfig * e_table_config_new (const char *header, ETableSpecification *spec, - ETableState *state) + ETableState *state, + GtkWindow *parent_window) { ETableConfig *config = g_object_new (E_TABLE_CONFIG_TYPE, NULL); - if (e_table_config_construct (config, header, spec, state) == NULL){ + if (e_table_config_construct (config, header, spec, state, parent_window) == NULL){ g_object_unref (config); return NULL; } diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade index ee1bb958f5..19602c28af 100644 --- a/widgets/table/e-table-config.glade +++ b/widgets/table/e-table-config.glade @@ -2,13 +2,12 @@ - Show Fields GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE - False + True True False True @@ -303,7 +302,7 @@ Group GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE - False + True True False True @@ -1235,7 +1234,7 @@ Sort GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE - False + True True False True @@ -1789,22 +1788,70 @@ - + + True + dialog1 + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE - False - False + True + True False + True - - + + True - False - True - GTK_POS_TOP - False - 2 - 2 - False + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-apply + True + GTK_RELIEF_NORMAL + -10 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + True + GTK_PACK_END + + @@ -1864,29 +1911,6 @@ - - - True - - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 1 - 2 - fill - - - True @@ -2024,6 +2048,30 @@ fill + + + + True + + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 1 + 2 + fill + + + @@ -2047,35 +2095,12 @@ - False - True - - - - - - True - label20 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab + 0 + True + True - - 0 - True - True - diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index f385814f28..1373fb94de 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -31,6 +31,7 @@ #include #include #include +#include G_BEGIN_DECLS @@ -100,11 +101,13 @@ typedef struct { GType e_table_config_get_type (void); ETableConfig *e_table_config_new (const char *header, ETableSpecification *spec, - ETableState *state); + ETableState *state, + GtkWindow *parent_window); ETableConfig *e_table_config_construct (ETableConfig *etco, const char *header, ETableSpecification *spec, - ETableState *state); + ETableState *state, + GtkWindow *parent_window); void e_table_config_raise (ETableConfig *config); G_END_DECLS diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index be1b231381..36e9e0b20b 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -1452,7 +1452,7 @@ ethi_popup_customize_view(GtkWidget *widget, EthiHeaderInfo *info) ethi->config = e_table_config_new ( _("Customize Current View"), - spec, state); + spec, state, NULL); g_object_weak_ref (G_OBJECT (ethi->config), config_destroyed, ethi); g_signal_connect ( -- cgit v1.2.3