From 9529bae97d33cf727914fdbff77decc8da97cc33 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 24 May 2002 12:36:56 +0000 Subject: [ fixes 90% of #25047 ] shamelessly lifted from 2002-05-24 Chris Toshok [ fixes 90% of #25047 ] * e-folder-list.c (get_folder_for_uri): shamelessly lifted from evolution-folder-selector-button.c. (create_display_string): modeled again after evolution-folder-selector-button.c, so we can give a little more context (and make the table look like the folder selector buttons.) (SPEC): add a pixbuf column, also remove the sorting behavior. (columns): add a pixbuf column and another string column (for the display string). (add_clicked): create the display string and get the proper pixbuf, and insert both. (edit_clicked): removed. (update_buttons): remove edit button handling from here. (e_folder_list_init): remove the hooking up of button-edit's "clicked" signal. (e_folder_list_construct): get a reference to the storage registry so we can look up folders. (e_folder_list_set_items): analogous change to add_clicked - get the display string and pixbuf and insert them. * glade/e-folder-list.glade: remove the edit button. * glade/e-shell-config-default-folders.glade: remove the frame/vbox, since we embed it in a notebook and the tab has the title already. * e-shell-config.c (config_control_factory_cb): the only config control we deal with here now is the folder settings control. * e-shell-config-default-folders.c (e_shell_config_default_folders_create_widget): rename e_shell_config_default_folders_create_control to this, return the widget, and take the config control to use as an arg. * e-shell-config-offline.c (e_shell_config_offline_create_widget): make an analogous change here as with default_folders_create_widget. * e-shell-config-default-folders.h (e_shell_config_default_folders_create_widget): track change to prototype. * e-shell-config-offline.h (e_shell_config_offline_create_widget): same. * GNOME_Evolution_Shell.oaf.in: remove the DefaultFolders and OfflineFolders controls and add a FolderSettings_Control. * Makefile.am (evolution_SOURCES): add e-shell-config-folder-settings.[ch] and e-shell-config-autocompletion.[ch]. * e-shell-config-folder-settings.[ch]: new files, embed (after a fashion) the default folder, offline, and autocompletion UI's in a notebook. * e-shell-config-autocompletion.[ch]: Basically copy over and shell-ize the addressbook autocompletion config control so it can be embedded more easily with the other folder settings. svn path=/trunk/; revision=17000 --- shell/glade/e-shell-config-default-folders.glade | 402 +++++++++++------------ 1 file changed, 191 insertions(+), 211 deletions(-) (limited to 'shell/glade/e-shell-config-default-folders.glade') diff --git a/shell/glade/e-shell-config-default-folders.glade b/shell/glade/e-shell-config-default-folders.glade index 0730fec1ca..13e58ff437 100644 --- a/shell/glade/e-shell-config-default-folders.glade +++ b/shell/glade/e-shell-config-default-folders.glade @@ -25,229 +25,209 @@ False - GtkVBox - default_folders_vbox + GtkTable + default_folders_table + 4 + 4 + 2 False - 0 + 4 + 4 - GtkFrame - default_folder_frame - - 0 - GTK_SHADOW_ETCHED_IN + GtkLabel + label1 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 - 0 - True - True + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + - - GtkTable - table1 - 4 - 4 - 2 - False - 4 - 4 - - - GtkLabel - label1 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label4 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - + + GtkLabel + label4 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label3 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - + + GtkLabel + label3 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - label2 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - + + GtkLabel + label2 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + - - Custom - default_mail_button - e_shell_config_default_folder_selector_button_new - 0 - 0 - Wed, 10 Apr 2002 17:54:56 GMT - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - True - - + + Custom + default_mail_button + e_shell_config_default_folder_selector_button_new + 0 + 0 + Wed, 10 Apr 2002 17:54:56 GMT + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + True + + - - Custom - default_contacts_button - e_shell_config_default_folder_selector_button_new - 0 - 0 - Wed, 10 Apr 2002 17:55:01 GMT - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - + + Custom + default_contacts_button + e_shell_config_default_folder_selector_button_new + 0 + 0 + Wed, 10 Apr 2002 17:55:01 GMT + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + True + + - - Custom - default_calendar_button - e_shell_config_default_folder_selector_button_new - 0 - 0 - Wed, 10 Apr 2002 17:55:06 GMT - - 1 - 2 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - + + Custom + default_calendar_button + e_shell_config_default_folder_selector_button_new + 0 + 0 + Wed, 10 Apr 2002 17:55:06 GMT + + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + True + + - - Custom - default_tasks_button - e_shell_config_default_folder_selector_button_new - 0 - 0 - Wed, 10 Apr 2002 17:55:12 GMT - - 1 - 2 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - - - + + Custom + default_tasks_button + e_shell_config_default_folder_selector_button_new + 0 + 0 + Wed, 10 Apr 2002 17:55:12 GMT + + 1 + 2 + 3 + 4 + 0 + 0 + False + False + False + False + True + True + -- cgit v1.2.3