diff options
author | Chris Toshok <toshok@ximian.com> | 2004-06-22 05:49:01 +0800 |
---|---|---|
committer | Chris Toshok <toshok@src.gnome.org> | 2004-06-22 05:49:01 +0800 |
commit | 3f4b0efb112cdc935ababe0647b0a4906a1d4748 (patch) | |
tree | 57b755876c9df1d0f5b6114b6bdf90418275afaf /addressbook/gui/component/ldap-config.glade | |
parent | 176a9fed3f97941eebbb56e6cd2a8d977e084ad4 (diff) | |
download | gsoc2013-evolution-3f4b0efb112cdc935ababe0647b0a4906a1d4748.tar gsoc2013-evolution-3f4b0efb112cdc935ababe0647b0a4906a1d4748.tar.gz gsoc2013-evolution-3f4b0efb112cdc935ababe0647b0a4906a1d4748.tar.bz2 gsoc2013-evolution-3f4b0efb112cdc935ababe0647b0a4906a1d4748.tar.lz gsoc2013-evolution-3f4b0efb112cdc935ababe0647b0a4906a1d4748.tar.xz gsoc2013-evolution-3f4b0efb112cdc935ababe0647b0a4906a1d4748.tar.zst gsoc2013-evolution-3f4b0efb112cdc935ababe0647b0a4906a1d4748.zip |
remove the auth-entry-notebook in the edit dialog, and rename the auth
2004-06-21 Chris Toshok <toshok@ximian.com>
* gui/component/ldap-config.glade: remove the auth-entry-notebook
in the edit dialog, and rename the auth entry to... auth-entry.
* gui/component/addressbook-config.c (source_to_dialog_new): nuke
- it's identical to source_to_dialog.
(dialog_to_source): we only have one auth entry now. fill it in
properly.
(source_to_dialog): fill in the auth entry properly based on the
auth type, and remove auth_entry_notebook references.
(auth_optionmenu_activated): remove auth_entry_notebook
references.
(setup_general_tab): same, and use auth-entry instead of
email-entry/dn-entry.
(general_tab_check): use auth_principle instead of email/binddn.
(add_folder_modify): same.
(addressbook_add_server_dialog): put setup_connecting_tab inside
the ifdef HAVE_LDAP, and call source_to_dialog instead of
source_to_dialog_new.
(addressbook_config_edit_source): always call setup_general_tab.
* gui/component/addressbook-config.h (AddressbookLDAPScopeType):
reorder to match order in option menu (we should really remove
BASE altogether.. it's useless for searching.)
* gui/component/addressbook-view.c (update_command_state):
macroize this, annoying seeing the same 4 lines repeated 15 times.
svn path=/trunk/; revision=26445
Diffstat (limited to 'addressbook/gui/component/ldap-config.glade')
-rw-r--r-- | addressbook/gui/component/ldap-config.glade | 157 |
1 files changed, 59 insertions, 98 deletions
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 326bfb5cc3..fa4c6d2734 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -10,6 +10,11 @@ <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkVBox" id=""> @@ -495,7 +500,7 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">email-entry</property> + <property name="mnemonic_widget">auth-entry</property> </widget> <packing> <property name="left_attach">0</property> @@ -508,7 +513,7 @@ </child> <child> - <widget class="GtkEntry" id="email-entry"> + <widget class="GtkEntry" id="auth-entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">True</property> @@ -727,6 +732,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment13"> @@ -735,6 +741,10 @@ <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox16"> @@ -1202,6 +1212,7 @@ <property name="label">gtk-cancel</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -1211,6 +1222,7 @@ <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment12"> @@ -1219,6 +1231,10 @@ <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox14"> @@ -1288,6 +1304,11 @@ <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="has_separator">False</property> <child internal-child="vbox"> @@ -1309,6 +1330,7 @@ <property name="label">gtk-cancel</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="response_id">-6</property> </widget> </child> @@ -1321,6 +1343,7 @@ <property name="label">gtk-ok</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="response_id">-5</property> </widget> </child> @@ -1841,7 +1864,6 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">email-entry</property> </widget> <packing> <property name="left_attach">0</property> @@ -1854,101 +1876,6 @@ </child> <child> - <widget class="GtkNotebook" id="auth-entry-notebook"> - <property name="visible">True</property> - <property name="sensitive">False</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="GtkEntry" id="email-entry"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Evolution will use this email address to authenticate you with the server.</property> - <property name="can_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="tab_expand">True</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label549"> - <property name="visible">True</property> - <property name="label" translatable="yes">label549</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="GtkEntry" id="dn-entry"> - <property name="visible">True</property> - <property name="can_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="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label550"> - <property name="visible">True</property> - <property name="label" translatable="yes">label550</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="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">expand|shrink|fill</property> - <property name="y_options">shrink|fill</property> - </packing> - </child> - - <child> <widget class="GtkOptionMenu" id="auth-optionmenu"> <property name="visible">True</property> <property name="tooltip" translatable="yes">This is the method evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your ldap server.</property> @@ -1994,6 +1921,28 @@ <property name="y_options">shrink</property> </packing> </child> + + <child> + <widget class="GtkEntry" id="auth-entry"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Evolution will use this email address to authenticate you with the server.</property> + <property name="can_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> </widget> <packing> <property name="padding">0</property> @@ -2256,6 +2205,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment61"> @@ -2264,6 +2214,10 @@ <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox126"> @@ -2650,6 +2604,11 @@ <property name="default_height">200</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="has_separator">False</property> <child internal-child="vbox"> @@ -2671,6 +2630,7 @@ <property name="label">gtk-cancel</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="response_id">-6</property> </widget> </child> @@ -2683,6 +2643,7 @@ <property name="label">gtk-ok</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="response_id">-5</property> </widget> </child> |