From df74b9e7f99fff70070ed9e0758cdcdfc89267c3 Mon Sep 17 00:00:00 2001
From: "bienvenu%netscape.com" <bienvenu%netscape.com>
Date: Fri, 4 May 2001 00:08:23 +0000
Subject: [PATCH] fix 72365 can't view ignored threads r=naving, sr=sspitzer

---
 mailnews/base/resources/content/commandglue.js            | 8 +++++++-
 .../base/resources/content/mail3PaneWindowCommands.js     | 3 +++
 mailnews/base/resources/content/mailWindowOverlay.js      | 3 +++
 mailnews/base/resources/content/mailWindowOverlay.xul     | 2 ++
 mailnews/base/resources/locale/en-US/messenger.dtd        | 3 ++-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js
index 75e76c0651e9..d85664dd3de0 100644
--- a/mailnews/base/resources/content/commandglue.js
+++ b/mailnews/base/resources/content/commandglue.js
@@ -346,7 +346,13 @@ function SwitchView(command)
       CreateDBView(msgWindow.openFolder, nsMsgViewType.eShowWatchedThreadsWithUnread, nsMsgViewFlagsType.kThreadedDisplay,
             nsMsgViewSortType.byThread, nsMsgViewSortOrder.ascending);
    break;
-    case "cmd_viewKilledThreads":
+    case "cmd_viewIgnoredThreads":
+      if (viewFlags & nsMsgViewFlagsType.kShowIgnored)
+        viewFlags = viewFlags & ~nsMsgViewFlagsType.kShowIgnored;
+      else
+        viewFlags = viewFlags | nsMsgViewFlagsType.kShowIgnored;
+      CreateDBView(msgWindow.openFolder, nsMsgViewType.eShowAllThreads, viewFlags,
+            nsMsgViewSortType.byThread, nsMsgViewSortOrder.ascending);
     break;
   }
 
diff --git a/mailnews/base/resources/content/mail3PaneWindowCommands.js b/mailnews/base/resources/content/mail3PaneWindowCommands.js
index 4740cfff8be4..642529247bd7 100644
--- a/mailnews/base/resources/content/mail3PaneWindowCommands.js
+++ b/mailnews/base/resources/content/mail3PaneWindowCommands.js
@@ -210,6 +210,7 @@ var DefaultController =
 			case "cmd_viewUnreadMsgs":
       case "cmd_viewThreadsWithUnread":
       case "cmd_viewWatchedThreadsWithUnread":
+      case "cmd_viewIgnoredThreads":
       case "cmd_undo":
       case "cmd_redo":
 			case "cmd_expandAllThreads":
@@ -369,6 +370,7 @@ var DefaultController =
       case "cmd_viewUnreadMsgs":
       case "cmd_viewThreadsWithUnread":
       case "cmd_viewWatchedThreadsWithUnread":
+      case "cmd_viewIgnoredThreads":
         return true;
       case "cmd_undo":
       case "cmd_redo":
@@ -494,6 +496,7 @@ var DefaultController =
       case "cmd_viewThreadsWithUnread":
       case "cmd_viewWatchedThreadsWithUnread":
 			case "cmd_viewUnreadMsgs":
+      case "cmd_viewIgnoredThreads":
 				SwitchView(command);
 				break;
 			case "cmd_undo":
diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js
index 3f2cb8bceb19..c72ef21d3f0d 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mailnews/base/resources/content/mailWindowOverlay.js
@@ -176,6 +176,9 @@ function InitViewMessagesMenu()
   var watchedTheadsWithUnreadMenuItem = document.getElementById("viewWatchedThreadsWithUnreadMenuItem");
   if(watchedTheadsWithUnreadMenuItem)
       watchedTheadsWithUnreadMenuItem.setAttribute("checked", viewType == nsMsgViewType.eShowWatchedThreadsWithUnread);
+  var ignoredTheadsMenuItem = document.getElementById("viewIgnoredThreadsMenuItem");
+  if(ignoredTheadsMenuItem)
+      ignoredTheadsMenuItem.setAttribute("checked", (viewFlags & nsMsgViewFlagsType.kShowIgnored) != 0);
 }
 
 function InitMessageMenu()
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 3dfc8cb7c44f..09f5320a8377 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -99,6 +99,7 @@ Rights Reserved.
    <command id="cmd_viewUnreadMsgs" oncommand="goDoCommand('cmd_viewUnreadMsgs')" disabled="true"/>
    <command id="cmd_viewThreadsWithUnread" oncommand="goDoCommand('cmd_viewThreadsWithUnread')" disabled="true"/>
    <command id="cmd_viewWatchedThreadsWithUnread" oncommand="goDoCommand('cmd_viewWatchedThreadsWithUnread')" disabled="true"/>
+   <command id="cmd_viewIgnoredThreads" oncommand="goDoCommand('cmd_viewIgnoredThreads')" disabled="true"/>
    <command id="cmd_sortByThread" oncommand="goDoCommand('cmd_sortByThread')" disabled="true"/>
 
 </commandset>
@@ -895,6 +896,7 @@ Rights Reserved.
            label="&threadsMsgsCmd.label;"
            accesskey="&threadsMsgsCmd.accesskey;"
            observes="cmd_sortByThread"/>
+          <menuitem id="viewIgnoredThreadsMenuItem" type="checkbox" label="&ignoredThreadsCmd.label;" disabled="true" observes="cmd_viewIgnoredThreads"/>
           <menuseparator/>
           <menuitem label="&expandAllThreadsCmd.label;" accesskey="&expandAllThreadsCmd.accesskey;" key="key_expandAllThreads" disabled="true" observes="cmd_expandAllThreads"/>
           <menuitem label="&collapseAllThreadsCmd.label;" accesskey="&collapseAllThreadsCmd.accesskey;" key="key_collapseAllThreads" disabled="true" observes="cmd_collapseAllThreads"/>
diff --git a/mailnews/base/resources/locale/en-US/messenger.dtd b/mailnews/base/resources/locale/en-US/messenger.dtd
index f7942c7d53c6..8cea7d7eabc8 100644
--- a/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -175,6 +175,7 @@ Rights Reserved.
 <!ENTITY threadsWithUnreadCmd.accesskey "t">  
 <!ENTITY watchedThreadsWithUnreadCmd.label "Watched Threads With Unread">  
 <!ENTITY watchedThreadsWithUnreadCmd.accesskey "w">  
+<!ENTITY ignoredThreadsCmd.label "Ignored Threads">  
 <!ENTITY headersMenu.label "Headers"> 
 <!ENTITY headersMenu.accesskey "h"> 
 <!ENTITY headersAllCmd.label "All">  
@@ -346,7 +347,7 @@ Rights Reserved.
 <!ENTITY moveMsgMenu.accesskey "m">  
 <!ENTITY copyMsgMenu.label "Copy Message">  
 <!ENTITY copyMsgMenu.accesskey "c">  
-<!ENTITY killThreadMenu.label "Kill Thread">
+<!ENTITY killThreadMenu.label "Ignore Thread">
 <!ENTITY killThreadMenu.accesskey "k">
 <!ENTITY killThreadMenu.key "k">
 <!ENTITY watchThreadMenu.label "Watch Thread">