From f933ed2d80ee4cfba6f45d89a0ab42f9bac8c46c Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 27 Aug 2012 17:09:08 +0000 Subject: [PATCH] 2012-08-27 [colin] 3.8.1cvs37 * src/mainwindow.c * src/summaryview.c Separate "Mark all read" from "Mark as read" and "Ignore thread" --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mainwindow.c | 12 ++++++++---- src/summaryview.c | 6 ++++-- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83f610108..5e2be6b95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-08-27 [colin] 3.8.1cvs37 + + * src/mainwindow.c + * src/summaryview.c + Separate "Mark all read" from "Mark as read" + and "Ignore thread" + 2012-08-27 [wwp] 3.8.1cvs36 * src/inc.c diff --git a/PATCHSETS b/PATCHSETS index 77d849a58..26dfdf400 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4411,3 +4411,4 @@ ( cvs diff -u -r 1.274.2.346 -r 1.274.2.347 src/mainwindow.c; ) > 3.8.1cvs34.patchset ( cvs diff -u -r 1.1.2.61 -r 1.1.2.62 manual/advanced.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/de/advanced.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/de/dist/html/Makefile.am; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/dist/html/Makefile.am; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 manual/es/advanced.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/dist/html/Makefile.am; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 manual/fr/advanced.xml; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/dist/html/Makefile.am; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/pl/dist/html/Makefile.am; ) > 3.8.1cvs35.patchset ( cvs diff -u -r 1.149.2.108 -r 1.149.2.109 src/inc.c; cvs diff -u -r 1.150.2.124 -r 1.150.2.125 src/procmsg.c; ) > 3.8.1cvs36.patchset +( cvs diff -u -r 1.274.2.347 -r 1.274.2.348 src/mainwindow.c; cvs diff -u -r 1.395.2.448 -r 1.395.2.449 src/summaryview.c; ) > 3.8.1cvs37.patchset diff --git a/configure.ac b/configure.ac index 9a995096c..a48fa9462 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=36 +EXTRA_VERSION=37 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mainwindow.c b/src/mainwindow.c index ce168b661..13b73e719 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -646,14 +646,14 @@ static GtkActionEntry mainwin_entries[] = {"Message/MailingList/ViewArchive/PlaceHolder", NULL, "Placeholder", NULL, NULL, G_CALLBACK(mainwindow_nothing_cb) }, {"Message/MailingList/ContactOwner", NULL, N_("Contact owner") }, {"Message/MailingList/ContactOwner/PlaceHolder", NULL, "Placeholder", NULL, NULL, G_CALLBACK(mainwindow_nothing_cb) }, - /*{"Message/---", NULL, "---" },*/ + /* separation */ {"Message/Move", NULL, N_("M_ove..."), "O", NULL, G_CALLBACK(move_to_cb) }, {"Message/Copy", NULL, N_("_Copy..."), "O", NULL, G_CALLBACK(copy_to_cb) }, {"Message/Trash", NULL, N_("Move to _trash"), "D", NULL, G_CALLBACK(delete_trash_cb) }, {"Message/Delete", NULL, N_("_Delete..."), NULL, NULL, G_CALLBACK(delete_cb) }, {"Message/CancelNews", NULL, N_("Cancel a news message"), NULL, NULL, G_CALLBACK(cancel_cb) }, - /*{"Message/---", NULL, "---" },*/ + /* separation */ {"Message/Mark", NULL, N_("_Mark") }, {"Message/Mark/Mark", NULL, N_("_Mark"), "asterisk", NULL, G_CALLBACK(mark_cb) }, @@ -662,7 +662,9 @@ static GtkActionEntry mainwin_entries[] = {"Message/Mark/MarkUnread", NULL, N_("Mark as unr_ead"), "exclam", NULL, G_CALLBACK(mark_as_unread_cb) }, {"Message/Mark/MarkRead", NULL, N_("Mark as rea_d"), NULL, NULL, G_CALLBACK(mark_as_read_cb) }, + /* separation */ {"Message/Mark/MarkAllRead", NULL, N_("Mark all read"), NULL, NULL, G_CALLBACK(mark_all_read_cb) }, + /* separation */ {"Message/Mark/IgnoreThread", NULL, N_("Ignore thread"), NULL, NULL, G_CALLBACK(ignore_thread_cb) }, {"Message/Mark/UnignoreThread", NULL, N_("Unignore thread"), NULL, NULL, G_CALLBACK(unignore_thread_cb) }, {"Message/Mark/WatchThread", NULL, N_("Watch thread"), NULL, NULL, G_CALLBACK(watch_thread_cb) }, @@ -1889,15 +1891,17 @@ MainWindow *main_window_create() MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "IgnoreThread", "Message/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "WatchThread", "Message/Mark/WatchThread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "UnwatchThread", "Message/Mark/UnwatchThread", GTK_UI_MANAGER_MENUITEM) - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator4", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkSpam", "Message/Mark/MarkSpam", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkHam", "Message/Mark/MarkHam", GTK_UI_MANAGER_MENUITEM) - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator5", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Lock", "Message/Mark/Lock", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Unlock", "Message/Mark/Unlock", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ColorLabel", "Message/ColorLabel", GTK_UI_MANAGER_MENUITEM) diff --git a/src/summaryview.c b/src/summaryview.c index 3c8fb5bb2..785025646 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -702,15 +702,17 @@ SummaryView *summary_create(MainWindow *mainwin) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "IgnoreThread", "Message/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "WatchThread", "Message/Mark/WatchThread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "UnwatchThread", "Message/Mark/UnwatchThread", GTK_UI_MANAGER_MENUITEM) - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator4", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkSpam", "Message/Mark/MarkSpam", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkHam", "Message/Mark/MarkHam", GTK_UI_MANAGER_MENUITEM) - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator5", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Lock", "Message/Mark/Lock", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Unlock", "Message/Mark/Unlock", GTK_UI_MANAGER_MENUITEM) -- 2.25.1