Separate menubutton into two buttons

merike · Feb 16, 2013 · 9302a8d · 9302a8d
1 parent adfb944
commit 9302a8d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 17 deletions.
diff --git a/extension/chrome/content/event-extractor.js b/extension/chrome/content/event-extractor.js
@@ -130,12 +130,15 @@ var extract = {
   },
 
   setButtons: function setButtons () {
-    let button = document.getElementById("extractEventButton");
-    if (button) {
+    let eventButton = document.getElementById("extractEventButton");
+    let taskButton = document.getElementById("extractTaskButton");
+    if (eventButton) {
       if (gFolderDisplay.selectedCount == 0) {
-        button.disabled = true;
+        eventButton.disabled = true;
+        taskButton.disabled = true;
       } else {
-        button.disabled = false;
+        eventButton.disabled = false;
+        taskButton.disabled = false;
       }
     }
   }

diff --git a/extension/chrome/content/msgHeaderOverlay.xul b/extension/chrome/content/msgHeaderOverlay.xul
@@ -8,18 +8,24 @@
   <script type="application/javascript" src="chrome://event-extract/content/event-extractor.js"/>
 
   <toolbar id="header-view-toolbar">
-    <toolbarbutton id="hdrExtractEventButton" label="Extract as event" tooltiptext="Extract as event to calendar" oncommand="extract.extractFromEmail(true)" class="toolbarbutton-1 msgHeaderView-button" type="menu-button" removable="true">
-      <menupopup id="extractEventDropdown">
-        <menuitem id="extractTaskButton" label="Extract as task" tooltiptext="Extract as task to calendar" oncommand="extract.extractFromEmail(false); event.stopPropagation();"/>
-      </menupopup>
-    </toolbarbutton>
+    <toolbarbutton id="hdrExtractEventButton" label="Extract as event"
+                   tooltiptext="Extract as event to calendar"
+                   oncommand="extract.extractFromEmail(true)"
+                   class="toolbarbutton-1 msgHeaderView-button" removable="true" />
+    <toolbarbutton id="hdrExtractTaskButton" label="Extract as task"
+                   tooltiptext="Extract as task to calendar"
+                   oncommand="extract.extractFromEmail(false)"
+                   class="toolbarbutton-1 msgHeaderView-button" removable="true" />
   </toolbar>
 
   <toolbar id="mail-bar3">
-    <toolbarbutton id="extractEventButton" label="Extract as event" tooltiptext="Extract as event to calendar" oncommand="extract.extractFromEmail(true)" class="toolbarbutton-1" type="menu-button" removable="true">
-      <menupopup id="extractEventDropdown">
-        <menuitem id="extractTaskButton" label="Extract as task" tooltiptext="Extract as task to calendar" oncommand="extract.extractFromEmail(false); event.stopPropagation();"/>
-      </menupopup>
-    </toolbarbutton>
+    <toolbarbutton id="extractEventButton" label="Extract as event"
+                   tooltiptext="Extract as event to calendar"
+                   oncommand="extract.extractFromEmail(true)"
+                   class="toolbarbutton-1" removable="true" />
+    <toolbarbutton id="extractTaskButton" label="Extract as task"
+                   tooltiptext="Extract as task to calendar"
+                   oncommand="extract.extractFromEmail(false)"
+                   class="toolbarbutton-1" removable="true" />
   </toolbar>
 </overlay>
diff --git a/extension/skin/msgHeader.css b/extension/skin/msgHeader.css
@@ -7,25 +7,43 @@
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
+#hdrExtractTaskButton {
+  list-style-image: url("chrome://calendar/skin/toolbar-small.png");
+  -moz-image-region: rect(0px, 256px, 16px, 240px);
+}
+
 #extractEventButton {
   list-style-image: url("chrome://calendar/skin/toolbar-large.png");
   -moz-image-region: rect(0px, 24px, 24px, 0px);
 }
 
+#extractTaskButton {
+  list-style-image: url("chrome://calendar/skin/toolbar-large.png");
+  -moz-image-region: rect(0px, 384px, 24px, 360px);
+}
+
 #extractEventButton[disabled] {
   -moz-image-region: rect(48px, 24px, 72px, 0px);
 }
 
+#extractTaskButton[disabled] {
+  -moz-image-region: rect(48px, 384px, 72px, 360px);
+}
+
 toolbar[iconsize="small"] #extractEventButton {
   list-style-image: url("chrome://calendar/skin/toolbar-small.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
+toolbar[iconsize="small"] #extractTaskButton {
+  list-style-image: url("chrome://calendar/skin/toolbar-small.png");
+  -moz-image-region: rect(0px, 256px, 16px, 240px);
+}
+
 toolbar[iconsize="small"] #extractEventButton[disabled] {
   -moz-image-region: rect(32px, 16px, 48px, 0px);
 }
 
-#extractTaskButton {
-  list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-  -moz-image-region: rect(0px, 384px, 16px, 368px);
+toolbar[iconsize="small"] #extractTaskButton[disabled] {
+  -moz-image-region: rect(32px, 256px, 48px, 240px);
 }