From 2f335a1c52db84fc9f8e02f38d67fb8d44e0c03e Mon Sep 17 00:00:00 2001 From: "chanial%noos.fr" Date: Wed, 19 Nov 2003 06:34:51 +0000 Subject: [PATCH] Bug 194678: Move pageSetup into the toolkit. r=bsmedberg, sr=bryner and a big thanks to Dave Miller for moving the files! git-svn-id: svn://10.0.0.236/trunk@149543 18797224-902f-48f8-a5cc-f745e15eee43 --- .../src/os2/nsPrintingPromptService.cpp | 2 +- .../unixshared/nsPrintingPromptService.cpp | 2 +- .../src/win/nsPrintingPromptService.cpp | 2 +- mozilla/gfx/src/nsPrintOptionsImpl.cpp | 2 +- .../themes/classic/communicator/printing.css | 87 ------------------ .../icons/pg-landscape-small.gif | Bin .../icons/pg-landscape.gif | Bin .../icons/pg-portrait-small.gif | Bin .../icons/pg-portrait.gif | Bin mozilla/themes/classic/global/printing.css | 8 +- mozilla/themes/classic/jar.mn | 10 +- .../themes/modern/communicator/printing.css | 87 ------------------ .../icons/pg-landscape-small.gif | Bin .../icons/pg-landscape.gif | Bin .../icons/pg-portrait-small.gif | Bin .../icons/pg-portrait.gif | Bin mozilla/themes/modern/global/printing.css | 8 +- mozilla/themes/modern/jar.mn | 10 +- mozilla/xpfe/communicator/jar.mn | 4 - .../resources/content/printPageSetup.xul | 8 +- .../content/printPreviewBindings.xml | 2 +- mozilla/xpfe/global/jar.mn | 4 + .../resources/content/printPageSetup.xul | 8 +- .../resources/content/unix/printjoboptions.js | 4 +- 24 files changed, 37 insertions(+), 211 deletions(-) delete mode 100644 mozilla/themes/classic/communicator/printing.css rename mozilla/themes/classic/{communicator => global}/icons/pg-landscape-small.gif (100%) rename mozilla/themes/classic/{communicator => global}/icons/pg-landscape.gif (100%) rename mozilla/themes/classic/{communicator => global}/icons/pg-portrait-small.gif (100%) rename mozilla/themes/classic/{communicator => global}/icons/pg-portrait.gif (100%) delete mode 100644 mozilla/themes/modern/communicator/printing.css rename mozilla/themes/modern/{communicator => global}/icons/pg-landscape-small.gif (100%) rename mozilla/themes/modern/{communicator => global}/icons/pg-landscape.gif (100%) rename mozilla/themes/modern/{communicator => global}/icons/pg-portrait-small.gif (100%) rename mozilla/themes/modern/{communicator => global}/icons/pg-portrait.gif (100%) diff --git a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp index 7408718126e..80b2969d59c 100644 --- a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp @@ -59,7 +59,7 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printsettings-se static const char *kPrintDialogURL = "chrome://global/content/printdialog.xul"; static const char *kPrintProgressDialogURL = "chrome://global/content/printProgress.xul"; static const char *kPrtPrvProgressDialogURL = "chrome://global/content/printPreviewProgress.xul"; -static const char *kPageSetupDialogURL = "chrome://communicator/content/printPageSetup.xul"; +static const char *kPageSetupDialogURL = "chrome://global/content/printPageSetup.xul"; /**************************************************************** ************************* ParamBlock *************************** diff --git a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp index d8dfb11e4d6..3fb211e9ea9 100644 --- a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp @@ -53,7 +53,7 @@ static const char *kPrintDialogURL = "chrome://global/content/printdialog.xul"; static const char *kPrintProgressDialogURL = "chrome://global/content/printProgress.xul"; static const char *kPrtPrvProgressDialogURL = "chrome://global/content/printPreviewProgress.xul"; -static const char *kPageSetupDialogURL = "chrome://communicator/content/printPageSetup.xul"; +static const char *kPageSetupDialogURL = "chrome://global/content/printPageSetup.xul"; static const char *kPrinterPropertiesURL = "chrome://global/content/printjoboptions.xul"; /**************************************************************** diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp index a7588b689b6..18e91bd97a4 100644 --- a/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp @@ -56,7 +56,7 @@ static const char *kPrintProgressDialogURL = "chrome://global/content/printProgress.xul"; static const char *kPrtPrvProgressDialogURL = "chrome://global/content/printPreviewProgress.xul"; -static const char *kPageSetupDialogURL = "chrome://communicator/content/printPageSetup.xul"; +static const char *kPageSetupDialogURL = "chrome://global/content/printPageSetup.xul"; // Static Data static HINSTANCE gInstance; diff --git a/mozilla/gfx/src/nsPrintOptionsImpl.cpp b/mozilla/gfx/src/nsPrintOptionsImpl.cpp index 273ba31728b..6afbf5cadac 100644 --- a/mozilla/gfx/src/nsPrintOptionsImpl.cpp +++ b/mozilla/gfx/src/nsPrintOptionsImpl.cpp @@ -302,7 +302,7 @@ nsPrintOptions::ShowPrintSetupDialog(nsIPrintSettings *aPS) wwatch->GetActiveWindow(getter_AddRefs(active)); nsCOMPtr parent = do_QueryInterface(active); nsCOMPtr newWindow; - rv = wwatch->OpenWindow(parent, "chrome://communicator/content/printPageSetup.xul", + rv = wwatch->OpenWindow(parent, "chrome://global/content/printPageSetup.xul", "_blank", "chrome,modal,centerscreen", array, getter_AddRefs(newWindow)); } diff --git a/mozilla/themes/classic/communicator/printing.css b/mozilla/themes/classic/communicator/printing.css deleted file mode 100644 index fa98c293eea..00000000000 --- a/mozilla/themes/classic/communicator/printing.css +++ /dev/null @@ -1,87 +0,0 @@ -/* ***** 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 Mozilla Print Preview Toolbar. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corp. - * Portions created by the Initial Developer are Copyright (C) 2002 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Samir Gehani - * Bill Law - * - * 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 ***** */ - -/* ::::: print preview toolbar ::::: */ - -/* ..... page navigation ..... */ - -.home-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp-end.gif"); -} - -.end-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp-end.gif"); -} - -.last-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif"); -} - -.next-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); -} - -/* ...... 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://communicator/skin/icons/pg-portrait-small.gif"); -} - -.toolbar-landscape-page { - list-style-image: url("chrome://communicator/skin/icons/pg-landscape-small.gif"); -} - -/* ::::: page setup dialog ::::: */ - -.portrait-page { - list-style-image: url("chrome://communicator/skin/icons/pg-portrait.gif"); -} - -.landscape-page { - list-style-image: url("chrome://communicator/skin/icons/pg-landscape.gif"); -} diff --git a/mozilla/themes/classic/communicator/icons/pg-landscape-small.gif b/mozilla/themes/classic/global/icons/pg-landscape-small.gif similarity index 100% rename from mozilla/themes/classic/communicator/icons/pg-landscape-small.gif rename to mozilla/themes/classic/global/icons/pg-landscape-small.gif diff --git a/mozilla/themes/classic/communicator/icons/pg-landscape.gif b/mozilla/themes/classic/global/icons/pg-landscape.gif similarity index 100% rename from mozilla/themes/classic/communicator/icons/pg-landscape.gif rename to mozilla/themes/classic/global/icons/pg-landscape.gif diff --git a/mozilla/themes/classic/communicator/icons/pg-portrait-small.gif b/mozilla/themes/classic/global/icons/pg-portrait-small.gif similarity index 100% rename from mozilla/themes/classic/communicator/icons/pg-portrait-small.gif rename to mozilla/themes/classic/global/icons/pg-portrait-small.gif diff --git a/mozilla/themes/classic/communicator/icons/pg-portrait.gif b/mozilla/themes/classic/global/icons/pg-portrait.gif similarity index 100% rename from mozilla/themes/classic/communicator/icons/pg-portrait.gif rename to mozilla/themes/classic/global/icons/pg-portrait.gif diff --git a/mozilla/themes/classic/global/printing.css b/mozilla/themes/classic/global/printing.css index fa98c293eea..e1c646d6d03 100644 --- a/mozilla/themes/classic/global/printing.css +++ b/mozilla/themes/classic/global/printing.css @@ -69,19 +69,19 @@ /* ..... orientation ..... */ .toolbar-portrait-page { - list-style-image: url("chrome://communicator/skin/icons/pg-portrait-small.gif"); + list-style-image: url("chrome://global/skin/icons/pg-portrait-small.gif"); } .toolbar-landscape-page { - list-style-image: url("chrome://communicator/skin/icons/pg-landscape-small.gif"); + list-style-image: url("chrome://global/skin/icons/pg-landscape-small.gif"); } /* ::::: page setup dialog ::::: */ .portrait-page { - list-style-image: url("chrome://communicator/skin/icons/pg-portrait.gif"); + list-style-image: url("chrome://global/skin/icons/pg-portrait.gif"); } .landscape-page { - list-style-image: url("chrome://communicator/skin/icons/pg-landscape.gif"); + list-style-image: url("chrome://global/skin/icons/pg-landscape.gif"); } diff --git a/mozilla/themes/classic/jar.mn b/mozilla/themes/classic/jar.mn index c55af60a5c9..73ca499dfa5 100644 --- a/mozilla/themes/classic/jar.mn +++ b/mozilla/themes/classic/jar.mn @@ -4,7 +4,6 @@ classic.jar: skin/classic/communicator/button.css (communicator/button.css) skin/classic/communicator/brand.css (communicator/brand.css) skin/classic/communicator/dialogs.css (communicator/dialogs.css) - skin/classic/communicator/printing.css (communicator/printing.css) skin/classic/communicator/communicator.css (communicator/communicator.css) skin/classic/communicator/formatting.css (communicator/formatting.css) skin/classic/communicator/prefpanels.css (communicator/prefpanels.css) @@ -58,10 +57,6 @@ classic.jar: skin/classic/communicator/brand/throbber16-anim.gif (communicator/brand/throbber16-anim.gif) skin/classic/communicator/icons/offline.gif (communicator/icons/offline.gif) skin/classic/communicator/icons/online.gif (communicator/icons/online.gif) - skin/classic/communicator/icons/pg-landscape.gif (communicator/icons/pg-landscape.gif) - skin/classic/communicator/icons/pg-landscape-small.gif (communicator/icons/pg-landscape-small.gif) - skin/classic/communicator/icons/pg-portrait.gif (communicator/icons/pg-portrait.gif) - skin/classic/communicator/icons/pg-portrait-small.gif (communicator/icons/pg-portrait-small.gif) skin/classic/communicator/icons/search-act.gif (communicator/icons/search-act.gif) skin/classic/communicator/icons/search.gif (communicator/icons/search.gif) skin/classic/communicator/icons/search-hov.gif (communicator/icons/search-hov.gif) @@ -109,6 +104,7 @@ classic.jar: skin/classic/editor/icons/progress-busy.gif (editor/icons/progress-busy.gif) skin/classic/editor/icons/progress-done.gif (editor/icons/progress-done.gif) skin/classic/editor/icons/progress-failed.gif (editor/icons/progress-failed.gif) + skin/classic/global/printing.css (global/printing.css) skin/classic/global/filepicker/blank.gif (global/filepicker/blank.gif) skin/classic/global/filepicker/dir-closed.gif (global/filepicker/dir-closed.gif) skin/classic/global/filepicker/dir-open.gif (global/filepicker/dir-open.gif) @@ -139,6 +135,10 @@ classic.jar: skin/classic/global/console/console-error-dash.gif (global/console/console-error-dash.gif) skin/classic/global/console/console-error-caret.gif (global/console/console-error-caret.gif) skin/classic/global/icons/close-button.gif (global/icons/close-button.gif) + skin/classic/global/icons/pg-landscape.gif (global/icons/pg-landscape.gif) + skin/classic/global/icons/pg-landscape-small.gif (global/icons/pg-landscape-small.gif) + skin/classic/global/icons/pg-portrait.gif (global/icons/pg-portrait.gif) + skin/classic/global/icons/pg-portrait-small.gif (global/icons/pg-portrait-small.gif) skin/classic/global/icons/tab-new.gif (global/icons/tab-new.gif) skin/classic/global/toolbar/tbgrip-arrow.gif (global/toolbar/tbgrip-arrow.gif) skin/classic/global/toolbar/tbgrip-arrow-clps.gif (global/toolbar/tbgrip-arrow-clps.gif) diff --git a/mozilla/themes/modern/communicator/printing.css b/mozilla/themes/modern/communicator/printing.css deleted file mode 100644 index fa98c293eea..00000000000 --- a/mozilla/themes/modern/communicator/printing.css +++ /dev/null @@ -1,87 +0,0 @@ -/* ***** 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 Mozilla Print Preview Toolbar. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corp. - * Portions created by the Initial Developer are Copyright (C) 2002 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Samir Gehani - * Bill Law - * - * 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 ***** */ - -/* ::::: print preview toolbar ::::: */ - -/* ..... page navigation ..... */ - -.home-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp-end.gif"); -} - -.end-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp-end.gif"); -} - -.last-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif"); -} - -.next-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); -} - -/* ...... 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://communicator/skin/icons/pg-portrait-small.gif"); -} - -.toolbar-landscape-page { - list-style-image: url("chrome://communicator/skin/icons/pg-landscape-small.gif"); -} - -/* ::::: page setup dialog ::::: */ - -.portrait-page { - list-style-image: url("chrome://communicator/skin/icons/pg-portrait.gif"); -} - -.landscape-page { - list-style-image: url("chrome://communicator/skin/icons/pg-landscape.gif"); -} diff --git a/mozilla/themes/modern/communicator/icons/pg-landscape-small.gif b/mozilla/themes/modern/global/icons/pg-landscape-small.gif similarity index 100% rename from mozilla/themes/modern/communicator/icons/pg-landscape-small.gif rename to mozilla/themes/modern/global/icons/pg-landscape-small.gif diff --git a/mozilla/themes/modern/communicator/icons/pg-landscape.gif b/mozilla/themes/modern/global/icons/pg-landscape.gif similarity index 100% rename from mozilla/themes/modern/communicator/icons/pg-landscape.gif rename to mozilla/themes/modern/global/icons/pg-landscape.gif diff --git a/mozilla/themes/modern/communicator/icons/pg-portrait-small.gif b/mozilla/themes/modern/global/icons/pg-portrait-small.gif similarity index 100% rename from mozilla/themes/modern/communicator/icons/pg-portrait-small.gif rename to mozilla/themes/modern/global/icons/pg-portrait-small.gif diff --git a/mozilla/themes/modern/communicator/icons/pg-portrait.gif b/mozilla/themes/modern/global/icons/pg-portrait.gif similarity index 100% rename from mozilla/themes/modern/communicator/icons/pg-portrait.gif rename to mozilla/themes/modern/global/icons/pg-portrait.gif diff --git a/mozilla/themes/modern/global/printing.css b/mozilla/themes/modern/global/printing.css index fa98c293eea..e1c646d6d03 100644 --- a/mozilla/themes/modern/global/printing.css +++ b/mozilla/themes/modern/global/printing.css @@ -69,19 +69,19 @@ /* ..... orientation ..... */ .toolbar-portrait-page { - list-style-image: url("chrome://communicator/skin/icons/pg-portrait-small.gif"); + list-style-image: url("chrome://global/skin/icons/pg-portrait-small.gif"); } .toolbar-landscape-page { - list-style-image: url("chrome://communicator/skin/icons/pg-landscape-small.gif"); + list-style-image: url("chrome://global/skin/icons/pg-landscape-small.gif"); } /* ::::: page setup dialog ::::: */ .portrait-page { - list-style-image: url("chrome://communicator/skin/icons/pg-portrait.gif"); + list-style-image: url("chrome://global/skin/icons/pg-portrait.gif"); } .landscape-page { - list-style-image: url("chrome://communicator/skin/icons/pg-landscape.gif"); + 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 97ba624a7bf..8dd24cf5207 100644 --- a/mozilla/themes/modern/jar.mn +++ b/mozilla/themes/modern/jar.mn @@ -7,7 +7,6 @@ modern.jar: skin/modern/communicator/button.css (communicator/button.css) skin/modern/communicator/toolbar.css (communicator/toolbar.css) skin/modern/communicator/dialogs.css (communicator/dialogs.css) - skin/modern/communicator/printing.css (communicator/printing.css) skin/modern/communicator/plugins.css (communicator/plugins.css) skin/modern/communicator/communicator.css (communicator/communicator.css) skin/modern/communicator/bookmarks/bookmark-folder-closed.gif (communicator/bookmarks/bookmark-folder-closed.gif) @@ -35,10 +34,6 @@ modern.jar: skin/modern/communicator/icons/lock-secure.gif (communicator/icons/lock-secure.gif) skin/modern/communicator/icons/offline.gif (communicator/icons/offline.gif) skin/modern/communicator/icons/online.gif (communicator/icons/online.gif) - skin/modern/communicator/icons/pg-landscape.gif (communicator/icons/pg-landscape.gif) - skin/modern/communicator/icons/pg-landscape-small.gif (communicator/icons/pg-landscape-small.gif) - skin/modern/communicator/icons/pg-portrait.gif (communicator/icons/pg-portrait.gif) - skin/modern/communicator/icons/pg-portrait-small.gif (communicator/icons/pg-portrait-small.gif) skin/modern/communicator/icons/turbo-systray.gif (communicator/icons/turbo-systray.gif) skin/modern/communicator/icons/btn1.gif (communicator/icons/btn1.gif) skin/modern/communicator/icons/search.gif (communicator/icons/search.gif) @@ -137,6 +132,7 @@ modern.jar: skin/modern/global/listbox.css (global/listbox.css) skin/modern/global/menu.css (global/menu.css) skin/modern/global/menulist.css (global/menulist.css) + skin/modern/global/printing.css (global/printing.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) @@ -198,6 +194,10 @@ modern.jar: skin/modern/global/icons/close-act.gif (global/icons/close-act.gif) skin/modern/global/icons/close.gif (global/icons/close.gif) skin/modern/global/icons/close-hov.gif (global/icons/close-hov.gif) + skin/modern/global/icons/pg-landscape.gif (global/icons/pg-landscape.gif) + skin/modern/global/icons/pg-landscape-small.gif (global/icons/pg-landscape-small.gif) + skin/modern/global/icons/pg-portrait.gif (global/icons/pg-portrait.gif) + skin/modern/global/icons/pg-portrait-small.gif (global/icons/pg-portrait-small.gif) skin/modern/global/icons/tab-new.gif (global/icons/tab-new.gif) skin/modern/global/icons/tab-new-hov.gif (global/icons/tab-new-hov.gif) skin/modern/global/icons/tab-new-act.gif (global/icons/tab-new-act.gif) diff --git a/mozilla/xpfe/communicator/jar.mn b/mozilla/xpfe/communicator/jar.mn index 222f0687a5b..db5d27eddf9 100644 --- a/mozilla/xpfe/communicator/jar.mn +++ b/mozilla/xpfe/communicator/jar.mn @@ -25,8 +25,6 @@ comm.jar: content/communicator/askViewZoom.xul (resources/content/askViewZoom.xul) content/communicator/askViewZoom.js (resources/content/askViewZoom.js) content/communicator/findUtils.js (resources/content/findUtils.js) - content/communicator/printPageSetup.js (resources/content/printPageSetup.js) - content/communicator/printPageSetup.xul (resources/content/printPageSetup.xul) content/communicator/printPreviewBindings.xml (resources/content/printPreviewBindings.xml) content/communicator/printing.js (resources/content/printing.js) content/communicator/plugins.html (resources/content/plugins.html) @@ -48,8 +46,6 @@ en-US.jar: locale/en-US/communicator/viewZoomOverlay.dtd (resources/locale/en-US/viewZoomOverlay.dtd) locale/en-US/communicator/viewZoomOverlay.properties (resources/locale/en-US/viewZoomOverlay.properties) locale/en-US/communicator/printPreview.dtd (resources/locale/en-US/printPreview.dtd) - locale/en-US/communicator/printPageSetup.dtd (resources/locale/en-US/printPageSetup.dtd) - locale/en-US/communicator/printPageSetup.properties (resources/locale/en-US/printPageSetup.properties) locale/en-US/communicator/popupManager.dtd (resources/locale/en-US/popupManager.dtd) locale/en-US/communicator/popupManager.properties (resources/locale/en-US/popupManager.properties) locale/en-US/communicator/aboutPopups.dtd (resources/locale/en-US/aboutPopups.dtd) diff --git a/mozilla/xpfe/communicator/resources/content/printPageSetup.xul b/mozilla/xpfe/communicator/resources/content/printPageSetup.xul index bc131f8f7b2..bfb850f7dfc 100644 --- a/mozilla/xpfe/communicator/resources/content/printPageSetup.xul +++ b/mozilla/xpfe/communicator/resources/content/printPageSetup.xul @@ -29,9 +29,9 @@ Contributor(s): --> - - - + + + -