Bug 676991 - Move toolbar print button to utilityOverlay r=neil/standard8
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 24 Sep 2011 13:53:14 +0100
changeset 8553 a508ab7862d2255fd421bade976d964fb6dcbb8f
parent 8552 956d6ff41176e411a4e3520c4e922b3b0efd94d2
child 8554 fec4d614ba99e959bb59c6e7823e6b85183b0899
push id6570
push useriann_cvs@blueyonder.co.uk
push dateSat, 24 Sep 2011 12:53:26 +0000
treeherdercomm-central@a508ab7862d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil, standard8
bugs676991
Bug 676991 - Move toolbar print button to utilityOverlay r=neil/standard8
editor/ui/composer/content/editor.xul
editor/ui/composer/content/editorOverlay.xul
editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
suite/browser/navigator.xul
suite/common/utilityOverlay.xul
suite/debugQA/content/debugQATextEditorShell.xul
suite/locales/en-US/chrome/browser/navigator.dtd
suite/locales/en-US/chrome/mailnews/messenger.dtd
suite/mailnews/mailWindowOverlay.xul
suite/themes/classic/communicator/communicator.css
suite/themes/classic/editor/editorPrimaryToolbar.css
suite/themes/classic/mac/communicator/communicator.css
suite/themes/classic/mac/editor/editorPrimaryToolbar.css
suite/themes/classic/mac/messenger/primaryToolbar.css
suite/themes/classic/mac/navigator/navigator.css
suite/themes/classic/messenger/primaryToolbar.css
suite/themes/classic/navigator/navigator.css
suite/themes/modern/communicator/communicator.css
suite/themes/modern/editor/editorPrimaryToolbar.css
suite/themes/modern/messenger/primaryToolbar.css
suite/themes/modern/navigator/navigator.css
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -266,17 +266,17 @@
     <toolbarbutton id="previewButton"
                    class="toolbarbutton-1"
                    label="&previewToolbarCmd.label;"
                    command="cmd_preview"
                    tooltiptext="&previewToolbarCmd.tooltip;"/>
     <toolbarbutton id="cutButton"/>
     <toolbarbutton id="copyButton"/>
     <toolbarbutton id="pasteButton"/>
-    <toolbarbutton id="printButton"/>
+    <toolbarbutton id="print-button"/>
     <toolbarbutton id="findButton"/>
     <toolbarseparator class="toolbarseparator-primary"/>
     <toolbarbutton id="linkButton"/>
     <toolbarbutton id="namedAnchorButton"/>
     <toolbarbutton id="imageButton"/>
     <toolbarbutton id="hlineButton"/>
     <toolbarbutton id="tableButton"/>
     <toolbarbutton id="spellingButton"/>
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -1131,31 +1131,21 @@
                  tooltiptext="&cutToolbarCmd.tooltip;"/>
   <toolbarbutton id="copyButton" class="toolbarbutton-1"
                  command="cmd_copy"
                  tooltiptext="&copyToolbarCmd.tooltip;"/>
   <toolbarbutton id="pasteButton" class="toolbarbutton-1"
                  command="cmd_paste"
                  tooltiptext="&pasteToolbarCmd.tooltip;"/>
 
-  <toolbarbutton id="printButton" type="menu-button" class="toolbarbutton-1"
+  <toolbarbutton id="print-button"
                  label="&printToolbarCmd.label;"
-                 tooltiptext="&printToolbarCmd.tooltip;"
-                 oncommand="if (event.target==this) goDoCommand('cmd_print');">
-    <menupopup id="printMenu">
-      <menuitem id="printMenuItemToolbar" accesskey="&printCmd.accesskey;" label="&printCmd.label;" default="true"
-                oncommand="goDoCommand('cmd_print');"/>
+                 tooltiptext="&printToolbarCmd.tooltip;"/>
       <!-- 'printSetupToolbar' is merged in here from platformGlobalOverlay.xul -->
-      <menuitem id="printPreviewMenuItemToolbar"
-                label="&printPreviewCmd.label;"
-                accesskey="&printPreviewCmd.accesskey;"
-                oncommand="goDoCommand('cmd_printpreview');"/>
-    </menupopup>
-  </toolbarbutton>
-    
+
   <toolbarbutton id="findButton"
                  class="toolbarbutton-1"
                  label="&findToolbarCmd.label;"
                  command="cmd_find"
                  tooltiptext="&findToolbarCmd.tooltip;"/>
   <toolbarbutton id="spellingButton"
                  class="toolbarbutton-1"
                  label="&spellToolbarCmd.label;"
