Bug 334598 - Use Unicode symbols in print preview page navigation buttons. r=felipe

toolkit/components/printing/content/printPreviewBindings.xml

@@ -31,9 +31,9 @@
       <xul:vbox align="center" pack="center">
         <xul:label value="&page.label;" accesskey="&page.accesskey;" control="pageNumber"/>
       </xul:vbox>
-      <xul:toolbarbutton class="home-arrow tabbable"
+      <xul:toolbarbutton anonid="navigateHome" class="navigate-button tabbable"
         oncommand="parentNode.navigate(0, 0, 'home');" tooltiptext="&homearrow.tooltip;"/>
-      <xul:toolbarbutton class="previous-arrow tabbable"
+      <xul:toolbarbutton anonid="navigatePrevious" class="navigate-button tabbable"
         oncommand="parentNode.navigate(-1, 0, 0);" tooltiptext="&previousarrow.tooltip;"/>
       <xul:hbox align="center" pack="center">
         <xul:textbox id="pageNumber" size="3" value="1" min="1" type="number"
@@ -41,9 +41,9 @@
         <xul:label value="&of.label;"/>
         <xul:label value="1"/>
       </xul:hbox>
-      <xul:toolbarbutton class="next-arrow tabbable"
+      <xul:toolbarbutton anonid="navigateNext" class="navigate-button tabbable"
         oncommand="parentNode.navigate(1, 0, 0);" tooltiptext="&nextarrow.tooltip;"/>
-      <xul:toolbarbutton class="end-arrow tabbable"
+      <xul:toolbarbutton anonid="navigateEnd" class="navigate-button tabbable"
         oncommand="parentNode.navigate(0, 0, 'end');" tooltiptext="&endarrow.tooltip;"/>
 
       <xul:toolbarseparator class="toolbarseparator-primary"/>
@@ -157,6 +157,13 @@
           this.mMessageManager = aPPBrowser.messageManager;
           this.mMessageManager.addMessageListener("Printing:Preview:UpdatePageCount", this);
           this.updateToolbar();
+
+          let $ = id => document.getAnonymousElementByAttribute(this, "anonid", id);
+          let ltr = document.documentElement.matches(":root:-moz-locale-dir(ltr)");
+          $("navigateHome").label = ltr ? "⏮" : "⏭";
+          $("navigatePrevious").label = ltr ? "◂" : "▸";
+          $("navigateNext").label = ltr ? "▸" : "◂";
+          $("navigateEnd").label = ltr ? "⏭" : "⏮";
         ]]>
         </body>
       </method>

toolkit/themes/linux/global/printPreview.css

@@ -2,42 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* ..... page navigation ..... */
-
-.home-arrow {
-  list-style-image: url("moz-icon://stock/gtk-goto-first-ltr?size=menu");
+.navigate-button {
+  min-width: 1.9em;
 }
 
-.home-arrow:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-goto-first-rtl?size=menu");
+.navigate-button > .toolbarbutton-icon {
+  display: none;
 }
 
-.end-arrow {
-  list-style-image: url("moz-icon://stock/gtk-goto-last-ltr?size=menu");
-}
-
-.end-arrow:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-goto-last-rtl?size=menu");
-}
-
-.previous-arrow {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu");
-}
-
-.previous-arrow:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
-}
-
-.next-arrow {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu");
-}
-
-.next-arrow:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
-}
-
-/* ..... orientation ..... */
-
 .toolbar-portrait-page {
   list-style-image: url("moz-icon://stock/gtk-orientation-portrait?size=button");
 }

toolkit/themes/shared/non-mac.jar.inc.mn

@@ -88,10 +88,6 @@
   skin/classic/global/icons/warning-16.png                 (../../windows/global/icons/warning-16.png)
   skin/classic/global/icons/warning-64.png                 (../../windows/global/icons/warning-64.png)
   skin/classic/global/icons/windowControls.png             (../../windows/global/icons/windowControls.png)
