From 5b957f99cc69509304480117ba5c85b3f4d2e209 Mon Sep 17 00:00:00 2001
From: "bugzilla%arlen.demon.co.uk" <bugzilla%arlen.demon.co.uk>
Date: Fri, 6 May 2005 21:16:36 +0000
Subject: [PATCH] Bug 161466 Better UI for tabbed browsing prefs
 p=mozilla@Weilbacher.org r=jag sr=neil.parkwaycc.co.uk a=asa

---
 .../resources/content/pref-tabs.xul           | 36 ++++++++++++++++++-
 .../locale/en-US/mac/platformPrefOverlay.dtd  |  2 ++
 .../resources/locale/en-US/pref-tabs.dtd      | 16 +++++++++
 .../locale/en-US/unix/platformPrefOverlay.dtd |  2 ++
 .../locale/en-US/win/platformPrefOverlay.dtd  |  2 ++
 5 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/xpfe/components/prefwindow/resources/content/pref-tabs.xul b/xpfe/components/prefwindow/resources/content/pref-tabs.xul
index cebf8762101d..d05f570e4538 100644
--- a/xpfe/components/prefwindow/resources/content/pref-tabs.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-tabs.xul
@@ -21,6 +21,7 @@
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
+   Peter Weilbacher <mozilla@Weilbacher.org>
 
  Alternatively, the contents of this file may be used under the terms of
  either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -51,16 +52,19 @@
 
   <script type="application/x-javascript">
   <![CDATA[
-    var _elementIDs = ["tabStrip", "tabBackground", "middleClick", "urlBar", "loadGroup"];
+    var _elementIDs = ["tabStrip", "tabBackground", "middleClick", "urlBar", "loadGroup",
+                       "newWindowGroup", "externalGroup"];
   ]]>
   </script>
   <groupbox id="generalTabPreferences" align="start">
     <caption label="&tabDisplay.label;"/>
     <checkbox id="tabStrip"
               label="&autoHide.label;" 
+              accesskey="&autoHide.accesskey;" 
               prefstring="browser.tabs.autoHide"/>
     <checkbox id="tabBackground"
               label="&background.label;" 
+              accesskey="&background.accesskey;" 
               prefstring="browser.tabs.loadInBackground"
               reversed="true"/>
   </groupbox>
@@ -79,11 +83,41 @@
     <caption label="&openTabs.label;"/>
       <checkbox id="middleClick"
                 label="&middleClick.label;" 
+                accesskey="&middleClick.accesskey;" 
                 prefstring="browser.tabs.opentabfor.middleclick"/>
 
       <checkbox id="urlBar"
                 label="&urlbar.label;" 
+                accesskey="&urlbar.accesskey;" 
                 prefstring="browser.tabs.opentabfor.urlbar"/>
   </groupbox>
 
+  <hbox equalsize="always">
+    <groupbox flex="1">
+      <caption label="&newWindow.label;"/>
+      <description>&newWindowDescription.label;</description>
+      <radiogroup id="newWindowGroup" prefstring="browser.link.open_newwindow">
+        <radio value="1" label="&openCurrent.label;"
+               accesskey="&newWindowGroupCurrent.accesskey;"/>
+        <radio value="3" label="&openTab.label;"
+               accesskey="&newWindowGroupTab.accesskey;"/>
+        <radio value="2" label="&openWindow.label;"
+               accesskey="&newWindowGroupWindow.accesskey;"/>
+      </radiogroup> 
+    </groupbox>
+
+    <groupbox flex="1">
+      <caption label="&external.label;"/>
+      <description>&externalDescription.label;</description>
+      <radiogroup id="externalGroup" prefstring="browser.link.open_external">
+        <radio value="1" label="&openCurrent.label;"
+               accesskey="&externalGroupCurrent.accesskey;"/>
+        <radio value="3" label="&openTab.label;"
+               accesskey="&externalGroupTab.accesskey;"/>
+        <radio value="2" label="&openWindow.label;"
+               accesskey="&externalGroupWindow.accesskey;"/>
+      </radiogroup> 
+    </groupbox>
+  </hbox>
+
 </page>
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd b/xpfe/components/prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd
index 20fcd7f7c716..d60d94c1e662 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd
@@ -1,5 +1,7 @@
 <!ENTITY urlbar.label "&#8984;+Return in the Location bar">
+<!ENTITY urlbar.accesskey "L">
 <!ENTITY middleClick.label "Middle-click, &#8984;+click or &#8984;+Return on links in a Web page">
+<!ENTITY middleClick.accesskey "M">
 
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the
      preference dialog's <window> node, which specifies the width and height
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd
index 07ca1baaf33f..072fb5741d6a 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd
@@ -1,10 +1,26 @@
 <!ENTITY tabHeader.label "Tabbed Browsing">
 <!ENTITY tabDisplay.label "Tab Display">
 <!ENTITY autoHide.label "Hide the tab bar when only one tab is open">
+<!ENTITY autoHide.accesskey "d">
 <!ENTITY background.label "Select new tabs opened from links">
+<!ENTITY background.accesskey "S">
 <!ENTITY loadGroup.label "When opening a bookmark group">
 <!ENTITY loadGroupAppend.label "Add tabs">
 <!ENTITY loadGroupAppend.accesskey "A">
 <!ENTITY loadGroupReplace.label "Replace existing tabs">
 <!ENTITY loadGroupReplace.accesskey "R">
 <!ENTITY openTabs.label "Open tabs instead of windows for">
+
+<!ENTITY newWindow.label "Link open behavior">
+<!ENTITY newWindowDescription.label "Open links meant to open a new window in">
+<!ENTITY external.label "Links from other applications">
+<!ENTITY externalDescription.label "Open links passed from other applications in">
+<!ENTITY openCurrent.label "The current tab/window">
+<!ENTITY newWindowGroupCurrent.accesskey "c">
+<!ENTITY externalGroupCurrent.accesskey "u">
+<!ENTITY openTab.label "A new tab in the current window">
+<!ENTITY newWindowGroupTab.accesskey "n">
+<!ENTITY externalGroupTab.accesskey "e">
+<!ENTITY openWindow.label "A new window">
+<!ENTITY newWindowGroupWindow.accesskey "w">
+<!ENTITY externalGroupWindow.accesskey "o">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/unix/platformPrefOverlay.dtd b/xpfe/components/prefwindow/resources/locale/en-US/unix/platformPrefOverlay.dtd
index 8efdcf2f8357..5346f9d64351 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/unix/platformPrefOverlay.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/unix/platformPrefOverlay.dtd
@@ -1,5 +1,7 @@
 <!ENTITY urlbar.label "Ctrl+Enter in the Location bar">
+<!ENTITY urlbar.accesskey "L">
 <!ENTITY middleClick.label "Middle-click, Ctrl+click or Ctrl+Enter on links in a Web page">
+<!ENTITY middleClick.accesskey "M">
 
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the
      preference dialog's <window> node, which specifies the width and height
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd b/xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd
index f453a3dc4b24..e7a2d8184da0 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd
@@ -7,7 +7,9 @@
 <!ENTITY makeDefaultText            "Set &brandShortName; as your default browser.">
 
 <!ENTITY urlbar.label "Ctrl+Enter in the Location bar">
+<!ENTITY urlbar.accesskey "L">
 <!ENTITY middleClick.label "Middle-click, Ctrl+click or Ctrl+Enter on links in a Web page">
+<!ENTITY middleClick.accesskey "M">
 
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the
      preference dialog's <window> node, which specifies the width and height