2006-02-09 [wwp] 2.0.0cvs40
authorTristan Chabredier <wwp@claws-mail.org>
Thu, 9 Feb 2006 17:37:08 +0000 (17:37 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Thu, 9 Feb 2006 17:37:08 +0000 (17:37 +0000)
* 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
PATCHSETS
configure.ac
src/compose.c
src/editaddress.c
src/gtk/about.c
src/prefs_account.c
src/prefs_gtk.h

index 18895936184232c94b644e2729c2d505d96cfee3..83e8eff63e4a48ed2110b5930133bcb5846c8136 100644 (file)
--- 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
index fceac6d98c82f196032cda0a046ecbb4255ef11e..781743c8af3c7c3a33ce7aa1a8152495ddc27d93 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 45873b1ce8b9790e23cbfbfbf2bf8db99d8c3f8a..104596726c9e50218ead6c046ea5e622c649d0b3 100644 (file)
@@ -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=
 
index 3dd00b0d641faa6439791ebb42f261cc7410b69b..b53f4a1ec26df53b1d1e3b124e26bbc06a47118d 100644 (file)
@@ -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);
index 24932b640a0427703726246ae22dec654bc1b299..53823a73f91a31cde3aa27d56a06d5533eac1e67 100644 (file)
@@ -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 );
 }
 
index 21f94bdcc3888a82833e094eca43f33e44b3fe0e..d7d3e730c492d801ed4477a8e17ca2f17a177a52 100644 (file)
@@ -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);
 
index cde192257d2c1542a464de8c19508a3a0e765f85..6e08dc2d818ffd4065fe6025f8a05342998674b4 100644 (file)
@@ -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",
index 82f0414977028623839bb09bfbf77abadc23cc5e..88e4d4919611e9f6d64d10dadfe2a02a132d06c7 100644 (file)
@@ -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), \