From 626fc5c1f29a7ca784e7c6314b4ad383d49f5f5e Mon Sep 17 00:00:00 2001
From: "ben%bengoodger.com" <ben%bengoodger.com>
Date: Tue, 2 Dec 2003 21:52:22 +0000
Subject: [PATCH] Fix 227250 - incorrect accesskey underlined on "Options"
 button. Also, hook up some accelerator keys.

---
 .../downloads/content/downloadProperties.xul  |  4 +
 .../mozapps/downloads/content/downloads.js    | 82 ++++++++++---------
 .../mozapps/downloads/content/downloads.xul   |  3 +-
 .../downloads/locale/downloadProperties.dtd   |  7 --
 .../mozapps/downloads/locale/downloads.dtd    | 15 ++--
 5 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/toolkit/mozapps/downloads/content/downloadProperties.xul b/toolkit/mozapps/downloads/content/downloadProperties.xul
index 63d750b6613..2bd343fb57a 100644
--- a/toolkit/mozapps/downloads/content/downloadProperties.xul
+++ b/toolkit/mozapps/downloads/content/downloadProperties.xul
@@ -16,6 +16,10 @@
 
   <script type="application/x-javascript" src="chrome://mozapps/content/downloads/downloadProperties.js"/>
 
+  <keyset id="downloadInfoKeys">
+    <key id="key_close"   key="&cmd.close.commandKey;" oncommand="window.close()"     modifiers="accel"/>
+  </keyset>
+  
   <grid flex="1">
     <columns>
       <column/>
diff --git a/toolkit/mozapps/downloads/content/downloads.js b/toolkit/mozapps/downloads/content/downloads.js
index 5db366dfd08..90c8be82778 100644
--- a/toolkit/mozapps/downloads/content/downloads.js
+++ b/toolkit/mozapps/downloads/content/downloads.js
@@ -1,3 +1,42 @@
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is Mozilla.org Code.
+# 
+# The Initial Developer of the Original Code is
+# Doron Rosenberg.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Blake Ross <blakeross@telocity.com> (Original Author) 
+#   Ben Goodger <ben@bengoodger.com> (v2.0) 
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+ 
 ///////////////////////////////////////////////////////////////////////////////
 // Globals
 
@@ -518,42 +557,9 @@ function onDownloadShowOptions()
               "chrome,titlebar,resizable,modal", "catDownloadsButton");
 }
 
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-# 
-# The Original Code is Mozilla.org Code.
-# 
-# The Initial Developer of the Original Code is
-# Doron Rosenberg.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-# 
-# Contributor(s):
-#   Blake Ross <blakeross@telocity.com> (Original Author) 
-#   Ben Goodger <ben@bengoodger.com> (v2.0) 
-# 
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-# 
-# ***** END LICENSE BLOCK *****
+function onDownloadShowInfo()
+{
+  if (gDownloadsView.selected)
+    fireEventForElement(gDownloadsView.selected, "properties");
+}
 
- 
diff --git a/toolkit/mozapps/downloads/content/downloads.xul b/toolkit/mozapps/downloads/content/downloads.xul
index 78c78f8bdfa..8831356656e 100644
--- a/toolkit/mozapps/downloads/content/downloads.xul
+++ b/toolkit/mozapps/downloads/content/downloads.xul
@@ -76,7 +76,8 @@
     
   <keyset id="downloadKeys">
     <key id="key_cleanUp" keycode="VK_DELETE" command="cmd_cleanUp" modifiers="accel,shift"/>
-    <key id="key_close"   key="&cmd.close.commandKey;" oncommand="closeWindow(true);" modifiers="accel"/>
+    <key id="key_close"   key="&cmd.close.commandKey;" oncommand="closeWindow(true);"     modifiers="accel"/>
+    <key id="key_info"    key="&cmd.info.commandKey;"  oncommand="onDownloadShowInfo();"  modifiers="accel"/>
   </keyset>
   
   <vbox id="contextMenuPalette" hidden="true">
diff --git a/toolkit/mozapps/downloads/locale/downloadProperties.dtd b/toolkit/mozapps/downloads/locale/downloadProperties.dtd
index 348c932e773..e69de29bb2d 100644
--- a/toolkit/mozapps/downloads/locale/downloadProperties.dtd
+++ b/toolkit/mozapps/downloads/locale/downloadProperties.dtd
@@ -1,7 +0,0 @@
-<!ENTITY dateStarted.label      "Started:">
-<!ENTITY dateEnded.label        "Finished:">
-<!ENTITY window.title           "Properties">
-<!ENTITY downloadedFrom.label   "From:">
-<!ENTITY path.label             "To:">
-<!ENTITY acceptButton.label     "Close">
-
diff --git a/toolkit/mozapps/downloads/locale/downloads.dtd b/toolkit/mozapps/downloads/locale/downloads.dtd
index f3e3ab8413a..602137f97cd 100644
--- a/toolkit/mozapps/downloads/locale/downloads.dtd
+++ b/toolkit/mozapps/downloads/locale/downloads.dtd
@@ -27,26 +27,27 @@
 <!ENTITY downloads.title                  "Downloads">
 
 <!ENTITY cmd.pause.label                  "Pause">
-<!ENTITY cmd.pause.accesskey              "p">
+<!ENTITY cmd.pause.accesskey              "P">
 <!ENTITY cmd.resume.label                 "Resume">
-<!ENTITY cmd.resume.accesskey             "r">
+<!ENTITY cmd.resume.accesskey             "R">
 <!ENTITY cmd.cancel.label                 "Cancel">
-<!ENTITY cmd.cancel.accesskey             "c">
+<!ENTITY cmd.cancel.accesskey             "C">
 <!ENTITY cmd.show.label                   "Show">
-<!ENTITY cmd.show.accesskey               "s">
+<!ENTITY cmd.show.accesskey               "S">
 <!ENTITY cmd.show.tooltipWin              "Show this file in Explorer">
 <!ENTITY cmd.show.tooltipMac              "Show this file in Finder">
 <!ENTITY cmd.show.tooltipUnix             "Show this file in a browser window">
 <!ENTITY cmd.open.label                   "Open">
-<!ENTITY cmd.open.accesskey               "o">
+<!ENTITY cmd.open.accesskey               "O">
 <!ENTITY cmd.openWith.label               "Open With...">
 <!ENTITY cmd.openWith.accesskey           "h">
 <!ENTITY cmd.retry.label                  "Retry">
-<!ENTITY cmd.retry.accesskey              "r">
+<!ENTITY cmd.retry.accesskey              "R">
 <!ENTITY cmd.remove.label                 "Remove">
 <!ENTITY cmd.remove.accesskey             "e">
 <!ENTITY cmd.properties.label             "Properties">
 <!ENTITY cmd.properties.accesskey         "i">
+<!ENTITY cmd.info.commandKey              "i">
 
 <!ENTITY cmd.close.commandKey             "w">
 <!ENTITY cmd.cleanUp.label                "Clean Up">
@@ -54,7 +55,7 @@
 <!ENTITY cmd.cleanUp.accesskey            "a">
 
 <!ENTITY cmd.options.label                "Options">
-<!ENTITY cmd.options.accesskey            "o">
+<!ENTITY cmd.options.accesskey            "O">
 
 <!ENTITY closeWhenDone.label              "Close when downloads complete">
 <!ENTITY closeWhenDone.tooltip            "Closes the Downloads window when all files are done downloading">