Bug 45524 Mail compose toolbar buttons should have dropdown menus r=ducarroz r/sr=sspitzer

mailnews/compose/resources/content/messengercompose.xul

@@ -396,18 +396,30 @@
                id="button-address" label="&addressButton.label;" 
                tooltiptext="&addressButton.tooltip;" 
                command="cmd_selectAddress"/>
-       <toolbarbutton class="toolbarbutton-1"
+       <toolbarbutton class="toolbarbutton-1" type="menu-button"
                id="button-attach" label="&attachButton.label;" 
                tooltiptext="&attachButton.tooltip;" 
-               command="cmd_attachFile"/>
+               command="cmd_attachFile">
+         <menupopup>
+           <menuitem label="&attachFileCmd.label;" accesskey="&attachFileCmd.accesskey;" command="cmd_attachFile"/>
+           <menuitem label="&attachPageCmd.label;" accesskey="&attachPageCmd.accesskey;" command="cmd_attachPage"/>
+         </menupopup>
+       </toolbarbutton>
        <toolbarbutton class="toolbarbutton-1"
                id="spellingButton" label="&spellingButton.label;" 
                command="cmd_spelling"/>
        <toolbarseparator id="saveSeparator" class="toolbarseparator-primary"/>
-       <toolbarbutton class="toolbarbutton-1"
+       <toolbarbutton class="toolbarbutton-1" type="menu-button"
                id="button-save" label="&saveButton.label;" 
                tooltiptext="&saveButton.tooltip;" 
-               command="cmd_saveDefault"/>
+               command="cmd_saveDefault">
+         <menupopup>
+           <menuitem label="&saveAsFileCmd.label;" accesskey="&saveAsFileCmd.accesskey;" command="cmd_saveAsFile"/>
+           <menuseparator/>
+           <menuitem label="&saveAsDraftCmd.label;" accesskey="&saveAsDraftCmd.accesskey;" command="cmd_saveAsDraft"/>
+           <menuitem label="&saveAsTemplateCmd.label;" accesskey="&saveAsTemplateCmd.accesskey;" command="cmd_saveAsTemplate"/>
+         </menupopup>
+       </toolbarbutton>
        <spacer flex="1"/>
        <hbox id="throbber-box" align="center">
          <button id="navigator-throbber" 

themes/classic/messenger/messengercompose/messengercompose.css

@@ -71,11 +71,11 @@
   -moz-image-region: rect(252px 23px 273px 0px);
 }
 
-#button-attach:hover {
+#button-attach[buttonover="true"] {
   -moz-image-region: rect(252px 46px 273px 23px);
 } 
 
-#button-attach:hover:active {
+#button-attach[buttondown="true"] {
   -moz-image-region: rect(252px 69px 273px 46px);
 } 
 
@@ -104,11 +104,11 @@
   -moz-image-region: rect(273px 23px 294px 0px);
 }
 
-#button-save:hover {
+#button-save[buttonover="true"] {
   -moz-image-region: rect(273px 46px 294px 23px);
 } 
 
-#button-save:hover:active {
+#button-save[buttondown="true"] {
   -moz-image-region: rect(273px 69px 294px 46px);
 } 
 

themes/modern/messenger/messengercompose/messengercompose.css

@@ -92,11 +92,11 @@
   -moz-image-region: rect(340px 49px 373px 0);
 }
 
-#button-attach:hover {
+#button-attach[buttonover="true"] {
   -moz-image-region: rect(340px 99px 373px 50px);
 } 
 
-#button-attach:hover:active {
+#button-attach[buttondown="true"] {
   -moz-image-region: rect(340px 149px 373px 100px);
 } 
 
@@ -126,11 +126,11 @@
   -moz-image-region: rect(238px 49px 271px 0);
 }
 
-#button-save:hover {
+#button-save[buttonover="true"] {
   -moz-image-region: rect(238px 99px 271px 50px);
 } 
 
-#button-save:hover:active {
+#button-save[buttondown="true"] {
   -moz-image-region: rect(238px 149px 271px 100px);
 }