mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

182702: Convert printing code to use nsIPrefBranch and nsIPrefService 

r=rods sr=roc+moz
This commit is contained in:
caillon%returnzero.com 2002-12-04 02:03:17 +00:00
Родитель d422648613
Коммит d84dcb7bfa
4 изменённых файлов: 519 добавлений и 501 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

33
content/base/src/nsPrintEngine.cpp
Просмотреть файл

@ -142,7 +142,8 @@ static const char* kPrintingPromptService = "@mozilla.org/embedcomp/printingprom
#include "nsIViewManager.h"
#include "nsIView.h"
#include "nsIPref.h"
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIPageSequenceFrame.h"
#include "nsIURL.h"
#include "nsIWebShell.h"
@ -587,9 +588,9 @@ nsPrintEngine::Print(nsIPrintSettings* aPrintSettings,
if (mIsDoingPrintPreview) {
PRBool okToPrint = PR_FALSE;
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
prefs->GetBoolPref("print.whileInPrintPreview", &okToPrint);
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
prefBranch->GetBoolPref("print.whileInPrintPreview", &okToPrint);
}
if (!okToPrint) {
ShowPrintErrorDialog(NS_ERROR_GFX_PRINTER_PRINT_WHILE_PREVIEW, PR_FALSE);
@ -758,10 +759,10 @@ nsPrintEngine::Print(nsIPrintSettings* aPrintSettings,
mPrt->mPrintSettings->GetPrintSilent(&printSilently);
// Check prefs for a default setting as to whether we should print silently
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
PRBool alwaysPrintSilent;
if (NS_SUCCEEDED(prefs->GetBoolPref("print.always_print_silent", &alwaysPrintSilent))) {
if (NS_SUCCEEDED(prefBranch->GetBoolPref("print.always_print_silent", &alwaysPrintSilent))) {
printSilently = alwaysPrintSilent;
}
}
@ -1621,9 +1622,9 @@ nsPrintEngine::CheckDocumentForPPCaching()
// Only check if it is the first time into PP
if (!mOldPrtPreview) {
// First check the Pref
nsCOMPtr<nsIPref> prefs (do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
prefs->GetBoolPref("print.always_cache_old_pres", &cacheOldPres);
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
prefBranch->GetBoolPref("print.always_cache_old_pres", &cacheOldPres);
}
// Temp fix for FrameSet Print Preview Bugs
@ -1695,9 +1696,9 @@ nsPrintEngine::ShowPrintProgress(PRBool aIsForPrinting, PRBool& aDoNotify)
// if it is already being shown then don't bother to find out if it should be
// so skip this and leave mShowProgressDialog set to FALSE
if (!mPrt->mProgressDialogIsShown) {
nsCOMPtr<nsIPref> prefs (do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
prefs->GetBoolPref("print.show_print_progress", &mPrt->mShowProgressDialog);
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
prefBranch->GetBoolPref("print.show_print_progress", &mPrt->mShowProgressDialog);
}
}
@ -5120,10 +5121,10 @@ PRBool nsPrintEngine::mIsDoingRuntimeTesting = PR_FALSE;
void
nsPrintEngine::InitializeTestRuntimeError()
{
nsCOMPtr<nsIPref> prefs (do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
mIsDoingRuntimeTesting = PR_FALSE;
prefs->GetBoolPref("print.doing_runtime_error_checking", &mIsDoingRuntimeTesting);
prefBranch->GetBoolPref("print.doing_runtime_error_checking", &mIsDoingRuntimeTesting);
}
mLayoutDebugObj = do_GetService("@mozilla.org/debug/debugobject;1");

923
gfx/src/nsPrintOptionsImpl.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

31
gfx/src/nsPrintOptionsImpl.h
Просмотреть файл

@ -27,7 +27,8 @@
#include "nsCOMPtr.h"
#include "nsIPrintOptions.h"
#include "nsIPrintSettingsService.h"
class nsIPref;
#include "nsIPrefBranch.h"
//class nsIPrintSettings;
//*****************************************************************************
@ -44,23 +45,23 @@ public:
virtual ~nsPrintOptions();
protected:
void ReadBitFieldPref(nsIPref * aPref, const char * aPrefId, PRInt32 anOption);
void WriteBitFieldPref(nsIPref * aPref, const char * aPrefId, PRInt32 anOption);
void ReadJustification(nsIPref * aPref, const char * aPrefId, PRInt16& aJust, PRInt16 aInitValue);
void WriteJustification(nsIPref * aPref, const char * aPrefId, PRInt16 aJust);
void ReadInchesToTwipsPref(nsIPref * aPref, const char * aPrefId, nscoord& aTwips);
void WriteInchesFromTwipsPref(nsIPref * aPref, const char * aPrefId, nscoord aTwips);
void ReadBitFieldPref(const char * aPrefId, PRInt32 anOption);
void WriteBitFieldPref(const char * aPrefId, PRInt32 anOption);
void ReadJustification(const char * aPrefId, PRInt16& aJust, PRInt16 aInitValue);
void WriteJustification(const char * aPrefId, PRInt16 aJust);
void ReadInchesToTwipsPref(const char * aPrefId, nscoord& aTwips);
void WriteInchesFromTwipsPref(const char * aPrefId, nscoord aTwips);
nsresult ReadPrefString(nsIPref * aPref, const char * aPrefId, nsString& aString);
nsresult WritePrefString(nsIPref * aPref, const char * aPrefId, nsString& aString);
nsresult WritePrefString(nsIPref* aPref, PRUnichar*& aStr, const char* aPrefId);
nsresult ReadPrefDouble(nsIPref * aPref, const char * aPrefId, double& aVal);
nsresult WritePrefDouble(nsIPref * aPref, const char * aPrefId, double aVal);
nsresult ReadPrefString(const char * aPrefId, nsString& aString);
nsresult WritePrefString(const char * aPrefId, nsString& aString);
nsresult WritePrefString(PRUnichar*& aStr, const char* aPrefId);
nsresult ReadPrefDouble(const char * aPrefId, double& aVal);
nsresult WritePrefDouble(const char * aPrefId, double aVal);
virtual nsresult ReadPrefs(nsIPrintSettings* aPS, const nsString& aPrefName, PRUint32 aFlags);
virtual nsresult WritePrefs(nsIPrintSettings* aPS, const nsString& aPrefName, PRUint32 aFlags);
const char* GetPrefName(const char * aPrefName,
const nsString& aPrinterName);
static const char* GetPrefName(const char * aPrefName,
const nsString& aPrinterName);
// May be implemented by the platform-specific derived class
virtual nsresult _CreatePrintSettings(nsIPrintSettings **_retval);
@ -68,7 +69,7 @@ protected:
// Members
nsCOMPtr<nsIPrintSettings> mGlobalPrintSettings;
nsCString mPrefName;
nsCOMPtr<nsIPrefBranch> mPrefBranch;
static nsFont* sDefaultFont;
};

33
layout/printing/nsPrintEngine.cpp
Просмотреть файл

@ -142,7 +142,8 @@ static const char* kPrintingPromptService = "@mozilla.org/embedcomp/printingprom
#include "nsIViewManager.h"
#include "nsIView.h"
#include "nsIPref.h"
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIPageSequenceFrame.h"
#include "nsIURL.h"
#include "nsIWebShell.h"
@ -587,9 +588,9 @@ nsPrintEngine::Print(nsIPrintSettings* aPrintSettings,
if (mIsDoingPrintPreview) {
PRBool okToPrint = PR_FALSE;
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
prefs->GetBoolPref("print.whileInPrintPreview", &okToPrint);
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
prefBranch->GetBoolPref("print.whileInPrintPreview", &okToPrint);
}
if (!okToPrint) {
ShowPrintErrorDialog(NS_ERROR_GFX_PRINTER_PRINT_WHILE_PREVIEW, PR_FALSE);
@ -758,10 +759,10 @@ nsPrintEngine::Print(nsIPrintSettings* aPrintSettings,
mPrt->mPrintSettings->GetPrintSilent(&printSilently);
// Check prefs for a default setting as to whether we should print silently
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
PRBool alwaysPrintSilent;
if (NS_SUCCEEDED(prefs->GetBoolPref("print.always_print_silent", &alwaysPrintSilent))) {
if (NS_SUCCEEDED(prefBranch->GetBoolPref("print.always_print_silent", &alwaysPrintSilent))) {
printSilently = alwaysPrintSilent;
}
}
@ -1621,9 +1622,9 @@ nsPrintEngine::CheckDocumentForPPCaching()
// Only check if it is the first time into PP
if (!mOldPrtPreview) {
// First check the Pref
nsCOMPtr<nsIPref> prefs (do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
prefs->GetBoolPref("print.always_cache_old_pres", &cacheOldPres);
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
prefBranch->GetBoolPref("print.always_cache_old_pres", &cacheOldPres);
}
// Temp fix for FrameSet Print Preview Bugs
@ -1695,9 +1696,9 @@ nsPrintEngine::ShowPrintProgress(PRBool aIsForPrinting, PRBool& aDoNotify)
// if it is already being shown then don't bother to find out if it should be
// so skip this and leave mShowProgressDialog set to FALSE
if (!mPrt->mProgressDialogIsShown) {
nsCOMPtr<nsIPref> prefs (do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
prefs->GetBoolPref("print.show_print_progress", &mPrt->mShowProgressDialog);
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
prefBranch->GetBoolPref("print.show_print_progress", &mPrt->mShowProgressDialog);
}
}
@ -5120,10 +5121,10 @@ PRBool nsPrintEngine::mIsDoingRuntimeTesting = PR_FALSE;
void
nsPrintEngine::InitializeTestRuntimeError()
{
nsCOMPtr<nsIPref> prefs (do_GetService(NS_PREF_CONTRACTID));
if (prefs) {
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
mIsDoingRuntimeTesting = PR_FALSE;
prefs->GetBoolPref("print.doing_runtime_error_checking", &mIsDoingRuntimeTesting);
prefBranch->GetBoolPref("print.doing_runtime_error_checking", &mIsDoingRuntimeTesting);
}
mLayoutDebugObj = do_GetService("@mozilla.org/debug/debugobject;1");