From 63850355ccf9906ce026112301c2f838c833c969 Mon Sep 17 00:00:00 2001
From: "chuang%netscape.com"
 <chuang%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 21 Aug 2001 20:41:33 +0000
Subject: [PATCH] Bug 17476 Move/Copy menus should sort, r/sr=sspitzer, mscott

git-svn-id: svn://10.0.0.236/trunk@101543 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../resources/content/mailWindowOverlay.xul   | 27 +++++++++++---
 .../content/msgFolderPickerOverlay.xul        | 35 +++++++++++++++----
 .../search/resources/content/SearchDialog.xul |  2 ++
 .../resources/content/messengercompose.xul    |  7 +++-
 4 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 44f676d8b1f..f8efd3cb49c 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -328,6 +328,8 @@ Rights Reserved.
     <menu id="threadPaneContext-moveMenu"
         label="&contextMoveMsgMenu.label;"
         accesskey="&contextMoveMsgMenu.accesskey;"
+        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+        sortDirection="ascending"
         datasources="rdf:null">
       <menupopup/>
       <template> 
@@ -394,7 +396,9 @@ Rights Reserved.
     <menu id="threadPaneContext-copyMenu"
       label="&contextCopyMsgMenu.label;"
       accesskey="&contextCopyMsgMenu.accesskey;"
-      datasources="rdf:null">
+      sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+      sortDirection="ascending"
+      datasources="rdf:null"> 
       <menupopup/>
       <template>
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -577,6 +581,8 @@ Rights Reserved.
     <menu id="messagePaneContext-moveMenu"
         label="&contextMoveMsgMenu.label;"
         accesskey="&contextMoveMsgMenu.accesskey;"
+        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+        sortDirection="ascending"
         datasources="rdf:null">
       <menupopup/>
       <template> 
@@ -643,6 +649,8 @@ Rights Reserved.
     <menu id="messagePaneContext-copyMenu"
       label="&contextCopyMsgMenu.label;"
       accesskey="&contextCopyMsgMenu.accesskey;"
+      sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+      sortDirection="ascending"
       datasources="rdf:null">
       <menupopup/>
       <template>
@@ -798,6 +806,8 @@ Rights Reserved.
        observes="cmd_getNewMessages"/>
                         <menu label="&getNewMsgForCmd.label;" 
                               accesskey="&getNewMsgForCmd.accesskey;"
+                              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+                              sortDirection="ascending"
                               datasources="rdf:msgaccountmanager"
                               containment="http://home.netscape.com/NC-rdf#child"
                               ref="msgaccounts:/"
@@ -1050,7 +1060,9 @@ Rights Reserved.
             key="key_editAsNew"
             observes="cmd_editAsNew"/>
     <menuseparator/>
-    <menu label="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null">
+    <menu label="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null"
+     sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+     sortDirection="ascending">
       <menupopup/>
       <template> 
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -1113,7 +1125,9 @@ Rights Reserved.
         </rule>
       </template>
     </menu>
-    <menu label="&copyMsgMenu.label;" accesskey="&copyMsgMenu.accesskey;" id="copyMenu" datasources="rdf:null">
+    <menu label="&copyMsgMenu.label;" accesskey="&copyMsgMenu.accesskey;" id="copyMenu" datasources="rdf:null"
+     sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+     sortDirection="ascending">
       <menupopup/>
       <template>
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -1210,6 +1224,8 @@ Rights Reserved.
     <hbox id="toolbar_button_box">
                         <menubutton class="menubutton-dual toolbar top" id="button-getmsg" 
                                     label="&getMsgButton.label;" crop="right" tooltip="aTooltip" 
+                                    sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+                                    sortDirection="ascending"
                                     tooltiptext="&getMsgButton.tooltip;" 
                                     observes="button_getNewMessages" datasources="rdf:msgaccountmanager" 
                                     oncommand="goDoCommand('cmd_getNewMessages')" 
@@ -1238,7 +1254,10 @@ Rights Reserved.
       <button class="button-toolbar-2 top" id="button-replyall" label="&replyAllButton.label;" tooltip="aTooltip" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
       <button class="button-toolbar-2 top" id="button-forward" label="&forwardButton.label;" tooltip="aTooltip"  tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
       <toolbarseparator class="toolbarseparator-primary"/>
-      <menubutton class="button-toolbar-2 top" id="button-file" observes="button_file" datasources="rdf:null" label="&fileButton.label;" tooltip="aTooltip" tooltiptext="&fileButton.tooltip;">
+      <menubutton class="button-toolbar-2 top" id="button-file" observes="button_file"
+                  datasources="rdf:null" label="&fileButton.label;"
+                  tooltip="aTooltip" tooltiptext="&fileButton.tooltip;"
+                  sortResource="http://home.netscape.com/NC-rdf#FolderTreeName" sortDirection="ascending">
         <template> 
         <rule nc:NoSelect="true" iscontainer="true" isempty="false">
           <menupopup>