-  skin/classic/global/printpreview/arrow-left.png          (../../windows/global/printpreview/arrow-left.png)
-  skin/classic/global/printpreview/arrow-left-end.png      (../../windows/global/printpreview/arrow-left-end.png)
-  skin/classic/global/printpreview/arrow-right.png         (../../windows/global/printpreview/arrow-right.png)
-  skin/classic/global/printpreview/arrow-right-end.png     (../../windows/global/printpreview/arrow-right-end.png)
   skin/classic/global/radio/radio-check.gif                (../../windows/global/radio/radio-check.gif)
   skin/classic/global/radio/radio-check-dis.gif            (../../windows/global/radio/radio-check-dis.gif)
   skin/classic/global/scrollbar/slider.gif                 (../../windows/global/scrollbar/slider.gif)

toolkit/themes/windows/global/jar.mn

@@ -80,10 +80,6 @@ toolkit.jar:
   skin/classic/global/icons/warning-16-XP.png                    (icons/warning-16-XP.png)
   skin/classic/global/icons/warning-64-XP.png                    (icons/warning-64-XP.png)
   skin/classic/global/icons/windowControls-XP.png                (icons/windowControls-XP.png)
-  skin/classic/global/printpreview/arrow-left-XP.png             (printpreview/arrow-left-XP.png)
-  skin/classic/global/printpreview/arrow-left-end-XP.png         (printpreview/arrow-left-end-XP.png)
-  skin/classic/global/printpreview/arrow-right-XP.png            (printpreview/arrow-right-XP.png)
-  skin/classic/global/printpreview/arrow-right-end-XP.png        (printpreview/arrow-right-end-XP.png)
   skin/classic/global/toolbar/spring-XP.png                      (toolbar/spring-XP.png)
   skin/classic/global/tree/sort-asc-XP.png                       (tree/sort-asc-XP.png)
   skin/classic/global/tree/sort-dsc-XP.png                       (tree/sort-dsc-XP.png)
@@ -124,10 +120,6 @@ toolkit.jar:
 % override chrome://global/skin/icons/warning-16.png              chrome://global/skin/icons/warning-16-XP.png             osversion<6
 % override chrome://global/skin/icons/warning-64.png              chrome://global/skin/icons/warning-64-XP.png             osversion<6
 % override chrome://global/skin/icons/windowControls.png          chrome://global/skin/icons/windowControls-XP.png         osversion<6
-% override chrome://global/skin/printpreview/arrow-left.png       chrome://global/skin/printpreview/arrow-left-XP.png      osversion<6
-% override chrome://global/skin/printpreview/arrow-left-end.png   chrome://global/skin/printpreview/arrow-left-end-XP.png  osversion<6
-% override chrome://global/skin/printpreview/arrow-right.png      chrome://global/skin/printpreview/arrow-right-XP.png     osversion<6
-% override chrome://global/skin/printpreview/arrow-right-end.png  chrome://global/skin/printpreview/arrow-right-end-XP.png osversion<6
 % override chrome://global/skin/toolbar/spring.png                chrome://global/skin/toolbar/spring-XP.png               osversion<6
 % override chrome://global/skin/tree/sort-asc.png                 chrome://global/skin/tree/sort-asc-XP.png                osversion<6
 % override chrome://global/skin/tree/sort-dsc.png                 chrome://global/skin/tree/sort-dsc-XP.png                osversion<6

toolkit/themes/windows/global/printPreview.css

@@ -2,65 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* ..... page navigation ..... */
-
-.home-arrow,
-.end-arrow:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/printpreview/arrow-left-end.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
+.navigate-button {
+  min-width: 1.9em;
 }
 
-.home-arrow:hover,
-.end-arrow:-moz-locale-dir(rtl):hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+.navigate-button > .toolbarbutton-icon {
+  display: none;
 }
 
-.end-arrow,
-.home-arrow:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/printpreview/arrow-right-end.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.end-arrow:hover,
-.home-arrow:-moz-locale-dir(rtl):hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.previous-arrow,
-.next-arrow:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/printpreview/arrow-left.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.previous-arrow:hover,
-.next-arrow:-moz-locale-dir(rtl):hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.next-arrow,
-.previous-arrow:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/printpreview/arrow-right.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.next-arrow:hover,
-.previous-arrow:-moz-locale-dir(rtl):hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-/* ...... scale in/decrement ..... */
-
-.up-arrow {
-  list-style-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif");
-}
-
-.down-arrow {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif");
-}
-
-
-/* ..... orientation ..... */
-
 .toolbar-portrait-page {
   list-style-image: url("chrome://global/skin/icons/Print-preview.png");
   -moz-image-region: rect(0px 16px 16px 0px);