context menu button lets you move it, only adds itself the first time

Micah Lee · pde · commit 544a8114e074 · 2011-06-29T13:08:49.000-07:00
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -10,29 +10,28 @@ INFO=3;
 NOTE=4;
 WARN=5;
 
-
 function https_everywhere_load() {
+  return;
+  // on first run, put the context menu in the addons bar
+  try {
+    var first_run;
     try {
-       var firefoxnav = document.getElementById("nav-bar");
-       var curSet = firefoxnav.currentSet;
-       if(curSet.indexOf("https-everywhere-button") == -1) {
-         var set;
-         // Place the button before the urlbar
-         if(curSet.indexOf("urlbar-container") != -1)
-           set = curSet.replace(/urlbar-container/, "https-everywhere-button,urlbar-container");
-         else  // at the end
-           set = curSet + ",https-everywhere-button";
-         firefoxnav.setAttribute("currentset", set);
-         firefoxnav.currentSet = set;
-         document.persist("nav-bar", "currentset");
-         // If you don't do the following call, funny things happen
-         try {
-           BrowserToolboxCustomizeDone(true);
-         }
-         catch (e) { }
-       }
+      first_run = Services.prefs.getBoolPref("extensions.https_everywhere.firstrun_context_menu");
+    } catch(e) {
+      Services.prefs.setBoolPref("extensions.https_everywhere.firstrun_context_menu", true);
+      first_run = true;
+    }
+    if(first_run) {
+      Services.prefs.setBoolPref("extensions.https_everywhere.firstrun_context_menu", false);
+      var addon_bar = document.getElementById("addon-bar");
+      if(addon_bar.currentSet.indexOf("https-everywhere-button") == -1) {
+        var set = addon_bar.currentSet+',https-everywhere-button';
+        addon_bar.setAttribute('currentset', set);
+        addon_bar.currentSet = set;
+        document.persist('addon-bar', 'currentset');
+      }
     }
-    catch(e) { }
+  } catch(e) { }
 }
 
 function show_applicable_list() {
diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul
@@ -20,6 +20,7 @@
             tooltiptext="HTTPS Everywhere"
             label="HTTPS Everywhere"
             context="https-everywhere-context-menu"
+            buttonstyle="pictures"
             type="menu" >
 
             <menupopup id="https-everywhere-context" onpopupshowing="show_applicable_list()"></menupopup>
diff --git a/src/chrome/skin/https-everywhere.css b/src/chrome/skin/https-everywhere.css
@@ -1,27 +1,27 @@
 #https-everywhere-button {
-    list-style-image: url("chrome://https-everywhere/skin/https-everywhere-24.png");
-    -moz-box-orient: horizontal;
+  list-style-image: url("chrome://https-everywhere/skin/https-everywhere-24.png");
+  -moz-box-orient: horizontal;
 }
 
 toolbar[iconsize="small"] #https-everywhere-button {
-    list-style-image: url("chrome://https-everywhere/skin/https-everywhere-16.png");
-    -moz-box-orient: horizontal;
+  list-style-image: url("chrome://https-everywhere/skin/https-everywhere-16.png");
+  -moz-box-orient: horizontal;
 }
 
 #https-everywhere-button menuitem.active-item label {
-    color: #9AD100;
-    font-weight: bold;
+  color: #9AD100;
+  font-weight: bold;
 }
 #https-everywhere-button menuitem.moot-item label {
-    color: #9AD100;
-    opacity: 0.5;
-    font-weight: bold;
+  color: #9AD100;
+  opacity: 0.5;
+  font-weight: bold;
 }
 #https-everywhere-button menuitem.breaking-item label {
-    color: #b99999;
-    font-weight: bold;
+  color: #b99999;
+  font-weight: bold;
 }
 #https-everywhere-button menuitem.inactive-item label {
-    color: #999999;
-    font-weight: bold;
+  color: #999999;
+  font-weight: bold;
 }