diff --git a/mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul b/mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul
index 238a3a0ff00..e404722da71 100644
--- a/mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul
@@ -30,7 +30,10 @@ Rights Reserved.
   <script type="application/x-javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
 
-  <menu class="push" label="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
+  <menu class="push" label="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" 
+    sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+    sortDirection="ascending"
+    datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
     ref="msgaccounts:/">
         <template>
           <rule nc:CanCreateSubfolders="true" nc:CanCreateFoldersOnServer="true" iscontainer="true" isempty="false">
@@ -81,6 +84,8 @@ Rights Reserved.
 
   <menulist label="&renamefolderclickhere.label;" uri=""
     id="msgRenameFolderPicker"
+    sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+    sortDirection="ascending"
     datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
     ref="msgaccounts:/">
         <template>
@@ -146,6 +151,8 @@ Rights Reserved.
   </menulist>
 
   <menulist label="&choosefolderclickhere.label;" uri="" id="msgFccFolderPicker"
+    sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+    sortDirection="ascending"
     datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
     ref="msgaccounts:/">
         <template>
@@ -200,6 +207,8 @@ Rights Reserved.
 
   <menulist label="&choosefolderclickhere.label;" uri=""
     id="msgDraftsFolderPicker"
+    sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+    sortDirection="ascending"
     datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
     ref="msgaccounts:/">
         <template>
@@ -254,6 +263,8 @@ Rights Reserved.
 
   <menulist label="&choosefolderclickhere.label;" uri=""
     id="msgStationeryFolderPicker"
+    sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+    sortDirection="ascending"
     datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
     ref="msgaccounts:/">
         <template>
@@ -306,8 +317,10 @@ Rights Reserved.
       <menupopup />
     </menulist>
 
-  <menu class="push" label="&chooseaccountclickhere.label;" 
+  <menulist label="&chooseaccountclickhere.label;" 
         uri="" id="msgFccAccountPicker" 
+        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+        sortDirection="ascending"
         datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
         ref="msgaccounts:/">
     <template>
@@ -324,10 +337,12 @@ Rights Reserved.
       </rule>
     </template>
     <menupopup />
-  </menu>
+  </menulist>
 
-  <menu class="push" label="&chooseaccountclickhere.label;" 
+  <menulist label="&chooseaccountclickhere.label;" 
         uri="" id="msgDraftsAccountPicker" 
+        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+        sortDirection="ascending"
         datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
         ref="msgaccounts:/">
     <template>
@@ -344,10 +359,12 @@ Rights Reserved.
       </rule>
     </template>
     <menupopup />
-  </menu>
+  </menulist>
 
-  <menu class="push" label="&chooseaccountclickhere.label;" 
+  <menulist label="&chooseaccountclickhere.label;" 
         uri="" id="msgStationeryAccountPicker" 
+        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+        sortDirection="ascending"
         datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
         ref="msgaccounts:/">
     <template>
@@ -364,9 +381,11 @@ Rights Reserved.
       </rule>
     </template>
     <menupopup />
-  </menu>
+  </menulist>
 
     <menulist id="searchableFolders"
+              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+              sortDirection="ascending"
               datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
               ref="msgaccounts:/">
       <template>
@@ -406,6 +425,8 @@ Rights Reserved.
     </menulist>
     <menulist id="actionTargetFolder"
               containment="http://home.netscape.com/NC-rdf#child"
+              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+              sortDirection="ascending"
               datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
               ref="msgaccounts:/">
       <template>
diff --git a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
index 4dee99ff444..e93260db04b 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
@@ -108,6 +108,8 @@ Rights Reserved.
             <menubutton id="fileMessageButton" label="&fileButton.label;"
                         observes="file_message_button"
                         oncommand="MoveMessageInSearch(event.target)" 
+                        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+                        sortDirection="ascending"
                         datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
                         ref="msgaccounts:/">
         <menupopup/>
diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul
index 7dfb77b1518..6d88ed6fe55 100644
--- a/mozilla/mailnews/compose/resources/content/messengercompose.xul
+++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul
@@ -289,7 +289,12 @@
               <menuitem type="radio" name="priority" label="&highestPriorityCmd.label;" accesskey="&highestPriorityCmd.accesskey;" id="highest"/>
             </menupopup>
           </menu>
-          <menu label="&fileCarbonCopyCmd.label;" accesskey="&fileCarbonCopyCmd.accesskey;" id="fccMenu" datasources="rdf:mailnewsfolders rdf:msgaccountmanager" ref="msgaccounts:/">
+          <menu id="fccMenu" label="&fileCarbonCopyCmd.label;" 
+             accesskey="&fileCarbonCopyCmd.accesskey;" 
+             sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+             sortDirection="ascending"
+             datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
+             ref="msgaccounts:/">
             <menupopup/>
             <template> 
               <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">