From f8e8cdd77f31a062f74a3263aaa15fb58b1506b9 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Thu, 9 Feb 2006 17:37:08 +0000 Subject: [PATCH] 2006-02-09 [wwp] 2.0.0cvs40 * src/gtk/about.c * src/compose.c * src/prefs_account.c * src/prefs_gtk.h * src/editaddress.c added mnemonics to notebook widgets (compose, account prefs, about and editaddress), patch by Fabien Vantard (fzzzzz!). Solved some mnemonic conflicts around the Browse buttons in accounts prefs. --- ChangeLog | 11 +++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 12 +++++++++--- src/editaddress.c | 12 ++++++------ src/gtk/about.c | 6 +++--- src/prefs_account.c | 20 ++++++++++---------- src/prefs_gtk.h | 2 +- 8 files changed, 42 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 188959361..83e8eff63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-02-09 [wwp] 2.0.0cvs40 + + * src/gtk/about.c + * src/compose.c + * src/prefs_account.c + * src/prefs_gtk.h + * src/editaddress.c + added mnemonics to notebook widgets (compose, account prefs, about and editaddress), + patch by Fabien Vantard (fzzzzz!). Solved some mnemonic conflicts around the + Browse buttons in accounts prefs. + 2006-02-09 [colin] 2.0.0cvs39 * src/matcher.c diff --git a/PATCHSETS b/PATCHSETS index fceac6d98..781743c8a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1223,3 +1223,4 @@ ( cvs diff -u -r 1.42.2.20 -r 1.42.2.21 po/fr.po; ) > 2.0.0cvs37.patchset ( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/gtk/filesel.c; ) > 2.0.0cvs38.patchset ( cvs diff -u -r 1.75.2.16 -r 1.75.2.17 src/matcher.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtksourceprintjob.c; ) > 2.0.0cvs39.patchset +( cvs diff -u -r 1.4.2.28 -r 1.4.2.29 src/gtk/about.c; cvs diff -u -r 1.382.2.239 -r 1.382.2.240 src/compose.c; cvs diff -u -r 1.105.2.48 -r 1.105.2.49 src/prefs_account.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/prefs_gtk.h; cvs diff -u -r 1.14.2.15 -r 1.14.2.16 src/editaddress.c; ) > 2.0.0cvs40.patchset diff --git a/configure.ac b/configure.ac index 45873b1ce..104596726 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=39 +EXTRA_VERSION=40 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index 3dd00b0d6..b53f4a1ec 100644 --- a/src/compose.c +++ b/src/compose.c @@ -5472,11 +5472,17 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) gtk_widget_show(notebook); /* header labels and entries */ - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_header(compose), gtk_label_new(_("Header"))); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), + compose_create_header(compose), + gtk_label_new_with_mnemonic(_("Hea_der"))); /* attachment list */ - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_attach(compose), gtk_label_new(_("Attachments"))); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), + compose_create_attach(compose), + gtk_label_new_with_mnemonic(_("_Attachments"))); /* Others Tab */ - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_others(compose), gtk_label_new(_("Others"))); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), + compose_create_others(compose), + gtk_label_new_with_mnemonic(_("Othe_rs"))); /* Subject */ subject_hbox = gtk_hbox_new(FALSE, 0); diff --git a/src/editaddress.c b/src/editaddress.c index 24932b640..53823a73f 100644 --- a/src/editaddress.c +++ b/src/editaddress.c @@ -643,7 +643,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) { gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox ); gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH ); - label = gtk_label_new( pageLbl ); + label = gtk_label_new_with_mnemonic( pageLbl ); gtk_widget_show( label ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( personeditdlg.notebook ), @@ -765,7 +765,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) { gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox ); gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH ); - label = gtk_label_new( pageLbl ); + label = gtk_label_new_with_mnemonic( pageLbl ); gtk_widget_show( label ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( personeditdlg.notebook ), @@ -958,7 +958,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox ); gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH ); - label = gtk_label_new( pageLbl ); + label = gtk_label_new_with_mnemonic( pageLbl ); gtk_widget_show( label ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( personeditdlg.notebook ), @@ -1067,9 +1067,9 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) static void addressbook_edit_person_create( gboolean *cancelled ) { addressbook_edit_person_dialog_create( cancelled ); - addressbook_edit_person_page_basic( PAGE_BASIC, _( "User Data" ) ); - addressbook_edit_person_page_email( PAGE_EMAIL, _( "Email Addresses" ) ); - addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "Other Attributes" ) ); + addressbook_edit_person_page_basic( PAGE_BASIC, _( "_User Data" ) ); + addressbook_edit_person_page_email( PAGE_EMAIL, _( "_Email Addresses" ) ); + addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "O_ther Attributes" ) ); gtk_widget_show_all( personeditdlg.window ); } diff --git a/src/gtk/about.c b/src/gtk/about.c index 21f94bdcc..d7d3e730c 100644 --- a/src/gtk/about.c +++ b/src/gtk/about.c @@ -319,7 +319,7 @@ static void about_create(void) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolledwin, - gtk_label_new(_("Info"))); + gtk_label_new_with_mnemonic(_("_Info"))); scrolledwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin), @@ -468,7 +468,7 @@ static void about_create(void) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolledwin, - gtk_label_new(_("Authors"))); + gtk_label_new_with_mnemonic(_("_Authors"))); scrolledwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin), @@ -530,7 +530,7 @@ static void about_create(void) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolledwin, - gtk_label_new(_("License"))); + gtk_label_new_with_mnemonic(_("_License"))); gtk_box_pack_start(GTK_BOX(vbox1), notebook, TRUE, TRUE, 0); diff --git a/src/prefs_account.c b/src/prefs_account.c index cde192257..6e08dc2d8 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -1008,21 +1008,21 @@ static void prefs_account_create(void) /* create all widgets on notebook */ prefs_account_basic_create(); - SET_NOTEBOOK_LABEL(notebook, _("Basic"), page++); + SET_NOTEBOOK_LABEL(notebook, _("_Basic"), page++); prefs_account_receive_create(); - SET_NOTEBOOK_LABEL(notebook, _("Receive"), page++); + SET_NOTEBOOK_LABEL(notebook, _("_Receive"), page++); prefs_account_send_create(); - SET_NOTEBOOK_LABEL(notebook, _("Send"), page++); + SET_NOTEBOOK_LABEL(notebook, _("_Send"), page++); prefs_account_compose_create(); - SET_NOTEBOOK_LABEL(notebook, _("Compose"), page++); + SET_NOTEBOOK_LABEL(notebook, _("Co_mpose"), page++); prefs_account_privacy_create(); - SET_NOTEBOOK_LABEL(notebook, _("Privacy"), page++); + SET_NOTEBOOK_LABEL(notebook, _("_Privacy"), page++); #if USE_OPENSSL prefs_account_ssl_create(); - SET_NOTEBOOK_LABEL(notebook, _("SSL"), page++); + SET_NOTEBOOK_LABEL(notebook, _("SS_L"), page++); #endif /* USE_OPENSSL */ prefs_account_advanced_create(); - SET_NOTEBOOK_LABEL(notebook, _("Advanced"), page++); + SET_NOTEBOOK_LABEL(notebook, _("A_dvanced"), page++); prefs_account_fix_size(); } @@ -1425,7 +1425,7 @@ static void prefs_account_receive_create(void) gtk_widget_set_size_request (local_inbox_entry, DEFAULT_ENTRY_WIDTH, -1); gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_entry, TRUE, TRUE, 0); - local_inbox_btn = gtkut_get_browse_file_btn(_("_Browse")); + local_inbox_btn = gtkut_get_browse_file_btn(_("Bro_wse")); gtk_widget_show (local_inbox_btn); gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), local_inbox_btn, _("Unfiltered messages will be stored in this folder"), @@ -1520,7 +1520,7 @@ static void prefs_account_receive_create(void) gtk_widget_set_size_request (inbox_entry, DEFAULT_ENTRY_WIDTH, -1); gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0); - inbox_btn = gtkut_get_browse_file_btn(_("_Browse")); + inbox_btn = gtkut_get_browse_file_btn(_("Bro_wse")); gtk_widget_show (inbox_btn); gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), inbox_btn, _("Unfiltered messages will be stored in this folder"), @@ -1920,7 +1920,7 @@ static void prefs_account_compose_create(void) gtk_widget_show (entry_sigpath); gtk_box_pack_start (GTK_BOX (hbox2), entry_sigpath, TRUE, TRUE, 0); - signature_browse_button = gtkut_get_browse_file_btn(_("_Browse")); + signature_browse_button = gtkut_get_browse_file_btn(_("Bro_wse")); gtk_widget_show (signature_browse_button); gtk_box_pack_start (GTK_BOX (hbox2), signature_browse_button, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(signature_browse_button), "clicked", diff --git a/src/prefs_gtk.h b/src/prefs_gtk.h index 82f041497..88e4d4919 100644 --- a/src/prefs_gtk.h +++ b/src/prefs_gtk.h @@ -83,7 +83,7 @@ struct _PrefsDialog GtkWidget *label; \ gint i = page_num; \ \ - label = gtk_label_new (str); \ + label = gtk_label_new_with_mnemonic (str); \ gtk_widget_show (label); \ gtk_notebook_set_tab_label \ (GTK_NOTEBOOK (notebook), \ -- 2.25.1