Bug 620776 - Add plugin.disable UI to Preferences. r=IanN ui-r=neil

suite/browser/browser-prefs.js

@@ -721,6 +721,7 @@ pref("plugins.update.notifyUser", false);
 pref("plugins.hide_infobar_for_outdated_plugin", false);
 pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
 pref("plugins.hide_infobar_for_missing_plugin", false);
+pref("plugin.disable", false);
 
 #ifdef XP_MACOSX
 pref("plugins.use_layers", true);

suite/common/pref/pref-scripts.xul

@@ -65,6 +65,9 @@
       <preference id="dom.event.contextmenu.enabled"
                   name="dom.event.contextmenu.enabled"
                   type="bool"/>
+      <preference id="plugin.disable"
+                  name="plugin.disable"
+                  type="bool" inverted="true"/>
       <preference id="plugins.hide_infobar_for_missing_plugin"
                   name="plugins.hide_infobar_for_missing_plugin"
                   type="bool" inverted="true"/>
@@ -105,8 +108,13 @@
       </listbox>
     </groupbox>
 
-    <groupbox id="pluginPreferences" hidden="true">
+    <groupbox id="pluginPreferences">
       <caption label="&enablePlugin.label;"/>
+      <checkbox id="pluginForSuite"
+                label="&enablePluginForSuite.label;"
+                accesskey="&enablePluginForSuite.accesskey;"
+                preference="plugin.disable"/>
+
       <!-- mailnews will add its checkbox here using overlay (mailPrefsOverlay.xul).
       -->
     </groupbox>

suite/locales/en-US/chrome/common/pref/pref-scripts.dtd

@@ -17,7 +17,9 @@
 <!ENTITY allowContextmenuDisable.label   "Disable or replace context menus">
 <!ENTITY allowHideStatusBar.label        "Hide the status bar">
 
-<!ENTITY enablePlugin.label              "Enable Plugins for">
+<!ENTITY enablePlugin.label              "Enable Plugins for:">
+<!ENTITY enablePluginForSuite.label      "Suite">
+<!ENTITY enablePluginForSuite.accesskey  "u">
 
 <!ENTITY whenPluginsRequired.label       "When additional plugins are required">
 <!ENTITY displayNotification.label       "Display a notification bar at the top of the content area">

suite/mailnews/prefs/mailPrefsOverlay.xul

@@ -17,13 +17,17 @@
                 type="bool"/>
   </preferences>
   <preferences id="scripts_preferences">
+    <preference id="plugin.disable"
+                onchange="setDisableState('pluginAllowMailNews', !this.value);"/>
     <preference id="mailnews.message_display.allow.plugins"
                 name="mailnews.message_display.allow.plugins"
                 type="bool"/>
   </preferences>
   <!-- plugin toggle for mail/news -->
-  <groupbox id="pluginPreferences" hidden="false">
+  <groupbox id="pluginPreferences">
     <checkbox id="pluginAllowMailNews"
+              class="indent"
+              onsyncfrompreference="document.getElementById('scripts_pane').setDisableState(this.id, !document.getElementById('plugin.disable').value);"
               label="&enbPluginCheckMailNews.label;"
               accesskey="&enbPluginCheckMailNews.accesskey;"
               preference="mailnews.message_display.allow.plugins"/>