Re: [evolution-patches] Patches for mail related a11y
- From: Mengjie Yu <Meng-Jie Yu Sun COM>
- To: Not Zed <notzed ximian com>
- Cc: patches <evolution-patches lists ximian com>
- Subject: Re: [evolution-patches] Patches for mail related a11y
- Date: Tue, 02 Nov 2004 15:01:15 +0800
Hi, Not Zed
Thanks a lot about your review.
I have edited the code as your proposal, here they are.
Regards
Mengjie Yu
On Tue, 2004-11-02 at 13:58, Not Zed wrote:
> Hi,
>
> I've only had a quick look, but anything like this:
>
> On Tue, 2004-11-02 at 12:24 +0800, Mengjie Yu wrote:
> > - w = g_object_new(gtk_check_button_get_type(),
> > - "label", text,
> > - "active", camel_url_get_param(url, name) !=
> > NULL,
> > - NULL);
> > + w = gtk_check_button_new_with_mnemonic (text);
> > + g_object_set_data ((GObject *)w, "active",
> > camel_url_get_param(url, name) != NULL);
>
> Is incorrect.
>
> first you should use g_object_set not g_object_set_data if you want to
> do that. But instead, since its already got a list of set values,
> just do:
>
> g_object_new(gtk_check_button_get_type(),
> "label", text,
> "use_underline", TRUE,
> ettc.
>
> i.e. just add the "use_underline", TRUE to the list of arguments.
>
> Since that'll require at least one new patch, i'll await that for
> review.
>
> Cheers,
> Michael
> --
>
> Michael Zucchi <notzed ximian com>
> "I'm stuck in a reality I can't
> imagine could be real."
> Novell's Evolution and Free
> Software Developer
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3487
diff -u -p -r1.3487 ChangeLog
--- ChangeLog 28 Oct 2004 09:25:26 -0000 1.3487
+++ ChangeLog 2 Nov 2004 06:48:54 -0000
@@ -1,3 +1,17 @@
+2004-11-02 mengjie yu <meng-jie yu sun com>
+
+ * em-account-editor.c: (emae_option_toggle),
+ (emae_receive_options_item):add mnemonic for buttons.
+ * em-format-html-display.c: (efhd_attachment_button):add atk name
+ for the popup button.
+ * mail-account-gui.c: (mail_account_gui_build_extra_conf):add
+ access key for chechbox.
+ * mail-config.glade: add mnemonic for buttons, checkboxes, etc.
+ * mail-dialogs.glade:add mnemonic for buttons, checkboxes, etc.
+ * message-list.c: (message_list_construct):add a atk name for the
+ message list
+ * message-tags.glade:add mnemonic for buttons, checkboxes, etc.
+
2004-10-28 Not Zed <NotZed Ximian com>
* mail-folder-cache.c (real_flush_updates):
Index: em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.7
diff -u -p -r1.7 em-account-editor.c
--- em-account-editor.c 28 Oct 2004 09:25:26 -0000 1.7
+++ em-account-editor.c 2 Nov 2004 06:49:06 -0000
@@ -1642,6 +1642,7 @@ emae_option_toggle(EMAccountEditorServic
w = g_object_new(gtk_check_button_get_type(),
"label", text,
"active", camel_url_get_param(url, name) != NULL,
+ "use_underline", TRUE,
NULL);
g_object_set_data((GObject *)w, "option-name", (void *)name);
g_signal_connect(w, "toggled", G_CALLBACK(emae_option_toggle_changed), service);
@@ -1785,7 +1786,7 @@ emae_receive_options_item(EConfig *ec, E
row = ((GtkTable *)parent)->nrows;
box = gtk_hbox_new(FALSE, 4);
- w = gtk_check_button_new_with_label(_("Automatically check for _new mail every"));
+ w = gtk_check_button_new_with_mnemonic(_("Automatically check for _new mail every"));
emae_account_toggle_widget(emae, (GtkToggleButton *)w, E_ACCOUNT_SOURCE_AUTO_CHECK);
gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0);
@@ -2067,7 +2068,7 @@ static EMConfigItem emae_editor_items[]
{ E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade },
/* Most sections for this is auto-generated fromt the camel config */
- { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), },
+ { E_CONFIG_PAGE, "20.receive_options", N_("Receiving O_ptions"), },
{ E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Mail"), },
{ E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
@@ -2145,7 +2146,7 @@ static EMConfigItem emae_druid_items[] =
{ E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade },
/* Most sections for this is auto-generated fromt the camel config */
- { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), },
+ { E_CONFIG_PAGE, "20.receive_options", N_("Receiving O_ptions"), },
{ E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Mail"), },
{ E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
Index: em-format-html-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
retrieving revision 1.56
diff -u -p -r1.56 em-format-html-display.c
--- em-format-html-display.c 28 Oct 2004 09:25:26 -0000 1.56
+++ em-format-html-display.c 2 Nov 2004 06:49:08 -0000
@@ -1296,6 +1296,11 @@ efhd_attachment_button(EMFormatHTML *efh
button = gtk_button_new();
/*GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);*/
gtk_container_add((GtkContainer *)button, gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+
+ AtkObject *a11y = gtk_widget_get_accessible (button);
+ atk_object_set_name (a11y, _("Attachment Button"));
+
+
g_signal_connect(button, "button_press_event", G_CALLBACK(efhd_attachment_popup), info);
g_signal_connect(button, "popup_menu", G_CALLBACK(efhd_attachment_popup_menu), info);
g_signal_connect(button, "clicked", G_CALLBACK(efhd_attachment_popup_menu), info);
Index: mail-account-gui.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-account-gui.c,v
retrieving revision 1.175
diff -u -p -r1.175 mail-account-gui.c
--- mail-account-gui.c 8 Oct 2004 15:56:18 -0000 1.175
+++ mail-account-gui.c 2 Nov 2004 06:49:15 -0000
@@ -1091,7 +1091,7 @@ mail_account_gui_build_extra_conf (MailA
enable_widget = path_label;
} else {
/* make a new label */
- label = gtk_label_new (entries[i].text);
+ label = gtk_label_new_with_mnemonic (entries[i].text);
gtk_table_resize (cur_table, cur_table->nrows + 1, 2);
gtk_table_attach (cur_table, label, 0, 2, rows, rows + 1,
GTK_EXPAND | GTK_FILL, 0, 0, 0);
@@ -1106,7 +1106,7 @@ mail_account_gui_build_extra_conf (MailA
GtkWidget *checkbox;
gboolean active;
- checkbox = gtk_check_button_new_with_label (entries[i].text);
+ checkbox = gtk_check_button_new_with_mnemonic (entries[i].text);
if (url)
active = camel_url_get_param (url, entries[i].name) != NULL;
else
@@ -1143,9 +1143,10 @@ mail_account_gui_build_extra_conf (MailA
entry = path;
} else {
/* make a new text entry with label */
- label = gtk_label_new (entries[i].text);
+ label = gtk_label_new_with_mnemonic (entries[i].text);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
entry = gtk_entry_new ();
+ gtk_label_set_mnemonic_widget (label, entry);
gtk_table_attach (cur_table, label, 0, 1, rows, rows + 1,
GTK_FILL, 0, 0, 0);
@@ -1211,7 +1212,7 @@ mail_account_gui_build_extra_conf (MailA
}
hbox = gtk_hbox_new (FALSE, 0);
- checkbox = gtk_check_button_new_with_label (pre);
+ checkbox = gtk_check_button_new_with_mnemonic (pre);
g_free (pre);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), enable);
adj = gtk_adjustment_new (def, min, max, 1, 1, 1);
Index: mail-config.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.glade,v
retrieving revision 1.152
diff -u -p -r1.152 mail-config.glade
--- mail-config.glade 27 Sep 2004 18:45:15 -0000 1.152
+++ mail-config.glade 2 Nov 2004 06:50:37 -0000
@@ -346,7 +346,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="management_name_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Name:</property>
+ <property name="label" translatable="yes">N_ame:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -517,7 +517,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="identity_address_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Email _Address:</property>
+ <property name="label" translatable="yes">Email A_ddress:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -680,7 +680,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="sigLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">Signat_ure:</property>
+ <property name="label" translatable="yes">_Signature:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -847,7 +847,7 @@ For example: "Work" or "P
<widget class="GtkCheckButton" id="management_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Make this my default account</property>
+ <property name="label" translatable="yes">Make this my defa_ult account</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -895,7 +895,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="label31">
<property name="visible">True</property>
- <property name="label" translatable="yes">Identity</property>
+ <property name="label" translatable="yes">_Identity</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -936,7 +936,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="source_type_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Server _Type: </property>
+ <property name="label" translatable="yes">Ser_ver Type: </property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -1583,7 +1583,7 @@ For example: "Work" or "P
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Note: you will not be prompted for a password until you connect for the first time</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Re_member password</property>
+ <property name="label" translatable="yes">Remember pass_word</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -1635,7 +1635,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="label33">
<property name="visible">True</property>
- <property name="label" translatable="yes">Receiving Email</property>
+ <property name="label" translatable="yes">Re_ceiving Email</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1676,7 +1676,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="transport_type_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Server _Type: </property>
+ <property name="label" translatable="yes">Ser_ver Type: </property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -1922,7 +1922,7 @@ For example: "Work" or "P
<widget class="GtkCheckButton" id="transport_needs_auth">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Ser_ver requires authentication</property>
+ <property name="label" translatable="yes">Server _requires authentication</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -2229,7 +2229,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="transport_auth_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">T_ype: </property>
+ <property name="label" translatable="yes">Ty_pe: </property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -2365,7 +2365,7 @@ For example: "Work" or "P
<widget class="GtkCheckButton" id="transport_remember_password">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Remember _password</property>
+ <property name="label" translatable="yes">Remember pass_word</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -2432,7 +2432,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="label" translatable="yes">Sending Mail</property>
+ <property name="label" translatable="yes">Sending _Mail</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -2561,7 +2561,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="sent_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Sent _Messages Folder:</property>
+ <property name="label" translatable="yes">Sent Messages F_older:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3064,7 +3064,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="label" translatable="yes">Defaults</property>
+ <property name="label" translatable="yes">Defaul_ts</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -3233,7 +3233,7 @@ For example: "Work" or "P
<widget class="GtkCheckButton" id="pgp_no_imip_sign">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Don't sign _meeting requests (for Outlook compatibility)</property>
+ <property name="label" translatable="yes">Don't sign meeting re_quests (for Outlook compatibility)</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3271,7 +3271,7 @@ For example: "Work" or "P
<widget class="GtkCheckButton" id="pgp_always_trust">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</property>
+ <property name="label" translatable="yes">Always trust keys i_n my keyring when encrypting</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3424,7 +3424,7 @@ For example: "Work" or "P
<widget class="GtkCheckButton" id="smime_encrypt_to_self">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">A_lso encrypt to self when sending encrypted mail</property>
+ <property name="label" translatable="yes">Also encrypt t_o self when sending encrypted mail</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3446,7 +3446,7 @@ For example: "Work" or "P
<widget class="GtkCheckButton" id="smime_encrypt_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Encrypt outgoing messages (by default)</property>
+ <property name="label" translatable="yes">Encrypt o_utgoing messages (by default)</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3504,7 +3504,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="label470">
<property name="visible">True</property>
- <property name="label" translatable="yes">Encry_ption certificate:</property>
+ <property name="label" translatable="yes">Encryption certi_ficate:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3602,7 +3602,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="button98">
<property name="visible">True</property>
- <property name="label" translatable="yes">Select...</property>
+ <property name="label" translatable="yes">Se_lect...</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3635,10 +3635,68 @@ For example: "Work" or "P
<widget class="GtkButton" id="smime_encrypt_key_clear">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment35">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <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="hbox230">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image10">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ <property name="icon_size">4</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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label577">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Clea_r</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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -3708,7 +3766,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="label472">
<property name="visible">True</property>
- <property name="label" translatable="yes">Select...</property>
+ <property name="label" translatable="yes">S_elect...</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3741,10 +3799,68 @@ For example: "Work" or "P
<widget class="GtkButton" id="smime_sign_key_clear">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment34">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <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="hbox229">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ <property name="icon_size">4</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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label576">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cle_ar</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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -3793,7 +3909,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="lblSecurity">
<property name="visible">True</property>
- <property name="label" translatable="yes">Security</property>
+ <property name="label" translatable="yes">Securit_y</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -4969,7 +5085,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="lblGeneral">
<property name="visible">True</property>
- <property name="label" translatable="yes">General</property>
+ <property name="label" translatable="yes">_General</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -5247,7 +5363,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="lblHtmlMail">
<property name="visible">True</property>
- <property name="label" translatable="yes">HTML Mail</property>
+ <property name="label" translatable="yes">HTML Ma_il</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -5542,10 +5658,68 @@ For example: "Work" or "P
<widget class="GtkButton" id="cmdRestoreLabels">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-revert-to-saved</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment36">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <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="hbox231">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image11">
+ <property name="visible">True</property>
+ <property name="stock">gtk-revert-to-saved</property>
+ <property name="icon_size">4</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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label578">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Re_vert</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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -5587,7 +5761,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="lblColours">
<property name="visible">True</property>
- <property name="label" translatable="yes">Colors</property>
+ <property name="label" translatable="yes">_Colors</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -5745,10 +5919,68 @@ For example: "Work" or "P
<widget class="GtkButton" id="cmdHeadersRemove">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment37">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <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="hbox232">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image12">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon_size">4</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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label579">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Re_move</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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -5780,7 +6012,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="lblHeaders">
<property name="visible">True</property>
- <property name="label" translatable="yes">Headers</property>
+ <property name="label" translatable="yes">Heade_rs</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5889,7 +6121,7 @@ For example: "Work" or "P
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Checks incoming mail messages to be Junk</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Check _incoming mail for junk</property>
+ <property name="label" translatable="yes">C_heck incoming mail for junk</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -6089,7 +6321,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="label473">
<property name="visible">True</property>
- <property name="label" translatable="yes">Junk</property>
+ <property name="label" translatable="yes">_Junk</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6476,7 +6708,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="lblCharset">
<property name="visible">True</property>
- <property name="label" translatable="yes">C_haracter set:</property>
+ <property name="label" translatable="yes">Charac_ter set:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6666,7 +6898,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="lblGeneral">
<property name="visible">True</property>
- <property name="label" translatable="yes">General</property>
+ <property name="label" translatable="yes">_General</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -7092,7 +7324,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="lblSignatures">
<property name="visible">True</property>
- <property name="label" translatable="yes">Signatures</property>
+ <property name="label" translatable="yes">Sig_natures</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -7504,7 +7736,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="label450">
<property name="visible">True</property>
- <property name="label" translatable="yes">Spell Checking</property>
+ <property name="label" translatable="yes">Spell _Checking</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
Index: mail-dialogs.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-dialogs.glade,v
retrieving revision 1.2
diff -u -p -r1.2 mail-dialogs.glade
--- mail-dialogs.glade 20 Sep 2004 05:59:55 -0000 1.2
+++ mail-dialogs.glade 2 Nov 2004 06:50:42 -0000
@@ -13,6 +13,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_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -34,6 +39,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>
@@ -46,6 +52,7 @@
<property name="label">gtk-find</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">-3</property>
</widget>
</child>
@@ -59,104 +66,106 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox1">
- <property name="border_width">6</property>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="border_width">6</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">12</property>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Find:</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="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="search_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="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</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="GtkLabel" id="search_matches_label">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">F_ind:</property>
+ <property name="use_underline">True</property>
<property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">search_entry</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="search_case_check">
+ <widget class="GtkEntry" id="search_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Case Sensitive</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">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="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>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="search_matches_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></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">1</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="search_case_check">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">C_ase Sensitive</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
@@ -176,6 +185,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_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -197,6 +211,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>
@@ -229,15 +244,15 @@
<child>
<widget class="GtkVBox" id="frame5">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
- <child>
+ <child>
<widget class="GtkLabel" id="label464">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold">Digital Signature</span></property>
- <property name="use_underline">False</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span weight="bold">D_igital Signature</span></property>
+ <property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
@@ -262,44 +277,44 @@
<child>
<widget class="GtkLabel" id="label465">
- <property name="visible">True</property>
+ <property name="visible">True</property>
<property name="label" translatable="yes"></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="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">12</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- </packing>
- </child>
+ </packing>
+ </child>
- <child>
+ <child>
<widget class="GtkTable" id="table10">
- <property name="visible">True</property>
+ <property name="visible">True</property>
<property name="n_rows">1</property>
<property name="n_columns">1</property>
<property name="homogeneous">False</property>
<property name="row_spacing">2</property>
<property name="column_spacing">6</property>
- <child>
+ <child>
<widget class="GtkVBox" id="signature_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
- <child>
- <placeholder/>
- </child>
- </widget>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
@@ -338,8 +353,8 @@
<child>
<widget class="GtkLabel" id="label477">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold">Encryption</span></property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes"><span weight="bold">_Encryption</span></property>
+ <property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
@@ -366,17 +381,17 @@
<widget class="GtkLabel" id="label478">
<property name="visible">True</property>
<property name="label" translatable="yes"></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="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">12</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -407,17 +422,17 @@
<property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -440,8 +455,8 @@
<child>
<widget class="GtkLabel" id="label473">
<property name="visible">True</property>
- <property name="label" translatable="yes">Summary</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">_Summary</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>
@@ -463,8 +478,8 @@
<child>
<widget class="GtkLabel" id="label474">
<property name="visible">True</property>
- <property name="label" translatable="yes">Details</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">_Details</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>
@@ -498,6 +513,11 @@
<property name="default_height">400</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_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -519,6 +539,7 @@
<property name="label">gtk-refresh</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">0</property>
</widget>
</child>
@@ -531,6 +552,7 @@
<property name="label">gtk-close</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">-7</property>
</widget>
</child>
@@ -646,6 +668,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="alignment1">
@@ -654,6 +677,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="hbox3">
@@ -711,6 +738,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="alignment2">
@@ -719,6 +747,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="hbox4">
@@ -803,6 +835,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_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -824,6 +861,7 @@
<property name="label">gtk-no</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>
@@ -834,6 +872,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>
<property name="response_id">-3</property>
<child>
@@ -843,6 +882,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="hbox1">
@@ -870,7 +913,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Accept License</property>
+ <property name="label" translatable="yes">_Accept License</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -948,6 +991,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
+ <property name="overwrite">False</property>
+ <property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_NONE</property>
<property name="cursor_visible">True</property>
@@ -972,9 +1017,10 @@
<widget class="GtkCheckButton" id="license_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Tick this to accept the license agreement</property>
+ <property name="label" translatable="yes">_Tick this to accept the license agreement</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1004,6 +1050,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_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -1025,6 +1076,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">0</property>
</widget>
</child>
@@ -1037,6 +1089,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">0</property>
</widget>
</child>
@@ -1067,9 +1120,9 @@
<property name="visible">True</property>
<property name="creation_function">e_create_image_widget</property>
<property name="string1">stock_mail-flag-for-followup</property>
- <property name="string2"></property>
<property name="int1">0</property>
<property name="int2">0</property>
+ <property name="last_modification_time">Thu, 28 Oct 2004 06:20:22 GMT</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1195,9 +1248,68 @@ Please select a follow up action from th
<widget class="GtkButton" id="clear">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <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="hbox172">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ <property name="icon_size">4</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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label479">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">C_lear</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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -1291,9 +1403,10 @@ Please select a follow up action from th
<widget class="GtkCheckButton" id="completed">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">C_ompleted</property>
+ <property name="label" translatable="yes">Co_mpleted</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1334,6 +1447,11 @@ Please select a follow up action from th
<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_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -1355,6 +1473,7 @@ Please select a follow up action from th
<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>
@@ -1367,6 +1486,7 @@ Please select a follow up action from th
<property name="label">gtk-apply</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">0</property>
</widget>
</child>
@@ -1379,6 +1499,7 @@ Please select a follow up action from th
<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>
@@ -1541,9 +1662,68 @@ Please select a follow up action from th
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <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="hbox173">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">4</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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label480">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">A_dd</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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -1555,6 +1735,7 @@ Please select a follow up action from th
<property name="label">gtk-remove</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
</widget>
</child>
</widget>
Index: message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.402
diff -u -p -r1.402 message-list.c
--- message-list.c 20 Oct 2004 03:02:25 -0000 1.402
+++ message-list.c 2 Nov 2004 06:51:01 -0000
@@ -1992,6 +1992,7 @@ message_list_class_init (MessageListClas
static void
message_list_construct (MessageList *message_list)
{
+ AtkObject *a11y;
gboolean construct_failed;
message_list->model =
e_tree_memory_callbacks_new (ml_tree_icon_at,
@@ -2033,6 +2034,11 @@ message_list_construct (MessageList *mes
if (!construct_failed)
e_tree_root_node_set_visible (message_list->tree, FALSE);
+ if (atk_get_root () != NULL) {
+ a11y = gtk_widget_get_accessible (message_list->tree);
+ atk_object_set_name (a11y, _("Message List"));
+ }
+
g_signal_connect((message_list->tree), "cursor_activated",
G_CALLBACK (on_cursor_activated_cmd),
message_list);
Index: message-tags.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-tags.glade,v
retrieving revision 1.9
diff -u -p -r1.9 message-tags.glade
--- message-tags.glade 19 May 2004 21:16:44 -0000 1.9
+++ message-tags.glade 2 Nov 2004 06:51:04 -0000
@@ -11,6 +11,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_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -32,6 +37,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">0</property>
</widget>
</child>
@@ -44,6 +50,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">0</property>
</widget>
</child>
@@ -74,9 +81,9 @@
<property name="visible">True</property>
<property name="creation_function">e_create_image_widget</property>
<property name="string1">stock_mail-flag-for-followup</property>
- <property name="string2"></property>
<property name="int1">0</property>
<property name="int2">0</property>
+ <property name="last_modification_time">Sat, 30 Oct 2004 10:04:05 GMT</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -202,9 +209,68 @@ Please select a follow up action from th
<widget class="GtkButton" id="clear">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <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="hbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ <property name="icon_size">4</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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">C_lear</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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -298,9 +364,10 @@ Please select a follow up action from th
<widget class="GtkCheckButton" id="completed">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">C_ompleted</property>
+ <property name="label" translatable="yes">Co_mpleted</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.496
diff -u -p -r1.496 ChangeLog
--- ChangeLog 28 Oct 2004 04:05:31 -0000 1.496
+++ ChangeLog 2 Nov 2004 03:42:01 -0000
@@ -1,3 +1,8 @@
+2004-11-02 mengjie yu <meng-jie yu sun com>
+
+ * e-config.c: (ec_rebuild):add mnemonic for label.
+ * e-passwords.c: (ep_ask_password):add description for password dialog.
+
2004-10-28 Not Zed <NotZed Ximian com>
* e-config.c (ec_rebuild): revert the last change.
Index: e-config.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-config.c,v
retrieving revision 1.8
diff -u -p -r1.8 e-config.c
--- e-config.c 28 Oct 2004 04:05:31 -0000 1.8
+++ e-config.c 2 Nov 2004 03:42:06 -0000
@@ -584,7 +584,7 @@ ec_rebuild(EConfig *emp)
page = ((GnomeDruidPageStandard *)w)->vbox;
connect = TRUE;
} else {
- w = gtk_label_new(item->label);
+ w = gtk_label_new_with_mnemonic (item->label);
gtk_widget_show(w);
page = gtk_vbox_new(FALSE, 12);
gtk_container_set_border_width((GtkContainer *)page, 12);
Index: e-passwords.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-passwords.c,v
retrieving revision 1.22
diff -u -p -r1.22 e-passwords.c
--- e-passwords.c 13 Oct 2004 17:25:37 -0000 1.22
+++ e-passwords.c 2 Nov 2004 03:42:08 -0000
@@ -420,6 +420,7 @@ ep_ask_password(EPassMsg *msg)
GtkWidget *vbox;
int type = msg->flags & E_PASSWORDS_REMEMBER_MASK;
int noreply = msg->noreply;
+ AtkObject *a11y;
msg->noreply = 1;
@@ -442,6 +443,9 @@ ep_ask_password(EPassMsg *msg)
gtk_container_set_border_width((GtkContainer *)vbox, 6);
msg->entry = gtk_entry_new ();
+
+ a11y = gtk_widget_get_accessible (msg->entry);
+ atk_object_set_description (a11y, msg->prompt);
gtk_entry_set_visibility ((GtkEntry *)msg->entry, !(msg->flags & E_PASSWORDS_SECRET));
gtk_entry_set_activates_default((GtkEntry *)msg->entry, TRUE);
gtk_box_pack_start (GTK_BOX (vbox), msg->entry, TRUE, FALSE, 3);
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/filter/ChangeLog,v
retrieving revision 1.417
diff -u -p -r1.417 ChangeLog
--- ChangeLog 12 Aug 2004 20:35:30 -0000 1.417
+++ ChangeLog 2 Nov 2004 03:33:23 -0000
@@ -1,3 +1,7 @@
+2004-10-31 mengjie yu <meng-jie yu sun com>
+
+ * filter-rule.c: (get_widget):add mnemonic widget in search box
+
2004-07-29 Carlos Garnacho Parro <carlosg gnome org>
* filter-file.c: added the "use_filechooser" property to the
Index: filter-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-rule.c,v
retrieving revision 1.64
diff -u -p -r1.64 filter-rule.c
--- filter-rule.c 17 Jun 2004 07:34:07 -0000 1.64
+++ filter-rule.c 2 Nov 2004 03:33:24 -0000
@@ -787,9 +787,10 @@ get_widget (FilterRule *fr, struct _Rule
rule parts need to be a vbox */
vbox = gtk_vbox_new (FALSE, 6);
- label = gtk_label_new (_("Rule name:"));
+ label = gtk_label_new_with_mnemonic (_("_Rule name:"));
name = gtk_entry_new ();
-
+ gtk_label_set_mnemonic_widget (label, name);
+
if (!fr->name) {
fr->name = g_strdup (_("Untitled"));
gtk_entry_set_text (GTK_ENTRY (name), fr->name);
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.2285
diff -u -p -r1.2285 ChangeLog
--- ChangeLog 28 Oct 2004 16:54:44 -0000 1.2285
+++ ChangeLog 2 Nov 2004 04:07:36 -0000
@@ -1,3 +1,7 @@
+2004-11-02 mengjie yu <meng-jie yu sun com>
+
+ * providers/imap/camel-imap-provider.c:add mnemonic for checkboxes.
+
2004-10-28 Jeffrey Stedfast <fejj ximian com>
* providers/imap4/camel-imap4-summary.c (envelope_decode_nstring):
Index: providers/imap/camel-imap-provider.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/imap/camel-imap-provider.c,v
retrieving revision 1.31
diff -u -p -r1.31 camel-imap-provider.c
--- providers/imap/camel-imap-provider.c 20 Sep 2004 05:59:54 -0000 1.31
+++ providers/imap/camel-imap-provider.c 2 Nov 2004 04:07:37 -0000
@@ -43,33 +43,33 @@ CamelProviderConfEntry imap_conf_entries
{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
N_("Checking for New Mail") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,
- N_("Check for new messages in all folders"), "1" },
+ N_("C_heck for new messages in all folders"), "1" },
{ CAMEL_PROVIDER_CONF_SECTION_END },
{ CAMEL_PROVIDER_CONF_SECTION_START, "cmdsection", NULL,
N_("Connection to Server") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "use_command", NULL,
- N_("Use custom command to connect to server"), "0" },
+ N_("_Use custom command to connect to server"), "0" },
{ CAMEL_PROVIDER_CONF_ENTRY, "command", "use_command",
N_("Command:"), "ssh -C -l %u %h exec /usr/sbin/imapd" },
{ CAMEL_PROVIDER_CONF_SECTION_END },
{ CAMEL_PROVIDER_CONF_SECTION_START, "folders", NULL,
N_("Folders") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "use_lsub", NULL,
- N_("Show only subscribed folders"), "1" },
+ N_("_Show only subscribed folders"), "1" },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "override_namespace", NULL,
- N_("Override server-supplied folder namespace"), "0" },
+ N_("O_verride server-supplied folder namespace"), "0" },
{ CAMEL_PROVIDER_CONF_ENTRY, "namespace", "override_namespace",
N_("Namespace") },
{ CAMEL_PROVIDER_CONF_SECTION_END },
{ CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,
- N_("Apply filters to new messages in INBOX on this server"), "0" },
+ N_("_Apply filters to new messages in INBOX on this server"), "0" },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk", NULL,
- N_("Check new messages for Junk contents"), "0" },
+ N_("Check new messages for _Junk contents"), "0" },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk_inbox", "filter_junk",
- N_("Only check for Junk messages in the INBOX folder"), "0" },
+ N_("Only check for Junk messa_ges in the INBOX folder"), "0" },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "offline_sync", NULL,
- N_("Automatically synchronize remote mail locally"), "0" },
+ N_("Automatically synchroni_ze remote mail locally"), "0" },
{ CAMEL_PROVIDER_CONF_SECTION_END },
{ CAMEL_PROVIDER_CONF_END }
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
