fix 72365 can't view ignored threads r=naving, sr=sspitzer

This commit is contained in:
bienvenu%netscape.com 2001-05-04 00:08:23 +00:00
parent 0f5bd49f89
commit df74b9e7f9
5 changed files with 17 additions and 2 deletions

View File

@ -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;
}

View File

@ -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":

View File

@ -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()

View File

@ -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"/>

View File

@ -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">