Bug 718515 - Update messenger compose window's mail toolbar to use removable attribute r=neil
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 18 Jan 2012 17:47:15 +0000
changeset 10451 243812475f89ad3d3e6b646f768b0d4791c7f4f1
parent 10450 ef508aa563580a09cdabb4797a8a050cf6d4f07f
child 10452 7617b704d5638be3888a7b85fd2d0dc3f3270072
push id402
push userbugzilla@standard8.plus.com
push dateTue, 13 Mar 2012 21:17:18 +0000
treeherdercomm-beta@d080a8ebf16a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil
bugs718515
Bug 718515 - Update messenger compose window's mail toolbar to use removable attribute r=neil
suite/mailnews/compose/messengercompose.xul
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -459,16 +459,106 @@
              class="toolbar-primary chromeclass-toolbar"
              persist="collapsed"
              grippytooltiptext="&mailToolbar.tooltip;"
              toolbarname="&showComposeToolbarCmd.label;"
              accesskey="&showComposeToolbarCmd.accesskey;"
              customizable="true"
              defaultset="button-send,separator,button-address,button-attach,spellingButton,button-security,separator,button-save,spring,throbber-box"
              context="toolbar-context-menu">
+      <toolbarbutton id="button-send"
+                     class="toolbarbutton-1"
+                     label="&sendButton.label;"
+                     tooltiptext="&sendButton.tooltip;"
+                     now_label="&sendButton.label;"
+                     now_tooltiptext="&sendButton.tooltip;"
+                     later_label="&sendLaterCmd.label;"
+                     later_tooltiptext="&sendlaterButton.tooltip;"
+                     removable="true"
+                     command="cmd_sendButton">
+       <observes element="Communicator:WorkMode"
+                 attribute="offline"/>
+      </toolbarbutton>
+
+      <toolbarbutton id="button-address"
+                     class="toolbarbutton-1"
+                     label="&addressButton.label;"
+                     tooltiptext="&addressButton.tooltip;"
+                     removable="true"
+                     command="cmd_selectAddress"/>
+
+      <toolbarbutton id="button-attach"
+                     type="menu-button"
+                     class="toolbarbutton-1"
+                     label="&attachButton.label;"
+                     tooltiptext="&attachButton.tooltip;"
+                     removable="true"
+                     command="cmd_attachFile">
+        <menupopup id="button-attachPopup">
+          <menuitem id="button-attachFile"
+                    label="&attachFileCmd.label;"
+                    accesskey="&attachFileCmd.accesskey;"
+                    command="cmd_attachFile"/>
+          <menuitem id="button-attachPage"
+                    label="&attachPageCmd.label;"
+                    accesskey="&attachPageCmd.accesskey;"
+                    command="cmd_attachPage"/>
+          <menuseparator id="buttonAttachAfterPageSeparator"/>
+          <menuitem id="button-attachVCard"
+                    type="checkbox"
+                    label="&attachVCardCmd.label;"
+                    accesskey="&attachVCardCmd.accesskey;"
+                    command="cmd_attachVCard"/>
+        </menupopup>
+      </toolbarbutton>
+
+      <toolbarbutton id="spellingButton"
+                     type="menu-button"
+                     class="toolbarbutton-1"
+                     label="&spellingButton.label;"
+                     removable="true"
+                     command="cmd_spelling">
+        <!-- this popup gets dynamically generated -->
+        <menupopup id="languageMenuList"
+                   oncommand="ChangeLanguage(event);"
+                   onpopupshowing="OnShowDictionaryMenu(event.target);"/>
+      </toolbarbutton>
+
+      <toolbarbutton id="button-save"
+                     type="menu-button"
+                     class="toolbarbutton-1"
+                     label="&saveButton.label;"
+                     tooltiptext="&saveButton.tooltip;"
+                     removable="true"
+                     command="cmd_save">
+        <menupopup id="button-savePopup">
+          <menuitem id="button-saveAsFile"
+                    label="&saveAsFileCmd.label;"
+                    accesskey="&saveAsFileCmd.accesskey;"
+                    command="cmd_saveAsFile"/>
+          <menuseparator id="buttonSaveAfterFileSeparator"/>
+          <menuitem id="button-saveAsDraft"
+                    label="&saveAsDraftCmd.label;"
+                    accesskey="&saveAsDraftCmd.accesskey;"
+                    command="cmd_saveAsDraft"/>
+          <menuitem id="button-saveAsTemplate"
+                    label="&saveAsTemplateCmd.label;"
+                    accesskey="&saveAsTemplateCmd.accesskey;"
+                    command="cmd_saveAsTemplate"/>
+        </menupopup>
+      </toolbarbutton>
+
+      <toolbaritem id="throbber-box"
+                   removable="true"
+                   align="center">
+          <button id="navigator-throbber"
+                  oncommand="goClickThrobber('compose.throbber.url', event)"
+                  onclick="checkForMiddleClick(this, event);"
+                  tooltiptext="&throbber.tooltip;"/>
+      </toolbaritem>
     </toolbar>
 
     <toolbarset id="customToolbars" context="toolbar-context-menu"/>
 
     <toolbar id="MsgHeadersToolbar"
              persist="collapsed"
              flex="1"
              grippytooltiptext="&addressBar.tooltip;"
