From 81a9c1e88d1c08fd59c6492686b45d53919a99b6 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Wed, 2 Jun 2004 13:02:09 +0000 Subject: Don't need these two functions any more (source_to_dialog, 2004-06-02 Rodney Dawes * gui/component/addressbook-config.c (focus_help, add_focus_handler): Don't need these two functions any more (source_to_dialog, auth_optionmenu_func): Don't try to change the notebook page or set the widget sensitive, for a notebook that doesn't exist any more (reparent_to_vbox): Don't need this function any more, as the widgets are all contained in the same dialog in the glade now (setup_general_tab, setup_connecting_tab, setup_searching_tab): We don't need to do the focus-based "tooltip" stuff any more We just use tooltips on the widgets now (ssl_optionmenu_selected, add_ssl_activate_cb): We don't need the ssl_optionmenu_selected callback any more, as the tooltips are just set on the necessary widgets now (query_for_supported_bases): Set the border widths on the dialog's vbox and action_area to be compliant with the HIG (addressbook_add_server_dialog): Unref the GConfClient object (addressbook_config_edit_source): Create the source_list so that we can actually save the changes that we make here Create the GladeXML with only the widget subtree that we need to use here, to avoid popping up other visible dialogs Set the border widths on the dialog's vbox and action_area to be compliant with the HIG We don't need to reparent widgets to vboxes any more, as the widgets are now part of the dialog's widget tree If we are without LDAP or not in LDAP mode, then hide the notebook borders, and change the border size of its child to appear as though we are a normal non-LDAP dialog We don't need to set the type hint on the window as we are no a real GtkDialog * gui/component/ldap-config.glade: Update the properties dialogs to be compliant with the HIG layout Get rid of some of the extra windows and put their children in the appropriate places in the properties dialog Make the properties dialog be a real GtkDialog Fixes #41141 svn path=/trunk/; revision=26153 --- addressbook/ChangeLog | 40 + addressbook/gui/component/addressbook-config.c | 123 +- addressbook/gui/component/ldap-config.glade | 2763 ++++++++++-------------- 3 files changed, 1196 insertions(+), 1730 deletions(-) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 4f58dc05c9..c6bbbc8185 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,43 @@ +2004-06-02 Rodney Dawes + + * gui/component/addressbook-config.c (focus_help, add_focus_handler): + Don't need these two functions any more + (source_to_dialog, auth_optionmenu_func): + Don't try to change the notebook page or set the widget sensitive, + for a notebook that doesn't exist any more + (reparent_to_vbox): Don't need this function any more, as the + widgets are all contained in the same dialog in the glade now + (setup_general_tab, setup_connecting_tab, setup_searching_tab): + We don't need to do the focus-based "tooltip" stuff any more + We just use tooltips on the widgets now + (ssl_optionmenu_selected, add_ssl_activate_cb): + We don't need the ssl_optionmenu_selected callback any more, as the + tooltips are just set on the necessary widgets now + (query_for_supported_bases): Set the border widths on the dialog's + vbox and action_area to be compliant with the HIG + (addressbook_add_server_dialog): Unref the GConfClient object + (addressbook_config_edit_source): Create the source_list so that + we can actually save the changes that we make here + Create the GladeXML with only the widget subtree that we need to + use here, to avoid popping up other visible dialogs + Set the border widths on the dialog's vbox and action_area to be + compliant with the HIG + We don't need to reparent widgets to vboxes any more, as the widgets + are now part of the dialog's widget tree + If we are without LDAP or not in LDAP mode, then hide the notebook + borders, and change the border size of its child to appear as though + we are a normal non-LDAP dialog + We don't need to set the type hint on the window as we are no a + real GtkDialog + + * gui/component/ldap-config.glade: Update the properties dialogs to + be compliant with the HIG layout + Get rid of some of the extra windows and put their children in the + appropriate places in the properties dialog + Make the properties dialog be a real GtkDialog + + Fixes #41141 + 2004-06-01 Larry Ewing * gui/contact-list-editor/e-contact-list-editor.c: Add in a source diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 0f24f168ea..76c82bec34 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -66,27 +66,6 @@ typedef struct { int page_num; } FocusHelpClosure; -static void -focus_help (GtkWidget *w, GdkEventFocus *event, FocusHelpClosure *closure) -{ - gtk_notebook_set_current_page (GTK_NOTEBOOK(closure->notebook), closure->page_num); -} - -static void -add_focus_handler (GtkWidget *widget, GtkWidget *notebook, int page_num) -{ - FocusHelpClosure *focus_closure = g_new0 (FocusHelpClosure, 1); - focus_closure->notebook = notebook; - focus_closure->page_num = page_num; - - g_signal_connect_data (G_OBJECT (widget), - "focus_in_event" /* XXX */, - G_CALLBACK (focus_help), - focus_closure, - (GClosureNotify) g_free, - (GConnectFlags)0); -} - typedef struct _AddressbookSourceDialog AddressbookSourceDialog; typedef void (*ModifyFunc)(GtkWidget *item, AddressbookSourceDialog *dialog); @@ -451,10 +430,8 @@ source_to_dialog (AddressbookSourceDialog *dialog) gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->auth_optionmenu), dialog->auth); if (dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE) { - gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->auth_label_notebook), dialog->auth - 1); gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->auth_entry_notebook), dialog->auth - 1); } - gtk_widget_set_sensitive (dialog->auth_label_notebook, dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE); gtk_widget_set_sensitive (dialog->auth_entry_notebook, dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE); gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->scope_optionmenu), dialog->scope); @@ -546,18 +523,6 @@ addressbook_add_server_dialog_cancel (GtkWidget *widget, AddressbookSourceDialog gtk_widget_destroy (dialog->window); } -static void -reparent_to_vbox (AddressbookSourceDialog *dialog, char *vbox_name, char *widget_name) -{ - GtkWidget *vbox, *widget; - - vbox = glade_xml_get_widget (dialog->gui, vbox_name); - widget = glade_xml_get_widget (dialog->gui, widget_name); - - gtk_widget_reparent (widget, vbox); - gtk_box_set_child_packing (GTK_BOX (vbox), widget, TRUE, TRUE, 0, GTK_PACK_START); -} - static void auth_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog) { @@ -567,13 +532,10 @@ auth_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog) dialog->general_modify_func (item, dialog); if (dialog->auth == 0) { - gtk_widget_set_sensitive (dialog->auth_label_notebook, FALSE); gtk_widget_set_sensitive (dialog->auth_entry_notebook, FALSE); } else { - gtk_widget_set_sensitive (dialog->auth_label_notebook, TRUE); gtk_widget_set_sensitive (dialog->auth_entry_notebook, TRUE); - gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->auth_label_notebook), dialog->auth - 1); gtk_notebook_set_current_page (GTK_NOTEBOOK(dialog->auth_entry_notebook), dialog->auth - 1); } } @@ -588,43 +550,27 @@ add_auth_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog) static void setup_general_tab (AddressbookSourceDialog *dialog, ModifyFunc modify_func) { - GtkWidget *general_tab_help; GtkWidget *menu; - general_tab_help = glade_xml_get_widget (dialog->gui, "general-tab-help"); - dialog->general_modify_func = modify_func; dialog->host = glade_xml_get_widget (dialog->gui, "server-name-entry"); g_signal_connect (dialog->host, "changed", G_CALLBACK (modify_func), dialog); - if (general_tab_help) - add_focus_handler (dialog->host, general_tab_help, 0); - - dialog->auth_label_notebook = glade_xml_get_widget (dialog->gui, "auth-label-notebook"); dialog->auth_entry_notebook = glade_xml_get_widget (dialog->gui, "auth-entry-notebook"); dialog->email = glade_xml_get_widget (dialog->gui, "email-entry"); g_signal_connect (dialog->email, "changed", G_CALLBACK (modify_func), dialog); - if (general_tab_help) - add_focus_handler (dialog->email, general_tab_help, 1); - dialog->binddn = glade_xml_get_widget (dialog->gui, "dn-entry"); if (dialog->binddn) g_signal_connect (dialog->binddn, "changed", G_CALLBACK (modify_func), dialog); - if (general_tab_help) - add_focus_handler (dialog->binddn, general_tab_help, 2); - dialog->auth_optionmenu = glade_xml_get_widget (dialog->gui, "auth-optionmenu"); menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->auth_optionmenu)); gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_auth_activate_cb, dialog); - - if (general_tab_help) - add_focus_handler (dialog->auth_optionmenu, general_tab_help, 3); } static gboolean @@ -666,25 +612,11 @@ ssl_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog) dialog->connecting_modify_func (item, dialog); } -static void -ssl_optionmenu_selected (GtkWidget *item, AddressbookSourceDialog *dialog) -{ - GtkWidget *connecting_tab_help; - int ssl_type = g_list_index (gtk_container_get_children (GTK_CONTAINER (item->parent)), - item); - - connecting_tab_help = glade_xml_get_widget (dialog->gui, "connecting-tab-help"); - - gtk_notebook_set_current_page (GTK_NOTEBOOK(connecting_tab_help), ssl_type + 1); -} - static void add_ssl_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog) { g_signal_connect (item, "activate", G_CALLBACK (ssl_optionmenu_activated), dialog); - g_signal_connect (item, "select", - G_CALLBACK (ssl_optionmenu_selected), dialog); } static void @@ -713,19 +645,11 @@ static void setup_connecting_tab (AddressbookSourceDialog *dialog, ModifyFunc modify_func) { GtkWidget *menu; - GtkWidget *connecting_tab_help; dialog->connecting_modify_func = modify_func; - connecting_tab_help = glade_xml_get_widget (dialog->gui, "connecting-tab-help"); - dialog->port_combo = glade_xml_get_widget (dialog->gui, "port-combo"); - if (connecting_tab_help) { - add_focus_handler (dialog->port_combo, connecting_tab_help, 0); - add_focus_handler (GTK_COMBO(dialog->port_combo)->entry, connecting_tab_help, 0); - } - g_signal_connect (GTK_COMBO(dialog->port_combo)->entry, "changed", G_CALLBACK (modify_func), dialog); g_signal_connect (GTK_COMBO(dialog->port_combo)->entry, "changed", @@ -852,6 +776,10 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog) gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, "supported-bases-dialog", NULL); dialog = glade_xml_get_widget (gui, "supported-bases-dialog"); + gtk_widget_realize (dialog); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12); + supported_bases_table = glade_xml_get_widget (gui, "supported-bases-table"); gtk_widget_show (supported_bases_table); selection_model = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(supported_bases_table))); @@ -910,15 +838,11 @@ setup_searching_tab (AddressbookSourceDialog *dialog, ModifyFunc modify_func) { GtkWidget *menu; GtkWidget *rootdn_button; - GtkWidget *searching_tab_help; dialog->searching_modify_func = modify_func; - searching_tab_help = glade_xml_get_widget (dialog->gui, "searching-tab-help"); dialog->rootdn = glade_xml_get_widget (dialog->gui, "rootdn-entry"); - if (searching_tab_help) - add_focus_handler (dialog->rootdn, searching_tab_help, 0); if (modify_func) g_signal_connect (dialog->rootdn, "changed", @@ -926,17 +850,11 @@ setup_searching_tab (AddressbookSourceDialog *dialog, ModifyFunc modify_func) dialog->scope_optionmenu = glade_xml_get_widget (dialog->gui, "scope-optionmenu"); - if (searching_tab_help) - add_focus_handler (dialog->scope_optionmenu, searching_tab_help, 1); - menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->scope_optionmenu)); gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_scope_activate_cb, dialog); dialog->timeout_scale = glade_xml_get_widget (dialog->gui, "timeout-scale"); - if (searching_tab_help) - add_focus_handler (dialog->timeout_scale, searching_tab_help, 2); - if (modify_func) g_signal_connect (GTK_RANGE(dialog->timeout_scale)->adjustment, "value_changed", @@ -1121,6 +1039,8 @@ addressbook_add_server_dialog (void) g_object_weak_ref (G_OBJECT (sdialog->window), addressbook_source_dialog_destroy, sdialog); + g_object_unref (gconf_client); + /* make sure we fill in the default values */ source_to_dialog_new (sdialog); @@ -1336,10 +1256,17 @@ void addressbook_config_edit_source (GtkWidget *parent, ESource *source) { AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1); - GtkWidget *general_tab_help; + GConfClient *gconf_client; - sdialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL); + gconf_client = gconf_client_get_default (); + sdialog->source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); + g_object_unref (gconf_client); + + sdialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, "account-editor-window", NULL); sdialog->window = glade_xml_get_widget (sdialog->gui, "account-editor-window"); + gtk_widget_realize (sdialog->window); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (sdialog->window)->vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (sdialog->window)->action_area), 12); sdialog->source = source; sdialog->source_group = e_source_peek_group (source); @@ -1350,17 +1277,10 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) #ifdef HAVE_LDAP - /* general tab */ - general_tab_help = glade_xml_get_widget (sdialog->gui, "general-tab-help"); - reparent_to_vbox (sdialog, "account-editor-general-ldap-vbox", "general-tab"); setup_general_tab (sdialog, editor_modify_cb); - /* connecting tab */ - reparent_to_vbox (sdialog, "account-editor-connecting-vbox", "connecting-tab"); setup_connecting_tab (sdialog, editor_modify_cb); - /* searching tab */ - reparent_to_vbox (sdialog, "account-editor-searching-vbox", "searching-tab"); setup_searching_tab (sdialog, editor_modify_cb); #endif @@ -1372,16 +1292,22 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) #ifdef HAVE_LDAP if (strcmp ("ldap://", e_source_group_peek_base_uri (sdialog->source_group))) { - gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-general-ldap-vbox")); gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox")); gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox")); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (sdialog->notebook), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (sdialog->notebook), FALSE); + gtk_container_set_border_width (GTK_CONTAINER (glade_xml_get_widget (sdialog->gui, "account-editor-general-vbox")), 0); + gtk_window_set_default_size (GTK_WINDOW (sdialog->window), 332, 124); } else { - add_focus_handler (sdialog->display_name, general_tab_help, 4); + gtk_widget_show (glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox")); + gtk_widget_show (glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox")); } #else - gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-general-ldap-vbox")); gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox")); gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox")); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (sdialog->notebook), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (sdialog->notebook), FALSE); + gtk_container_set_border_width (GTK_CONTAINER (glade_xml_get_widget (sdialog->gui, "account-editor-general-vbox")), 0); #endif source_to_dialog (sdialog); @@ -1397,7 +1323,6 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) gtk_widget_set_sensitive (sdialog->ok_button, FALSE); - gtk_window_set_type_hint (GTK_WINDOW (sdialog->window), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_modal (GTK_WINDOW (sdialog->window), TRUE); gtk_widget_show (sdialog->window); diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index dcc080dd44..326bfb5cc3 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -13,13 +13,13 @@ - 12 True False - 12 + 0 + 12 True True True @@ -1189,9 +1189,10 @@ + 12 True GTK_BUTTONBOX_END - 0 + 12 @@ -1279,24 +1280,62 @@ - + + True Address Book Properties GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + False - - - 6 + + True False - 6 + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + True + GTK_PACK_END + + - 6 + 12 True True True @@ -1307,25 +1346,45 @@ - 6 + 12 True False - 6 + 12 + + + + True + <b>Display</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 3 + True False - 4 + 12 - + True - _Display name: - True + + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 @@ -1341,26 +1400,39 @@ - + True - 1 + _Name: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 0.5 - 0.9 - 1 + 0 + 0 + account-editor-display-name-entry + + + 0 + False + False + + - - - True - True - True - True - 0 - - True - * - False - - + + + True + This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. + True + True + True + 0 + + True + * + False 0 @@ -1377,883 +1449,365 @@ - - True + False - 0 + 12 - + + True + <b>Server Information</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + - - - 0 - True - True - - - - - False - True - - - - - True - General - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - + + + True + False + 12 - - - True - False - 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - - - - False - True - - + + + True + 3 + 2 + False + 6 + 6 - - - True - Connecting - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - + + + True + _Port: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + entry27 + + + 0 + 1 + 1 + 2 + fill + + + - - - True - False - 0 + + + True + _Server: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + server-name-entry + + + 0 + 1 + 0 + 1 + fill + + + - - - - - - False - True - - + + + True + False + 6 - - - True - Searching - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - 0 - True - True - - - - - - True - - - 0 - True - True - - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - - - - - - True - False - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - - - general-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - - - - 6 - True - False - 6 - - - - 6 - True - 4 - 2 - False - 6 - 6 - - - - True - _Server name: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - server-name-entry - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - _Log in method: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - 7.45058e-09 - 0.5 - 0 - 1 - - - - True - True - 0 - - - - True - - - - True - Anonymously - True - - - - - - True - Using email address - True - - - - - - True - Using distinguished name (DN) - True - - - - - - - - - 1 - 2 - 2 - 3 - - - - - - - True - False - False - False - GTK_POS_TOP - False - False - - - - True - Email address: - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label546 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - Distinguished _name: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label547 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - 0 - 1 - 3 - 4 - fill - fill - - - - - - True - False - False - False - GTK_POS_TOP - False - False - - - - True - True - True - True - 0 - - True - * - False - - - False - True - - - - - - True - label549 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - True - True - True - 0 - - True - * - False - - - False - True - - - - - - True - label550 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - 1 - 2 - 3 - 4 - fill - fill - - - - - - True - - - 0 - 2 - 0 - 1 - fill - - - - - 0 - False - False - - - - - - True - False - False - GTK_POS_TOP - False - False - - - - True - This is the full name of your ldap server. For example, "ldap.mycompany.com". - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label163 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - Evolution will use this email address to authenticate you with the server - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label164 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - Evolution will use this DN to authenticate you with the server - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label165 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - + + + True + _Use secure connection: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + ssl-optionmenu + + + 0 + False + False + + - - - True - This is the method evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your ldap server. - False - False - GTK_JUSTIFY_CENTER - True - False - 0.5 - 0.5 - 0 - 0 - - - False - True - - + + + True + True + 0 - - - True - label551 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - + + + True - - - True - This is the name for this server that will appear in your Evolution folder list. -It is for display purposes only. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - False - True - - + + + True + Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS. + Always + True + + + + + + True + Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure. + Whenever Possible + True + + + + + + True + Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits. + Never + True + + + + + + + 0 + True + True + + + + + 0 + 2 + 2 + 3 + expand|shrink|fill + shrink|fill + + - - - True - label452 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - 0 - False - False - GTK_PACK_END - - - - - + + + True + False + True + False + True + False + + + + True + This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify. + True + True + True + True + 0 + + True + * + False + + - - connecting-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False + + + True + GTK_SELECTION_BROWSE - - - 6 - True - False - 6 + + + True + True + 389 + + - - - 6 - True - 2 - 2 - False - 6 - 6 + + + True + True + 636 + + - - - True - _Port number: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - + + + True + True + 3268 + + + + + + + 1 + 2 + 1 + 2 + + + - - - True - 7.45058e-09 - 0.5 - 0 - 1 + + + True + This is the full name of your ldap server. For example, "ldap.mycompany.com". + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + 0 + True + True + + + + + 0 + True + True + + - - - True - False - True - False - True - False - - - + + True - True - True - True - True - 0 - - True - * - False + <b>Authentication</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + 0 + False + False + - - + + True - GTK_SELECTION_BROWSE + False + 12 - + True - - - - True - 389 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + - + True + 2 + 2 + False + 6 + 6 - + True - 636 - False + _Log in: + True False GTK_JUSTIFY_LEFT False @@ -2262,20 +1816,23 @@ It is for display purposes only. 0.5 0 0 + auth-optionmenu + + 0 + 1 + 0 + 1 + fill + + - - - - - - True - + True - 3268 - False + _Email address: + True False GTK_JUSTIFY_LEFT False @@ -2284,290 +1841,191 @@ It is for display purposes only. 0.5 0 0 + email-entry + + 0 + 1 + 1 + 2 + fill + + - - - - - - True - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - - - - - - - - - 1 - 2 - 0 - 1 - - - - - - - True - U_se SSL/TLS: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - True - 7.45058e-09 - 0.5 - 0 - 1 - - - - True - True - 0 - - - - True - - - - True - Always - True - - - - - - True - Whenever Possible - True - - + False + False + False + GTK_POS_TOP + False + False - - - True - Never - True - - - - - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - 0 - False - True - - + + + True + Evolution will use this email address to authenticate you with the server. + True + True + True + 0 + + True + * + False + + + True + True + + - - - True - False - False - GTK_POS_TOP - False - False + + + True + label549 + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + - - - True - This is the port on the LDAP server that Evolution will try to connect to. A -list of standard ports has been provided. Ask your system administrator -what port you should specify. - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - False - True - - + + + True + True + True + True + 0 + + True + * + False + + + False + True + + - - - True - label163 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - + + + True + label550 + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 1 + 2 + 1 + 2 + expand|shrink|fill + shrink|fill + + - - - True - Selecting this option means that Evolution will only connect to your LDAP server if -your LDAP server supports SSL or TLS. - False - False - GTK_JUSTIFY_LEFT - False - False - 7.45058e-09 - 0.5 - 0 - 0 - - - False - True - - + + + True + This is the method evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your ldap server. + True + 0 - - - True - label398 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - + + + True - - - True - Selecting this option means that Evolution will only try to use SSL/TLS if you are in a -insecure environment. For example, if you and your LDAP server are behind a firewall -at work, then Evolution doesn't need to use SSL/TLS because your connection is already -secure. - False - False - GTK_JUSTIFY_LEFT - False - False - 7.45058e-09 - 0.5 - 0 - 0 - - - False - True - - + + + True + Anonymously + True + + - - - True - label396 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - + + + True + Using email address + True + + - - - True - Selecting this option means that your server does not support either SSL or TLS. This -means that your connection will be insecure, and that you will be vulnerable to security -exploits. - False - False - GTK_JUSTIFY_LEFT - False - False - 7.45058e-09 - 0.5 - 0 - 0 + + + True + Using distinguished name (DN) + True + + + + + + + 1 + 2 + 0 + 1 + expand|shrink|fill + shrink + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + False - True + False - + True - label397 + General False False GTK_JUSTIFY_CENTER @@ -2582,172 +2040,316 @@ exploits. tab - - - 0 - True - True - - - - - - - - searching-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - - - - 6 - True - False - 6 - - - - 6 - True - 4 - 2 - False - 6 - 6 - - - - True - _Search base: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - True - S_earch scope: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - + + 12 + False + 12 - - - True - 7.45058e-09 - 7.45058e-09 - 0 - 1 + + + True + <b>Searching</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True - True - 0 + False + 12 - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + 3 + 3 + False + 6 + 6 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Search _base: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + rootdn-entry + + + 0 + 1 + 0 + 1 + expand|shrink|fill + shrink|fill + + - + True - One + _Search scope: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + scope-optionmenu + + + 0 + 1 + 2 + 3 + expand|shrink|fill + shrink|fill + + + + + + True + The search scope defines how deep you would like the search to extend down the directory tree. A search scope of "sub" will include all entries below your search base. A search scope of "one" will only include the entries one level beneath your base. + True + 0 + + + + + + + True + Search base only + True + + + + + + + True + Only locations within starting point + True + + + + + + + True + Starting point and locations within it + True + + + + + + + + 1 + 3 + 2 + 3 + expand|shrink|fill + shrink|fill + + + + + + True + The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree. + True + True + True + True + 0 + + True + * + False + + 1 + 3 + 0 + 1 + expand|shrink|fill + shrink|fill + - - - True - Sub - True + + + True + True + GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-find + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Find Possible Search Bases + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + 1 + 2 + 1 + 2 + expand|shrink|fill + shrink|fill + + + 0 + True + True + - - - - 1 - 2 - 1 - 2 - fill - - - - - - - 3 - True - False - 3 - - - - True - True - True - True - True - 0 - - True - * - False - 0 - True - True + False + False - + True - True - S_how Supported Bases - True - GTK_RELIEF_NORMAL + <b>Downloading</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 0 @@ -2755,62 +2357,20 @@ exploits. False - - - 1 - 2 - 0 - 1 - fill - - - - - - True - _Timeout (minutes): - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 1 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - 7.45058e-09 - 0.5 - 1 - 1 - - 3 + True False - 3 + 12 - + True - 1:00 + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 @@ -2826,105 +2386,210 @@ exploits. - + True - True - True - GTK_POS_BOTTOM - 0 - GTK_UPDATE_CONTINUOUS - False - 3 1 5 0.5 1 0 - - - 0 - True - True - - + 2 + 3 + False + 6 + 6 - - - True - 5:00 - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 3 - 0 - - - 0 - False - False - - - - - - - 1 - 2 - 2 - 3 - - - + + + True + False + 6 - - - True - _Download limit: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - fill - - - + + + True + 1 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 3 1 5 0.5 1 0 + + + 0 + True + True + + + + + + True + 5 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 1 + 2 + 0 + 1 + expand|shrink|fill + shrink|fill + + + + + + True + minutes + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 0 + 1 + shrink|fill + shrink|fill + + + + + + True + cards + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 1 + 2 + shrink|fill + shrink|fill + + - - - True - 0 - 0.5 - 0 - 1 + + + True + _Timeout: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + timeout-scale + + + 0 + 1 + 0 + 1 + shrink|fill + shrink|fill + + - - - 3 - True - False - 3 + + + True + _Download limit: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + download-limit-spinbutton + + + 0 + 1 + 1 + 2 + shrink|fill + shrink|fill + + - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 100 0 10000 1 10 10 + + + True + This is the maximum number of entries to download. Setting this number to be too large will slow down your address book. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 1000 1 10 10 + + + 1 + 2 + 1 + 2 + expand|shrink|fill + shrink|fill + + 0 @@ -2932,202 +2597,24 @@ exploits. True - - - - True - cards - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + 0 + False + False + - - 1 - 2 - 3 - 4 - fill - fill - - - - - 0 - True - True - - - - - - True - False - False - GTK_POS_TOP - False - False - - - - True - The search base is the distinguished name (DN) of the entry where your searches will -begin. If you leave this blank, the search will begin at the root of the directory tree. - False - False - GTK_JUSTIFY_LEFT - False - False - 7.45058e-09 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label163 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - The search scope defines how deep you would like the search to extend down the -directory tree. A search scope of "sub" will include all entries below your search base. -A search scope of "one" will only include the entries one level beneath your base. - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label164 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - This option controls how long a search will be run. - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label165 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - This is the maximum number of entries to download. Setting this number to be -too large will slow down your address book. - False - False - GTK_JUSTIFY_LEFT - False - False - 7.45058e-09 - 0.5 - 0 - 0 - False - True + False - + True - label166 + Details False False GTK_JUSTIFY_CENTER @@ -3145,9 +2632,8 @@ too large will slow down your address book. 0 - False - False - GTK_PACK_END + True + True @@ -3155,48 +2641,49 @@ too large will slow down your address book. + True Supported Search Bases GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER False - 300 + 320 200 True False - True + False - + True False - 6 + 0 - + True GTK_BUTTONBOX_END - + True True True - gtk-ok + gtk-cancel True GTK_RELIEF_NORMAL - -5 + -6 - + True True True - gtk-cancel + gtk-ok True GTK_RELIEF_NORMAL - -6 + -5 @@ -3209,12 +2696,26 @@ too large will slow down your address book. - + + 12 True - supported_bases_create_table - 0 - 0 - Fri, 12 Apr 2002 20:06:45 GMT + False + 0 + + + + True + supported_bases_create_table + 0 + 0 + Fri, 12 Apr 2002 20:06:45 GMT + + + 0 + True + True + + 0 -- cgit v1.2.3