Fixed toolbar icon. Closes #4.

Note that the icon artwork is temporary.
codebutler · Nov 18, 2010 · ea1130b · ea1130b
1 parent f071ee1
commit ea1130b
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 13 deletions.
diff --git a/xpi/chrome.manifest b/xpi/chrome.manifest
@@ -2,9 +2,11 @@ content   firesheep                 chrome/content/
 skin      firesheep   classic/1.0   chrome/skin/
 locale    firesheep   en-US         chrome/locale/en-US/
 
-overlay   chrome://browser/content/browser.xul                     chrome://firesheep/content/ff-overlay.xul
-style     chrome://firesheep/content/ff-sidebar.xul                chrome://firesheep/skin/sidebar-osx.css      OS=Darwin
-style     chrome://firesheep/content/preferences/prefsWindow.xul   chrome://firesheep/skin/preferences-osx.css  OS=Darwin
+overlay   chrome://browser/content/browser.xul                   chrome://firesheep/content/browserOverlay.xul
+overlay   chrome://global/content/customizeToolbar.xul           chrome://firesheep/content/customizeToolbarOverlay.xul
+
+style     chrome://firesheep/content/sidebar.xul                 chrome://firesheep/skin/sidebar-osx.css      OS=Darwin
+style     chrome://firesheep/content/preferences/prefsWindow.xul chrome://firesheep/skin/preferences-osx.css  OS=Darwin
 
 resource firesheep modules/
 

diff --git a/xpi/chrome/content/ff-overlay.js → xpi/chrome/content/browserOverlay.js b/xpi/chrome/content/ff-overlay.js → xpi/chrome/content/browserOverlay.js
@@ -1,5 +1,5 @@
 //
-// ff-overlay.js
+// browserOverlay.js
 // Part of the Firesheep project.
 //
 // Copyright (C) 2010 Eric Butler

diff --git a/xpi/chrome/content/ff-overlay.xul → xpi/chrome/content/browserOverlay.xul b/xpi/chrome/content/ff-overlay.xul → xpi/chrome/content/browserOverlay.xul
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="chrome://firesheep/skin/overlay.css" type="text/css"?>
 
 <!--
-  ff-overlay.xul
+  browserOverlay.xul
   Part of the Firesheep project.
   
   Copyright (C) 2010 Eric Butler
@@ -27,15 +27,18 @@
 <!DOCTYPE overlay SYSTEM "chrome://firesheep/locale/overlay.dtd">
 
 <overlay id="firesheep-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="ff-overlay.js"/>
+  <script src="browserOverlay.js"/>
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="firesheep-strings" src="chrome://firesheep/locale/overlay.properties"/>
   </stringbundleset>
 
   <toolbarpalette id="BrowserToolbarPalette">
-  <toolbarbutton id="firesheep-toolbar-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-    label="&firesheepToolbarButton.label;" tooltiptext="&firesheepToolbarButton.tooltip;"
+    <toolbarbutton 
+      id="firesheep-toolbar-button" 
+      class="toolbarbutton-1 chromeclass-toolbar-additional"
+      label="&firesheepToolbarButton.label;" 
+      tooltiptext="&firesheepToolbarButton.tooltip;"
     oncommand="FiresheepUI.toggleSidebar()"/>
   </toolbarpalette>
 
@@ -53,7 +56,7 @@
                  autoCheck="false"
                  type="checkbox"
                  group="sidebar"
-                 sidebarurl="chrome://firesheep/content/ff-sidebar.xul"
+                 sidebarurl="chrome://firesheep/content/sidebar.xul"
                  sidebartitle="&firesheepSidebar.label;"
                  oncommand="FiresheepUI.toggleSidebar()" />
   </broadcasterset>

diff --git a/xpi/chrome/content/customizeToolbarOverlay.xul b/xpi/chrome/content/customizeToolbarOverlay.xul
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://firesheep/skin/overlay.css" type="text/css"?>
+<overlay id="FirebugOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+</overlay>
diff --git a/xpi/chrome/content/ff-sidebar.js → xpi/chrome/content/sidebar.js b/xpi/chrome/content/ff-sidebar.js → xpi/chrome/content/sidebar.js
@@ -1,5 +1,5 @@
 //
-// ff-sidebar.js
+// sidebar.js
 // Part of the Firesheep project.
 //
 // Copyright (C) 2010 Eric Butler

diff --git a/xpi/chrome/content/ff-sidebar.xul → xpi/chrome/content/sidebar.xul b/xpi/chrome/content/ff-sidebar.xul → xpi/chrome/content/sidebar.xul
@@ -3,7 +3,7 @@
 <?xml-stylesheet href="chrome://firesheep/skin/sidebar.css" type="text/css"?>
 
 <!--
-  ff-sidebar.xul
+  sidebar.xul
   Part of the Firesheep project.
   
   Copyright (C) 2010 Eric Butler
@@ -30,8 +30,8 @@
 <page id="firesheepSidebar" title="&firesheepSidebar.label;"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script src="ff-sidebar.js"/>
-  <script src="ff-overlay.js"/>
+  <script src="sidebar.js"/>
+  <script src="browserOverlay.js"/>
 
   <vbox flex="1">
     <hbox id="toolbar">

diff --git a/xpi/chrome/skin/overlay.css b/xpi/chrome/skin/overlay.css
@@ -0,0 +1,9 @@
+#firesheep-toolbar-button {
+	list-style-image: url('chrome://firesheep/skin/toolbar-button.png');
+}
+
+toolbar[iconsize="small"] #firesheep-toolbar-button > .toolbarbutton-icon {
+	list-style-image: url('chrome://firesheep/skin/toolbar-button.png');
+    width: 16px;
+    height: 16px;
+}
diff --git a/xpi/chrome/skin/toolbar-button.png b/xpi/chrome/skin/toolbar-button.png