From 686a39b86442eabd1716dfa5c951e6dd5d58f471 Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Tue, 19 Jun 2007 13:57:02 +0000 Subject: [PATCH] Bug 382794 Fix print preview to work with *stripe themes p=MReimer r+sr=me git-svn-id: svn://10.0.0.236/trunk@228315 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/suite/common/printPreviewBindings.xml | 6 +-- .../themes/modern/global/printPageSetup.css | 43 +++++++++++++++++++ .../global/{printing.css => printPreview.css} | 15 ++----- mozilla/themes/modern/jar.mn | 3 +- 4 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 mozilla/themes/modern/global/printPageSetup.css rename mozilla/themes/modern/global/{printing.css => printPreview.css} (90%) diff --git a/mozilla/suite/common/printPreviewBindings.xml b/mozilla/suite/common/printPreviewBindings.xml index d2032840006..bf6c347bf63 100644 --- a/mozilla/suite/common/printPreviewBindings.xml +++ b/mozilla/suite/common/printPreviewBindings.xml @@ -46,7 +46,7 @@ - + @@ -61,7 +61,7 @@ - - diff --git a/mozilla/themes/modern/global/printPageSetup.css b/mozilla/themes/modern/global/printPageSetup.css new file mode 100644 index 00000000000..14f53aa4120 --- /dev/null +++ b/mozilla/themes/modern/global/printPageSetup.css @@ -0,0 +1,43 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the SeaMonkey Page Setup Dialog + * + * The Initial Developer of the Original Code is SeaMonkey team + * Portions created by the Initial Developer are Copyright (C) 2007 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Manuel Reimer + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +.portrait-page { + list-style-image: url("chrome://global/skin/icons/pg-portrait.gif"); +} + +.landscape-page { + list-style-image: url("chrome://global/skin/icons/pg-landscape.gif"); +} diff --git a/mozilla/themes/modern/global/printing.css b/mozilla/themes/modern/global/printPreview.css similarity index 90% rename from mozilla/themes/modern/global/printing.css rename to mozilla/themes/modern/global/printPreview.css index a62ea3c4be3..732e9897f1c 100644 --- a/mozilla/themes/modern/global/printing.css +++ b/mozilla/themes/modern/global/printPreview.css @@ -21,6 +21,7 @@ * Contributor(s): * Samir Gehani * Bill Law + * Manuel Reimer * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -48,11 +49,11 @@ list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp-end.gif"); } -.last-arrow { +.left-arrow { list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif"); } -.next-arrow { +.right-arrow { list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); } @@ -65,13 +66,3 @@ .toolbar-landscape-page { list-style-image: url("chrome://global/skin/icons/pg-landscape-small.gif"); } - -/* ::::: page setup dialog ::::: */ - -.portrait-page { - list-style-image: url("chrome://global/skin/icons/pg-portrait.gif"); -} - -.landscape-page { - list-style-image: url("chrome://global/skin/icons/pg-landscape.gif"); -} diff --git a/mozilla/themes/modern/jar.mn b/mozilla/themes/modern/jar.mn index 88a52e7e6a6..0db5d797d0a 100644 --- a/mozilla/themes/modern/jar.mn +++ b/mozilla/themes/modern/jar.mn @@ -170,7 +170,8 @@ modern.jar: skin/modern/global/menulist.css (global/menulist.css) skin/modern/global/numberbox.css (global/numberbox.css) skin/modern/global/netError.css (global/netError.css) - skin/modern/global/printing.css (global/printing.css) + skin/modern/global/printPreview.css (global/printPreview.css) + skin/modern/global/printPageSetup.css (global/printPageSetup.css) skin/modern/global/progressmeter.css (global/progressmeter.css) skin/modern/global/radio.css (global/radio.css) skin/modern/global/scrollbox.css (global/scrollbox.css)