diff options
author | Hans Petter Jansson <hpj@ximian.com> | 2003-12-01 21:21:40 +0800 |
---|---|---|
committer | Hans Petter <hansp@src.gnome.org> | 2003-12-01 21:21:40 +0800 |
commit | 10c2d9dbf7617385024ba92ac158b29bb520d8e3 (patch) | |
tree | 5b98791677186956de36a2d9043d63799a3c40e2 /addressbook/gui/component/ldap-config.glade | |
parent | 8accc252992dfcd8deb55d0afe9bfe6986fa166e (diff) | |
download | gsoc2013-evolution-10c2d9dbf7617385024ba92ac158b29bb520d8e3.tar gsoc2013-evolution-10c2d9dbf7617385024ba92ac158b29bb520d8e3.tar.gz gsoc2013-evolution-10c2d9dbf7617385024ba92ac158b29bb520d8e3.tar.bz2 gsoc2013-evolution-10c2d9dbf7617385024ba92ac158b29bb520d8e3.tar.lz gsoc2013-evolution-10c2d9dbf7617385024ba92ac158b29bb520d8e3.tar.xz gsoc2013-evolution-10c2d9dbf7617385024ba92ac158b29bb520d8e3.tar.zst gsoc2013-evolution-10c2d9dbf7617385024ba92ac158b29bb520d8e3.zip |
Remove addressbook-storage.[ch] and new-addressbook.[ch].
2003-12-01 Hans Petter Jansson <hpj@ximian.com>
* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
Remove addressbook-storage.[ch] and new-addressbook.[ch].
* gui/component/addressbook-storage.[ch]: Removed from repository.
* gui/component/new-addressbook.[ch]: Removed from repository.
* gui/component/addressbook-component.c (load_uri_for_selection):
Set source_uid property on view control, not folder_uri.
(new_addressbook_cb): Call addressbook_config_create_new_source ().
(edit_addressbook_cb): Implement.
(fill_popup_menu_callback): Hook up edit_addressbook_cb ().
(addressbook_component_init): Create the LDAP source group.
* gui/component/addressbook-config.c (AddressbookSourceDialog):
Take out the NEW_ADVANCED_UI stuff and add ESource related vars.
(ldap_unparse_auth)
(ldap_parse_auth)
(ldap_unparse_scope)
(ldap_unparse_ssl)
(ldap_parse_ssl): Moved here from addressbook-storage.c.
(addressbook_dialog_get_source)
(addressbook_dialog_set_source)
(objectclasses_create_server_table)
(objectclasses_create_evolution_table)
(objectclasses_add_foreach)
(objectclasses_add)
(objectclasses_sever_double_click)
(objectclasses_remove_foreach)
(objectclasses_remove)
(objectclasses_evolution_double_click)
(objectclasses_restore_default)
(server_selection_model_changed)
(evolution_selection_model_changed)
(setup_objectclasses_tab): Nuke aging, unfinished NEW_ADVANCED_UI.
(add_source_clicked)
(edit_source_clicked)
(delete_server)
(delete_source_clicked)
(ldap_config_control_destroy_callback)
(ldap_config_control_apply_callback)
(sources_selection_changed)
(sources_table_row_activated)
(ldap_dialog_new)
(addressbook_dialog_create_sources_table)
(ldap_config_control_new)
(addressbook_config_control_new): Nuke config control.
(create_source_dir)
(dialog_to_source)
(dialog_to_temp_source)
(source_to_uri_parts)
(source_to_dialog)
(source_group_changed_cb)
(source_group_menu_add_groups)
(folder_page_forward)
(finish_page_back): Implement.
(addressbook_ldap_init): Take ESource instead of AddressbookSource.
(addressbook_ldap_auth): Don't take a source, not needed.
(addressbook_root_dse_query): Ditto.
(addressbook_source_dialog_destroy): Clean up destroy function.
(addressbook_add_server_druid_finish): Clean up, create ESource.
(general_tab_check): If it's not LDAP, these options don't matter.
(do_ldap_root_dse_query): Source no longer needed here.
(query_for_supported_bases): Use a temp source generated from
current dialog settings.
(display_name_page_prepare): Renamed to folder_page_prepare ().
(druid_display_name_page_modify_cb): Renamed to
druid_folder_page_modify_cb ().
(addressbook_add_server_druid): Set up source list, group selector.
Make LDAP pages optional, dependent on selected group. Use ESource.
(edit_dialog_store_change): Remove config control list stuff,
export settings to ESource.
(addressbook_edit_server_dialog): Renamed to
addressbook_config_edit_source (), which takes an ESource. Remove
config control list stuff, make LDAP pages show up only if we have
an LDAP source. Remove NEW_ADVANCED_UI cruft.
(addressbook_config_create_new_source): Just call
addressbook_add_server_druid ().
* gui/component/addressbook-config.h: Move LDAP enums here, from
addressbook-storage.h.
* gui/component/addressbook.c (control_activate_cb): uri -> source
(addressbook_view_clear): Unref source list.
(book_open_cb): Use ESource.
(load_uri_auth_cb): Renamed to load_source_auth_cb (), manipulate
ESource instead of URI.
(get_remember_password): Implement.
(set_remember_password): Implement.
(addressbook_authenticate): Use ESource properties.
(load_uri_cb): Renamed to load_source_cb (), ESource adaptation.
(addressbook_load_uri): Renamed to addressbook_load_source (), takes
ESource.
(addressbook_load_default_book): ESource adaptation.
(get_prop): folder_uri property -> source_uid property.
(set_prop): folder_uri property -> source_uid property. Find ESource
by UID.
(addressbook_new_control): Set up source_uid property and ESourceList.
* gui/component/component-factory.c (factory): Disable config control.
* gui/component/ldap-config.glade: Druid and notebook dialogs
generalized to deal with local sources as well as LDAP. This file
should probably be renamed...
* gui/component/select-names/e-select-names-manager.c
(load_completion_books): Use addressbook_load_source (). However, this
needs a bit more work to get source UIDs instead of URIs.
* gui/component/select-names/e-select-names.c
(addressbook_model_set_uri): Use addressbook_load_source (). However,
this needs a bit more work to get source UIDs instead of URIs.
svn path=/trunk/; revision=23521
Diffstat (limited to 'addressbook/gui/component/ldap-config.glade')
-rw-r--r-- | addressbook/gui/component/ldap-config.glade | 497 |
1 files changed, 277 insertions, 220 deletions
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 494c34d3ca..d7b5972ad5 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -102,13 +102,19 @@ </child> <child> - <widget class="GtkHSeparator" id="hseparator12"> + <widget class="GtkVBox" id="account-editor-general-ldap-vbox"> <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <placeholder/> + </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -278,7 +284,7 @@ </widget> <widget class="GtkWindow" id="account-druid-window"> - <property name="title" translatable="yes">Add LDAP Server</property> + <property name="title" translatable="yes">New Addressbook</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> @@ -295,7 +301,7 @@ <widget class="GnomeDruidPageEdge" id="druidpagestart1"> <property name="visible">True</property> <property name="position">GNOME_EDGE_START</property> - <property name="title" translatable="yes">LDAP Configuration Assistant</property> + <property name="title" translatable="yes">Addressbook Creation Assistant</property> <property name="text" translatable="yes">This assistant will help you to access online directory services using LDAP (Lightweight Directory Access Protocol) servers. @@ -304,29 +310,28 @@ Adding a new LDAP server requires some specialized information about the server. </child> <child> - <widget class="GnomeDruidPageStandard" id="add-server-druid-info-page"> + <widget class="GnomeDruidPageStandard" id="add-server-druid-folder-page"> <property name="visible">True</property> - <property name="title" translatable="yes">Step 1: Server Information</property> + <property name="title" translatable="yes">Step 1: Folder Characteristics</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="druid-vbox1"> - <property name="border_width">3</property> + <widget class="GtkVBox" id="druid-vbox6"> + <property name="border_width">16</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">3</property> + <property name="spacing">6</property> <child> - <widget class="GtkVBox" id="account-druid-general-vbox"> + <widget class="GtkVBox" id="vbox21"> <property name="border_width">6</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label158"> + <widget class="GtkLabel" id="label198"> <property name="visible">True</property> - <property name="label" translatable="yes">The first step in configuring an LDAP server is to provide its name, and your log in -information. Please ask your system administrator if you are unsure of this information.</property> + <property name="label" translatable="yes">Specifying a display name and group is the first step in setting up an addressbook.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -345,13 +350,213 @@ information. Please ask your system administrator if you are unsure of this info </child> <child> - <widget class="GtkHSeparator" id="hseparator2"> + <widget class="GtkHSeparator" id="hseparator5"> + <property name="visible">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="table15"> + <property name="border_width">3</property> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">3</property> + + <child> + <widget class="GtkEntry" id="druid-display-name-entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label199"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Display name:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">druid-display-name-entry</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label555"> + <property name="visible">True</property> + <property name="label" translatable="yes">Group:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkOptionMenu" id="druid-group-option-menu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="history">-1</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkNotebook" id="notebook15"> <property name="visible">True</property> + <property name="show_tabs">False</property> + <property name="show_border">False</property> + <property name="tab_pos">GTK_POS_TOP</property> + <property name="scrollable">False</property> + <property name="enable_popup">False</property> + + <child> + <widget class="GtkLabel" id="label207"> + <property name="visible">True</property> + <property name="label" translatable="yes">This is the name that will appear in your Evolution folder list. It is for display purposes only. </property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label208"> + <property name="visible">True</property> + <property name="label" translatable="yes">label163</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label215"> + <property name="visible">True</property> + <property name="label" translatable="yes">Selecting this option will let you change Evolution's default settings for LDAP +searches, and for creating and editing contacts. </property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label210"> + <property name="visible">True</property> + <property name="label" translatable="yes">label164</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> </packing> </child> </widget> @@ -367,30 +572,29 @@ information. Please ask your system administrator if you are unsure of this info </child> <child> - <widget class="GnomeDruidPageStandard" id="add-server-druid-connecting-page"> + <widget class="GnomeDruidPageStandard" id="add-server-druid-info-page"> <property name="visible">True</property> - <property name="title" translatable="yes">Step 2: Connecting to Server</property> + <property name="title" translatable="yes">Step 2: Server Information</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="druid-vbox2"> + <widget class="GtkVBox" id="druid-vbox1"> <property name="border_width">3</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">3</property> <child> - <widget class="GtkVBox" id="account-druid-connecting-vbox"> + <widget class="GtkVBox" id="account-druid-general-vbox"> <property name="border_width">6</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label174"> + <widget class="GtkLabel" id="label158"> <property name="visible">True</property> - <property name="label" translatable="yes">Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer) -and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect -your connection. Ask your system administrator if your LDAP server uses these protocols.</property> + <property name="label" translatable="yes">You have decided to configure an LDAP server. The first step in doing this is to provide its name and your +log in information. Please ask your system administrator if you are unsure of this information.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -409,7 +613,7 @@ your connection. Ask your system administrator if your LDAP server uses these pr </child> <child> - <widget class="GtkHSeparator" id="hseparator3"> + <widget class="GtkHSeparator" id="hseparator2"> <property name="visible">True</property> </widget> <packing> @@ -431,38 +635,38 @@ your connection. Ask your system administrator if your LDAP server uses these pr </child> <child> - <widget class="GnomeDruidPageStandard" id="add-server-druid-searching-page"> + <widget class="GnomeDruidPageStandard" id="add-server-druid-connecting-page"> <property name="visible">True</property> - <property name="title" translatable="yes">Step 3: Searching the Directory</property> + <property name="title" translatable="yes">Step 3: Connecting to Server</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox23"> + <widget class="GtkVBox" id="druid-vbox2"> <property name="border_width">3</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">3</property> <child> - <widget class="GtkVBox" id="account-druid-searching-vbox"> + <widget class="GtkVBox" id="account-druid-connecting-vbox"> <property name="border_width">6</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label254"> + <widget class="GtkLabel" id="label174"> <property name="visible">True</property> - <property name="label" translatable="yes">The options on this page control how many entries should be included in your -searches, and how long a search should take. Ask your system administrator if you -need to change these options.</property> + <property name="label" translatable="yes">Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer) +and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect +your connection. Ask your system administrator if your LDAP server uses these protocols.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">7.45058e-09</property> <property name="yalign">0.5</property> - <property name="xpad">0</property> + <property name="xpad">3</property> <property name="ypad">0</property> </widget> <packing> @@ -473,7 +677,7 @@ need to change these options.</property> </child> <child> - <widget class="GtkHSeparator" id="hseparator7"> + <widget class="GtkHSeparator" id="hseparator3"> <property name="visible">True</property> </widget> <packing> @@ -495,36 +699,38 @@ need to change these options.</property> </child> <child> - <widget class="GnomeDruidPageStandard" id="add-server-druid-display-name-page"> + <widget class="GnomeDruidPageStandard" id="add-server-druid-searching-page"> <property name="visible">True</property> - <property name="title" translatable="yes">Step 4: Display Name</property> + <property name="title" translatable="yes">Step 4: Searching the Directory</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="druid-vbox5"> + <widget class="GtkVBox" id="vbox23"> <property name="border_width">3</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">3</property> <child> - <widget class="GtkVBox" id="vbox21"> + <widget class="GtkVBox" id="account-druid-searching-vbox"> <property name="border_width">6</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label198"> + <widget class="GtkLabel" id="label254"> <property name="visible">True</property> - <property name="label" translatable="yes">Specifying a display name is the last required step in configuring an LDAP server.</property> + <property name="label" translatable="yes">The options on this page control how many entries should be included in your +searches, and how long a search should take. Ask your system administrator if you +need to change these options.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">7.45058e-09</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> - <property name="xpad">3</property> + <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> @@ -535,7 +741,7 @@ need to change these options.</property> </child> <child> - <widget class="GtkHSeparator" id="hseparator5"> + <widget class="GtkHSeparator" id="hseparator7"> <property name="visible">True</property> </widget> <packing> @@ -544,167 +750,6 @@ need to change these options.</property> <property name="fill">False</property> </packing> </child> - - <child> - <widget class="GtkTable" id="table15"> - <property name="border_width">3</property> - <property name="visible">True</property> - <property name="n_rows">1</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">3</property> - - <child> - <widget class="GtkEntry" id="druid-display-name-entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label199"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Display name:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">druid-display-name-entry</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkNotebook" id="notebook15"> - <property name="visible">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkLabel" id="label207"> - <property name="visible">True</property> - <property name="label" translatable="yes">This is the name for this server that will appear in your Evolution folder list. -It is for display purposes only. </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label208"> - <property name="visible">True</property> - <property name="label" translatable="yes">label163</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label215"> - <property name="visible">True</property> - <property name="label" translatable="yes">Selecting this option will let you change Evolution's default settings for LDAP -searches, and for creating and editing contacts. </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label210"> - <property name="visible">True</property> - <property name="label" translatable="yes">label164</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> </widget> <packing> <property name="padding">0</property> @@ -722,8 +767,7 @@ searches, and for creating and editing contacts. </property> <property name="visible">True</property> <property name="position">GNOME_EDGE_FINISH</property> <property name="title" translatable="yes">Finished</property> - <property name="text" translatable="yes">Congratulations, you are finished setting up this LDAP server. You -are now ready to access this directory. + <property name="text" translatable="yes">Congratulations, you are finished setting up this addressbook. Please click the "Finish" button to save the settings you have entered here.</property> </widget> @@ -983,7 +1027,7 @@ Please click the "Finish" button to save the settings you have entered <widget class="GtkTable" id="table36"> <property name="border_width">6</property> <property name="visible">True</property> - <property name="n_rows">3</property> + <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> @@ -1007,8 +1051,8 @@ Please click the "Finish" button to save the settings you have entered <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -1031,8 +1075,8 @@ Please click the "Finish" button to save the settings you have entered <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -1054,8 +1098,8 @@ Please click the "Finish" button to save the settings you have entered <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -1109,8 +1153,8 @@ Please click the "Finish" button to save the settings you have entered <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> @@ -1206,8 +1250,8 @@ Please click the "Finish" button to save the settings you have entered <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options">fill</property> </packing> @@ -1300,12 +1344,25 @@ Please click the "Finish" button to save the settings you have entered <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options">fill</property> </packing> </child> + + <child> + <widget class="GtkHSeparator" id="hseparator12"> + <property name="visible">True</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> |