--- a/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
@@ -63,20 +63,16 @@
 
 <!ENTITY publishCmd.label "Publish">
 <!ENTITY publishCmd.accesskey "b">
 <!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "Publish As…">
 <!ENTITY publishAsCmd.accesskey "h">
 <!ENTITY saveAsChangeEncodingCmd.label "Save And Change Character Encoding">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "E">
-<!ENTITY printCmd.label "Print…">
-<!ENTITY printCmd.accesskey "P">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printPreviewCmd.accesskey "v">
 
 <!-- Edit menu items -->
 <!ENTITY editMenu.label "Edit">
 <!ENTITY editMenu.accesskey "E">
 <!ENTITY pasteNoFormatting.label "Paste Without Formatting">
 <!ENTITY pasteNoFormatting.accesskey "n">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Paste As">
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -366,28 +366,19 @@
       </toolbaritem>
 
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" class="chromeclass-toolbar-additional nav-bar-class"
                    flex="1" persist="width" removable="true">
         <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
 
-      <toolbarbutton id="print-button" type="menu-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
+      <toolbarbutton id="print-button"
                      label="&printButton.label;"
-                     oncommand="if (event.target==this) PrintUtils.print();"
-                     tooltiptext="&printButton.tooltip;">
-        <menupopup id="printMenu">
-          <menuitem id="printMenuItemToolbar" label="&printCmd.label;" accesskey="&printCmd.accesskey;"
-                    default="true" oncommand="PrintUtils.print()"/>
-          <menuitem id="printPreviewMenuItemToolbar" label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;"
-                    oncommand="setTimeout(BrowserPrintPreview, 0);"/>
-        </menupopup>
-      </toolbarbutton>
+                     tooltiptext="&printButton.tooltip;"/>
 
       <toolbaritem id="throbber-box" align="center">
         <button id="navigator-throbber"
                 oncommand="goClickThrobber('browser.throbber.url', event)"
                 onclick="checkForMiddleClick(this, event);"
                 tooltiptext="&throbber.tooltip;"/>
       </toolbaritem>
 
--- a/suite/common/utilityOverlay.xul
+++ b/suite/common/utilityOverlay.xul
@@ -473,14 +473,31 @@
               oncommand="toDataManager(this.hostport + '|permissions|add|popup')"/>
     <menuitem id="dontShowMessage" label="&dontShowMessage.label;"
               accesskey="&dontShowMessage.accesskey;"
               oncommand="disablePopupBlockerNotifications();"/>
     <menuseparator id="popupNotificationMenuSeparator" hidden="true"/>
     <!-- Additional items are generated, see popupNotificationMenuShowing() -->
   </menupopup>
 
+  <toolbarbutton id="print-button"
+                 type="menu-button"
+                 class="toolbarbutton-1 chromeclass-toolbar-additional"
+                 command="cmd_print">
+    <menupopup id="printMenu">
+      <menuitem id="printMenuItemToolbar"
+                label="&printCmd.label;"
+                accesskey="&printCmd.accesskey;"
+                default="true"
+                command="cmd_print"/>
+      <menuitem id="printPreviewMenuItemToolbar"
+                label="&printPreviewCmd.label;"
+                accesskey="&printPreviewCmd.accesskey;"
+                command="cmd_printpreview"/>
+    </menupopup>
+  </toolbarbutton>
+
   <!-- Sync toolbar button -->
   <toolbarbutton id="sync-button"
                  class="toolbarbutton-1 chromeclass-toolbar-additional"
                  label="&syncToolbarButton.label;"
                  oncommand="gSyncUI.handleToolbarButton();"/>
 </overlay>
--- a/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/suite/debugQA/content/debugQATextEditorShell.xul
@@ -157,17 +157,17 @@
      <!-- toolbar filled out from editorOverlay -->
     <toolbar id="EditToolbar"
              class="chromeclass-toolbar toolbar-primary"
              persist="collapsed"
              grippytooltiptext="&compositionToolbar.tooltip;">
       <toolbarbutton id="newButton"/>
       <toolbarbutton id="openButton"/>
       <toolbarbutton id="saveButton"/>
