[Pale-Moon] Re-organize the Privacy category in preferences.

application/palemoon/components/preferences/privacy.xul

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
+<!-- -*- Mode: XML; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
@@ -87,20 +87,9 @@
     
     <script type="application/javascript" src="chrome://browser/content/preferences/privacy.js"/>
 
-    <tabbox id="privacyPrefs" flex="1"
-            onselect="gPrivacyPane.tabSelectionChanged();">
-
-      <tabs id="tabsElement">
-        <tab id="historyTab" label="&history.label;"/>
-        <tab id="trackingTab" label="&tracking.label;"/>
-        <tab id="locationBarTab" label="&locationBar.label;"/>
-      </tabs>
-
-      <tabpanels flex="1">
-
     <!-- History -->
-        <tabpanel id="historyPanel" orient="vertical">
+    <groupbox id="historyPanel">
-        
+      <caption>&history.label;</caption>
       <hbox align="center">
         <label id="historyModeLabel"
                control="historyMode"
@@ -169,7 +158,6 @@
                         label="&rememberSearchForm.label;"
                         accesskey="&rememberSearchForm.accesskey;"
                         preference="browser.formfill.enable"/>
-
                 <hbox id="cookiesBox">
                   <checkbox id="acceptCookies" label="&acceptCookies.label;" flex="1"
                             preference="network.cookie.cookieBehavior"
@@ -180,7 +168,6 @@
                           label="&cookieExceptions.label;" accesskey="&cookieExceptions.accesskey;"
                           preference="pref.privacy.disable_button.cookie_exceptions"/>
                 </hbox>
-
                 <hbox id="acceptThirdPartyRow" class="indent">
                   <hbox id="acceptThirdPartyBox" align="center">
                     <label id="acceptThirdPartyLabel" control="acceptThirdPartyMenu"
@@ -231,11 +218,12 @@
           </vbox>
         </deck>
 
-        </tabpanel>
+      </groupbox>
         
       <!-- Tracking -->
-        <tabpanel id="trackingPanel" orient="vertical">
+      <groupbox id="trackingPanel">
-
+        <caption>&tracking.label;</caption>
+        <hbox align="center">
           <checkbox id="privacyDoNotTrackCheckbox"
                     label="&dntTrackingNotOkay.label2;"
                     accesskey="&dntTrackingNotOkay.accesskey;"
@@ -245,14 +233,15 @@
                  href="https://www.mozilla.org/dnt"
                  value="&doNotTrackInfo.label;"/>
 
-        </tabpanel>
+        </hbox>
+      </groupbox>
         
       <!-- Location Bar -->
-        <tabpanel id="locatioBarPanel" orient="vertical">
+      <groupbox id="locatioBarPanel">
+        <caption>&locationBar.label;</caption>
           
         <label id="locationBarSuggestionLabel">&locbar.suggest.label;</label>
-
+        <hbox id="tabPrefsBox" align="center" flex="1">
-          <vbox id="tabPrefsBox" align="start" flex="1">
           <checkbox id="historySuggestion" label="&locbar.history.label;"
                     accesskey="&locbar.history.accesskey;"
                     preference="browser.urlbar.suggest.history"/>
@@ -262,12 +251,10 @@
           <checkbox id="openpageSuggestion" label="&locbar.openpage.label;"
                     accesskey="&locbar.openpage.accesskey;"
                     preference="browser.urlbar.suggest.openpage"/>
-          </vbox>
+        </hbox>
       
-        </tabpanel>
+      </groupbox>
 
-      </tabpanels>
-    </tabbox>
   </prefpane>
 
 </overlay>