From 2cb8a81e22f652356e12f6d680b68ef61f041ec7 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Fri, 13 Jan 2006 14:11:22 +0000 Subject: [PATCH] 2006-01-13 [paul] 1.9.100cvs141 * src/account.c * src/export.c * src/import.c * src/mainwindow.c * src/prefs_account.c * src/prefs_display_header.c * src/prefs_receive.c * src/prefs_send.c * src/prefs_summaries.c * src/prefs_themes.c * src/prefs_toolbar.c * src/gtk/about.c various cleanups --- ChangeLog | 16 ++++++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/account.c | 2 +- src/export.c | 29 ++++++++++++++++++----------- src/gtk/about.c | 4 ++-- src/import.c | 26 ++++++++++++++++---------- src/mainwindow.c | 20 ++++++++++---------- src/prefs_account.c | 20 ++++++++++++++------ src/prefs_display_header.c | 8 +++++++- src/prefs_receive.c | 4 ++-- src/prefs_send.c | 1 - src/prefs_summaries.c | 27 +++++++++++++-------------- src/prefs_themes.c | 2 +- src/prefs_toolbar.c | 4 ++++ 15 files changed, 106 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd9c3bedc..695964286 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2006-01-13 [paul] 1.9.100cvs141 + + * src/account.c + * src/export.c + * src/import.c + * src/mainwindow.c + * src/prefs_account.c + * src/prefs_display_header.c + * src/prefs_receive.c + * src/prefs_send.c + * src/prefs_summaries.c + * src/prefs_themes.c + * src/prefs_toolbar.c + * src/gtk/about.c + various cleanups + 2006-01-12 [colin] 1.9.100cvs140 * src/folder.c diff --git a/PATCHSETS b/PATCHSETS index 018e52bd4..f47da4606 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1124,3 +1124,4 @@ ( cvs diff -u -r 1.382.2.218 -r 1.382.2.219 src/compose.c; ) > 1.9.100cvs138.patchset ( cvs diff -u -r 1.274.2.85 -r 1.274.2.86 src/mainwindow.c; cvs diff -u -r 1.60.2.27 -r 1.60.2.28 src/prefs_actions.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/foldersort.c; ) > 1.9.100cvs139.patchset ( cvs diff -u -r 1.213.2.72 -r 1.213.2.73 src/folder.c; cvs diff -u -r 1.87.2.22 -r 1.87.2.23 src/folder.h; cvs diff -u -r 1.115.2.70 -r 1.115.2.71 src/main.c; ) > 1.9.100cvs140.patchset +( cvs diff -u -r 1.61.2.40 -r 1.61.2.41 src/account.c; cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/export.c; cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/import.c; cvs diff -u -r 1.274.2.86 -r 1.274.2.87 src/mainwindow.c; cvs diff -u -r 1.105.2.45 -r 1.105.2.46 src/prefs_account.c; cvs diff -u -r 1.16.2.15 -r 1.16.2.16 src/prefs_display_header.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_receive.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_send.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_summaries.c; cvs diff -u -r 1.3.2.34 -r 1.3.2.35 src/prefs_themes.c; cvs diff -u -r 1.30.2.21 -r 1.30.2.22 src/prefs_toolbar.c; cvs diff -u -r 1.4.2.27 -r 1.4.2.28 src/gtk/about.c; ) > 1.9.100cvs141.patchset diff --git a/configure.ac b/configure.ac index 36107b0e9..a86b61149 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=100 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=140 +EXTRA_VERSION=141 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/account.c b/src/account.c index e05f8c841..2dddfb83d 100644 --- a/src/account.c +++ b/src/account.c @@ -664,7 +664,7 @@ static void account_edit_create(void) label = gtk_label_new (_("New messages will be checked in this order. Check the boxes\n" - "on the 'G' column to enable message retrieval by 'Get all'.")); + "on the 'G' column to enable message retrieval by 'Get Mail'.")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); diff --git a/src/export.c b/src/export.c index 3248c6bd1..80bdd610e 100644 --- a/src/export.c +++ b/src/export.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -140,7 +140,7 @@ static void export_create(void) GtkWidget *confirm_area; window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(window), _("Export")); + gtk_window_set_title(GTK_WINDOW(window), _("Export to mbox file")); gtk_container_set_border_width(GTK_CONTAINER(window), 5); gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); gtk_window_set_modal(GTK_WINDOW(window), TRUE); @@ -159,7 +159,8 @@ static void export_create(void) gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); desc_label = gtk_label_new - (_("Specify target folder and mbox file.")); + (_("Locate the folder to export and specify the mbox file.")); + gtk_label_set_line_wrap(GTK_LABEL(desc_label), TRUE); gtk_box_pack_start(GTK_BOX(hbox), desc_label, FALSE, FALSE, 0); table = gtk_table_new(2, 3, FALSE); @@ -169,33 +170,39 @@ static void export_create(void) gtk_table_set_col_spacings(GTK_TABLE(table), 8); gtk_widget_set_size_request(table, 420, -1); - src_label = gtk_label_new(_("Source dir:")); + src_label = gtk_label_new(_("Source folder:")); gtk_table_attach(GTK_TABLE(table), src_label, 0, 1, 0, 1, - GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); gtk_misc_set_alignment(GTK_MISC(src_label), 1, 0.5); - file_label = gtk_label_new(_("Exporting file:")); + file_label = gtk_label_new(_("Mbox file:")); gtk_table_attach(GTK_TABLE(table), file_label, 0, 1, 1, 2, - GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); gtk_misc_set_alignment(GTK_MISC(file_label), 1, 0.5); src_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), src_entry, 1, 2, 0, 1, - GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); + (GtkAttachOptions) (GTK_EXPAND|GTK_SHRINK|GTK_FILL), + (GtkAttachOptions) (0), 0, 0); file_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, 1, 2, - GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); + (GtkAttachOptions) (GTK_EXPAND|GTK_SHRINK|GTK_FILL), + (GtkAttachOptions) (0), 0, 0); src_button = gtkut_get_browse_directory_btn(_("_Browse")); gtk_table_attach(GTK_TABLE(table), src_button, 2, 3, 0, 1, - 0, 0, 0, 0); + (GtkAttachOptions) (0), + (GtkAttachOptions) (0), 0, 0); g_signal_connect(G_OBJECT(src_button), "clicked", G_CALLBACK(export_srcsel_cb), NULL); file_button = gtkut_get_browse_file_btn(_("B_rowse")); gtk_table_attach(GTK_TABLE(table), file_button, 2, 3, 1, 2, - 0, 0, 0, 0); + (GtkAttachOptions) (0), + (GtkAttachOptions) (0), 0, 0); g_signal_connect(G_OBJECT(file_button), "clicked", G_CALLBACK(export_filesel_cb), NULL); diff --git a/src/gtk/about.c b/src/gtk/about.c index 653cbeaad..21f94bdcc 100644 --- a/src/gtk/about.c +++ b/src/gtk/about.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -252,7 +252,7 @@ static void about_create(void) gtk_box_pack_start(GTK_BOX(vbox1), table2, FALSE, FALSE, 0); label = gtk_label_new - (_("Copyright (C) 1999-2005 Hiroyuki Yamamoto \n" + (_("Copyright (C) 1999-2006 Hiroyuki Yamamoto \n" "and the Sylpheed-Claws team")); gtk_label_set_selectable(GTK_LABEL(label), TRUE); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER); diff --git a/src/import.c b/src/import.c index d0a81c495..ff5437f3f 100644 --- a/src/import.c +++ b/src/import.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -146,7 +146,7 @@ static void import_create(void) GtkWidget *confirm_area; window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(window), _("Import")); + gtk_window_set_title(GTK_WINDOW(window), _("Import mbox file")); gtk_container_set_border_width(GTK_CONTAINER(window), 5); gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); gtk_window_set_modal(GTK_WINDOW(window), TRUE); @@ -165,7 +165,8 @@ static void import_create(void) gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); desc_label = gtk_label_new - (_("Specify target mbox file and destination folder.")); + (_("Locate the mbox file and specify the destination folder.")); + gtk_label_set_line_wrap(GTK_LABEL(desc_label), TRUE); gtk_box_pack_start(GTK_BOX(hbox), desc_label, FALSE, FALSE, 0); table = gtk_table_new(2, 3, FALSE); @@ -175,19 +176,22 @@ static void import_create(void) gtk_table_set_col_spacings(GTK_TABLE(table), 8); gtk_widget_set_size_request(table, 420, -1); - file_label = gtk_label_new(_("Importing file:")); + file_label = gtk_label_new(_("Mbox file:")); gtk_table_attach(GTK_TABLE(table), file_label, 0, 1, 0, 1, - GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); gtk_misc_set_alignment(GTK_MISC(file_label), 1, 0.5); - dest_label = gtk_label_new(_("Destination dir:")); + dest_label = gtk_label_new(_("Destination folder:")); gtk_table_attach(GTK_TABLE(table), dest_label, 0, 1, 1, 2, - GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); gtk_misc_set_alignment(GTK_MISC(dest_label), 1, 0.5); file_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, 0, 1, - GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); + (GtkAttachOptions) (GTK_EXPAND|GTK_SHRINK|GTK_FILL), + (GtkAttachOptions) (0), 0, 0); dest_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), dest_entry, 1, 2, 1, 2, @@ -195,13 +199,15 @@ static void import_create(void) file_button = gtkut_get_browse_file_btn(_("_Browse")); gtk_table_attach(GTK_TABLE(table), file_button, 2, 3, 0, 1, - 0, 0, 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); g_signal_connect(G_OBJECT(file_button), "clicked", G_CALLBACK(import_filesel_cb), NULL); dest_button = gtkut_get_browse_directory_btn(_("B_rowse")); gtk_table_attach(GTK_TABLE(table), dest_button, 2, 3, 1, 2, - 0, 0, 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); g_signal_connect(G_OBJECT(dest_button), "clicked", G_CALLBACK(import_destsel_cb), NULL); diff --git a/src/mainwindow.c b/src/mainwindow.c index 7f9882aa0..44c33b6fd 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -538,23 +538,23 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_View/---"), NULL, NULL, 0, ""}, {N_("/_View/_Go to"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/_Prev message"), "P", prev_cb, 0, NULL}, + {N_("/_View/_Go to/_Previous message"), "P", prev_cb, 0, NULL}, {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL}, {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/P_rev unread message"), + {N_("/_View/_Go to/P_revious unread message"), "P", prev_unread_cb, 0, NULL}, {N_("/_View/_Go to/N_ext unread message"), "N", next_unread_cb, 0, NULL}, {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/Prev ne_w message"), NULL, prev_new_cb, 0, NULL}, + {N_("/_View/_Go to/Previous ne_w message"), NULL, prev_new_cb, 0, NULL}, {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL}, {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/Prev _marked message"), + {N_("/_View/_Go to/Previous _marked message"), NULL, prev_marked_cb, 0, NULL}, {N_("/_View/_Go to/Next m_arked message"), NULL, next_marked_cb, 0, NULL}, {N_("/_View/_Go to/---"), NULL, NULL, 0, ""}, - {N_("/_View/_Go to/Prev _labeled message"), + {N_("/_View/_Go to/Previous _labeled message"), NULL, prev_labeled_cb, 0, NULL}, {N_("/_View/_Go to/Next la_beled message"), NULL, next_labeled_cb, 0, NULL}, @@ -1863,13 +1863,13 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) {"/View/Expand all threads" , M_MSG_EXIST}, {"/View/Collapse all threads" , M_MSG_EXIST}, {"/View/Hide read messages" , M_HIDE_READ_MSG}, - {"/View/Go to/Prev message" , M_MSG_EXIST}, + {"/View/Go to/Previous message" , M_MSG_EXIST}, {"/View/Go to/Next message" , M_MSG_EXIST}, - {"/View/Go to/Prev unread message" , M_MSG_EXIST}, - {"/View/Go to/Prev new message" , M_MSG_EXIST}, - {"/View/Go to/Prev marked message" , M_MSG_EXIST}, + {"/View/Go to/Previous unread message" , M_MSG_EXIST}, + {"/View/Go to/Previous new message" , M_MSG_EXIST}, + {"/View/Go to/Previous marked message" , M_MSG_EXIST}, {"/View/Go to/Next marked message" , M_MSG_EXIST}, - {"/View/Go to/Prev labeled message", M_MSG_EXIST}, + {"/View/Go to/Previous labeled message", M_MSG_EXIST}, {"/View/Go to/Next labeled message", M_MSG_EXIST}, {"/View/Open in new window" , M_SINGLE_TARGET_EXIST}, {"/View/Show all headers" , M_SINGLE_TARGET_EXIST}, diff --git a/src/prefs_account.c b/src/prefs_account.c index b3bfc0bcd..73b946406 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -1360,6 +1360,7 @@ static void prefs_account_receive_create(void) GtkWidget *hbox1; GtkWidget *size_limit_chkbtn; GtkWidget *size_limit_entry; + GtkTooltips *size_limit_tooltip; GtkWidget *label; GtkWidget *filter_on_recv_chkbtn; GtkWidget *vbox3; @@ -1390,6 +1391,7 @@ static void prefs_account_receive_create(void) GtkTooltips *maxarticle_tool_tip; inbox_tooltip = gtk_tooltips_new(); + size_limit_tooltip = gtk_tooltips_new(); vbox1 = gtk_vbox_new (FALSE, VSPACING); gtk_widget_show (vbox1); @@ -1479,6 +1481,12 @@ static void prefs_account_receive_create(void) PACK_CHECK_BUTTON (hbox1, size_limit_chkbtn, _("Receive size limit")); + gtk_tooltips_set_tip(GTK_TOOLTIPS(size_limit_tooltip), size_limit_chkbtn, + _("Messages over this limit will be partially retrieved. " + "When selecting them you will be able to download them fully " + "or delete them."), + NULL); + size_limit_entry = gtk_entry_new (); gtk_widget_show (size_limit_entry); gtk_widget_set_size_request (size_limit_entry, 64, -1); @@ -1598,7 +1606,7 @@ static void prefs_account_receive_create(void) PACK_CHECK_BUTTON (vbox1, recvatgetall_chkbtn, - _("'Get all' checks for new messages on this account")); + _("'Get Mail' checks for new messages on this account")); receive.pop3_frame = frame1; receive.use_apop_chkbtn = use_apop_chkbtn; @@ -2304,30 +2312,30 @@ static void prefs_account_advanced_create(void) gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); PACK_HBOX (hbox1); - PACK_CHECK_BUTTON (hbox1, checkbtn_smtpport, _("Specify SMTP port")); + PACK_CHECK_BUTTON (hbox1, checkbtn_smtpport, _("SMTP port")); PACK_PORT_ENTRY (hbox1, entry_smtpport); SET_TOGGLE_SENSITIVITY (checkbtn_smtpport, entry_smtpport); PACK_HBOX (hbox_popport); PACK_CHECK_BUTTON (hbox_popport, checkbtn_popport, - _("Specify POP3 port")); + _("POP3 port")); PACK_PORT_ENTRY (hbox_popport, entry_popport); SET_TOGGLE_SENSITIVITY (checkbtn_popport, entry_popport); PACK_HBOX (hbox_imapport); PACK_CHECK_BUTTON (hbox_imapport, checkbtn_imapport, - _("Specify IMAP4 port")); + _("IMAP4 port")); PACK_PORT_ENTRY (hbox_imapport, entry_imapport); SET_TOGGLE_SENSITIVITY (checkbtn_imapport, entry_imapport); PACK_HBOX (hbox_nntpport); PACK_CHECK_BUTTON (hbox_nntpport, checkbtn_nntpport, - _("Specify NNTP port")); + _("NNTP port")); PACK_PORT_ENTRY (hbox_nntpport, entry_nntpport); SET_TOGGLE_SENSITIVITY (checkbtn_nntpport, entry_nntpport); PACK_HBOX (hbox1); - PACK_CHECK_BUTTON (hbox1, checkbtn_domain, _("Specify domain name")); + PACK_CHECK_BUTTON (hbox1, checkbtn_domain, _("Domain name")); entry_domain = gtk_entry_new (); gtk_widget_show (entry_domain); diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c index 038a5998a..c9048c24a 100644 --- a/src/prefs_display_header.c +++ b/src/prefs_display_header.c @@ -279,6 +279,8 @@ static void prefs_display_header_create(void) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (list_view_scrolledwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(list_view_scrolledwin), + GTK_SHADOW_IN); headers_list_view = prefs_display_header_list_view_create (_("Displayed Headers")); @@ -343,6 +345,8 @@ static void prefs_display_header_create(void) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (list_view_scrolledwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(list_view_scrolledwin), + GTK_SHADOW_IN); hidden_headers_list_view = prefs_display_header_list_view_create (_("Hidden headers")); @@ -368,7 +372,9 @@ static void prefs_display_header_create(void) G_CALLBACK (prefs_display_header_delete_cb), hidden_headers_list_view); - PACK_CHECK_BUTTON (btn_hbox, checkbtn_other_headers, + + + PACK_CHECK_BUTTON (vbox, checkbtn_other_headers, _("Show all unspecified headers")); SET_TOGGLE_SENSITIVITY (checkbtn_other_headers, list_view_hbox2); diff --git a/src/prefs_receive.c b/src/prefs_receive.c index 2b9483036..a92be748f 100644 --- a/src/prefs_receive.c +++ b/src/prefs_receive.c @@ -153,7 +153,7 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, gtk_box_pack_start (GTK_BOX (vbox2), hbox_autochk, FALSE, FALSE, 0); PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk, - _("Auto-check new mail")); + _("Automatically check for new mail")); label_autochk1 = gtk_label_new (_("every")); gtk_widget_show (label_autochk1); @@ -176,7 +176,7 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, SET_TOGGLE_SENSITIVITY(checkbtn_autochk, label_autochk2); PACK_CHECK_BUTTON (vbox2, checkbtn_chkonstartup, - _("Check new mail on startup")); + _("Check for new mail on startup")); PACK_CHECK_BUTTON (vbox2, checkbtn_openinbox, _("Go to inbox after receiving new mail")); PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc, diff --git a/src/prefs_send.c b/src/prefs_send.c index 500c0c26b..4ab83f8e6 100644 --- a/src/prefs_send.c +++ b/src/prefs_send.c @@ -201,7 +201,6 @@ void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window, SET_MENUITEM(_("Automatic (Recommended)"), CS_AUTO); SET_MENUITEM(NULL, NULL); SET_MENUITEM(_("7bit ascii (US-ASCII)"), CS_US_ASCII); - SET_MENUITEM(NULL, NULL); SET_MENUITEM(_("Unicode (UTF-8)"), CS_UTF_8); SET_MENUITEM(NULL, NULL); SET_MENUITEM(_("Western European (ISO-8859-1)"), CS_ISO_8859_1); diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index e82fed1c5..f6c1757ca 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -325,7 +325,7 @@ static void prefs_keybind_select(void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width (GTK_CONTAINER (window), 8); - gtk_window_set_title (GTK_WINDOW (window), _("Key bindings")); + gtk_window_set_title (GTK_WINDOW (window), _("Select key bindings")); gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); gtk_window_set_modal (GTK_WINDOW (window), TRUE); gtk_window_set_resizable(GTK_WINDOW (window), FALSE); @@ -343,9 +343,6 @@ static void prefs_keybind_select(void) gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - hbox1 = gtk_hbox_new (FALSE, 8); - gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0); - combo = gtk_combo_new (); gtk_box_pack_start (GTK_BOX (hbox1), combo, TRUE, TRUE, 0); gtkut_combo_set_items (GTK_COMBO (combo), @@ -361,9 +358,11 @@ static void prefs_keybind_select(void) label = gtk_label_new (_("You can also modify each menu shortcut by pressing\n" - "any key(s) when placing the mouse pointer on the item.")); + "any key(s) when focusing the mouse pointer on the item.")); gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + gtkut_widget_set_small_font_size (label); hbox1 = gtk_hbox_new (FALSE, 8); gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0); @@ -372,7 +371,7 @@ static void prefs_keybind_select(void) &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL); gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0); - gtk_widget_grab_default (ok_btn); + gtk_widget_grab_focus (ok_btn); MANAGE_WINDOW_SIGNALS_CONNECT(window); g_signal_connect (G_OBJECT (window), "delete_event", @@ -454,9 +453,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget) {"
/View/Show or hide/Message View", "V"}, {"
/View/Thread view", "T"}, - {"
/View/Go to/Prev message", "P"}, + {"
/View/Go to/Previous message", "P"}, {"
/View/Go to/Next message", "N"}, - {"
/View/Go to/Prev unread message", "P"}, + {"
/View/Go to/Previous unread message", "P"}, {"
/View/Go to/Next unread message", "N"}, {"
/View/Go to/Other folder...", "G"}, {"
/View/Open in new window", "N"}, @@ -508,9 +507,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget) {"
/View/Show or hide/Message View", ""}, {"
/View/Thread view", "T"}, - {"
/View/Go to/Prev message", "P"}, + {"
/View/Go to/Previous message", "P"}, {"
/View/Go to/Next message", "N"}, - {"
/View/Go to/Prev unread message", "P"}, + {"
/View/Go to/Previous unread message", "P"}, {"
/View/Go to/Next unread message", "N"}, {"
/View/Go to/Other folder...", "G"}, {"
/View/Open in new window", "N"}, @@ -562,9 +561,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget) {"
/View/Show or hide/Message view", "V"}, {"
/View/Thread view", "T"}, - {"
/View/Go to/Prev message", ""}, + {"
/View/Go to/Previous message", ""}, {"
/View/Go to/Next message", ""}, - {"
/View/Go to/Prev unread message", ""}, + {"
/View/Go to/Previous unread message", ""}, {"
/View/Go to/Next unread message", ""}, {"
/View/Go to/Other folder...", "C"}, {"
/View/Open in new window", "N"}, @@ -616,9 +615,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget) {"
/View/Show or hide/Message View", ""}, {"
/View/Thread view", "T"}, - {"
/View/Go to/Prev message", "P"}, + {"
/View/Go to/Previous message", "P"}, {"
/View/Go to/Next message", "N"}, - {"
/View/Go to/Prev unread message", "P"}, + {"
/View/Go to/Previous unread message", "P"}, {"
/View/Go to/Next unread message", "N"}, {"
/View/Go to/Other folder...", "G"}, {"
/View/Open in new window", "N"}, diff --git a/src/prefs_themes.c b/src/prefs_themes.c index 963bad4db..e16ddf1d8 100644 --- a/src/prefs_themes.c +++ b/src/prefs_themes.c @@ -859,7 +859,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin gtk_widget_show (vbox2); gtk_container_add (GTK_CONTAINER (frame1), vbox2); - hbox3 = gtk_hbox_new (FALSE, 0); + hbox3 = gtk_hbox_new (FALSE, 5); gtk_widget_show (hbox3); gtk_box_pack_start (GTK_BOX (vbox2), hbox3, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbox3), 5); diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index 4649c97d4..7ad7fd9a4 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -712,6 +712,8 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar) TRUE, TRUE, 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_icons), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_icons), + GTK_SHADOW_IN); list_view_icons = create_icon_list_view(prefs_toolbar); gtk_widget_show(list_view_icons); @@ -822,6 +824,8 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar) gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_list_view_set), 1); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_set), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_set), + GTK_SHADOW_IN); list_view_set = create_set_list_view(prefs_toolbar); gtk_widget_show(list_view_set); -- 2.25.1