From b0132a26a6efe9275b663c2c476da95ae8f1e09b Mon Sep 17 00:00:00 2001
From: "rob_strong@exchangecode.com" <rob_strong@exchangecode.com>
Date: Mon, 3 Dec 2007 18:38:06 -0800
Subject: [PATCH] Bug 406387 - Move System Defaults from Main to Advanced -
 General. r=sspitzer, approval1.9=dsicore

---
 browser/components/preferences/advanced.js    | 47 ++++++++++++++++++
 browser/components/preferences/advanced.xul   | 32 ++++++++++++-
 browser/components/preferences/main.js        | 48 -------------------
 browser/components/preferences/main.xul       | 33 +------------
 .../components/preferences/preferences.xul    |  6 +--
 .../chrome/browser/preferences/advanced.dtd   | 10 +++-
 .../en-US/chrome/browser/preferences/main.dtd | 19 ++------
 .../browser/preferences/preferences.dtd       |  6 +--
 8 files changed, 99 insertions(+), 102 deletions(-)

diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
index 080a68400ca5..8b094d61bcd1 100644
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
@@ -399,4 +399,51 @@ var gAdvancedPane = {
                                         "chrome://pippki/content/device_manager.xul",
                                         "", null);
   }
+#ifdef HAVE_SHELL_SERVICE
+  ,
+
+  // SYSTEM DEFAULTS
+
+  /*
+   * Preferences:
+   *
+   * browser.shell.checkDefault
+   * - true if a default-browser check (and prompt to make it so if necessary)
+   *   occurs at startup, false otherwise
+   */
+
+  /**
+   * Checks whether the browser is currently registered with the operating
+   * system as the default browser.  If the browser is not currently the
+   * default browser, the user is given the option of making it the default;
+   * otherwise, the user is informed that this browser already is the browser.
+   */
+  checkNow: function ()
+  {
+    var shellSvc = Components.classes["@mozilla.org/browser/shell-service;1"]
+                             .getService(Components.interfaces.nsIShellService);
+    var brandBundle = document.getElementById("bundleBrand");
+    var shellBundle = document.getElementById("bundleShell");
+    var brandShortName = brandBundle.getString("brandShortName");
+    var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
+    var promptMessage;
+    const IPS = Components.interfaces.nsIPromptService;
+    var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                         .getService(IPS);
+    if (!shellSvc.isDefaultBrowser(false)) {
+      promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", 
+                                                     [brandShortName]);
+      var rv = psvc.confirmEx(window, promptTitle, promptMessage, 
+                              IPS.STD_YES_NO_BUTTONS,
+                              null, null, null, null, { });
+      if (rv == 0)
+        shellSvc.setDefaultBrowser(true, false);
+    }
+    else {
+      promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
+                                                     [brandShortName]);
+      psvc.alert(window, promptTitle, promptMessage);
+    }
+  }
+#endif
 };
diff --git a/browser/components/preferences/advanced.xul b/browser/components/preferences/advanced.xul
index 672fe37af079..de3c07756f6a 100644
--- a/browser/components/preferences/advanced.xul
+++ b/browser/components/preferences/advanced.xul
@@ -72,6 +72,15 @@
       <preference id="general.smoothScroll"            name="general.smoothScroll"            type="bool"/>
       <preference id="layout.spellcheckDefault"        name="layout.spellcheckDefault"        type="int"/>
 
+#ifdef HAVE_SHELL_SERVICE
+      <preference id="browser.shell.checkDefaultBrowser"
+                  name="browser.shell.checkDefaultBrowser"
+                  type="bool"/>
+
+      <preference id="pref.general.disable_button.default_browser"
+                  name="pref.general.disable_button.default_browser"
+                  type="bool"/>
+#endif
 
       <!-- Network tab -->
       <preference id="browser.cache.disk.capacity"     name="browser.cache.disk.capacity"     type="int"/>
@@ -114,6 +123,11 @@
                   type="bool"/>
     </preferences>
     
+#ifdef HAVE_SHELL_SERVICE
+    <stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/>
+    <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
+#endif
+
     <script type="application/x-javascript" src="chrome://browser/content/preferences/advanced.js"/>
 
     <tabbox id="advancedPrefs" flex="1"
@@ -169,6 +183,22 @@
                       preference="layout.spellcheckDefault"/>
           </groupbox>
 
+#ifdef HAVE_SHELL_SERVICE
+          <!-- System Defaults -->
+          <groupbox id="systemDefaultsGroup" orient="horizontal">
+            <caption label="&systemDefaults.label;"/>
+
+            <hbox id="checkDefaultBox" align="center" flex="1">      
+              <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser"
+                        label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault.accesskey;"
+                        flex="1"/>
+              <button id="checkDefaultButton"
+                      label="&checkNow.label;" accesskey="&checkNow.accesskey;"
+                      oncommand="gAdvancedPane.checkNow()"
+                      preference="pref.general.disable_button.default_browser"/>
+            </hbox>
+          </groupbox>
+#endif
         </tabpanel>
 
         <!-- Network -->