-      <toolbarbutton id="printButton"/>
+      <toolbarbutton id="print-button"/>
       <toolbarseparator class="toolbarseparator-primary"/>
       <toolbarbutton id="spellingButton"/>
       <spacer flex="1"/>
     </toolbar>
   </toolbox>
 
   <menupopup id="popupNotificationMenu"/>
 
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -9,21 +9,16 @@
 <!ENTITY mainWindow.titlemodifier "&brandShortName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 
 <!ENTITY editPageCmd.label "Edit Page">
 <!ENTITY editPageCmd.accesskey "E">
 <!ENTITY editPageCmd.commandkey "e">
 
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printPreviewCmd.accesskey "v">
-<!ENTITY printCmd.label "Print…">
-<!ENTITY printCmd.accesskey "p">
-
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "Personal Toolbar">
 <!ENTITY personalbarCmd.accesskey "P">
 
 <!ENTITY closeWindow.label "Close Window">
 <!ENTITY closeWindow.accesskey "W">
 
--- a/suite/locales/en-US/chrome/mailnews/messenger.dtd
+++ b/suite/locales/en-US/chrome/mailnews/messenger.dtd
@@ -102,20 +102,16 @@
 <!ENTITY synchronizeOfflineCmd.label "Download/Sync Now…">
 <!ENTITY synchronizeOfflineCmd.accesskey "S">
 <!ENTITY settingsOfflineCmd.label "Offline Settings…">
 <!ENTITY settingsOfflineCmd.accesskey "e">
 <!ENTITY downloadSelectedCmd.label "Get Selected Messages">
 <!ENTITY downloadSelectedCmd.accesskey "t">
 <!ENTITY downloadFlaggedCmd.label "Get Flagged Messages">
 <!ENTITY downloadFlaggedCmd.accesskey "G">
-<!ENTITY printCmd.label "Print…">
-<!ENTITY printCmd.accesskey "P">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printPreviewCmd.accesskey "v">
 
 <!-- Edit Menu -->
 <!ENTITY deleteMsgCmd.label "Delete Message">
 <!ENTITY deleteMsgCmd.accesskey "D">
 <!ENTITY undeleteMsgCmd.label "Undelete Message">
 <!ENTITY undeleteMsgCmd.accesskey "d">
 <!ENTITY cancelNewsMsgCmd.label "Cancel Message">
 <!ENTITY cancelNewsMsgCmd.accesskey "n">
--- a/suite/mailnews/mailWindowOverlay.xul
+++ b/suite/mailnews/mailWindowOverlay.xul
@@ -2247,35 +2247,20 @@
               <menuseparator id="button-markAllReadSeparator"/>
               <menuitem id="markFlaggedToolbarItem"
                         type="checkbox"
                         label="&markFlaggedCmd.label;"
                         accesskey="&markFlaggedCmd.accesskey;"
                         command="cmd_markAsFlagged"/>
           </menupopup>
     </toolbarbutton>
-    <toolbarbutton id="button-print"
-                   class="toolbarbutton-1"
-                   type="menu-button"
+    <toolbarbutton id="print-button"
                    label="&printButton.label;"
                    observes="button_print"
-                   oncommand="goDoCommand('cmd_print')"
-                   tooltiptext="&printButton.tooltip;">
-      <menupopup id="printMenu"
-                 onpopupshowing="goUpdateCommand('cmd_printpreview');">
-        <menuitem id="button-printMenu"
-                  label="&printCmd.label;"
-                  accesskey="&printCmd.accesskey;"
-                  default="true"/>
-        <menuitem id="button-printPreviewMenu"
-                  label="&printPreviewCmd.label;"
-                  accesskey="&printPreviewCmd.accesskey;"
-                  command="cmd_printpreview"/>
-      </menupopup>
-    </toolbarbutton>
+                   tooltiptext="&printButton.tooltip;"/>
     <toolbarbutton id="button-stop"
                    class="toolbarbutton-1"
                    label="&stopButton.label;"
                    tooltiptext="&stopButton.tooltip;"
                    command="cmd_stop"/>
     <toolbaritem id="button-search-container"
                  title="&searchButton.title;"
                  align="center"
