issue #1155 - Don't allow displaying icon text with Australis theme

lib/main.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
@@ skipping 113 matching lines @@
   __proto__: StylesheetFeature,
   stylesheet: "chrome://abpcustomization/content/oneLineSubscriptions.css"
 };
 
 var RemoveActionsButton =
 {
   __proto__: StylesheetFeature,
   stylesheet: "chrome://abpcustomization/content/noActionButton.css"
 };
 
-var RemoveToolbarIconDisplayOption =
-{
-  __proto__: StylesheetFeature,
-  stylesheet: "chrome://abpcustomization/content/noToolbarIconDisplay.css"
+var AddonPageAustralisStyles =
+{
+  __proto__: StylesheetFeature,
+  stylesheet: "chrome://abpcustomization/content/addonPageAustralisStyles.css"
 };
 
 var ToolbarIconDisplay =
 {
   __proto__: StylesheetFeature,
   get template()
   {
     let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
     request.open("GET", "chrome://abpcustomization/content/toolbarIconDisplay.css", false);
     request.overrideMimeType("text/plain");
@@ skipping 30 matching lines @@
   stylesheet: "chrome://abpcustomization/content/hideMenus.css"
 };
 
 let features =
 {
   "addon-page-styles": AddonPageStyles,
   "vertical-preferences-layout": VerticalPreferencesLayout,
   "preferences-one-line-subscriptions": OneLineSubscriptions,
   "preferences-remove-actions-button": RemoveActionsButton,
   "toolbar-icon-display": ToolbarIconDisplay,
-  "remove-toolbar-icon-display-option": RemoveToolbarIconDisplayOption,

[saroyanm, 2014/07/30 10:56:23]

Have little doubt regarding the naming, hope we will be Okey with namings.

[Wladimir Palant, 2014/07/30 11:34:08]

It's probably better to name it AddonPageAustralisStyles - not quite as long and
it describes the intention rather than the implementation. It would also make
sense to place it right after AddonPageStyles in the list here, given how
similar they are.

[saroyanm, 2014/07/30 12:50:35]

Done.

+  "addon-page-australis-styles": AddonPageAustralisStyles,
   "green-icon": GreenIcon,
   "remove-menus": RemoveMenus
 };
 
 function updateFeature(name)
 {
   if (name in features)
   {
     let enabled;
     if (name == "addon-page-styles")
       enabled = true;
-    else if (name == "toolbar-icon-display")
-      enabled = !isAustralis;

[Wladimir Palant, 2014/07/30 11:34:08]

I don't think we want to have |enabled = true| for every SeaMonkey user (no
Australis). Your previous attempt was correctly setting the enabled variable
only in the Australis scenario and following the default path (preferences)
otherwise.

[saroyanm, 2014/07/30 12:50:35]

Make, sense. Thanks.

-    else if (name == "remove-toolbar-icon-display-option")
+    else if (name == "toolbar-icon-display" && isAustralis)
+      enabled = false;
+    else if (name == "addon-page-australis-styles")
       enabled = isAustralis;
     else
       enabled = Prefs[name];
 
     if (enabled)
       features[name].init();
     else
       features[name].shutdown();
   }
 }
 
 // Initialize features and make sure to update them on changes
 for (let feature in features)
   updateFeature(feature);
 
 Prefs.addListener(updateFeature);