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

lib/main.js

Index: lib/main.js
===================================================================
--- a/lib/main.js
+++ b/lib/main.js
@@ -9,6 +9,13 @@
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
 
+var isAustralis = false;
+try
+{
+  Cu.import("resource:///modules/CustomizableUI.jsm", null);
+  isAustralis = true;
+} catch(e) {}
+
 var WindowFeature =
 {
   observer: null,
@@ -124,6 +131,12 @@
   stylesheet: "chrome://abpcustomization/content/noActionButton.css"
 };
 
+var RemoveToolbarIconDisplayOption =
+{
+  __proto__: StylesheetFeature,
+  stylesheet: "chrome://abpcustomization/content/noToolbarIconDisplay.css"
+};
+
 var ToolbarIconDisplay =
 {
   __proto__: StylesheetFeature,
@@ -172,6 +185,7 @@
   "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.

   "green-icon": GreenIcon,
   "remove-menus": RemoveMenus
 };
@@ -183,6 +197,10 @@
     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")
+      enabled = isAustralis;
     else
       enabled = Prefs[name];
 
@@ -193,7 +211,6 @@
   }
 }
 
-
 // Initialize features and make sure to update them on changes
 for (let feature in features)
   updateFeature(feature);