From bd2c577efb49e575a61a979c9d88d4739cd4475e Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Sun, 29 Sep 2002 01:28:11 +0000
Subject: [PATCH] Readd connection panel, add tabbed browsing panel.

---
 .../prefwindow/content/pref-tabs.xul          | 63 +++++++++++++++++++
 .../prefwindow/content/preftree.xul           | 12 ++++
 browser/components/prefwindow/jar.mn          |  2 +
 .../prefwindow/locale/pref-tabs.dtd           |  6 ++
 .../components/prefwindow/locale/preftree.dtd |  1 +
 5 files changed, 84 insertions(+)
 create mode 100644 browser/components/prefwindow/content/pref-tabs.xul
 create mode 100644 browser/components/prefwindow/locale/pref-tabs.dtd

diff --git a/browser/components/prefwindow/content/pref-tabs.xul b/browser/components/prefwindow/content/pref-tabs.xul
new file mode 100644
index 000000000000..05f8eebfa38d
--- /dev/null
+++ b/browser/components/prefwindow/content/pref-tabs.xul
@@ -0,0 +1,63 @@
+<?xml version="1.0"?> 
+<!--
+   The contents of this file are subject to the Netscape 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/NPL/
+    
+   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 Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+
+<!DOCTYPE page [
+<!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">
+%platformCommunicationDTD;
+<!ENTITY % tabsDTD SYSTEM "chrome://browser/locale/pref/pref-tabs.dtd">
+%tabsDTD;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://browser/content/pref/pref-tabs.xul');"
+      headertitle="&tabHeader.label;">
+
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = ["tabStrip", "tabBackground", "middleClick", "urlBar"];
+  ]]>
+  </script>
+  <groupbox id="generalTabPreferences" align="start">
+    <caption label="&tabDisplay.label;"/>
+    <checkbox id="tabStrip"
+              label="&autoHide.label;" 
+              prefstring="browser.tabs.autoHide"/>
+    <checkbox id="tabBackground"
+              label="&background.label;" 
+              prefstring="browser.tabs.loadInBackground"/>
+  </groupbox>
+
+  <groupbox id="useTabPreferences" align="start">
+    <caption label="&openTabs.label;"/>
+      <checkbox id="middleClick"
+                label="&middleClick.label;" 
+                prefstring="browser.tabs.opentabfor.middleclick"/>
+
+      <checkbox id="urlBar"
+                label="&urlbar.label;" 
+                prefstring="browser.tabs.opentabfor.urlbar"/>
+  </groupbox>
+
+</page>
diff --git a/browser/components/prefwindow/content/preftree.xul b/browser/components/prefwindow/content/preftree.xul
index 685c5159695d..283529d3e3e3 100644
--- a/browser/components/prefwindow/content/preftree.xul
+++ b/browser/components/prefwindow/content/preftree.xul
@@ -71,6 +71,13 @@
       </treerow>
     </treeitem>
 
+    <treeitem>
+      <treerow>
+        <treecell url="chrome://browser/content/pref/pref-connection.xul" label="&connection.label;" />
+      </treerow>
+    </treeitem>
+
+
     <treeitem id="advancedItem" container="true">
       <treerow>
         <treecell url="chrome://browser/content/pref/pref-advanced.xul" label="&advance.label;"/>
@@ -81,6 +88,11 @@
             <treecell url="chrome://browser/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/> 
           </treerow>
         </treeitem>
+        <treeitem>
+          <treerow>
+            <treecell url="chrome://browser/content/pref/pref-tabs.xul" label="&tabs.label;"/> 
+          </treerow>
+        </treeitem>
       </treechildren>
     </treeitem>
   </treechildren>
diff --git a/browser/components/prefwindow/jar.mn b/browser/components/prefwindow/jar.mn
index e115eaf360ef..1ce060112fa7 100644
--- a/browser/components/prefwindow/jar.mn
+++ b/browser/components/prefwindow/jar.mn
@@ -38,6 +38,7 @@ browser.jar:
     content/browser/pref/autocomplete-showsearch.gif       (content/autocomplete-showsearch.gif)
     content/browser/pref/pref-winhooks.xul                 (content/pref-winhooks.xul)
     content/browser/pref/pref-winhooks.js                  (content/pref-winhooks.js)
+    content/browser/pref/pref-tabs.xul                     (content/pref-tabs.xul)
 
 en-US.jar:
     locale/en-US/browser/pref/pref-advanced.dtd            (locale/pref-advanced.dtd)
@@ -49,6 +50,7 @@ en-US.jar:
     locale/en-US/browser/pref/pref-download.dtd            (locale/pref-download.dtd)
     locale/en-US/browser/pref/pref-fonts.dtd               (locale/pref-fonts.dtd)
     locale/en-US/browser/pref/pref-languages.dtd           (locale/pref-languages.dtd)
+    locale/en-US/browser/pref/pref-tabs.dtd                (locale/pref-tabs.dtd)
     locale/en-US/browser/pref/pref-languages.properties    (locale/pref-languages.properties)
     locale/en-US/browser/pref/pref-navigator.dtd           (locale/pref-navigator.dtd)
     locale/en-US/browser/pref/pref-connection.dtd          (locale/pref-connection.dtd)    
diff --git a/browser/components/prefwindow/locale/pref-tabs.dtd b/browser/components/prefwindow/locale/pref-tabs.dtd
new file mode 100644
index 000000000000..f02be3d658b1
--- /dev/null
+++ b/browser/components/prefwindow/locale/pref-tabs.dtd
@@ -0,0 +1,6 @@
+<!ENTITY tabHeader.label "Tabbed Browsing">
+<!ENTITY tabDisplay.label "Tab Display">
+<!ENTITY autoHide.label "Hide the tab bar when only one tab is open">
+<!ENTITY background.label "Load links in the background">
+<!ENTITY openTabs.label "Open tabs instead of windows for">
+<!ENTITY middleClick.label "Middle-click or control-click of links in a Web page">
diff --git a/browser/components/prefwindow/locale/preftree.dtd b/browser/components/prefwindow/locale/preftree.dtd
index fb30e06bb9df..d4c64e5b183c 100644
--- a/browser/components/prefwindow/locale/preftree.dtd
+++ b/browser/components/prefwindow/locale/preftree.dtd
@@ -10,3 +10,4 @@
 <!ENTITY advance.label "Advanced">
 <!ENTITY connection.label "Connection">
 <!ENTITY scriptsAndWindows.label "Scripts &amp; Windows">
+<!ENTITY tabs.label "Tabbed Browsing">
\ No newline at end of file