--- a/suite/themes/classic/communicator/communicator.css
+++ b/suite/themes/classic/communicator/communicator.css
@@ -104,16 +104,52 @@
 
 /* ::::: iconic menus and menuitems ::::: */
 
 menu.menu-iconic > .menu-iconic-left,
 menuitem.menuitem-iconic > .menu-iconic-left {
   display: -moz-box;
 }
 
+/* ::::: toolbar print button ::::: */
+#print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#print-button:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#print-button:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
 /* ::::: lightweight themes ::::: */
 
 toolbar button:-moz-lwtheme,
 toolbar menulist:-moz-lwtheme:not([open="true"]),
 toolbar textbox:-moz-lwtheme:not([focused="true"]) {
   opacity: .8;
 }
 
--- a/suite/themes/classic/editor/editorPrimaryToolbar.css
+++ b/suite/themes/classic/editor/editorPrimaryToolbar.css
@@ -121,33 +121,16 @@
 #previewButton:hover:active {
   -moz-image-region: rect(180px 89px 209px 60px);
 }
 
 #previewButton[disabled="true"] {
   -moz-image-region: rect(180px 119px 209px 90px) !important;
 }
 
-#printButton {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#printButton:hover {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#printButton:hover:active {
-  -moz-image-region: rect(0 89px 29px 60px);
-}
-
-#printButton[disabled="true"] {
-  -moz-image-region: rect(0 119px 29px 90px);
-}
-
 #linkButton {
   -moz-image-region: rect(90px 29px 119px 0);
 }
 
 #linkButton:hover {
   -moz-image-region: rect(90px 59px 119px 30px);
 }
 
@@ -296,9 +279,9 @@
 }
 
 #findButton:hover:active {
   -moz-image-region: rect(420px 89px 449px 60px);
 }
 
 #findButton[disabled="true"] {
   -moz-image-region: rect(420px 119px 449px 90px) !important;
-}
\ No newline at end of file
+}
--- a/suite/themes/classic/mac/communicator/communicator.css
+++ b/suite/themes/classic/mac/communicator/communicator.css
@@ -103,16 +103,46 @@ grippy {
   list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
 }
 
 .sidebarTree {
   border: none;
   margin: 0px !important;
 }
 
+/* ::::: toolbar print button ::::: */
+#print-button {
+ list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#print-button:hover:active,
+#print-button[open] {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(0 89px 29px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active,
+toolbar[iconsize="small"] > #print-button[open] {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 59px 19px 40px) !important;
+}
+
 /* ::::: lightweight themes ::::: */
 
 toolbar textbox:-moz-lwtheme:not([focused="true"]) {
   opacity: 0.9;
 }
 
 treecols:-moz-lwtheme {
   text-shadow: none;
--- a/suite/themes/classic/mac/editor/editorPrimaryToolbar.css
+++ b/suite/themes/classic/mac/editor/editorPrimaryToolbar.css
@@ -101,30 +101,16 @@
 #previewButton:hover:active {
   -moz-image-region: rect(180px 59px 209px 30px);
 }
 
 #previewButton[disabled="true"] {
   -moz-image-region: rect(180px 89px 209px 60px) !important;
 }
 
-#printButton {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#printButton:hover:active,
-#printButton[open] {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#printButton[disabled="true"] {
-  -moz-image-region: rect(0 89px 29px 60px);
-}
-
 #linkButton {
   -moz-image-region: rect(90px 29px 119px 0);
 }
 
 #linkButton:hover:active {
   -moz-image-region: rect(90px 59px 119px 30px);
 }
 
--- a/suite/themes/classic/mac/messenger/primaryToolbar.css
+++ b/suite/themes/classic/mac/messenger/primaryToolbar.css
@@ -210,30 +210,16 @@ toolbarpaletteitem > #button-delete {
 #button-junk:hover:active {
   -moz-image-region: rect(360px 59px 389px 30px);
 }
 
 #button-junk[disabled="true"] {
   -moz-image-region: rect(360px 89px 389px 60px) !important;
 }
 
-#button-print {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#button-print:hover:active,
-#button-print[open] {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#button-print[disabled="true"] {
-  -moz-image-region: rect(0 89px 29px 60px) !important;
-}
-
 #button-stop {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   -moz-image-region: rect(30px 29px 59px 0);
 }
 
 #button-stop:hover:active {
   -moz-image-region: rect(30px 59px 59px 30px);
 }
