From 18196c4b732af6b94e9651fc3dc40ab0eabfa685 Mon Sep 17 00:00:00 2001 From: "putterman%netscape.com" Date: Mon, 21 Aug 2000 20:00:48 +0000 Subject: [PATCH] More fixes for 48244 which makes the 3pane menus look better. Also fixed 44223 which brings Open Link in New Window to the top of the message pane context menu r=bienvenu. --- .../content/mail3PaneWindowVertLayout.xul | 208 +------------- .../base/resources/content/mailCommands.js | 18 +- .../resources/content/mailContextMenus.js | 169 +++++++----- .../resources/content/mailWindowOverlay.js | 146 +++++++++- .../resources/content/mailWindowOverlay.xul | 260 +++++++++++++++--- .../base/resources/content/messageWindow.js | 3 + mailnews/base/resources/content/messenger.xul | 206 +------------- .../base/resources/locale/en-US/messenger.dtd | 32 +-- .../locale/en-US/messenger.properties | 12 +- mailnews/base/util/nsMsgFolder.cpp | 9 + 10 files changed, 517 insertions(+), 546 deletions(-) diff --git a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul index d7a9823e2da3..d35bdb7369c4 100644 --- a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul +++ b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul @@ -81,204 +81,10 @@ Rights Reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -292,11 +98,13 @@ Rights Reserved. - - + + + + diff --git a/mailnews/base/resources/content/mailCommands.js b/mailnews/base/resources/content/mailCommands.js index 5a38239f0498..2861eb2ecdda 100644 --- a/mailnews/base/resources/content/mailCommands.js +++ b/mailnews/base/resources/content/mailCommands.js @@ -188,18 +188,14 @@ function SendUnsentMessages(folder) // turn this into a new post or a reply to group. if (server.type == "nntp") { - if (type == msgComposeType.Reply) - type = msgComposeType.ReplyToGroup; - else - if (type == msgComposeType.New) - { - type = msgComposeType.NewsPost; - + if (type == msgComposeType.New) + { + type = msgComposeType.NewsPost; if (folder.isServer) - newsgroup = ""; - else - newsgroup = server.hostName + "/" + folder.name; - } + newsgroup = ""; + else + newsgroup = server.hostName + "/" + folder.name; + } } identity = getIdentityForServer(server); // dump("identity = " + identity + "\n"); diff --git a/mailnews/base/resources/content/mailContextMenus.js b/mailnews/base/resources/content/mailContextMenus.js index 61847bf4ecd6..5515017c06b1 100644 --- a/mailnews/base/resources/content/mailContextMenus.js +++ b/mailnews/base/resources/content/mailContextMenus.js @@ -27,7 +27,7 @@ var isNewsgroup = false; var selectedMessage = null; - if(numSelected == 1) + if(numSelected >= 0) { selectedMessage = selectedMessages[0]; isNewsgroup = GetMessageType(selectedMessage) == "news"; @@ -43,6 +43,7 @@ SetupReplyToNewsgroupMenuItem("threadPaneContext-replyNewsgroup", numSelected, isNewsgroup, false); SetupReplyAllMenuItem("threadPaneContext-replyAll", numSelected, false); SetupForwardMenuItem("threadPaneContext-forward", numSelected, false); + SetupForwardAsAttachmentMenuItem("threadPaneContext-forwardAsAttachment", numSelected, false); ShowMenuItem("threadPaneContext-sep-reply", true); @@ -50,7 +51,7 @@ SetupCopyMenuItem("threadPaneContext-copyMenu", numSelected, false); SetupSaveAsMenuItem("threadPaneContext-saveAs", numSelected, false); SetupPrintMenuItem("threadPaneContext-print", numSelected, false); - SetupDeleteMenuItem("threadPaneContext-delete", numSelected, false); + SetupDeleteMenuItem("threadPaneContext-delete", numSelected, isNewsgroup, false); SetupAddSenderToABMenuItem("threadPaneContext-addSenderToAddressBook", numSelected, false); SetupAddAllToABMenuItem("threadPaneContext-addAllToAddressBook", numSelected, false); @@ -112,10 +113,16 @@ function SetupReplyAllMenuItem(menuID, numSelected, forceHide) function SetupForwardMenuItem(menuID, numSelected, forceHide) { - ShowMenuItem(menuID, !forceHide); + ShowMenuItem(menuID, (numSelected <= 1) && !forceHide); EnableMenuItem(menuID, (numSelected > 0)); } +function SetupForwardAsAttachmentMenuItem(menuID, numSelected, forceHide) +{ + ShowMenuItem(menuID, (numSelected > 1) && !forceHide); + EnableMenuItem(menuID, (numSelected > 1)); +} + function SetupMoveMenuItem(menuID, numSelected, isNewsgroup, forceHide) { ShowMenuItem(menuID, !isNewsgroup && !forceHide); @@ -140,10 +147,25 @@ function SetupPrintMenuItem(menuID, numSelected, forceHide) EnableMenuItem(menuID, (numSelected > 0)); } -function SetupDeleteMenuItem(menuID, numSelected, forceHide) +function SetupDeleteMenuItem(menuID, numSelected, isNewsgroup, forceHide) { - ShowMenuItem(menuID, !forceHide); - EnableMenuItem(menuID, (numSelected > 0)); + var showMenuItem = !forceHide; + + ShowMenuItem(menuID, showMenuItem); + if(showMenuItem) + { + EnableMenuItem(menuID, (numSelected > 0)); + if(!isNewsgroup) + { + SetMenuItemValue(menuID, Bundle.GetStringFromName("delete")); + SetMenuItemAccessKey(menuID, Bundle.GetStringFromName("deleteAccessKey")); + } + else + { + SetMenuItemValue(menuID, Bundle.GetStringFromName("cancel")); + SetMenuItemAccessKey(menuID, Bundle.GetStringFromName("cancelAccessKey")); + } + } } function SetupAddSenderToABMenuItem(menuID, numSelected, forceHide) @@ -175,8 +197,10 @@ function fillFolderPaneContextMenu() var isServer = targetFolder.getAttribute('IsServer') == 'true'; var serverType = targetFolder.getAttribute('ServerType'); var specialFolder = targetFolder.getAttribute('SpecialFolder'); + var canSubscribeToFolder = (serverType == "nntp") || (serverType == "imap"); + var canGetMessages = isServer && (serverType != "nntp") && (serverType !="none"); - ShowMenuItem("folderPaneContext-getMessages", (numSelected <= 1) && (isServer && (serverType != 'nntp'))); + ShowMenuItem("folderPaneContext-getMessages", (numSelected <= 1) && canGetMessages); EnableMenuItem("folderPaneContext-getMessages", true); ShowMenuItem("folderPaneContext-openNewWindow", (numSelected <= 1) && !isServer); @@ -191,23 +215,18 @@ function fillFolderPaneContextMenu() ShowMenuItem("folderPaneContext-sendUnsentMessages", (numSelected <= 1) && (specialFolder == 'Unsent Messages')); EnableMenuItem("folderPaneContext-sendUnsentMessages", true); - ShowMenuItem("folderPaneContext-unsubscribe", (numSelected <= 1) && ((serverType == 'nntp') && !isServer)); - EnableMenuItem("folderPaneContext-unsubscribe", false); - - ShowMenuItem("folderPaneContext-markFolderRead", (numSelected <= 1) && ((serverType == 'nntp') && !isServer)); - EnableMenuItem("folderPaneContext-markFolderRead", false); - ShowMenuItem("folderPaneContext-sep-edit", (numSelected <= 1)); SetupNewMenuItem(targetFolder, numSelected, isServer, serverType, specialFolder); - ShowMenuItem("folderPaneContext-subscribe", (numSelected <= 1) && (serverType == 'nntp')); + ShowMenuItem("folderPaneContext-subscribe", (numSelected <= 1) && canSubscribeToFolder && serverType != 'nntp'); EnableMenuItem("folderPaneContext-subscribe", true); - ShowMenuItem("folderPaneContext-sep-new", ((numSelected<=1) && (specialFolder != "Unsent Messages"))); + ShowMenuItem("folderPaneContext-newsSubscribe", (numSelected <= 1) && canSubscribeToFolder && isServer && serverType == 'nntp'); + EnableMenuItem("folderPaneContext-subscribe", true); ShowMenuItem("folderPaneContext-searchMessages", (numSelected<=1)); - EnableMenuItem("folderPaneContext-searchMessages", false); + EnableMenuItem("folderPaneContext-searchMessages", true); return(true); } @@ -218,21 +237,10 @@ function SetupRenameMenuItem(targetFolder, numSelected, isServer, serverType, sp var isMail = serverType != 'nntp'; var canRename = (targetFolder.getAttribute('CanRename') == "true"); - ShowMenuItem("folderPaneContext-rename", (numSelected <= 1) && (isServer || canRename)); + ShowMenuItem("folderPaneContext-rename", (numSelected <= 1) && !isServer && (specialFolder == "none") && canRename); EnableMenuItem("folderPaneContext-rename", !isServer); - if(isServer) - { - if(isMail) - { - SetMenuItemValue("folderPaneContext-rename", Bundle.GetStringFromName("renameAccount")); - } - else - { - SetMenuItemValue("folderPaneContext-rename", Bundle.GetStringFromName("renameNewsAccount")); - } - } - else if(canRename) + if(canRename) { SetMenuItemValue("folderPaneContext-rename", Bundle.GetStringFromName("renameFolder")); } @@ -241,27 +249,15 @@ function SetupRenameMenuItem(targetFolder, numSelected, isServer, serverType, sp function SetupRemoveMenuItem(targetFolder, numSelected, isServer, serverType, specialFolder) { var isMail = serverType != 'nntp'; - var isInbox = specialFolder == "Inbox"; - var isTrash = specialFolder == "Trash"; - var isUnsent = specialFolder == "Unsent Messages"; - var showRemove = (numSelected <=1) && (isServer || (isMail && (!(isInbox || isTrash || isUnsent)))); + var isSpecialFolder = specialFolder != "none"; + //Can't currently delete Accounts or special folders. + var showRemove = (numSelected <=1) && (isMail && !isSpecialFolder) && !isServer; ShowMenuItem("folderPaneContext-remove", showRemove); - EnableMenuItem("folderPaneContext-remove", false); + EnableMenuItem("folderPaneContext-remove", true); - if(isServer) - { - if(isMail) - { - SetMenuItemValue("folderPaneContext-remove", Bundle.GetStringFromName("removeAccount")); - } - else - { - SetMenuItemValue("folderPaneContext-remove", Bundle.GetStringFromName("removeNewsAccount")); - } - } - else if(isMail && !(isInbox || isTrash || isUnsent)) + if(isMail && !isSpecialFolder) { SetMenuItemValue("folderPaneContext-remove", Bundle.GetStringFromName("removeFolder")); } @@ -270,12 +266,14 @@ function SetupRemoveMenuItem(targetFolder, numSelected, isServer, serverType, sp function SetupNewMenuItem(targetFolder, numSelected, isServer, serverType, specialFolder) { var canCreateNew = targetFolder.getAttribute('CanCreateSubfolders') == 'true'; - var showNew = (numSelected <=1) && (serverType != 'nntp') && canCreateNew; + var isInbox = specialFolder == "Inbox"; + + var showNew = ((numSelected <=1) && (serverType != 'nntp') && canCreateNew) || isInbox; ShowMenuItem("folderPaneContext-new", showNew); EnableMenuItem("folderPaneContext-new", true); if(showNew) { - if(isServer) + if(isServer || isInbox) SetMenuItemValue("folderPaneContext-new", Bundle.GetStringFromName("newFolder")); else SetMenuItemValue("folderPaneContext-new", Bundle.GetStringFromName("newSubfolder")); @@ -286,18 +284,24 @@ function SetupNewMenuItem(targetFolder, numSelected, isServer, serverType, speci function ShowMenuItem(id, showItem) { var item = document.getElementById(id); - var showing = (item.getAttribute('hidden') !='true'); - if(item && (showItem != showing)) - item.setAttribute('hidden', showItem ? '' : 'true'); + if(item) + { + var showing = (item.getAttribute('hidden') !='true'); + if(showItem != showing) + item.setAttribute('hidden', showItem ? '' : 'true'); + } } function EnableMenuItem(id, enableItem) { var item = document.getElementById(id); - var enabled = (item.getAttribute('disabled') !='true'); - if(item && (enableItem != enabled)) + if(item) { - item.setAttribute('disabled', enableItem ? '' : 'true'); + var enabled = (item.getAttribute('disabled') !='true'); + if(enableItem != enabled) + { + item.setAttribute('disabled', enableItem ? '' : 'true'); + } } } @@ -309,6 +313,13 @@ function SetMenuItemValue(id, value) } +function SetMenuItemAccessKey(id, accessKey) +{ + var item = document.getElementById(id); + if(item) + item.setAttribute('accesskey', accessKey); + +} function fillMessagePaneContextMenu(contextMenuNode) { @@ -322,36 +333,46 @@ function fillMessagePaneContextMenu(contextMenuNode) if(numSelected == 1) isNewsgroup = GetMessageType(message) == "news"; + var hideMailItems = AreBrowserItemsShowing(); - SetupNewMessageWindowMenuItem("messagePaneContext-openNewWindow", numSelected, (numSelected == 0)); - SetupEditAsNewMenuItem("messagePaneContext-editAsNew", numSelected, (numSelected == 0)); - SetupReplyToSenderMenuItem("messagePaneContext-replySender", numSelected, (numSelected == 0)); - SetupReplyToNewsgroupMenuItem("messagePaneContext-replyNewsgroup", numSelected, isNewsgroup, (numSelected == 0)); - SetupReplyAllMenuItem("messagePaneContext-replyAll" , numSelected, (numSelected == 0)); - SetupForwardMenuItem("messagePaneContext-forward", numSelected, (numSelected == 0)); - SetupMoveMenuItem("messagePaneContext-moveMenu", numSelected, isNewsgroup, (numSelected == 0));"context-copy" - SetupCopyMenuItem("messagePaneContext-copyMenu", numSelected, (numSelected == 0)); - SetupSaveAsMenuItem("messagePaneContext-saveAs", numSelected, (numSelected == 0)); - SetupPrintMenuItem("messagePaneContext-print", numSelected, (numSelected == 0)); - SetupDeleteMenuItem("messagePaneContext-delete", numSelected, (numSelected == 0)); - SetupAddSenderToABMenuItem("messagePaneContext-addSenderToAddressBook", numSelected, (numSelected == 0)); - SetupAddAllToABMenuItem("messagePaneContext-addAllToAddressBook", numSelected, (numSelected == 0)); + SetupEditAsNewMenuItem("messagePaneContext-editAsNew", numSelected, (numSelected == 0 || hideMailItems)); + SetupReplyToSenderMenuItem("messagePaneContext-replySender", numSelected, (numSelected == 0 || hideMailItems)); + SetupReplyToNewsgroupMenuItem("messagePaneContext-replyNewsgroup", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems)); + SetupReplyAllMenuItem("messagePaneContext-replyAll" , numSelected, (numSelected == 0 || hideMailItems)); + SetupForwardMenuItem("messagePaneContext-forward", numSelected, (numSelected == 0 || hideMailItems)); + SetupForwardAsAttachmentMenuItem("threadPaneContext-forwardAsAttachment", numSelected, hideMailItems); + SetupMoveMenuItem("messagePaneContext-moveMenu", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems)); + SetupCopyMenuItem("messagePaneContext-copyMenu", numSelected, (numSelected == 0 || hideMailItems)); + SetupSaveAsMenuItem("messagePaneContext-saveAs", numSelected, (numSelected == 0 || hideMailItems)); + SetupPrintMenuItem("messagePaneContext-print", numSelected, (numSelected == 0 || hideMailItems)); + SetupDeleteMenuItem("messagePaneContext-delete", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems)); + SetupAddSenderToABMenuItem("messagePaneContext-addSenderToAddressBook", numSelected, (numSelected == 0 || hideMailItems)); + SetupAddAllToABMenuItem("messagePaneContext-addAllToAddressBook", numSelected, (numSelected == 0 || hideMailItems)); //Figure out separators ShowMenuItem("messagePaneContext-sep-open", ShowMessagePaneOpenSeparator()); ShowMenuItem("messagePaneContext-sep-reply", ShowMessagePaneReplySeparator()); ShowMenuItem("messagePaneContext-sep-edit", ShowMessagePaneEditSeparator()); - ShowMenuItem("messagePaneContext-sep-addressBook", ShowMessagePaneABSeparator()); ShowMenuItem("messagePaneContext-sep-link", ShowMessagePaneLinkSeparator()); ShowMenuItem("messagePaneContext-sep-image", ShowMessagePaneImageSeparator()); ShowMenuItem("messagePaneContext-sep-copy", ShowMessagePaneCopySeparator()); } +function AreBrowserItemsShowing() +{ + return(IsMenuItemShowingWithStyle("context-openlink") || + IsMenuItemShowingWithStyle("context-editlink") || + IsMenuItemShowingWithStyle("context-viewimage") || + IsMenuItemShowingWithStyle("context-copylink") || + IsMenuItemShowingWithStyle("context-copyimage") || + IsMenuItemShowingWithStyle("context-savelink") || + IsMenuItemShowingWithStyle("context-saveimage") || + IsMenuItemShowingWithStyle("context-bookmarklink")); +} function ShowMessagePaneOpenSeparator() { - return(IsMenuItemShowing("messagePaneContext-openNewWindow") || - IsMenuItemShowingWithStyle("context-selectall") || + return(IsMenuItemShowingWithStyle("context-selectall") || IsMenuItemShowingWithStyle("context-copy")); } @@ -373,12 +394,6 @@ function ShowMessagePaneEditSeparator() IsMenuItemShowing("messagePaneContext-delete")); } -function ShowMessagePaneABSeparator() -{ - return (IsMenuItemShowing("messagePaneContext-addSenderToAddressBook") || - IsMenuItemShowing("messagePaneContext-addAllToAddressBook")); -} - function ShowMessagePaneLinkSeparator() { return (IsMenuItemShowingWithStyle("context-openlink") || @@ -419,3 +434,5 @@ function IsMenuItemShowingWithStyle(menuID) } + + diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js index 2b62a5275eaa..575f62b69a66 100644 --- a/mailnews/base/resources/content/mailWindowOverlay.js +++ b/mailnews/base/resources/content/mailWindowOverlay.js @@ -36,6 +36,126 @@ function view_init() } } +function InitViewMessagesMenu() +{ + var allMenuItem = document.getElementById("viewAllMessagesMenuItem"); + var hidden = allMenuItem.getAttribute("hidden") == "true"; + if(allMenuItem && !hidden) + allMenuItem.setAttribute("checked", messageView.viewType == viewShowAll); + + var unreadMenuItem = document.getElementById("viewUnreadMessagesMenuItem"); + var hidden = unreadMenuItem.getAttribute("hidden") == "true"; + if(unreadMenuItem && !hidden) + unreadMenuItem.setAttribute("checked", messageView.viewType == viewShowUnread); + +} + +function InitMessageMenu() +{ + var messages = GetSelectedMessages(); + var numMessages = messages.length; + var isNews = false; + if(numMessages > 0) + { + isNews = GetMessageType(messages[0]) == "news"; + } + + //We show reply to Newsgroups only for news messages. + var replyNewsgroupMenuItem = document.getElementById("replyNewsgroupMainMenu"); + if(replyNewsgroupMenuItem) + replyNewsgroupMenuItem.setAttribute("hidden", isNews ? "" : "true"); + + //For mail messages we say reply. For news we say ReplyToSender. + var replyMenuItem = document.getElementById("replyMainMenu"); + if(replyMenuItem) + { + replyMenuItem.setAttribute("hidden", !isNews ? "" : "true"); + } + + var replySenderMenuItem = document.getElementById("replySenderMainMenu"); + if(replySenderMenuItem) + { + replySenderMenuItem.setAttribute("hidden", isNews ? "" : "true"); + } + +} + +function GetMessageType(message) +{ + + var compositeDS = GetCompositeDataSource("MessageProperty"); + var property = RDF.GetResource('http://home.netscape.com/NC-rdf#MessageType'); + var result = compositeDS.GetTarget(message, property, true); + result = result.QueryInterface(Components.interfaces.nsIRDFLiteral); + return result.Value; + +} + +function InitMessageMarkMenu() +{ + InitMarkReadMenuItem(); + InitMarkFlaggedMenuItem(); + +} + +function InitMarkReadMenuItem() +{ + var messages = GetSelectedMessages(); + var numMessages = messages.length; + + var compositeDS = GetCompositeDataSource("MarkMessageRead"); + var property = RDF.GetResource('http://home.netscape.com/NC-rdf#IsUnread'); + + var areMessagesRead; + + if(numMessages == 0) + areMessagesRead = false; + else + { + areMessagesRead = true; + for(var i = 0; i < numMessages; i++) + { + var result = compositeDS.GetTarget(messages[i], property, true); + result = result.QueryInterface(Components.interfaces.nsIRDFLiteral); + if(result.Value == "true") + { + areMessagesRead = false; + break; + } + } + } + + var markReadMenuItem = document.getElementById("markReadMenuItem"); + if(markReadMenuItem) + markReadMenuItem.setAttribute("checked", areMessagesRead); +} + +function InitMarkFlaggedMenuItem() +{ + var messages = GetSelectedMessages(); + var numMessages = messages.length; + + var compositeDS = GetCompositeDataSource("MarkMessageFlagged"); + var property = RDF.GetResource('http://home.netscape.com/NC-rdf#Flagged'); + + var areMessagesFlagged = false; + + for(var i = 0; i < numMessages; i++) + { + var result = compositeDS.GetTarget(messages[i], property, true); + result = result.QueryInterface(Components.interfaces.nsIRDFLiteral); + if(result.Value == "flagged") + { + areMessagesFlagged = true; + break; + } + } + + var markFlaggedMenuItem = document.getElementById("markFlaggedMenuItem"); + if(markFlaggedMenuItem) + markFlaggedMenuItem.setAttribute("checked", areMessagesFlagged); +} + function GetFirstSelectedMsgFolder() { var result = null; @@ -140,15 +260,39 @@ function MsgNewMessage(event) } function MsgReplyMessage(event) +{ + var loadedFolder = GetLoadedMsgFolder(); + + var server = loadedFolder.server; + + if(server && server.type == "nntp") + MsgReplyGroup(event); + else + MsgReplySender(event); + +} + +function MsgReplySender(event) { var loadedFolder = GetLoadedMsgFolder(); var messageArray = GetSelectedMessages(); - dump("\nMsgReplyMessage from XUL\n"); if (event && event.shiftKey) ComposeMessage(msgComposeType.Reply, msgComposeFormat.OppositeOfDefault, loadedFolder, messageArray); else ComposeMessage(msgComposeType.Reply, msgComposeFormat.Default, loadedFolder, messageArray); + +} + +function MsgReplyGroup(event) +{ + var loadedFolder = GetLoadedMsgFolder(); + var messageArray = GetSelectedMessages(); + + if (event && event.shiftKey) + ComposeMessage(msgComposeType.ReplyToGroup, msgComposeFormat.OppositeOfDefault, loadedFolder, messageArray); + else + ComposeMessage(msgComposeType.ReplyToGroup, msgComposeFormat.Default, loadedFolder, messageArray); } function MsgReplyToAllMessage(event) diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul index ec890c881574..2ce0a8856a3e 100644 --- a/mailnews/base/resources/content/mailWindowOverlay.xul +++ b/mailnews/base/resources/content/mailWindowOverlay.xul @@ -126,13 +126,212 @@ Rights Reserved. - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + @@ -435,10 +620,10 @@ Rights Reserved. - + - - + + @@ -498,7 +683,7 @@ Rights Reserved. - + @@ -512,16 +697,23 @@ Rights Reserved. - + - + + - + - - + - - + diff --git a/mailnews/base/resources/content/messageWindow.js b/mailnews/base/resources/content/messageWindow.js index 5e979c10a133..fb9e0c8f1cf5 100644 --- a/mailnews/base/resources/content/messageWindow.js +++ b/mailnews/base/resources/content/messageWindow.js @@ -152,6 +152,9 @@ function HideMenus() if(renameFolderMenu) renameFolderMenu.setAttribute("hidden", "true"); + var viewMessagesMenu = document.getElementById('viewMessagesMenu'); + if(viewMessagesMenu) + viewMessagesMenu.setAttribute("hidden", "true"); } function OnUnloadMessageWindow() diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul index c5c79c644267..b02af6a1dea3 100644 --- a/mailnews/base/resources/content/messenger.xul +++ b/mailnews/base/resources/content/messenger.xul @@ -86,208 +86,10 @@ Rights Reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - + - - - + - - @@ -290,6 +280,10 @@ Rights Reserved. + + + + @@ -368,18 +362,20 @@ Rights Reserved. - + - + - + - + + + @@ -398,13 +394,13 @@ Rights Reserved. - + - + diff --git a/mailnews/base/resources/locale/en-US/messenger.properties b/mailnews/base/resources/locale/en-US/messenger.properties index 460d81de206a..113340bfdab2 100644 --- a/mailnews/base/resources/locale/en-US/messenger.properties +++ b/mailnews/base/resources/locale/en-US/messenger.properties @@ -28,13 +28,19 @@ renameFolderDialogTitle=Rename Folder renameAccount=Rename Account... renameNewsAccount=Rename News Account... renameFolder=Rename Folder... -removeAccount=Remove Account... -removeNewsAccount=Remove News Account... -removeFolder=Remove Folder... +removeAccount=Delete Account... +removeNewsAccount=Delete News Account... +removeFolder=Delete Folder... newFolder=New Folder... newSubfolder=New Subfolder... titleNewsPreHost=on titleMailPreHost=for +replyToSender=Reply to Sender +reply=Reply +delete=Delete +deleteAccessKey=d +cancel=Cancel +cancelAccessKey=c # LOCALIZATION NOTES(HTMLFiles): Only translate "Files" in the line below HTMLFiles=HTML Files (*.htm, *.html, *.shtml) # LOCALIZATION NOTES(TextFiles): Do not translate "*.txt" in the line below diff --git a/mailnews/base/util/nsMsgFolder.cpp b/mailnews/base/util/nsMsgFolder.cpp index 95bb28c6d9f4..ebde52a62d94 100644 --- a/mailnews/base/util/nsMsgFolder.cpp +++ b/mailnews/base/util/nsMsgFolder.cpp @@ -746,6 +746,15 @@ NS_IMETHODIMP nsMsgFolder::GetCanCreateSubfolders(PRBool *aResult) { NS_ENSURE_ARG_POINTER(aResult); + + //Checking folder flag to see if it is the "Unsent Messages" or "Inbox" + //and if so return FALSE + if ((mFlags & MSG_FOLDER_FLAG_QUEUE) || (mFlags & MSG_FOLDER_FLAG_INBOX)) + { + *aResult = PR_FALSE; + return NS_OK; + } + // by default, you can create subfolders on server and folders // if otherwise, override it. *aResult = PR_TRUE;