@@ -200,7 +230,7 @@
                         aaa:labelledby="useCacheBefore cacheSize useCacheAfter"/>
                <label id="useCacheAfter" flex="1">&useCacheAfter.label;</label>
                <button id="clearCacheButton" icon="clear"
-                       label="&clearCacheNow.label;"
+                       label="&clearCacheNow.label;" accesskey="&clearCacheNow.accesskey;"
                        oncommand="gAdvancedPane.clearCache();"/>
              </hbox>
            </groupbox>
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
index 1066f01b138a..19e834b28a6d 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -466,52 +466,4 @@ var gMainPane = {
     const EMFEATURES = "chrome,menubar,extra-chrome,toolbar,dialog=no,resizable";
     window.openDialog(EMURL, "", EMFEATURES);
   }
-
-#ifdef HAVE_SHELL_SERVICE
-  ,
-
-  // SYSTEM DEFAULTS
-
-  /*
-   * Preferences:
-   *
-   * browser.shell.checkDefault
-   * - true if a default-browser check (and prompt to make it so if necessary)
-   *   occurs at startup, false otherwise
-   */
-
-  /**
-   * Checks whether the browser is currently registered with the operating
-   * system as the default browser.  If the browser is not currently the
-   * default browser, the user is given the option of making it the default;
-   * otherwise, the user is informed that this browser already is the browser.
-   */
-  checkNow: function ()
-  {
-    var shellSvc = Components.classes["@mozilla.org/browser/shell-service;1"]
-                             .getService(Components.interfaces.nsIShellService);
-    var brandBundle = document.getElementById("bundleBrand");
-    var shellBundle = document.getElementById("bundleShell");
-    var brandShortName = brandBundle.getString("brandShortName");
-    var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
-    var promptMessage;
-    const IPS = Components.interfaces.nsIPromptService;
-    var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                         .getService(IPS);
-    if (!shellSvc.isDefaultBrowser(false)) {
-      promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", 
-                                                     [brandShortName]);
-      var rv = psvc.confirmEx(window, promptTitle, promptMessage, 
-                              IPS.STD_YES_NO_BUTTONS,
-                              null, null, null, null, { });
-      if (rv == 0)
-        shellSvc.setDefaultBrowser(true, false);
-    }
-    else {
-      promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
-                                                     [brandShortName]);
-      psvc.alert(window, promptTitle, promptMessage);
-    }
-  }
-#endif
 };
diff --git a/browser/components/preferences/main.xul b/browser/components/preferences/main.xul
index b35246ed64f3..acd4f20e8b73 100644
--- a/browser/components/preferences/main.xul
+++ b/browser/components/preferences/main.xul
@@ -93,22 +93,9 @@
                   onchange="gMainPane.displayDownloadDirPref();"/>
       <preference id="browser.download.folderList"        name="browser.download.folderList"        type="int"/>
 
-      <!-- SYSTEM DEFAULTS -->
-      <preference id="browser.shell.checkDefaultBrowser"
-                  name="browser.shell.checkDefaultBrowser"
-                  type="bool"/>
-
-      <preference id="pref.general.disable_button.default_browser"
-                  name="pref.general.disable_button.default_browser"
-                  type="bool"/>
-
     </preferences>
     
     <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
-#ifdef HAVE_SHELL_SERVICE
-    <stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/>
-    <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
-#endif
 
     <!-- Startup -->
     <groupbox id="startupGroup">
@@ -195,31 +182,15 @@
       </radiogroup>
     </groupbox>
 
-#ifdef HAVE_SHELL_SERVICE
-    <!-- System Defaults -->
-    <groupbox id="systemDefaultsGroup" orient="horizontal">
-      <caption label="&systemDefaults.label;"/>
-
-      <hbox id="checkDefaultBox" align="center" flex="1">      
-        <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser"
-                  label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault.accesskey;"
-                  flex="1"/>
-        <button id="checkDefaultButton"
-                label="&checkNow.label;" accesskey="&checkNow.accesskey;"
-                oncommand="gMainPane.checkNow()"
-                preference="pref.general.disable_button.default_browser"/>
-      </hbox>
-    </groupbox>
-#endif
     <hbox class="bottomBox">
       <groupbox id="addonsMgrGroup" orient="horizontal" flex="1">
         <caption label="&addonsMgr.label;"/>
 
         <description control="manageAddons"
 #ifdef XP_WIN
-                     flex="1">&manageAddonsDesc.label;</description>
+                     flex="1">&manageAddonsDescWin.label;</description>
 #else