@@ -441,31 +427,16 @@ toolbar[iconsize="small"] > #button-junk
   -moz-image-region: rect(240px 39px 259px 20px);
 }
 
 toolbar[iconsize="small"] > #button-junk[disabled],
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk[disabled] {
   -moz-image-region: rect(240px 59px 259px 40px) !important;
 }
 
-toolbar[iconsize="small"] > #button-print,
-toolbar[iconsize="small"] > toolbarpaletteitem > #button-print {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] > #button-print:hover:active,
-toolbar[iconsize="small"] > #button-print[open] {
-  -moz-image-region: rect(0 39px 19px 20px);
-}
-
-toolbar[iconsize="small"] > #button-print[disabled="true"] {
-  -moz-image-region: rect(0 59px 19px 40px) !important;
-}
-
 toolbar[iconsize="small"] > #button-stop,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-stop {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(20px 19px 39px 0);
 }
 
 toolbar[iconsize="small"] > #button-stop:hover:active {
   -moz-image-region: rect(20px 39px 39px 20px);
--- a/suite/themes/classic/mac/navigator/navigator.css
+++ b/suite/themes/classic/mac/navigator/navigator.css
@@ -104,30 +104,16 @@
 #stop-button:hover:active {
   -moz-image-region: rect(30px 59px 59px 30px);
 }
 
 #stop-button[disabled="true"] {
   -moz-image-region: rect(30px 89px 59px 60px) !important;
 }
 
-#print-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#print-button:hover:active,
-#print-button[open] {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#print-button[disabled="true"] {
-  -moz-image-region: rect(0 89px 29px 60px) !important;
-}
-
 #home-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   -moz-image-region: rect(120px 29px 149px 0);
 }
 
 #home-button:hover:active {
   -moz-image-region: rect(120px 59px 149px 30px);
 }
@@ -199,31 +185,16 @@ toolbar[iconsize="small"] > #stop-button
 toolbar[iconsize="small"] > #stop-button:hover:active {
   -moz-image-region: rect(20px 39px 39px 20px);
 }
 
 toolbar[iconsize="small"] > #stop-button[disabled="true"] {
   -moz-image-region: rect(20px 59px 39px 40px) !important;
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
-toolbar[iconsize="small"] > #print-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] > #print-button:hover:active,
-toolbar[iconsize="small"] > #print-button[open] {
-  -moz-image-region: rect(0 39px 19px 20px);
-}
-
-toolbar[iconsize="small"] > #print-button[disabled="true"] {
-  -moz-image-region: rect(0 59px 19px 40px) !important;
-}
-
 toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
 toolbar[iconsize="small"] > #home-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(80px 19px 99px 0);
 }
 
 toolbar[iconsize="small"] > #home-button:hover:active {
   -moz-image-region: rect(80px 39px 99px 20px);
--- a/suite/themes/classic/messenger/primaryToolbar.css
+++ b/suite/themes/classic/messenger/primaryToolbar.css
@@ -249,33 +249,16 @@ toolbarpaletteitem > #button-delete {
 #button-junk:hover:active {
   -moz-image-region: rect(360px 89px 389px 60px);
 }
 
 #button-junk[disabled="true"] {
   -moz-image-region: rect(360px 119px 389px 90px) !important;
 }
 
-#button-print {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#button-print:hover {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#button-print:hover:active {
-  -moz-image-region: rect(0 89px 29px 60px);
-}
-
-#button-print[disabled] {
-  -moz-image-region: rect(0 119px 29px 90px) !important;
-}
-
 #button-stop {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   -moz-image-region: rect(30px 29px 59px 0);
 }
 
 #button-stop:hover {
   -moz-image-region: rect(30px 59px 59px 30px);
 } 
@@ -533,34 +516,16 @@ toolbar[iconsize="small"] > #button-junk
   -moz-image-region: rect(240px 59px 259px 40px);
 }
 
 toolbar[iconsize="small"] > #button-junk[disabled],
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk[disabled] {
   -moz-image-region: rect(240px 79px 259px 60px) !important;
 }
 
