From 4b7de92dda2ba8f72924dec6165c6376d84e1d12 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Wed, 22 Dec 1999 00:18:44 +0000 Subject: [PATCH] implement more of the View | Sort menu items, implement the View | Headers menu items, remove dead code. r=putterman, a=sdagley --- .../base/resources/content/threadPane.xul | 20 ++--- mailnews/base/resources/content/widgetglue.js | 89 ++++++++++++++----- .../base/resources/locale/en-US/messenger.dtd | 16 ++-- .../en-US/chrome/mailnews/messenger.dtd | 16 ++-- 4 files changed, 94 insertions(+), 47 deletions(-) diff --git a/mailnews/base/resources/content/threadPane.xul b/mailnews/base/resources/content/threadPane.xul index d971a84a0527..ac85df29ebb4 100644 --- a/mailnews/base/resources/content/threadPane.xul +++ b/mailnews/base/resources/content/threadPane.xul @@ -84,16 +84,16 @@ Rights Reserved. - - - - - - - - - - + + + + + + + + + + diff --git a/mailnews/base/resources/content/widgetglue.js b/mailnews/base/resources/content/widgetglue.js index 469203cd1ca1..df94d392588c 100644 --- a/mailnews/base/resources/content/widgetglue.js +++ b/mailnews/base/resources/content/widgetglue.js @@ -28,6 +28,9 @@ var msgComposeType = Components.interfaces.nsIMsgCompType; var msgComposFormat = Components.interfaces.nsIMsgCompFormat; var Bundle = srGetStrBundle("chrome://messenger/locale/messenger.properties"); +var prefs = Components.classes['component://netscape/preferences'].getService(); +prefs = prefs.QueryInterface(Components.interfaces.nsIPref); + // Controller object for folder pane var FolderPaneController = { @@ -221,13 +224,6 @@ var viewShowRead = 1; var viewShowUnread =2; var viewShowWatched = 3; - -function MsgLoadNewsMessage(url) -{ - dump("\n\nMsgLoadNewsMessage from XUL\n"); - OpenURL(url); -} - function MsgHome(url) { window.open( url, "_blank", "chrome,dependent=yes,all" ); @@ -326,8 +322,6 @@ function MsgReplyToAllMessage(event) function MsgForwardMessage(event) { dump("\nMsgForwardMessage from XUL\n"); - var prefs = Components.classes['component://netscape/preferences'].getService(); - prefs = prefs.QueryInterface(Components.interfaces.nsIPref); var forwardType = 0; try { var forwardType = prefs.GetIntPref("mail.forward_message_mode"); @@ -451,6 +445,48 @@ function MsgSortBySubject() SortThreadPane('SubjectColumn', 'http://home.netscape.com/NC-rdf#Subject'); } +function MsgSortByFlagged() +{ + SortThreadPane('FlaggedButtonColumn', 'http://home.netscape.com/NC-rdf#Flagged'); +} +function MsgSortByPriority() +{ + SortThreadPane('PriorityColumn', 'http://home.netscape.com/NC-rdf#Priority'); +} +function MsgSortBySize() +{ + SortThreadPane('SizeColumn', 'http://home.netscape.com/NC-rdf#Size'); +} +function MsgSortByThread() +{ + ChangeThreadView() +} +function MsgSortByUnread() +{ + SortThreadPane('UnreadButtonColumn', 'http://home.netscape.com/NC-rdf#TotalUnreadMessages'); +} +function MsgSortByOrderReceived() +{ + dump("not implemented yet.\n"); +} +function MsgSortAscending() +{ + dump("not implemented yet.\n"); +} +function MsgSortDescending() +{ + dump("not implemented yet.\n"); +} +function MsgSortByRead() +{ + dump("not implemented yet.\n"); +} + +function MsgSortByTotal() +{ + SortThreadPane('TotalColumn', 'http://home.netscape.com/NC-rdf#TotalMessages'); +} + function MsgNewFolder() { var windowTitle = Bundle.GetStringFromName("newFolderDialogTitle"); @@ -758,25 +794,36 @@ function MsgShowFolders() function MsgFolderProperties() {} function MsgShowLocationbar() {} -function MsgSortByFlag() {} -function MsgSortByPriority() {} -function MsgSortBySize() {} -function MsgSortByThread() {} -function MsgSortByUnread() {} -function MsgSortByOrderReceived() {} -function MsgSortAscending() {} -function MsgSortDescending() {} function MsgViewThreadsUnread() {} function MsgViewWatchedThreadsUnread() {} function MsgViewIgnoreThread() {} -function MsgViewAllHeaders() {} -function MsgViewNormalHeaders() {} -function MsgViewBriefHeaders() {} + +function MsgViewAllHeaders() +{ + prefs.SetIntPref("mail.show_headers",2); + MsgReload() +} +function MsgViewNormalHeaders() +{ + prefs.SetIntPref("mail.show_headers",1); + MsgReload() +} +function MsgViewBriefHeaders() +{ + prefs.SetIntPref("mail.show_headers",0); + MsgReload() +} + function MsgViewAttachInline() {} function MsgWrapLongLines() {} function MsgIncreaseFont() {} function MsgDecreaseFont() {} -function MsgReload() {} + +function MsgReload() +{ + ThreadPaneSelectionChange() +} + function MsgShowImages() {} function MsgRefresh() {} function MsgViewPageSource() {} diff --git a/mailnews/base/resources/locale/en-US/messenger.dtd b/mailnews/base/resources/locale/en-US/messenger.dtd index 519711d25031..d994b3d8b793 100644 --- a/mailnews/base/resources/locale/en-US/messenger.dtd +++ b/mailnews/base/resources/locale/en-US/messenger.dtd @@ -88,13 +88,13 @@ Rights Reserved. - - + + - + - + @@ -106,10 +106,10 @@ Rights Reserved. - - - - + + + + diff --git a/suite/locales/en-US/chrome/mailnews/messenger.dtd b/suite/locales/en-US/chrome/mailnews/messenger.dtd index 519711d25031..d994b3d8b793 100644 --- a/suite/locales/en-US/chrome/mailnews/messenger.dtd +++ b/suite/locales/en-US/chrome/mailnews/messenger.dtd @@ -88,13 +88,13 @@ Rights Reserved. - - + + - + - + @@ -106,10 +106,10 @@ Rights Reserved. - - - - + + + +