aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2004-07-22 10:12:34 +0800
committerChris Toshok <toshok@src.gnome.org>2004-07-22 10:12:34 +0800
commita63a20c74077659aa6559965a9ea7894a64590e9 (patch)
treecdfe7448a84994767efb03aaf09daea56146fdae /addressbook
parent23e97f1bef569a46e277ce5c4a9c8fd0313c00e3 (diff)
downloadgsoc2013-evolution-a63a20c74077659aa6559965a9ea7894a64590e9.tar
gsoc2013-evolution-a63a20c74077659aa6559965a9ea7894a64590e9.tar.gz
gsoc2013-evolution-a63a20c74077659aa6559965a9ea7894a64590e9.tar.bz2
gsoc2013-evolution-a63a20c74077659aa6559965a9ea7894a64590e9.tar.lz
gsoc2013-evolution-a63a20c74077659aa6559965a9ea7894a64590e9.tar.xz
gsoc2013-evolution-a63a20c74077659aa6559965a9ea7894a64590e9.tar.zst
gsoc2013-evolution-a63a20c74077659aa6559965a9ea7894a64590e9.zip
[ fixes #60508 ]
2004-07-21 Chris Toshok <toshok@ximian.com> [ fixes #60508 ] * gui/component/addressbook-config.h: reorder the Scopes so that they match the option menu. * gui/component/ldap-config.glade: change the scope option menu to only display One and Sub, and also set the Login field to Lo_gin in both dialogs. Add accelerators for the details page as well. svn path=/trunk/; revision=26692
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog11
-rw-r--r--addressbook/gui/component/addressbook-config.h2
-rw-r--r--addressbook/gui/component/ldap-config.glade61
3 files changed, 34 insertions, 40 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 4f96d6446e..67f7374ae0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2004-07-21 Chris Toshok <toshok@ximian.com>
+
+ [ fixes #60508 ]
+
+ * gui/component/addressbook-config.h: reorder the Scopes so that
+ they match the option menu.
+
+ * gui/component/ldap-config.glade: change the scope option menu to
+ only display One and Sub, and also set the Login field to Lo_gin
+ in both dialogs. Add accelerators for the details page as well.
+
2004-07-21 Rodney Dawes <dobey@novell.com>
* gui/contact-editor/contact-editor.glade:
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index 9f8259ce49..b5800bc123 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/addressbook/gui/component/addressbook-config.h
@@ -34,9 +34,9 @@ typedef enum {
} AddressbookLDAPAuthType;
typedef enum {
- ADDRESSBOOK_LDAP_SCOPE_BASE,
ADDRESSBOOK_LDAP_SCOPE_ONELEVEL,
ADDRESSBOOK_LDAP_SCOPE_SUBTREE,
+ ADDRESSBOOK_LDAP_SCOPE_BASE,
ADDRESSBOOK_LDAP_SCOPE_LAST
} AddressbookLDAPScopeType;
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
index fa4c6d2734..bc604cf457 100644
--- a/addressbook/gui/component/ldap-config.glade
+++ b/addressbook/gui/component/ldap-config.glade
@@ -490,7 +490,7 @@
<child>
<widget class="GtkLabel" id="label47">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Email address:</property>
+ <property name="label" translatable="yes">Lo_gin:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -661,8 +661,8 @@
<child>
<widget class="GtkLabel" id="label53">
<property name="visible">True</property>
- <property name="label" translatable="yes">Search base:</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">Search _base:</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>
@@ -671,6 +671,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">rootdn-entry</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -685,8 +686,8 @@
<child>
<widget class="GtkLabel" id="label54">
<property name="visible">True</property>
- <property name="label" translatable="yes">Search scope:</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">_Search scope:</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>
@@ -695,6 +696,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">scope-optionmenu</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -814,29 +816,18 @@
<widget class="GtkMenu" id="menu10">
<child>
- <widget class="GtkMenuItem" id="starting_point_only1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Search base only</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_starting_point_only1_activate" last_modification_time="Tue, 30 Mar 2004 19:13:27 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="only_locations_contained_within_the_starting_point1">
+ <widget class="GtkMenuItem" id="one">
<property name="visible">True</property>
- <property name="label" translatable="yes">Only locations within starting point</property>
+ <property name="label" translatable="yes">One</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_only_locations_contained_within_the_starting_point1_activate" last_modification_time="Tue, 30 Mar 2004 19:13:27 GMT"/>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="starting_point_and_locations_within_it1">
+ <widget class="GtkMenuItem" id="sub">
<property name="visible">True</property>
- <property name="label" translatable="yes">Starting point and locations within it</property>
+ <property name="label" translatable="yes">Sub</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_starting_point_and_locations_within_it1_activate" last_modification_time="Tue, 30 Mar 2004 19:13:27 GMT"/>
</widget>
</child>
</widget>
@@ -948,8 +939,8 @@
<child>
<widget class="GtkLabel" id="label58">
<property name="visible">True</property>
- <property name="label" translatable="yes">Timeout:</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">_Timeout:</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>
@@ -958,6 +949,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">timeout-scale</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1071,8 +1063,8 @@
<child>
<widget class="GtkLabel" id="label62">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download limit:</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">_Download limit:</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>
@@ -1081,6 +1073,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">download-limit-spinbutton</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1829,7 +1822,7 @@
<child>
<widget class="GtkLabel" id="label560">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Log in:</property>
+ <property name="label" translatable="yes">_Log in method:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1854,7 +1847,7 @@
<child>
<widget class="GtkLabel" id="label561">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Email address:</property>
+ <property name="label" translatable="yes">Lo_gin:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1864,6 +1857,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">auth-entry</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2138,29 +2132,18 @@
<widget class="GtkMenu" id="menu12">
<child>
- <widget class="GtkMenuItem" id="menuitem6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Search base only</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_starting_point_only1_activate" last_modification_time="Tue, 30 Mar 2004 19:13:27 GMT"/>
- </widget>
- </child>
-
- <child>
<widget class="GtkMenuItem" id="menuitem7">
<property name="visible">True</property>
- <property name="label" translatable="yes">Only locations within starting point</property>
+ <property name="label" translatable="yes">One</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_only_locations_contained_within_the_starting_point1_activate" last_modification_time="Tue, 30 Mar 2004 19:13:27 GMT"/>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="menuitem8">
<property name="visible">True</property>
- <property name="label" translatable="yes">Starting point and locations within it</property>
+ <property name="label" translatable="yes">Sub</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_starting_point_and_locations_within_it1_activate" last_modification_time="Tue, 30 Mar 2004 19:13:27 GMT"/>
</widget>
</child>
</widget>