-toolbar[iconsize="small"] > #button-print,
-toolbar[iconsize="small"] > toolbarpaletteitem > #button-print {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] > #button-print:hover {
-  -moz-image-region: rect(0 39px 19px 20px);
-}
-
-toolbar[iconsize="small"] > #button-print:hover:active {
-  -moz-image-region: rect(0 59px 19px 40px);
-}
-
-toolbar[iconsize="small"] > #button-print[disabled] {
-  -moz-image-region: rect(0 79px 19px 60px) !important;
-}
-
 toolbar[iconsize="small"] > #button-stop,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-stop {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(20px 19px 39px 0);
 }
 
 toolbar[iconsize="small"] > #button-stop:hover {
   -moz-image-region: rect(20px 39px 39px 20px);
--- a/suite/themes/classic/navigator/navigator.css
+++ b/suite/themes/classic/navigator/navigator.css
@@ -107,33 +107,16 @@
 #stop-button:hover:active {
   -moz-image-region: rect(30px 89px 59px 60px);
 }
 
 #stop-button[disabled="true"] {
   -moz-image-region: rect(30px 119px 59px 90px) !important;
 }
 
-#print-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#print-button:hover {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#print-button:hover:active {
-  -moz-image-region: rect(0 89px 29px 60px);
-}
-
-#print-button[disabled="true"] {
-  -moz-image-region: rect(0 119px 29px 90px) !important;
-}
-
 #home-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   -moz-image-region: rect(120px 29px 149px 0);
 }
 
 #home-button:hover {
   -moz-image-region: rect(120px 59px 149px 30px);
 } 
@@ -223,34 +206,16 @@ toolbar[iconsize="small"] > #stop-button
 toolbar[iconsize="small"] > #stop-button:hover:active {
   -moz-image-region: rect(20px 59px 39px 40px);
 }
 
 toolbar[iconsize="small"] > #stop-button[disabled="true"] {
   -moz-image-region: rect(20px 79px 39px 60px) !important;
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
-toolbar[iconsize="small"] > #print-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] > #print-button:hover {
-  -moz-image-region: rect(0 39px 19px 20px);
-}
-
-toolbar[iconsize="small"] > #print-button:hover:active {
-  -moz-image-region: rect(0 59px 19px 40px);
-}
-
-toolbar[iconsize="small"] > #print-button[disabled="true"] {
-  -moz-image-region: rect(0 79px 19px 60px) !important;
-}
-
 toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
 toolbar[iconsize="small"] > #home-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(80px 19px 99px 0);
 }
 
 toolbar[iconsize="small"] > #home-button:hover {
   -moz-image-region: rect(80px 39px 99px 20px);
--- a/suite/themes/modern/communicator/communicator.css
+++ b/suite/themes/modern/communicator/communicator.css
@@ -82,8 +82,44 @@
 .down[disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
 }
 
 .sidebarTree {
   border: none;
   margin: 0px !important;
 }
+
+/* ::::: toolbar print button ::::: */
+#print-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+  -moz-image-region: rect(0 42px 39px 0);
+}
+
+#print-button:hover {
+  -moz-image-region: rect(0 84px 39px 42px);
+}
+
+#print-button:hover:active {
+  -moz-image-region: rect(0 126px 39px 84px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(0 168px 39px 126px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover {
+  -moz-image-region: rect(0 38px 19px 19px);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active {
+  -moz-image-region: rect(0 57px 19px 38px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 76px 19px 57px) !important;
+}
--- a/suite/themes/modern/editor/editorPrimaryToolbar.css
+++ b/suite/themes/modern/editor/editorPrimaryToolbar.css
@@ -133,33 +133,16 @@
 #previewButton:hover:active {
   -moz-image-region: rect(204px 149px 237px 100px);
 }
 
 #previewButton[disabled="true"] {
   -moz-image-region: rect(204px 199px 237px 150px) !important;
 }
 
-#printButton {
-  list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
-  -moz-image-region: rect(34px 49px 67px 0);
-}
-
-#printButton:hover {
-  -moz-image-region: rect(34px 99px 67px 50px);
-}
-
-#printButton:hover:active {
-  -moz-image-region: rect(34px 149px 67px 100px);
-}
-
-#printButton[disabled="true"] {
-  -moz-image-region: rect(34px 199px 67px 150px);
-}
-
 #linkButton {
   -moz-image-region: rect(102px 49px 135px 0);
 }
 
 #linkButton:hover {
   -moz-image-region: rect(102px 99px 135px 50px);
 }
 
