diff --git a/widgets/table/e-table-config-no-group.glade b/widgets/table/e-table-config-no-group.glade new file mode 100644 index 0000000000..6f32c14e0c --- /dev/null +++ b/widgets/table/e-table-config-no-group.glade @@ -0,0 +1,1711 @@ + + + + + E-table + e-table + + + + C + True + True + False + False + False + + + + GnomeDialog + dialog-show-fields + False + Show Fields + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + False + True + + + GtkVBox + GnomeDialog:vbox + dialog-vbox3 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area3 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button20 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button22 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkVBox + vbox2 + False + 6 + + 0 + True + True + + + + GtkTable + table2 + 1 + 5 + True + 6 + 6 + + 0 + False + True + + + + GtkLabel + label-available + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 0 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + True + + + + + GtkLabel + label-displayed + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 3 + 5 + 0 + 1 + 0 + 0 + True + False + False + False + True + True + + + + + + GtkTable + table3 + 1 + 5 + True + 6 + 6 + + 0 + True + True + + + + GtkVBox + vbox4 + False + 6 + + 0 + 2 + 0 + 1 + 0 + 0 + True + True + False + False + True + True + + + + GtkScrolledWindow + scrolledwindow1 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkViewport + viewport1 + GTK_SHADOW_IN + + + Custom + available-field-list + e_table_proxy_etable_new + 0 + 0 + Sun, 18 Mar 2001 23:59:35 GMT + + + + + + + GtkVBox + vbox5 + False + 6 + + 3 + 5 + 0 + 1 + 0 + 0 + True + True + False + False + True + True + + + + GtkScrolledWindow + scrolledwindow2 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkViewport + viewport2 + GTK_SHADOW_IN + + + Custom + fields-shown + e_table_proxy_etable_new + 0 + 0 + Sun, 18 Mar 2001 23:59:49 GMT + + + + + + GtkHBox + hbox4 + True + 6 + + 0 + False + True + + + + GtkButton + button-up + True + + GTK_RELIEF_NORMAL + + 0 + False + True + + + + + GtkButton + button-down + True + + GTK_RELIEF_NORMAL + + 0 + False + True + + + + + + + GtkVBox + vbox6 + False + 6 + + 2 + 3 + 0 + 1 + 0 + 0 + True + True + False + False + True + True + + + + GtkButton + button-add + True + + GTK_RELIEF_NORMAL + + 0 + False + False + + + + + GtkButton + button-remove + True + + GTK_RELIEF_NORMAL + + 0 + False + False + + + + + Placeholder + + + + + + + + + GnomeDialog + dialog-group-by + False + Group + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + False + True + + + GtkVBox + GnomeDialog:vbox + dialog-vbox4 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area4 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button39 + True + True + + + + + GtkButton + button41 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button42 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkVBox + vbox24 + False + 0 + + 0 + True + True + + + + GtkHBox + hbox13 + False + 6 + + 0 + True + True + + + + GtkFrame + frame-group-1 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkHBox + hbox5 + False + 6 + + + GtkVBox + vbox7 + False + 0 + + 0 + True + True + + + + Custom + group-combo-1 + e_table_proxy_gtk_combo_text_new + 0 + 0 + Fri, 19 Jan 2001 04:52:09 GMT + + 0 + False + False + + + + + GtkCheckButton + checkbutton-group-1 + True + + False + True + + 0 + False + False + + + + + + GtkVBox + vbox8 + False + 0 + + 0 + False + True + + + + GtkRadioButton + radiobutton-ascending-group-1 + True + + False + True + g-group-1 + + 0 + False + False + + + + + GtkRadioButton + radiobutton-descending-group-1 + True + + False + True + g-group-1 + + 0 + False + False + + + + + + + + GtkLabel + label8 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label9 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label10 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + GtkHBox + hbox14 + False + 6 + + 0 + True + True + + + + GtkLabel + label11 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkFrame + frame-group-2 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkHBox + hbox6 + False + 6 + + + GtkVBox + vbox9 + False + 0 + + 0 + True + True + + + + Custom + group-combo-2 + e_table_proxy_gtk_combo_text_new + 0 + 0 + Fri, 19 Jan 2001 04:52:14 GMT + + 0 + False + False + + + + + GtkCheckButton + checkbutton-group-2 + True + + False + True + + 0 + False + False + + + + + + GtkVBox + vbox10 + False + 0 + + 0 + False + True + + + + GtkRadioButton + radiobutton-ascending-group-2 + True + + False + True + g-group-2 + + 0 + False + False + + + + + GtkRadioButton + radiobutton-descending-group-2 + True + + False + True + g-group-2 + + 0 + False + False + + + + + + + + GtkLabel + label19 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label18 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + GtkHBox + hbox15 + False + 6 + + 0 + True + True + + + + GtkLabel + label13 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label12 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkFrame + frame-group-3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkHBox + hbox7 + False + 6 + + + GtkVBox + vbox11 + False + 0 + + 0 + True + True + + + + Custom + group-combo-3 + e_table_proxy_gtk_combo_text_new + 0 + 0 + Fri, 19 Jan 2001 04:52:18 GMT + + 0 + False + False + + + + + GtkCheckButton + checkbutton-group-3 + True + + False + True + + 0 + False + False + + + + + + GtkVBox + vbox12 + False + 0 + + 0 + False + True + + + + GtkRadioButton + radiobutton-ascending-group-3 + True + + False + True + g-group-3 + + 0 + False + False + + + + + GtkRadioButton + radiobutton-descending-group-3 + True + + False + True + g-group-3 + + 0 + False + False + + + + + + + + GtkLabel + label17 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + GtkHBox + hbox16 + False + 6 + + 0 + True + True + + + + GtkLabel + label14 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label16 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label15 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkFrame + frame-group-4 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkHBox + hbox8 + False + 6 + + + GtkVBox + vbox13 + False + 0 + + 0 + True + True + + + + Custom + group-combo-4 + e_table_proxy_gtk_combo_text_new + 0 + 0 + Fri, 19 Jan 2001 04:52:21 GMT + + 0 + False + False + + + + + GtkCheckButton + checkbutton-group-4 + True + + False + True + + 0 + False + False + + + + + + GtkVBox + vbox14 + False + 0 + + 0 + False + True + + + + GtkRadioButton + radiobutton-ascending-group-4 + True + + False + True + g-group-4 + + 0 + False + False + + + + + GtkRadioButton + radiobutton-descending-group-4 + True + + False + True + g-group-4 + + 0 + False + False + + + + + + + + + + + + GnomeDialog + dialog-sort + False + Sort + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + False + True + + + GtkVBox + GnomeDialog:vbox + vbox15 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox1 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button43 + True + True + + + + + GtkButton + button44 + True + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button45 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkTable + table5 + 4 + 1 + False + 6 + 6 + + 0 + True + True + + + + GtkFrame + frame-sort-4 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + 1 + 3 + 4 + 0 + 0 + True + False + False + False + True + True + + + + GtkHBox + hbox9 + False + 6 + + + GtkAlignment + alignment1 + 0.5 + 0.5 + 1 + 0 + + 0 + True + True + + + + Custom + sort-combo-4 + e_table_proxy_gtk_combo_text_new + 0 + 0 + Tue, 16 Jan 2001 08:33:52 GMT + + + + + GtkVBox + vbox17 + False + 0 + + 0 + False + True + + + + GtkRadioButton + radiobutton-ascending-sort-4 + True + + False + True + group-4 + + 0 + False + False + + + + + GtkRadioButton + radiobutton-descending-sort-4 + True + + False + True + group-4 + + 0 + False + False + + + + + + + + GtkFrame + frame-sort-3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + 1 + 2 + 3 + 0 + 0 + True + False + False + False + True + True + + + + GtkHBox + hbox10 + False + 6 + + + GtkAlignment + alignment2 + 0.5 + 0.5 + 1 + 0 + + 0 + True + True + + + + Custom + sort-combo-3 + e_table_proxy_gtk_combo_text_new + 0 + 0 + Tue, 16 Jan 2001 05:22:22 GMT + + + + + GtkVBox + vbox19 + False + 0 + + 0 + False + True + + + + GtkRadioButton + radiobutton-ascending-sort-3 + True + + False + True + group-3 + + 0 + False + False + + + + + GtkRadioButton + radiobutton-descending-sort-3 + True + + False + True + group-3 + + 0 + False + False + + + + + + + + GtkFrame + frame-sort-2 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + 1 + 1 + 2 + 0 + 0 + True + False + False + False + True + True + + + + GtkHBox + hbox11 + False + 6 + + + GtkAlignment + alignment3 + 0.5 + 0.5 + 1 + 0 + + 0 + True + True + + + + Custom + sort-combo-2 + e_table_proxy_gtk_combo_text_new + 0 + 0 + Tue, 16 Jan 2001 05:22:15 GMT + + + + + GtkVBox + vbox21 + False + 0 + + 0 + False + True + + + + GtkRadioButton + radiobutton-ascending-sort-2 + True + + False + True + group-2 + + 0 + False + False + + + + + GtkRadioButton + radiobutton-descending-sort-2 + True + + False + True + group-2 + + 0 + False + False + + + + + + + + GtkFrame + frame-sort-1 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + 1 + 0 + 1 + 0 + 0 + True + False + False + False + True + True + + + + GtkHBox + hbox12 + False + 6 + + + GtkAlignment + alignment4 + 0.5 + 0.5 + 1 + 0 + + 0 + True + True + + + + Custom + sort-combo-1 + True + True + e_table_proxy_gtk_combo_text_new + 0 + 0 + Tue, 16 Jan 2001 05:22:00 GMT + + + + + GtkVBox + vbox23 + False + 0 + + 0 + False + True + + + + GtkRadioButton + radiobutton-ascending-sort-1 + True + + False + True + group-1 + + 0 + False + False + + + + + GtkRadioButton + radiobutton-descending-sort-1 + True + + False + True + group-1 + + 0 + False + False + + + + + + + + + + + GnomePropertyBox + e-table-config + False + GTK_WIN_POS_NONE + False + False + False + False + + + GtkNotebook + GnomePropertyBox:notebook + notebook1 + False + True + GTK_POS_TOP + False + 2 + 2 + False + + 0 + True + True + + + + GtkFrame + top-frame + 2 + + 0 + GTK_SHADOW_ETCHED_IN + + + GtkTable + table1 + 2 + 1 + 3 + False + 2 + 4 + + + GtkLabel + label4 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkButton + button-sort + True + True + + clicked + on_sort_clicked + Tue, 03 Oct 2000 22:10:58 GMT + + + GTK_RELIEF_NORMAL + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label-sort + + GTK_JUSTIFY_LEFT + True + 0 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + True + + + + + + + GtkLabel + Notebook:tab + label20 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 93dd0d31cf..1c379a2a5b 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -465,9 +465,10 @@ connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, vo { GtkWidget *button = glade_xml_get_widget (gui, widget_name); - gtk_signal_connect( - GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cback), config); + if (button) { + gtk_signal_connect (GTK_OBJECT (button), "clicked", + GTK_SIGNAL_FUNC (cback), config); + } } static void @@ -687,8 +688,13 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui) static void setup_gui (ETableConfig *config) { - GladeXML *gui = glade_xml_new_with_domain ( - ETABLE_GLADEDIR "/e-table-config.glade", NULL, PACKAGE); + GladeXML *gui; + + if (e_table_sort_info_get_can_group (config->state->sort_info)) { + gui = glade_xml_new_with_domain (ETABLE_GLADEDIR "/e-table-config.glade", NULL, PACKAGE); + } else { + gui = glade_xml_new_with_domain (ETABLE_GLADEDIR "/e-table-config-no-group.glade", NULL, PACKAGE); + } config->dialog_toplevel = glade_xml_get_widget ( gui, "e-table-config"); @@ -727,12 +733,6 @@ setup_gui (ETableConfig *config) GTK_OBJECT (config->dialog_toplevel), "apply", GTK_SIGNAL_FUNC (dialog_apply), config); - if (!e_table_sort_info_get_can_group (config->state->sort_info)) { - GtkWidget *button = glade_xml_get_widget (gui, "button-group"); - gtk_widget_hide (button); - gtk_widget_hide (config->group_label); - } - gtk_object_unref (GTK_OBJECT (gui)); } diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade index 7ed753664e..42bef34956 100644 --- a/widgets/table/e-table-config.glade +++ b/widgets/table/e-table-config.glade @@ -1569,6 +1569,7 @@ GnomePropertyBox e-table-config + False GTK_WIN_POS_NONE False False @@ -1604,38 +1605,12 @@ GtkTable table1 2 - 3 + 2 3 False 2 4 - - GtkLabel - label2 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - GtkLabel label3 @@ -1649,8 +1624,8 @@ 2 3 - 1 - 2 + 0 + 1 0 0 False @@ -1675,36 +1650,8 @@ 2 3 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkButton - button-fields - True - True - - clicked - on_fields_clicked - Tue, 03 Oct 2000 22:11:12 GMT - - - GTK_RELIEF_NORMAL - - 0 - 1 - 0 - 1 + 1 + 2 0 0 False @@ -1731,8 +1678,8 @@ 0 1 - 2 - 3 + 1 + 2 0 0 False @@ -1759,8 +1706,8 @@ 0 1 - 1 - 2 + 0 + 1 0 0 False @@ -1785,8 +1732,8 @@ 1 2 - 1 - 2 + 0 + 1 0 0 True @@ -1811,34 +1758,8 @@ 1 2 - 2 - 3 - 0 - 0 - True - False - False - False - True - True - - - - - GtkLabel - label-fields - - GTK_JUSTIFY_LEFT - True - 0 - 0.5 - 0 - 0 - - 1 - 2 - 0 - 1 + 1 + 2 0 0 True