Bug 407655 - Reorganize download context menus. r=sdwilsh, a1.9=beltzner

iaxat · Dec 14, 2007 · 56472f6 · 56472f6
1 parent 55a87f0
commit 56472f6
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 18 deletions.
diff --git a/toolkit/mozapps/downloads/content/downloads.js b/toolkit/mozapps/downloads/content/downloads.js
@@ -525,31 +525,79 @@ let gDownloadObserver = {
 
 var gContextMenus = [
   // DOWNLOAD_DOWNLOADING
-  ["menuitem_pause", "menuitem_cancel", "menuseparator_copy_location",
-   "menuitem_copyLocation"],
+  [
+    "menuitem_pause"
+    , "menuitem_cancel"
+    , "menuseparator"
+    , "menuitem_show"
+    , "menuseparator"
+    , "menuitem_copyLocation"
+  ],
   // DOWNLOAD_FINISHED
-  ["menuitem_open", "menuitem_show", "menuitem_removeFromList", "menuitem_clearList",
-   "menuseparator_copy_location", "menuitem_copyLocation"],
+  [
+    "menuitem_open"
+    , "menuitem_show"
+    , "menuseparator"
+    , "menuitem_copyLocation"
+    , "menuseparator"
+    , "menuitem_removeFromList"
+    , "menuitem_clearList"
+  ],
   // DOWNLOAD_FAILED
-  ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
-   "menuseparator_copy_location", "menuitem_copyLocation"],
+  [
+    "menuitem_retry"
+    , "menuseparator"
+    , "menuitem_copyLocation"
+    , "menuseparator"
+    , "menuitem_removeFromList"
+    , "menuitem_clearList"
+  ],
   // DOWNLOAD_CANCELED
-  ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
-   "menuseparator_copy_location", "menuitem_copyLocation"],
+  [
+    "menuitem_retry"
+    , "menuseparator"
+    , "menuitem_copyLocation"
+    , "menuseparator"
+    , "menuitem_removeFromList"
+    , "menuitem_clearList"
+  ],
   // DOWNLOAD_PAUSED
-  ["menuitem_resume", "menuitem_cancel", "menuseparator_copy_location",
-   "menuitem_copyLocation"],
+  [
+    "menuitem_resume"
+    , "menuitem_cancel"
+    , "menuseparator"
+    , "menuitem_show"
+    , "menuseparator"
+    , "menuitem_copyLocation"
+  ],
   // DOWNLOAD_QUEUED
-  ["menuitem_cancel", "menuseparator_copy_location",
-   "menuitem_copyLocation"],
+  [
+    "menuitem_cancel"
+    , "menuseparator"
+    , "menuitem_show"
+    , "menuseparator"
+    , "menuitem_copyLocation"
+  ],
   // DOWNLOAD_BLOCKED
-  ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
-   "menuseparator_copy_location", "menuitem_copyLocation"],
+  [
+    "menuitem_copyLocation"
+    , "menuseparator"
+    , "menuitem_removeFromList"
+    , "menuitem_clearList"
+  ],
   // DOWNLOAD_SCANNING
-  ["menuitem_copyLocation"],
+  [
+    "menuitem_show"
+    , "menuseparator"
+    , "menuitem_copyLocation"
+  ],
   // DOWNLOAD_DIRTY
-  ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
-   "menuseparator_copy_location", "menuitem_copyLocation"]
+  [
+    "menuitem_copyLocation"
+    , "menuseparator"
+    , "menuitem_removeFromList"
+    , "menuitem_clearList"
+  ]
 ];
 
 function buildContextMenu(aEvent)

diff --git a/toolkit/mozapps/downloads/content/downloads.xul b/toolkit/mozapps/downloads/content/downloads.xul
@@ -162,7 +162,7 @@
               label="&cmd.removeFromList.label;" accesskey="&cmd.removeFromList.accesskey;"
               command="cmd_removeFromList"/>
 
-    <menuseparator id="menuseparator_copy_location"/>
+    <menuseparator id="menuseparator"/>
 
     <menuitem id="menuitem_copyLocation"
               label="&cmd.copyDownloadLink.label;"