@@ -536,100 +626,16 @@
       <toolbarseparator class="toolbarseparator-standard"/>
       <toolbarbutton id="AlignPopupButton"/>
       <toolbarbutton id="InsertPopupButton"/>
       <toolbarbutton id="smileButtonMenu" padwithspace="true"/>
       <spacer flex="1"/>
     </toolbar>
 
     <toolbarpalette id="MsgComposeToolbarPalette">
-      <toolbarbutton id="button-send"
-                     class="toolbarbutton-1"
-                     label="&sendButton.label;"
-                     tooltiptext="&sendButton.tooltip;"
-                     now_label="&sendButton.label;"
-                     now_tooltiptext="&sendButton.tooltip;"
-                     later_label="&sendLaterCmd.label;"
-                     later_tooltiptext="&sendlaterButton.tooltip;"
-                     command="cmd_sendButton">
-       <observes element="Communicator:WorkMode"
-                 attribute="offline"/>
-      </toolbarbutton>
-
-      <toolbarbutton id="button-address"
-                     class="toolbarbutton-1"
-                     label="&addressButton.label;"
-                     tooltiptext="&addressButton.tooltip;"
-                     command="cmd_selectAddress"/>
-
-      <toolbarbutton id="button-attach"
-                     type="menu-button"
-                     class="toolbarbutton-1"
-                     label="&attachButton.label;"
-                     tooltiptext="&attachButton.tooltip;"
-                     command="cmd_attachFile">
-        <menupopup id="button-attachPopup">
-          <menuitem id="button-attachFile"
-                    label="&attachFileCmd.label;"
-                    accesskey="&attachFileCmd.accesskey;"
-                    command="cmd_attachFile"/>
-          <menuitem id="button-attachPage"
-                    label="&attachPageCmd.label;"
-                    accesskey="&attachPageCmd.accesskey;"
-                    command="cmd_attachPage"/>
-          <menuseparator id="buttonAttachAfterPageSeparator"/>
-          <menuitem id="button-attachVCard"
-                    type="checkbox"
-                    label="&attachVCardCmd.label;"
-                    accesskey="&attachVCardCmd.accesskey;"
-                    command="cmd_attachVCard"/>
-        </menupopup>
-      </toolbarbutton>
-
-      <toolbarbutton id="spellingButton"
-                     type="menu-button"
-                     class="toolbarbutton-1"
-                     label="&spellingButton.label;"
-                     command="cmd_spelling">
-        <!-- this popup gets dynamically generated -->
-        <menupopup id="languageMenuList"
-                   oncommand="ChangeLanguage(event);"
-                   onpopupshowing="OnShowDictionaryMenu(event.target);"/>
-      </toolbarbutton>
-
-      <toolbarbutton id="button-save"
-                     type="menu-button"
-                     class="toolbarbutton-1"
-                     label="&saveButton.label;"
-                     tooltiptext="&saveButton.tooltip;"
-                     command="cmd_save">
-        <menupopup id="button-savePopup">
-          <menuitem id="button-saveAsFile"
-                    label="&saveAsFileCmd.label;"
-                    accesskey="&saveAsFileCmd.accesskey;"
-                    command="cmd_saveAsFile"/>
-          <menuseparator id="buttonSaveAfterFileSeparator"/>
-          <menuitem id="button-saveAsDraft"
-                    label="&saveAsDraftCmd.label;"
-                    accesskey="&saveAsDraftCmd.accesskey;"
-                    command="cmd_saveAsDraft"/>
-          <menuitem id="button-saveAsTemplate"
-                    label="&saveAsTemplateCmd.label;"
-                    accesskey="&saveAsTemplateCmd.accesskey;"
-                    command="cmd_saveAsTemplate"/>
-        </menupopup>
-      </toolbarbutton>
-
-      <toolbaritem id="throbber-box"
-                   align="center">
-          <button id="navigator-throbber"
-                  oncommand="goClickThrobber('compose.throbber.url', event)"
-                  onclick="checkForMiddleClick(this, event);"
-                  tooltiptext="&throbber.tooltip;"/>
-      </toolbaritem>
     </toolbarpalette>
 
   </toolbox>
 
   <splitter id="compose-toolbar-sizer"
             resizeafter="grow"
             onmousedown="awSizerListen();"
             oncommand="awSizerResized(this);">