From: Paul Mangan Date: Fri, 5 Aug 2011 06:49:15 +0000 (+0000) Subject: 2011-08-05 [paul] 3.7.9cvs39 X-Git-Tag: rel_3_7_10~16 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ae5c7a82abbbed9fa7981d0ebae08b3a6432fd65 2011-08-05 [paul] 3.7.9cvs39 * src/mainwindow.c * src/messageview.c use 'Collapse quotes' rather than 'Fold quotes' on labels, for consistency * src/toolbar.c use 'Receive mail from account' rather than 'on account' --- diff --git a/ChangeLog b/ChangeLog index 0252a59b3..29a4f87e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-08-05 [paul] 3.7.9cvs39 + + * src/mainwindow.c + * src/messageview.c + use 'Collapse quotes' rather than 'Fold quotes' on + labels, for consistency + * src/toolbar.c + use 'Receive mail from account' rather than 'on account' + 2011-07-30 [mir] 3.7.9cvs38 * src/etpan/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 9fe6bbc49..4fd5c5982 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4190,3 +4190,4 @@ ( cvs diff -u -r 1.1.2.56 -r 1.1.2.57 manual/advanced.xml; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 manual/glossary.xml; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 manual/es/advanced.xml; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/es/glossary.xml; ) > 3.7.9cvs36.patchset ( cvs diff -u -r 1.13.2.42 -r 1.13.2.43 src/common/plugin.c; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/common/plugin.h; ) > 3.7.9cvs37.patchset ( cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/etpan/Makefile.am; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/smime/Makefile.am; ) > 3.7.9cvs38.patchset +( cvs diff -u -r 1.274.2.326 -r 1.274.2.327 src/mainwindow.c; cvs diff -u -r 1.94.2.216 -r 1.94.2.217 src/messageview.c; cvs diff -u -r 1.43.2.123 -r 1.43.2.124 src/toolbar.c; ) > 3.7.9cvs39.patchset diff --git a/configure.ac b/configure.ac index 81349f6bb..9fa08624b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=9 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=38 +EXTRA_VERSION=39 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mainwindow.c b/src/mainwindow.c index 1a8a4de5c..b182abafc 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -753,9 +753,9 @@ static GtkToggleActionEntry mainwin_toggle_entries[] = { {"View/FullScreen", NULL, N_("_Fullscreen"), "F11", NULL, G_CALLBACK(toggle_fullscreen_cb) }, /* toggle */ #endif {"View/AllHeaders", NULL, N_("Show all _headers"), "H", NULL, G_CALLBACK(show_all_header_cb) }, /* toggle */ - {"View/Quotes/FoldAll", NULL, N_("_Fold all"), "Q", NULL, G_CALLBACK(hide_quotes_cb) }, /* 1 toggle */ - {"View/Quotes/Fold2", NULL, N_("Fold from level _2"), NULL, NULL, G_CALLBACK(hide_quotes_cb) }, /* 2 toggle */ - {"View/Quotes/Fold3", NULL, N_("Fold from level _3"), NULL, NULL, G_CALLBACK(hide_quotes_cb) }, /* 3 toggle */ + {"View/Quotes/CollapseAll", NULL, N_("_Collapse all"), "Q", NULL, G_CALLBACK(hide_quotes_cb) }, /* 1 toggle */ + {"View/Quotes/Collapse2", NULL, N_("Collapse from level _2"), NULL, NULL, G_CALLBACK(hide_quotes_cb) }, /* 2 toggle */ + {"View/Quotes/Collapse3", NULL, N_("Collapse from level _3"), NULL, NULL, G_CALLBACK(hide_quotes_cb) }, /* 3 toggle */ }; static GtkRadioActionEntry mainwin_showhide_radio_entries[] = { /* toggle_toolbar_cb */ @@ -1794,9 +1794,9 @@ MainWindow *main_window_create() MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "MessageSource", "View/MessageSource", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "AllHeaders", "View/AllHeaders", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Quotes", "View/Quotes", GTK_UI_MANAGER_MENU) - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Quotes", "FoldAll", "View/Quotes/FoldAll", GTK_UI_MANAGER_MENUITEM) - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Quotes", "Fold2", "View/Quotes/Fold2", GTK_UI_MANAGER_MENUITEM) - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Quotes", "Fold3", "View/Quotes/Fold3", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Quotes", "CollapseAll", "View/Quotes/CollapseAll", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Quotes", "Collapse2", "View/Quotes/Collapse2", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Quotes", "Collapse3", "View/Quotes/Collapse3", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator6", "View/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "UpdateSummary", "View/UpdateSummary", GTK_UI_MANAGER_MENUITEM) @@ -3343,9 +3343,9 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/AllHeaders", mainwin->messageview->mimeview->textview->show_all_headers); cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & M_THREADED) != 0); - cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/FoldAll", (prefs_common.hide_quotes == 1)); - cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Fold2", (prefs_common.hide_quotes == 2)); - cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Fold3", (prefs_common.hide_quotes == 3)); + cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1)); + cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2)); + cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3)); main_window_menu_callback_unblock(mainwin); } @@ -4357,16 +4357,16 @@ static void hide_quotes_cb(GtkAction *action, gpointer data) if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) { const gchar *a_name = gtk_action_get_name(GTK_ACTION(action)); - if (!strcmp(a_name, "View/Quotes/FoldAll")) prefs_common.hide_quotes = 1; - else if (!strcmp(a_name, "View/Quotes/Fold2")) prefs_common.hide_quotes = 2; - else if (!strcmp(a_name, "View/Quotes/Fold3")) prefs_common.hide_quotes = 3; + if (!strcmp(a_name, "View/Quotes/CollapseAll")) prefs_common.hide_quotes = 1; + else if (!strcmp(a_name, "View/Quotes/Collapse2")) prefs_common.hide_quotes = 2; + else if (!strcmp(a_name, "View/Quotes/Collapse3")) prefs_common.hide_quotes = 3; } else prefs_common.hide_quotes = 0; mainwin->menu_lock_count++; - cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/FoldAll", (prefs_common.hide_quotes == 1)); - cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Fold2", (prefs_common.hide_quotes == 2)); - cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Fold3", (prefs_common.hide_quotes == 3)); + cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1)); + cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2)); + cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3)); mainwin->menu_lock_count--; summary_redisplay_msg(mainwin->summaryview); diff --git a/src/messageview.c b/src/messageview.c index 6ad5ec242..059d88ba7 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -298,9 +298,9 @@ static GtkActionEntry msgview_entries[] = static GtkToggleActionEntry msgview_toggle_entries[] = { {"View/AllHeaders", NULL, N_("Show all _headers"), "H", NULL, G_CALLBACK(show_all_header_cb) }, /* toggle */ - {"View/Quotes/FoldAll", NULL, N_("_Fold all"), "Q", NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 1 toggle */ - {"View/Quotes/Fold2", NULL, N_("Fold from level _2"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 2 toggle */ - {"View/Quotes/Fold3", NULL, N_("Fold from level _3"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 3 toggle */ + {"View/Quotes/CollapseAll", NULL, N_("_Collapse all"), "Q", NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 1 toggle */ + {"View/Quotes/Collapse2", NULL, N_("Collapse from level _2"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 2 toggle */ + {"View/Quotes/Collapse3", NULL, N_("Collapse from level _3"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 3 toggle */ }; static GtkRadioActionEntry msgview_radio_enc_entries[] = @@ -556,9 +556,9 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "MessageSource", "View/MessageSource", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "AllHeaders", "View/AllHeaders", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Quotes", "View/Quotes", GTK_UI_MANAGER_MENU) - MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "FoldAll", "View/Quotes/FoldAll", GTK_UI_MANAGER_MENUITEM) - MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Fold2", "View/Quotes/Fold2", GTK_UI_MANAGER_MENUITEM) - MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Fold3", "View/Quotes/Fold3", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "CollapseAll", "View/Quotes/CollapseAll", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Collapse2", "View/Quotes/Collapse2", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Collapse3", "View/Quotes/Collapse3", GTK_UI_MANAGER_MENUITEM) /* Message menu */ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Compose", "Message/Compose", GTK_UI_MANAGER_MENUITEM) @@ -2521,17 +2521,17 @@ static void msg_hide_quotes_cb(GtkToggleAction *action, gpointer data) return; if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) { const gchar *a_name = gtk_action_get_name(GTK_ACTION(action)); - if (!strcmp(a_name, "View/Quotes/FoldAll")) prefs_common.hide_quotes = 1; - else if (!strcmp(a_name, "View/Quotes/Fold2")) prefs_common.hide_quotes = 2; - else if (!strcmp(a_name, "View/Quotes/Fold3")) prefs_common.hide_quotes = 3; + if (!strcmp(a_name, "View/Quotes/CollapseAll")) prefs_common.hide_quotes = 1; + else if (!strcmp(a_name, "View/Quotes/Collapse2")) prefs_common.hide_quotes = 2; + else if (!strcmp(a_name, "View/Quotes/Collapse3")) prefs_common.hide_quotes = 3; } else prefs_common.hide_quotes = 0; updating_menu=TRUE; - cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/FoldAll", (prefs_common.hide_quotes == 1)); - cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Fold2", (prefs_common.hide_quotes == 2)); - cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Fold3", (prefs_common.hide_quotes == 3)); + cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1)); + cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2)); + cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3)); updating_menu=FALSE; if (!msginfo) return; @@ -2710,9 +2710,9 @@ void messageview_set_menu_sensitive(MessageView *messageview) /* do some smart things */ if (!messageview->menubar) return; - cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/FoldAll", (prefs_common.hide_quotes == 1)); - cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Fold2", (prefs_common.hide_quotes == 2)); - cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Fold3", (prefs_common.hide_quotes == 3)); + cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1)); + cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2)); + cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3)); } void messageview_learn (MessageView *msgview, gboolean is_spam) diff --git a/src/toolbar.c b/src/toolbar.c index b8ee47e60..8e895588c 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -177,8 +177,8 @@ struct { gchar *index_str; const gchar *descr; } toolbar_text [] = { - { "A_RECEIVE_ALL", N_("Receive Mail on all Accounts") }, - { "A_RECEIVE_CUR", N_("Receive Mail on current Account") }, + { "A_RECEIVE_ALL", N_("Receive Mail from all Accounts") }, + { "A_RECEIVE_CUR", N_("Receive Mail from current Account") }, { "A_SEND_QUEUED", N_("Send Queued Messages") }, { "A_COMPOSE_EMAIL", N_("Compose Email") }, { "A_COMPOSE_NEWS", N_("Compose News") }, @@ -1896,12 +1896,12 @@ Toolbar *toolbar_create(ToolbarType type, break; case A_RECEIVE_ALL: TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text, - _("Receive Mail on all Accounts"), - _("Receive Mail on selected Account")); + _("Receive Mail from all Accounts"), + _("Receive Mail from selected Account")); toolbar_data->getall_btn = item; break; case A_RECEIVE_CUR: - TOOLBAR_ITEM(item,icon_wid,toolbar_item->text, _("Receive Mail on current Account")); + TOOLBAR_ITEM(item,icon_wid,toolbar_item->text, _("Receive Mail from current Account")); toolbar_data->get_btn = item; break; case A_SEND_QUEUED: