From fd90a2b09a9bfe7997703cb3c0d20f964f5ffbe9 Mon Sep 17 00:00:00 2001
From: "andreww%netscape.com"
 <andreww%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 8 Mar 2002 20:46:30 +0000
Subject: [PATCH] 68961 (r=varada, sr=ben/alecf, a=asa) "sort" options on view
 menu of history should have mnemonics

git-svn-id: svn://10.0.0.236/trunk@116176 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../history/resources/historyTreeOverlay.xul  |  7 ++++++
 .../locale/en-US/historyTreeOverlay.dtd       | 23 ++++++++++++-------
 .../global/resources/content/nsTreeUtils.js   |  2 ++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
index 00836986cdb..1ab5f3e4f0d 100644
--- a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
+++ b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
@@ -101,36 +101,43 @@
       <outlinercol flex="4" id="Name" persist="hidden width sortActive sortDirection ordinal" 
                    label="&tree.header.name.label;" primary="true"
                    sort="rdf:http://home.netscape.com/NC-rdf#Name"
+                   accesskey="&tree.header.name.akey;"
                    class="sortDirectionIndicator"/>
       <splitter class="tree-splitter" id="pre-URL-splitter"/>
       <outlinercol flex="4" id="URL"
                    persist="hidden width sortActive sortDirection ordinal"
                    label="&tree.header.url.label;" class="sortDirectionIndicator"
+                   accesskey="&tree.header.url.akey;"
                    sort="rdf:http://home.netscape.com/NC-rdf#URL"/>
       <splitter class="tree-splitter" id="pre-Date-splitter"/>
       <outlinercol flex="1" id="Date"
                    persist="hidden width sortActive sortDirection ordinal"
                    label="&tree.header.date.label;" class="sortDirectionIndicator"
+                   accesskey="&tree.header.date.akey;"
                    sort="rdf:http://home.netscape.com/NC-rdf#Date"/>
       <splitter class="tree-splitter" id="pre-FirstVisitDate-splitter"/>
       <outlinercol flex="1" id="FirstVisitDate" hidden="true"
                    persist="hidden width sortActive sortDirection ordinal"
                    label="&tree.header.firstvisitdate.label;" class="sortDirectionIndicator"
+                   accesskey="&tree.header.firstvisitdate.akey;"
                    sort="rdf:http://home.netscape.com/NC-rdf#FirstVisitDate"/>
       <splitter class="tree-splitter" id="pre-Hostname-splitter"/>
       <outlinercol flex="1" id="Hostname" hidden="true"
                    persist="hidden width sortActive sortDirection ordinal"
                    label="&tree.header.hostname.label;" class="sortDirectionIndicator"
+                   accesskey="&tree.header.hostname.akey;"
                    sort="rdf:http://home.netscape.com/NC-rdf#Hostname"/>
       <splitter class="tree-splitter" id="pre-Referrer-splitter"/>
       <outlinercol flex="1" id="Referrer" hidden="true"
                    persist="hidden width sortActive sortDirection ordinal"
                    label="&tree.header.referrer.label;" class="sortDirectionIndicator"
+                   accesskey="&tree.header.referrer.akey;"
                    sort="rdf:http://home.netscape.com/NC-rdf#Referrer"/>
       <splitter class="tree-splitter" id="pre-VisitCount-splitter"/>
       <outlinercol flex="1" id="VisitCount" hidden="true"
                    persist="hidden width sortActive sortDirection ordinal"
                    label="&tree.header.visitcount.label;" class="sortDirectionIndicator"
+                   accesskey="&tree.header.visitcount.akey;"
                    sort="rdf:http://home.netscape.com/NC-rdf#VisitCount"/>
     </outlinercols>
   </outliner>
diff --git a/mozilla/xpfe/components/history/resources/locale/en-US/historyTreeOverlay.dtd b/mozilla/xpfe/components/history/resources/locale/en-US/historyTreeOverlay.dtd
index 3e3dd91307c..8fc56fe070f 100644
--- a/mozilla/xpfe/components/history/resources/locale/en-US/historyTreeOverlay.dtd
+++ b/mozilla/xpfe/components/history/resources/locale/en-US/historyTreeOverlay.dtd
@@ -1,8 +1,15 @@
-<!ENTITY tree.header.name.label     "Title">
-<!ENTITY tree.header.url.label      "Location">
-<!ENTITY tree.header.date.label     "Last Visited">
-<!ENTITY tree.header.firstvisitdate.label     "First Visited">
-<!ENTITY tree.header.referrer.label "Referrer">
-<!ENTITY tree.header.hostname.label "Hostname">
-<!ENTITY tree.header.visitcount.label "Visit Count">
-<!ENTITY collapseExpand.accesskey   "e">
\ No newline at end of file
+<!ENTITY tree.header.name.label              "Title">
+<!ENTITY tree.header.name.akey               "T">
+<!ENTITY tree.header.url.label               "Location">
+<!ENTITY tree.header.url.akey                "L">
+<!ENTITY tree.header.date.label              "Last Visited">
+<!ENTITY tree.header.date.akey               "a">
+<!ENTITY tree.header.firstvisitdate.label    "First Visited">
+<!ENTITY tree.header.firstvisitdate.akey     "F">
+<!ENTITY tree.header.referrer.label          "Referrer">
+<!ENTITY tree.header.referrer.akey           "R">
+<!ENTITY tree.header.hostname.label          "Hostname">
+<!ENTITY tree.header.hostname.akey           "H">
+<!ENTITY tree.header.visitcount.label        "Visit Count">
+<!ENTITY tree.header.visitcount.akey         "V">
+<!ENTITY collapseExpand.accesskey            "e">
diff --git a/mozilla/xpfe/global/resources/content/nsTreeUtils.js b/mozilla/xpfe/global/resources/content/nsTreeUtils.js
index 8c4272e8edb..ca940287f09 100644
--- a/mozilla/xpfe/global/resources/content/nsTreeUtils.js
+++ b/mozilla/xpfe/global/resources/content/nsTreeUtils.js
@@ -275,9 +275,11 @@ function fillViewMenu(popup)
           if (skip_column != tree_column && tree_column.getAttribute("collapsed") != "true") {
               // Construct an entry for each cell in the row.
               var column_name = tree_column.getAttribute("label");
+              var column_accesskey = treecolumn.getAttribute("accesskey");
               var item = document.createElement("menuitem");
               item.setAttribute("type", "radio");
               item.setAttribute("name", "sort_column");
+              item.setAttribute("accesskey", column_accesskey);
               if (column_name == "")
                   column_name = tree_column.getAttribute("display");
               var name = name_template.replace(/%NAME%/g, column_name);