--- a/suite/themes/modern/messenger/primaryToolbar.css
+++ b/suite/themes/modern/messenger/primaryToolbar.css
@@ -260,33 +260,16 @@ toolbarpaletteitem > #button-delete {
 #button-junk:hover:active {
   -moz-image-region: rect(544px 149px 577px 100px);
 }
 
 #button-junk[disabled="true"] {
   -moz-image-region: rect(544px 199px 577px 150px) !important;
 }
 
-#button-print {
-  list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
-  -moz-image-region: rect(34px 49px 67px 0);
-}
-
-#button-print:hover {
-  -moz-image-region: rect(34px 99px 67px 50px);
-}
-
-#button-print:hover:active {
-  -moz-image-region: rect(34px 149px 67px 100px);
-}
-
-#button-print[disabled] {
-  -moz-image-region: rect(34px 199px 67px 150px) !important;
-}
-
 #button-stop {
   list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
   -moz-image-region: rect(68px 49px 101px 0);
 }
 
 #button-stop:hover {
   -moz-image-region: rect(68px 99px 101px 50px);
 } 
@@ -335,33 +318,16 @@ toolbar[iconsize="small"] #button-file {
 toolbar[iconsize="small"] #button-goback {}
 toolbar[iconsize="small"] #button-goforward {}
 toolbar[iconsize="small"] #button-next {}
 toolbar[iconsize="small"] #button-junk {}
 toolbar[iconsize="small"] #button-delete {}
 toolbar[iconsize="small"] #button-mark {}
 */
 
-toolbar[iconsize="small"] #button-print {
-  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] #button-print:hover {
-  -moz-image-region: rect(0 38px 19px 19px);
-}
-
-toolbar[iconsize="small"] #button-print:hover:active {
-  -moz-image-region: rect(0 57px 19px 38px);
-}
-
-toolbar[iconsize="small"] #button-print[disabled] {
-  -moz-image-region: rect(0 76px 19px 57px) !important;
-}
-
 toolbar[iconsize="small"] #button-stop {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
   -moz-image-region: rect(19px 19px 38px 0);
 }
 
 toolbar[iconsize="small"] #button-stop:hover {
   -moz-image-region: rect(19px 38px 38px 19px);
 }
--- a/suite/themes/modern/navigator/navigator.css
+++ b/suite/themes/modern/navigator/navigator.css
@@ -118,33 +118,16 @@ toolbox {
 #stop-button:hover:active {
   -moz-image-region: rect(39px 126px 78px 84px);
 }
 
 #stop-button[disabled="true"] {
   -moz-image-region: rect(39px 168px 78px 126px) !important;
 }
 
-#print-button {
-  list-style-image: url("chrome://communicator/skin/icons/common.png");
-  -moz-image-region: rect(0 42px 39px 0);
-}
-
-#print-button:hover {
-  -moz-image-region: rect(0 84px 39px 42px);
-}
-
-#print-button:hover:active {
-  -moz-image-region: rect(0 126px 39px 84px);
-}
-
-#print-button[disabled="true"] {
-  -moz-image-region: rect(0 168px 39px 126px) !important;
-}
-
 #home-button {
   list-style-image: url("chrome://communicator/skin/icons/common.png");
   -moz-image-region: rect(156px 42px 195px 0);
 }
 
 #home-button:hover {
   -moz-image-region: rect(156px 84px 195px 42px);
 }
@@ -241,34 +224,16 @@ toolbar[iconsize="small"] > #stop-button
 toolbar[iconsize="small"] > #stop-button:hover:active {
   -moz-image-region: rect(19px 57px 38px 38px);
 }
 
 toolbar[iconsize="small"] > #stop-button[disabled="true"] {
   -moz-image-region: rect(19px 76px 38px 57px) !important;
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
-toolbar[iconsize="small"] > #print-button {
-  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] > #print-button:hover {
-  -moz-image-region: rect(0 38px 19px 19px);
-}
-
-toolbar[iconsize="small"] > #print-button:hover:active {
-  -moz-image-region: rect(0 57px 19px 38px);
-}
-
-toolbar[iconsize="small"] > #print-button[disabled="true"] {
-  -moz-image-region: rect(0 76px 19px 57px) !important;
-}
-
 toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
 toolbar[iconsize="small"] > #home-button {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
   -moz-image-region: rect(76px 19px 95px 0);
 }
 
 toolbar[iconsize="small"] > #home-button:hover {
   -moz-image-region: rect(76px 38px 95px 19px);