-                     flex="1">&manageAddonsDescUnix.label;</description>
+                     flex="1">&manageAddonsDescUnix2.label;</description>
 #endif
         <button id="manageAddons" label="&manageAddons.label;"
                 accesskey="&manageAddons.accesskey;"
diff --git a/browser/components/preferences/preferences.xul b/browser/components/preferences/preferences.xul
index 7529d99a62e5..a8c1a35ce031 100644
--- a/browser/components/preferences/preferences.xul
+++ b/browser/components/preferences/preferences.xul
@@ -83,12 +83,12 @@
 #endif
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 #ifdef USE_WIN_TITLE_STYLE
-            style="&prefWin.styleWin;">
+            style="&prefWin.styleWin2;">
 #else
 #ifdef XP_MACOSX
-            style="&prefWin.styleMac;">
+            style="&prefWin.styleMac2;">
 #else
-            style="&prefWin.styleGNOME;">
+            style="&prefWin.styleGNOME2;">
 #endif
 #endif
 
diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index 7f36755f528f..a1e7ef6621ab 100644
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -1,5 +1,4 @@
-<!-- Note: due to bug 143065, the only remaining accesskeys available to be used
-     in the Advanced pane are: "j", "o", "q", "z" -->
+<!-- Note: each tab panel must contain unique accesskeys -->
 
 <!ENTITY generalTab.label                "General">
 
@@ -21,6 +20,12 @@
 <!ENTITY checkSpelling.label             "Check my spelling as I type">
 <!ENTITY checkSpelling.accesskey         "t">
 
+<!ENTITY systemDefaults.label            "System Defaults">
+<!ENTITY alwaysCheckDefault.label        "Always check to see if &brandShortName; is the default browser on startup"><!--XXX-->
+<!ENTITY alwaysCheckDefault.accesskey    "w">
+<!ENTITY checkNow.label                  "Check Now">
+<!ENTITY checkNow.accesskey              "N">
+
 <!ENTITY networkTab.label                "Network">
 
 <!ENTITY connection.label                "Connection">
@@ -41,6 +46,7 @@
 <!ENTITY useCacheBefore.accesskey        "U">
 <!ENTITY useCacheAfter.label             "MB of space for the cache">
 <!ENTITY clearCacheNow.label             "Clear Now">
+<!ENTITY clearCacheNow.accesskey         "C">
 
 <!ENTITY updateTab.label                 "Update">
 
diff --git a/browser/locales/en-US/chrome/browser/preferences/main.dtd b/browser/locales/en-US/chrome/browser/preferences/main.dtd
index a5bfcfcc0d64..aa7074562351 100644
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -30,17 +30,8 @@
 <!ENTITY alwaysAsk.label "Always ask me where to save files">
 <!ENTITY alwaysAsk.accesskey "A">
 
-
-<!ENTITY systemDefaults.label  "System Defaults">
-
-<!ENTITY alwaysCheckDefault.label      "Always check to see if &brandShortName; is the default browser on startup"><!--XXX-->
-<!ENTITY alwaysCheckDefault.accesskey  "y">
-
-<!ENTITY checkNow.label             "Check Now">
-<!ENTITY checkNow.accesskey         "N">
-
-<!ENTITY addonsMgr.label            "Add-ons">
-<!ENTITY manageAddonsDesc.label     "Change options for your add-ons.">
-<!ENTITY manageAddonsDescUnix.label "Change preferences for your add-ons.">
-<!ENTITY manageAddons.label         "Manage Add-ons…">
-<!ENTITY manageAddons.accesskey     "M">
+<!ENTITY addonsMgr.label               "Add-ons">
+<!ENTITY manageAddonsDescWin.label     "Change options for your add-ons">
+<!ENTITY manageAddonsDescUnix2.label   "Change preferences for your add-ons">
+<!ENTITY manageAddons.label            "Manage Add-ons…">
+<!ENTITY manageAddons.accesskey        "M">
diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
index 02235a868995..dca9447c9663 100644
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -3,9 +3,9 @@
 <!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
-<!ENTITY  prefWin.styleWin        "width: 42em; min-height: 44em;">
-<!ENTITY  prefWin.styleMac        "width: 47em; min-height: 45em;">
-<!ENTITY  prefWin.styleGNOME      "width: 42em; min-height: 44.5em;">
+<!ENTITY  prefWin.styleWin2       "width: 42em; min-height: 39em;">
+<!ENTITY  prefWin.styleMac2       "width: 47em; min-height: 40em;">
+<!ENTITY  prefWin.styleGNOME2     "width: 42em; min-height: 39.5em;">
 
 <!ENTITY  paneMain.title          "Main">
 <!ENTITY  paneTabs.title          "Tabs">