? mail/themes/qute/mail/icons/message-ignored.png
? tools/findmethod
? tools/mozmake.sh
Index: .cvsignore
===================================================================
RCS file: /cvsroot/mozilla/.cvsignore,v
retrieving revision 1.11
diff -u -8 -p -r1.11 .cvsignore
--- .cvsignore 23 Feb 2008 21:43:04 -0000 1.11
+++ .cvsignore 7 Apr 2008 22:06:35 -0000
@@ -8,8 +8,12 @@ config-defs.h
.mozconfig
.mozconfig.mk
.mozconfig.out
mozconfig
a.out
unallmakefiles
nss
mozilla-config.h
+obj-i686-pc-linux-gnu
+mozmake.sh
+.hg
+.hgignore
Index: mail/base/content/hiddenWindow.js
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/hiddenWindow.js,v
retrieving revision 1.8
diff -u -8 -p -r1.8 hiddenWindow.js
--- mail/base/content/hiddenWindow.js 12 Sep 2007 06:03:24 -0000 1.8
+++ mail/base/content/hiddenWindow.js 7 Apr 2008 22:07:51 -0000
@@ -51,17 +51,17 @@ function hiddenWindowStartup()
'viewTextSizeMenu', 'menu_textZoomEnlarge', 'menu_textZoomReduce',
'goNextMenu', 'menu_nextMsg', 'menu_nextUnreadMsg', 'menu_nextUnreadThread',
'goPreviousMenu', 'menu_prevMsg', 'menu_prevUnreadMsg', 'menu_goForward', 'menu_goBack',
'goStartPage', 'newMsgCmd', 'replyMainMenu', 'replySenderMainMenu', 'replyNewsgroupMainMenu',
'menu_replyToAll', 'menu_forwardMsg', 'forwardAsMenu', 'menu_editMsgAsNew', 'openMessageWindowMenuitem',
'moveMenu', 'copyMenu', 'moveToFolderAgain', 'tagMenu', 'markMenu',
'markReadMenuItem', 'menu_markThreadAsRead', 'menu_markReadByDate', 'menu_markAllRead',
'markFlaggedMenuItem', 'menu_markAsJunk', 'menu_markAsNotJunk', 'createFilter',
- 'killThread', 'watchThread', 'applyFilters', 'runJunkControls', 'deleteJunk', 'menu_import',
+ 'killThread', 'killSubthread', 'watchThread', 'applyFilters', 'runJunkControls', 'deleteJunk', 'menu_import',
'searchMailCmd', 'searchAddressesCmd', 'filtersCmd', 'junkMailCmd',
'cmd_close', 'minimizeWindow', 'zoomWindow'];
var id;
var element;
for (id in disabledItems)
{
element = document.getElementById(disabledItems[id]);
if (element)
Index: mail/base/content/mail3PaneWindowCommands.js
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/mail3PaneWindowCommands.js,v
retrieving revision 1.43
diff -u -8 -p -r1.43 mail3PaneWindowCommands.js
--- mail/base/content/mail3PaneWindowCommands.js 10 Mar 2008 15:30:52 -0000 1.43
+++ mail/base/content/mail3PaneWindowCommands.js 7 Apr 2008 22:07:52 -0000
@@ -227,16 +227,17 @@ var DefaultController =
return true;
case "cmd_downloadFlagged":
case "cmd_downloadSelected":
case "cmd_synchronizeOffline":
return MailOfflineMgr.isOnline();
case "cmd_watchThread":
case "cmd_killThread":
+ case "cmd_killSubthread":
return(isNewsURI(GetFirstSelectedMessage()));
default:
return false;
}
},
isCommandEnabled: function(command)
@@ -259,16 +260,17 @@ var DefaultController =
gDBView.getCommandStatus(nsMsgViewCommandType.deleteNoTrash, enabled, checkStatus);
return enabled.value;
case "button_junk":
UpdateJunkToolbarButton();
if (gDBView)
gDBView.getCommandStatus(nsMsgViewCommandType.junk, enabled, checkStatus);
return enabled.value;
case "cmd_killThread":
+ case "cmd_killSubthread":
return GetNumSelectedMessages() > 0;
case "cmd_watchThread":
if (gDBView)
gDBView.getCommandStatus(nsMsgViewCommandType.toggleThreadWatched, enabled, checkStatus);
return enabled.value;
case "cmd_createFilterFromPopup":
case "cmd_createFilterFromMenu":
var loadedFolder = GetLoadedMsgFolder();
@@ -493,16 +495,19 @@ var DefaultController =
MarkCurrentMessageAsRead();
SetNextMessageAfterDelete();
gDBView.doCommand(nsMsgViewCommandType.deleteNoTrash);
break;
case "cmd_killThread":
/* kill thread kills the thread and then does a next unread */
GoNextMessage(nsMsgNavigationType.toggleThreadKilled, true);
break;
+ case "cmd_killSubthread":
+ GoNextMessage(nsMsgNavigationType.toggleSubthreadKilled, true);
+ break;
case "cmd_watchThread":
gDBView.doCommand(nsMsgViewCommandType.toggleThreadWatched);
break;
case "button_next":
case "cmd_nextUnreadMsg":
MsgNextUnreadMessage();
break;
case "cmd_nextUnreadThread":
Index: mail/base/content/mailWindowOverlay.js
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.js,v
retrieving revision 1.193
diff -u -8 -p -r1.193 mailWindowOverlay.js
--- mail/base/content/mailWindowOverlay.js 6 Apr 2008 23:41:16 -0000 1.193
+++ mail/base/content/mailWindowOverlay.js 7 Apr 2008 22:07:52 -0000
@@ -317,16 +317,19 @@ function InitMessageMenu()
// we only kill and watch threads for news
var threadMenuSeparator = document.getElementById("threadItemsSeparator");
if (threadMenuSeparator)
threadMenuSeparator.setAttribute("hidden", isNews ? "" : "true");
var killThreadMenuItem = document.getElementById("killThread");
if (killThreadMenuItem)
killThreadMenuItem.setAttribute("hidden", isNews ? "" : "true");
+ var killSubthreadMenuItem = document.getElementById("killSubthread");
+ if (killSubthreadMenuItem)
+ killSubthreadMenuItem.setAttribute("hidden", isNews ? "" : "true");
var watchThreadMenuItem = document.getElementById("watchThread");
if (watchThreadMenuItem)
watchThreadMenuItem.setAttribute("hidden", isNews ? "" : "true");
// disable the move and copy menus if there are no messages selected.
// disable the move menu if we can't delete msgs from the folder
var moveMenu = document.getElementById("moveMenu");
var msgFolder = GetLoadedMsgFolder();
Index: mail/base/content/mailWindowOverlay.xul
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.xul,v
retrieving revision 1.235
diff -u -8 -p -r1.235 mailWindowOverlay.xul
--- mail/base/content/mailWindowOverlay.xul 27 Mar 2008 08:09:52 -0000 1.235
+++ mail/base/content/mailWindowOverlay.xul 7 Apr 2008 22:07:53 -0000
@@ -239,16 +239,17 @@
+
@@ -368,16 +369,17 @@
+
#ifdef XP_WIN
@@ -1777,16 +1779,21 @@
accesskey="&createFilter.accesskey;"
command="cmd_createFilterFromMenu"/>
+
Index: mail/base/content/messageWindow.js
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/messageWindow.js,v
retrieving revision 1.62
diff -u -8 -p -r1.62 messageWindow.js
--- mail/base/content/messageWindow.js 12 Mar 2008 17:00:23 -0000 1.62
+++ mail/base/content/messageWindow.js 7 Apr 2008 22:07:53 -0000
@@ -756,16 +756,17 @@ var MessageWindowController =
supportsCommand: function(command)
{
switch ( command )
{
case "cmd_delete":
case "cmd_undo":
case "cmd_redo":
case "cmd_killThread":
+ case "cmd_killSubthread":
case "cmd_watchThread":
case "button_delete":
case "button_junk":
case "cmd_shiftDelete":
case "cmd_saveAsFile":
case "cmd_saveAsTemplate":
case "cmd_viewPageSource":
case "cmd_getMsgsForAuthAccounts":
Index: mail/locales/en-US/chrome/messenger/FilterEditor.dtd
===================================================================
RCS file: /cvsroot/mozilla/mail/locales/en-US/chrome/messenger/FilterEditor.dtd,v
retrieving revision 1.10
diff -u -8 -p -r1.10 FilterEditor.dtd
--- mail/locales/en-US/chrome/messenger/FilterEditor.dtd 2 Mar 2008 06:21:19 -0000 1.10
+++ mail/locales/en-US/chrome/messenger/FilterEditor.dtd 7 Apr 2008 22:07:55 -0000
@@ -28,10 +28,11 @@
+
Index: mail/locales/en-US/chrome/messenger/filter.properties
===================================================================
RCS file: /cvsroot/mozilla/mail/locales/en-US/chrome/messenger/filter.properties,v
retrieving revision 1.7
diff -u -8 -p -r1.7 filter.properties
--- mail/locales/en-US/chrome/messenger/filter.properties 8 Jan 2008 18:48:45 -0000 1.7
+++ mail/locales/en-US/chrome/messenger/filter.properties 7 Apr 2008 22:07:55 -0000
@@ -42,8 +42,9 @@ filterAction9=replied
filterAction10=forwarded
filterAction11=execution stopped
filterAction12=deleted from POP3 server
filterAction13=left on POP3 server
filterAction14=junk score
filterAction15=body fetched from POP3 server
filterAction16=copied to folder
filterAction17=tagged
+filterAction18=ignored subthread
Index: mail/locales/en-US/chrome/messenger/messenger.dtd
===================================================================
RCS file: /cvsroot/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd,v
retrieving revision 1.72
diff -u -8 -p -r1.72 messenger.dtd
--- mail/locales/en-US/chrome/messenger/messenger.dtd 27 Mar 2008 08:09:53 -0000 1.72
+++ mail/locales/en-US/chrome/messenger/messenger.dtd 7 Apr 2008 22:07:55 -0000
@@ -337,16 +337,19 @@
+
+
+
Index: mail/themes/pinstripe/mail/jar.mn
===================================================================
RCS file: /cvsroot/mozilla/mail/themes/pinstripe/mail/jar.mn,v
retrieving revision 1.17
diff -u -8 -p -r1.17 jar.mn
--- mail/themes/pinstripe/mail/jar.mn 19 Nov 2007 04:04:46 -0000 1.17
+++ mail/themes/pinstripe/mail/jar.mn 7 Apr 2008 22:07:56 -0000
@@ -177,22 +177,24 @@ classic.jar:
skin/classic/messenger/icons/symbol-replied-selected.png (icons/symbol-replied-selected.png)
skin/classic/messenger/icons/symbol-imapdeleted.png (icons/symbol-imapdeleted.png)
skin/classic/messenger/icons/symbol-imapdeleted-selected.png (icons/symbol-imapdeleted-selected.png)
skin/classic/messenger/icons/symbol-null.png (icons/symbol-null.png)
skin/classic/messenger/icons/template-folder.png (icons/template-folder.png)
skin/classic/messenger/icons/thread-closed-eye-selected.png (icons/thread-closed-eye-selected.png)
skin/classic/messenger/icons/thread-closed-eye.png (icons/thread-closed-eye.png)
skin/classic/messenger/icons/thread-closed-kill.png (icons/thread-closed-kill.png)
+ skin/classic/messenger/icons/message-closed-ignore.png (icons/message-closed-ignore.png)
skin/classic/messenger/icons/thread-closed-offl-eye.png (icons/thread-closed-offl-eye.png)
skin/classic/messenger/icons/thread-closed-offl-kill.png (icons/thread-closed-offl-kill.png)
skin/classic/messenger/icons/thread-closed-selected.png (icons/thread-closed-selected.png)
skin/classic/messenger/icons/thread-closed.png (icons/thread-closed.png)
skin/classic/messenger/icons/thread-new-closed-eye.png (icons/thread-new-closed-eye.png)
skin/classic/messenger/icons/thread-new-closed-kill.png (icons/thread-new-closed-kill.png)
+ skin/classic/messenger/icons/message-new-closed-ignore.png (icons/message-new-closed-ignore.png)
skin/classic/messenger/icons/thread-new-closed-offl-eye.png (icons/thread-new-closed-offl-eye.png)
skin/classic/messenger/icons/thread-new-closed-offl-kill.png (icons/thread-new-closed-offl-kill.png)
skin/classic/messenger/icons/thread-new-closed.png (icons/thread-new-closed.png)
skin/classic/messenger/icons/threadcol.png (icons/threadcol.png)
skin/classic/messenger/icons/threadpane-splitter-bg.gif (icons/threadpane-splitter-bg.gif)
skin/classic/messenger/icons/unreadmail-selected.png (icons/unreadmail-selected.png)
skin/classic/messenger/icons/unreadmail.png (icons/unreadmail.png)
skin/classic/messenger/icons/unthreadcol.png (icons/unthreadcol.png)
Index: mail/themes/pinstripe/mail/mailWindow1.css
===================================================================
RCS file: /cvsroot/mozilla/mail/themes/pinstripe/mail/mailWindow1.css,v
retrieving revision 1.14
diff -u -8 -p -r1.14 mailWindow1.css
--- mail/themes/pinstripe/mail/mailWindow1.css 20 Sep 2007 03:59:12 -0000 1.14
+++ mail/themes/pinstripe/mail/mailWindow1.css 7 Apr 2008 22:07:56 -0000
@@ -327,16 +327,20 @@ treechildren::-moz-tree-image(subjectCol
treechildren::-moz-tree-image(news, threadCol, watch) {
list-style-image: url("chrome://messenger/skin/icons/thread-closed-eye.png");
}
treechildren::-moz-tree-image(news, threadCol, ignore) {
list-style-image: url("chrome://messenger/skin/icons/thread-closed-kill.png");
}
+treechildren::-moz-tree-image(news, threadCol, ignoreSubthread) {
+ list-style-image: url("chrome://messenger/skin/icons/message-closed-kill.png");
+}
+
#sizeCol,
#unreadCol,
#totalCol {
text-align: right;
}
#threadPaneBox {
margin-top: -1px;
Index: mail/themes/pinstripe/mail/icons/message-closed-kill.png
===================================================================
RCS file: mail/themes/pinstripe/mail/icons/message-closed-kill.png
diff -N mail/themes/pinstripe/mail/icons/message-closed-kill.png
Binary files /dev/null and message-closed-kill.png differ
Index: mail/themes/pinstripe/mail/icons/message-new-closed-kill.png
===================================================================
RCS file: mail/themes/pinstripe/mail/icons/message-new-closed-kill.png
diff -N mail/themes/pinstripe/mail/icons/message-new-closed-kill.png
Binary files /dev/null and message-new-closed-kill.png differ
Index: mail/themes/qute/mail/jar.mn
===================================================================
RCS file: /cvsroot/mozilla/mail/themes/qute/mail/jar.mn,v
retrieving revision 1.23
diff -u -8 -p -r1.23 jar.mn
--- mail/themes/qute/mail/jar.mn 10 Mar 2008 15:30:52 -0000 1.23
+++ mail/themes/qute/mail/jar.mn 7 Apr 2008 22:07:57 -0000
@@ -88,16 +88,17 @@ classic.jar:
skin/classic/messenger/icons/attachment-col.png (icons/attachment-col.png)
skin/classic/messenger/icons/attachment.png (icons/attachment.png)
skin/classic/messenger/icons/junk-col.png (icons/junk-col.png)
skin/classic/messenger/icons/thread-col.png (icons/thread-col.png)
skin/classic/messenger/icons/thread-col-sorta.png (icons/thread-col-sorta.png)
skin/classic/messenger/icons/thread-col-sortd.png (icons/thread-col-sortd.png)
skin/classic/messenger/icons/thread.png (icons/thread.png)
skin/classic/messenger/icons/thread-ignored.png (icons/thread-ignored.png)
+ skin/classic/messenger/icons/message-ignored.png (icons/message-ignored.png)
skin/classic/messenger/icons/thread-watched.png (icons/thread-watched.png)
skin/classic/messenger/icons/flag-col.png (icons/flag-col.png)
skin/classic/messenger/icons/flag.png (icons/flag.png)
skin/classic/messenger/icons/server.png (icons/server.png)
skin/classic/messenger/icons/readcol.png (icons/readcol.png)
skin/classic/messenger/icons/unreadmail.png (icons/unreadmail.png)
skin/classic/messenger/icons/Search-bar.png (icons/Search-bar.png)
skin/classic/messenger/icons/search-arrow.gif (icons/search-arrow.gif)
Index: mail/themes/qute/mail/mailWindow1.css
===================================================================
RCS file: /cvsroot/mozilla/mail/themes/qute/mail/mailWindow1.css,v
retrieving revision 1.21
diff -u -8 -p -r1.21 mailWindow1.css
--- mail/themes/qute/mail/mailWindow1.css 2 Jul 2007 03:20:32 -0000 1.21
+++ mail/themes/qute/mail/mailWindow1.css 7 Apr 2008 22:07:57 -0000
@@ -145,16 +145,20 @@ treechildren::-moz-tree-image(threadCol,
treechildren::-moz-tree-image(news, threadCol, watch) {
list-style-image: url("chrome://messenger/skin/icons/thread-watched.png");
}
treechildren::-moz-tree-image(news, threadCol, ignore) {
list-style-image: url("chrome://messenger/skin/icons/thread-ignored.png");
}
+treechildren::-moz-tree-image(news, threadCol, ignoreSubthread) {
+ list-style-image: url("chrome://messenger/skin/icons/message-ignored.png");
+}
+
/* ..... read column ..... */
treecol.readColumnHeader {
list-style-image: url("chrome://messenger/skin/icons/readcol.png");
-moz-padding-end: 5px;
padding-bottom: 5px;
}
Index: mailnews/base/resources/content/mail3PaneWindowCommands.js
===================================================================
RCS file: /cvsroot/mozilla/mailnews/base/resources/content/mail3PaneWindowCommands.js,v
retrieving revision 1.158
diff -u -8 -p -r1.158 mail3PaneWindowCommands.js
--- mailnews/base/resources/content/mail3PaneWindowCommands.js 27 Mar 2008 13:33:48 -0000 1.158
+++ mailnews/base/resources/content/mail3PaneWindowCommands.js 7 Apr 2008 22:08:03 -0000
@@ -240,16 +240,17 @@ var DefaultController =
return true;
case "cmd_downloadFlagged":
case "cmd_downloadSelected":
case "cmd_synchronizeOffline":
return(CheckOnline());
case "cmd_watchThread":
case "cmd_killThread":
+ case "cmd_killSubthread":
return(isNewsURI(GetFirstSelectedMessage()));
default:
return false;
}
},
isCommandEnabled: function(command)
@@ -276,16 +277,17 @@ var DefaultController =
gDBView.getCommandStatus(nsMsgViewCommandType.deleteNoTrash, enabled, checkStatus);
return enabled.value;
case "button_junk":
UpdateJunkToolbarButton();
if (gDBView)
gDBView.getCommandStatus(nsMsgViewCommandType.junk, enabled, checkStatus);
return enabled.value;
case "cmd_killThread":
+ case "cmd_killSubthread":
return GetNumSelectedMessages() > 0;
case "cmd_watchThread":
if (gDBView)
gDBView.getCommandStatus(nsMsgViewCommandType.toggleThreadWatched, enabled, checkStatus);
return enabled.value;
case "cmd_createFilterFromPopup":
case "cmd_createFilterFromMenu":
var loadedFolder = GetLoadedMsgFolder();
@@ -513,16 +515,19 @@ var DefaultController =
case "cmd_shiftDelete":
case "button_shiftDelete":
MsgDeleteMessage(true);
break;
case "cmd_killThread":
/* kill thread kills the thread and then does a next unread */
GoNextMessage(nsMsgNavigationType.toggleThreadKilled, true);
break;
+ case "cmd_killSubthread":
+ GoNextMessage(nsMsgNavigationType.toggleSubthreadKilled, true);
+ break;
case "cmd_watchThread":
gDBView.doCommand(nsMsgViewCommandType.toggleThreadWatched);
break;
case "button_next":
case "cmd_nextUnreadMsg":
MsgNextUnreadMessage();
break;
case "cmd_nextUnreadThread":
Index: mailnews/base/resources/content/mailWindowOverlay.js
===================================================================
RCS file: /cvsroot/mozilla/mailnews/base/resources/content/mailWindowOverlay.js,v
retrieving revision 1.266
diff -u -8 -p -r1.266 mailWindowOverlay.js
--- mailnews/base/resources/content/mailWindowOverlay.js 28 Mar 2008 18:59:00 -0000 1.266
+++ mailnews/base/resources/content/mailWindowOverlay.js 7 Apr 2008 22:08:04 -0000
@@ -337,16 +337,20 @@ function InitMessageMenu()
var threadMenuSeparator = document.getElementById("threadItemsSeparator");
if (threadMenuSeparator) {
threadMenuSeparator.setAttribute("hidden", isNews ? "" : "true");
}
var killThreadMenuItem = document.getElementById("killThread");
if (killThreadMenuItem) {
killThreadMenuItem.setAttribute("hidden", isNews ? "" : "true");
}
+ var killSubthreadMenuItem = document.getElementById("killSubthread");
+ if (killSubthreadMenuItem) {
+ killSubthreadMenuItem.setAttribute("hidden", isNews ? "" : "true");
+ }
var watchThreadMenuItem = document.getElementById("watchThread");
if (watchThreadMenuItem) {
watchThreadMenuItem.setAttribute("hidden", isNews ? "" : "true");
}
// Disable the Move and Copy menus if there are no messages selected.
// Disable the Move menu if we can't delete messages from the folder.
var moveMenu = document.getElementById("moveMenu");
Index: mailnews/base/resources/content/mailWindowOverlay.xul
===================================================================
RCS file: /cvsroot/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul,v
retrieving revision 1.350
diff -u -8 -p -r1.350 mailWindowOverlay.xul
--- mailnews/base/resources/content/mailWindowOverlay.xul 10 Mar 2008 18:58:20 -0000 1.350
+++ mailnews/base/resources/content/mailWindowOverlay.xul 7 Apr 2008 22:08:04 -0000
@@ -244,16 +244,17 @@
+
@@ -356,16 +357,17 @@
+
+