corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 147419 remove ununsed plexName colorspace resolutionName and downloadFonts r=roc

Browse Source 
This was only used to write to and read from otherwise unused preferences.
This commit is contained in:
Karl Tomlinson
2015-06-11 09:34:27 +12:00
parent 73cdb71326
commit 8e7d93aacf
10 changed files with 3 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
embedding/components/printingui/ipc/PPrintingTypes.ipdlh
View File

@@ -53,10 +53,6 @@ struct PrintData {
double paperWidth;
double paperHeight;
short paperSizeUnit;
nsString plexName;
nsString colorspace;
nsString resolutionName;
bool downloadFonts;
bool printReversed;
bool printInColor;
int32_t orientation;

3
toolkit/components/printing/content/printdialog.js
View File

@@ -372,11 +372,8 @@ function onAccept()
if (saveToPrefs && printService != null) {
var flags = gPrintSetInterface.kInitSavePaperSize |
gPrintSetInterface.kInitSaveColorSpace |
gPrintSetInterface.kInitSaveEdges |
gPrintSetInterface.kInitSaveInColor |
gPrintSetInterface.kInitSaveResolutionName |
gPrintSetInterface.kInitSaveDownloadFonts |
gPrintSetInterface.kInitSaveShrinkToFit |
gPrintSetInterface.kInitSaveScaling;
printService.savePrintSettingsToPrefs(gPrintSettings, true, flags);

465
toolkit/components/printing/content/printjoboptions.js
View File

@@ -9,9 +9,6 @@ var gPrintBundle;
var gPrintSettings = null;
var gPrintSettingsInterface = Components.interfaces.nsIPrintSettings;
var gPaperArray;
var gPlexArray;
var gResolutionArray;
var gColorSpaceArray;
var gPrefs;
var gPrintSetInterface = Components.interfaces.nsIPrintSettings;
@@ -66,27 +63,15 @@ function initDialog()
dialog.paperList = document.getElementById("paperList");
dialog.paperGroup = document.getElementById("paperGroup");
dialog.plexList = document.getElementById("plexList");
dialog.plexGroup = document.getElementById("plexGroup");
dialog.resolutionList = document.getElementById("resolutionList");
dialog.resolutionGroup = document.getElementById("resolutionGroup");
dialog.jobTitleLabel = document.getElementById("jobTitleLabel");
dialog.jobTitleGroup = document.getElementById("jobTitleGroup");
dialog.jobTitleInput = document.getElementById("jobTitleInput");
dialog.colorspaceList = document.getElementById("colorspaceList");
dialog.colorspaceGroup = document.getElementById("colorspaceGroup");
dialog.colorGroup = document.getElementById("colorGroup");
dialog.colorRadioGroup = document.getElementById("colorRadioGroup");
dialog.colorRadio = document.getElementById("colorRadio");
dialog.grayRadio = document.getElementById("grayRadio");
dialog.fontsGroup = document.getElementById("fontsGroup");
dialog.downloadFonts = document.getElementById("downloadFonts");
dialog.topInput = document.getElementById("topInput");
dialog.bottomInput = document.getElementById("bottomInput");
dialog.leftInput = document.getElementById("leftInput");
@@ -244,333 +229,6 @@ function createPaperSizeList(selectedInx)
//dialog.paperList = selectElement;
}
//---------------------------------------------------
function plexListElement(aPlexListElement)
{
this.plexListElement = aPlexListElement;
}
plexListElement.prototype =
{
clearPlexList:
function ()
{
// remove the menupopup node child of the menulist.
this.plexListElement.removeChild(this.plexListElement.firstChild);
},
appendPlexNames:
function (aDataObject)
{
var popupNode = document.createElement("menupopup");
for (var i=0;i<aDataObject.length;i++) {
var plexObj = aDataObject[i];
var itemNode = document.createElement("menuitem");
var label;
try {
label = gPrintBundle.getString(plexObj.name);
}
catch (e) {
/* No name in string bundle ? Then build one manually (this
* usually happens when gPlexArray was build by createPlexArrayFromPrinterFeatures() ...) */
label = plexObj.name;
}
itemNode.setAttribute("label", label);
itemNode.setAttribute("value", i);
popupNode.appendChild(itemNode);
}
this.plexListElement.appendChild(popupNode);
}
};
//---------------------------------------------------
function createPlexArrayFromDefaults()
{
var plexNames = ["default"];
gPlexArray = new Array();
for (var i=0;i<plexNames.length;i++) {
var obj = new Object();
obj.name = plexNames[i];
gPlexArray[i] = obj;
}
}
//---------------------------------------------------
function createPlexArrayFromPrinterFeatures()
{
var printername = gPrintSettings.printerName;
if (doDebug) {
dump("createPlexArrayFromPrinterFeatures for " + printername + ".\n");
}
gPlexArray = new Array();
var numPlexs = gPrefs.getIntPref("print.tmp.printerfeatures." + printername + ".plex.count");
if (doDebug) {
dump("processing " + numPlexs + " entries...\n");
}
for ( var i=0 ; i < numPlexs ; i++ ) {
var obj = new Object();
obj.name = gPrefs.getCharPref("print.tmp.printerfeatures." + printername + ".plex." + i + ".name");
gPlexArray[i] = obj;
if (doDebug) {
dump("plex index=" + i + ", name='" + obj.name + "'.\n");
}
}
}
//---------------------------------------------------
function createPlexArray()
{
if (isListOfPrinterFeaturesAvailable()) {
createPlexArrayFromPrinterFeatures();
}
else {
createPlexArrayFromDefaults();
}
}
//---------------------------------------------------
function createPlexNameList(selectedInx)
{
var selectElement = new plexListElement(dialog.plexList);
selectElement.clearPlexList();
selectElement.appendPlexNames(gPlexArray);
if (selectedInx > -1) {
selectElement.plexListElement.selectedIndex = selectedInx;
}
//dialog.plexList = selectElement;
}
//---------------------------------------------------
function resolutionListElement(aResolutionListElement)
{
this.resolutionListElement = aResolutionListElement;
}
resolutionListElement.prototype =
{
clearResolutionList:
function ()
{
// remove the menupopup node child of the menulist.
this.resolutionListElement.removeChild(this.resolutionListElement.firstChild);
},
appendResolutionNames:
function (aDataObject)
{
var popupNode = document.createElement("menupopup");
for (var i=0;i<aDataObject.length;i++) {
var resolutionObj = aDataObject[i];
var itemNode = document.createElement("menuitem");
var label;
try {
label = gPrintBundle.getString(resolutionObj.name);
}
catch (e) {
/* No name in string bundle ? Then build one manually (this
* usually happens when gResolutionArray was build by createResolutionArrayFromPrinterFeatures() ...) */
label = resolutionObj.name;
}
itemNode.setAttribute("label", label);
itemNode.setAttribute("value", i);
popupNode.appendChild(itemNode);
}
this.resolutionListElement.appendChild(popupNode);
}
};
//---------------------------------------------------
function createResolutionArrayFromDefaults()
{
var resolutionNames = ["default"];
gResolutionArray = new Array();
for (var i=0;i<resolutionNames.length;i++) {
var obj = new Object();
obj.name = resolutionNames[i];
gResolutionArray[i] = obj;
}
}
//---------------------------------------------------
function createResolutionArrayFromPrinterFeatures()
{
var printername = gPrintSettings.printerName;
if (doDebug) {
dump("createResolutionArrayFromPrinterFeatures for " + printername + ".\n");
}
gResolutionArray = new Array();
var numResolutions = gPrefs.getIntPref("print.tmp.printerfeatures." + printername + ".resolution.count");
if (doDebug) {
dump("processing " + numResolutions + " entries...\n");
}
for ( var i=0 ; i < numResolutions ; i++ ) {
var obj = new Object();
obj.name = gPrefs.getCharPref("print.tmp.printerfeatures." + printername + ".resolution." + i + ".name");
gResolutionArray[i] = obj;
if (doDebug) {
dump("resolution index=" + i + ", name='" + obj.name + "'.\n");
}
}
}
//---------------------------------------------------
function createResolutionArray()
{
if (isListOfPrinterFeaturesAvailable()) {
createResolutionArrayFromPrinterFeatures();
}
else {
createResolutionArrayFromDefaults();
}
}
//---------------------------------------------------
function createResolutionNameList(selectedInx)
{
var selectElement = new resolutionListElement(dialog.resolutionList);
selectElement.clearResolutionList();
selectElement.appendResolutionNames(gResolutionArray);
if (selectedInx > -1) {
selectElement.resolutionListElement.selectedIndex = selectedInx;
}
//dialog.resolutionList = selectElement;
}
//---------------------------------------------------
function colorspaceListElement(aColorspaceListElement)
{
this.colorspaceListElement = aColorspaceListElement;
}
colorspaceListElement.prototype =
{
clearColorspaceList:
function ()
{
// remove the menupopup node child of the menulist.
this.colorspaceListElement.removeChild(this.colorspaceListElement.firstChild);
},
appendColorspaceNames:
function (aDataObject)
{
var popupNode = document.createElement("menupopup");
for (var i=0;i<aDataObject.length;i++) {
var colorspaceObj = aDataObject[i];
var itemNode = document.createElement("menuitem");
var label;
try {
label = gPrintBundle.getString(colorspaceObj.name);
}
catch (e) {
/* No name in string bundle ? Then build one manually (this
* usually happens when gColorspaceArray was build by createColorspaceArrayFromPrinterFeatures() ...) */
label = colorspaceObj.name;
}
itemNode.setAttribute("label", label);
itemNode.setAttribute("value", i);
popupNode.appendChild(itemNode);
}
this.colorspaceListElement.appendChild(popupNode);
}
};
//---------------------------------------------------
function createColorspaceArrayFromDefaults()
{
var colorspaceNames = ["default"];
gColorspaceArray = new Array();
for (var i=0;i<colorspaceNames.length;i++) {
var obj = new Object();
obj.name = colorspaceNames[i];
gColorspaceArray[i] = obj;
}
}
//---------------------------------------------------
function createColorspaceArrayFromPrinterFeatures()
{
var printername = gPrintSettings.printerName;
if (doDebug) {
dump("createColorspaceArrayFromPrinterFeatures for " + printername + ".\n");
}
gColorspaceArray = new Array();
var numColorspaces = gPrefs.getIntPref("print.tmp.printerfeatures." + printername + ".colorspace.count");
if (doDebug) {
dump("processing " + numColorspaces + " entries...\n");
}
for ( var i=0 ; i < numColorspaces ; i++ ) {
var obj = new Object();
obj.name = gPrefs.getCharPref("print.tmp.printerfeatures." + printername + ".colorspace." + i + ".name");
gColorspaceArray[i] = obj;
if (doDebug) {
dump("colorspace index=" + i + ", name='" + obj.name + "'.\n");
}
}
}
//---------------------------------------------------
function createColorspaceArray()
{
if (isListOfPrinterFeaturesAvailable()) {
createColorspaceArrayFromPrinterFeatures();
}
else {
createColorspaceArrayFromDefaults();
}
}
//---------------------------------------------------
function createColorspaceNameList(selectedInx)
{
var selectElement = new colorspaceListElement(dialog.colorspaceList);
selectElement.clearColorspaceList();
selectElement.appendColorspaceNames(gColorspaceArray);
if (selectedInx > -1) {
selectElement.colorspaceListElement.selectedIndex = selectedInx;
}
//dialog.colorspaceList = selectElement;
}
//---------------------------------------------------
function loadDialog()
{
@@ -579,11 +237,7 @@ function loadDialog()
var print_paper_width = 0.0;
var print_paper_height = 0.0;
var print_paper_name = "";
var print_plex_name = "";
var print_resolution_name = "";
var print_colorspace = "";
var print_color = true;
var print_downloadfonts = true;
var print_jobtitle = "";
gPrefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
@@ -594,11 +248,7 @@ function loadDialog()
print_paper_width = gPrintSettings.paperWidth;
print_paper_height = gPrintSettings.paperHeight;
print_paper_name = gPrintSettings.paperName;
print_plex_name = gPrintSettings.plexName;
print_resolution_name = gPrintSettings.resolutionName;
print_colorspace = gPrintSettings.colorspace;
print_color = gPrintSettings.printInColor;
print_downloadfonts = gPrintSettings.downloadFonts;
print_jobtitle = gPrintSettings.title;
}
@@ -608,11 +258,7 @@ function loadDialog()
dump("paperWidth "+print_paper_width+"\n");
dump("paperHeight "+print_paper_height+"\n");
dump("paperName "+print_paper_name+"\n");
dump("plexName "+print_plex_name+"\n");
dump("resolutionName "+print_resolution_name+"\n");
dump("colorspace "+print_colorspace+"\n");
dump("print_color "+print_color+"\n");
dump("print_downloadfonts "+print_downloadfonts+"\n");
dump("print_jobtitle "+print_jobtitle+"\n");
}
@@ -635,58 +281,6 @@ function loadDialog()
createPaperSizeList(paperSelectedInx);
createPlexArray();
var plexSelectedInx = 0;
for (var i=0;i<gPlexArray.length;i++) {
if (print_plex_name == gPlexArray[i].name) {
plexSelectedInx = i;
break;
}
}
if (doDebug) {
if (i == gPlexArray.length)
dump("loadDialog: No plex found.\n");
else
dump("loadDialog: found plex '"+gPlexArray[plexSelectedInx].name+"'.\n");
}
createResolutionArray();
var resolutionSelectedInx = 0;
for (var i=0;i<gResolutionArray.length;i++) {
if (print_resolution_name == gResolutionArray[i].name) {
resolutionSelectedInx = i;
break;
}
}
if (doDebug) {
if (i == gResolutionArray.length)
dump("loadDialog: No resolution found.\n");
else
dump("loadDialog: found resolution '"+gResolutionArray[resolutionSelectedInx].name+"'.\n");
}
createColorspaceArray();
var colorspaceSelectedInx = 0;
for (var i=0;i<gColorspaceArray.length;i++) {
if (print_colorspace == gColorspaceArray[i].name) {
colorspaceSelectedInx = i;
break;
}
}
if (doDebug) {
if (i == gColorspaceArray.length)
dump("loadDialog: No colorspace found.\n");
else
dump("loadDialog: found colorspace '"+gColorspaceArray[colorspaceSelectedInx].name+"'.\n");
}
createPlexNameList(plexSelectedInx);
createResolutionNameList(resolutionSelectedInx);
createColorspaceNameList(colorspaceSelectedInx);
/* Enable/disable and/or hide/unhide widgets based in the information
* whether the selected printer and/or print module supports the matching
* feature or not */
@@ -711,26 +305,6 @@ function loadDialog()
else
dialog.paperGroup.setAttribute("hidden","true");
// plex mode
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_plex"))
dialog.plexList.removeAttribute("disabled");
else
dialog.plexList.setAttribute("disabled","true");
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_plex_change"))
dialog.plexGroup.removeAttribute("hidden");
else
dialog.plexGroup.setAttribute("hidden","true");
// resolution
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_resolution"))
dialog.resolutionList.removeAttribute("disabled");
else
dialog.resolutionList.setAttribute("disabled","true");
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_resolution_change"))
dialog.resolutionGroup.removeAttribute("hidden");
else
dialog.resolutionGroup.setAttribute("hidden","true");
// color/grayscale radio
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_printincolor"))
dialog.colorRadioGroup.removeAttribute("disabled");
@@ -740,26 +314,6 @@ function loadDialog()
dialog.colorGroup.removeAttribute("hidden");
else
dialog.colorGroup.setAttribute("hidden","true");
// colorspace
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_colorspace"))
dialog.colorspaceList.removeAttribute("disabled");
else
dialog.colorspaceList.setAttribute("disabled","true");
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_colorspace_change"))
dialog.colorspaceGroup.removeAttribute("hidden");
else
dialog.colorspaceGroup.setAttribute("hidden","true");
// font download
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_downloadfonts"))
dialog.downloadFonts.removeAttribute("disabled");
else
dialog.downloadFonts.setAttribute("disabled","true");
if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_downloadfonts_change"))
dialog.fontsGroup.removeAttribute("hidden");
else
dialog.fontsGroup.setAttribute("hidden","true");
}
if (print_color) {
@@ -768,8 +322,6 @@ function loadDialog()
dialog.colorRadioGroup.selectedItem = dialog.grayRadio;
}
dialog.downloadFonts.checked = print_downloadfonts;
dialog.jobTitleInput.value = print_jobtitle;
dialog.topInput.value = gPrintSettings.edgeTop.toFixed(2);
@@ -806,15 +358,9 @@ function onAccept()
var print_paper_width = 0.0;
var print_paper_height = 0.0;
var print_paper_name = "";
var print_plex_name = "";
var print_resolution_name = "";
var print_colorspace = "";
if (gPrintSettings != null) {
var paperSelectedInx = dialog.paperList.selectedIndex;
var plexSelectedInx = dialog.plexList.selectedIndex;
var resolutionSelectedInx = dialog.resolutionList.selectedIndex;
var colorspaceSelectedInx = dialog.colorspaceList.selectedIndex;
if (gPaperArray[paperSelectedInx].inches) {
print_paper_unit = gPrintSettingsInterface.kPaperSizeInches;
} else {
@@ -823,22 +369,15 @@ function onAccept()
print_paper_width = gPaperArray[paperSelectedInx].width;
print_paper_height = gPaperArray[paperSelectedInx].height;
print_paper_name = gPaperArray[paperSelectedInx].name;
print_plex_name = gPlexArray[plexSelectedInx].name;
print_resolution_name = gResolutionArray[resolutionSelectedInx].name;
print_colorspace = gColorspaceArray[colorspaceSelectedInx].name;
gPrintSettings.paperSizeType = print_paper_type;
gPrintSettings.paperSizeUnit = print_paper_unit;
gPrintSettings.paperWidth = print_paper_width;
gPrintSettings.paperHeight = print_paper_height;
gPrintSettings.paperName = print_paper_name;
gPrintSettings.plexName = print_plex_name;
gPrintSettings.resolutionName = print_resolution_name;
gPrintSettings.colorspace = print_colorspace;
// save these out so they can be picked up by the device spec
gPrintSettings.printInColor = dialog.colorRadio.selected;
gPrintSettings.downloadFonts = dialog.downloadFonts.checked;
gPrintSettings.title = dialog.jobTitleInput.value;
gPrintSettings.edgeTop = dialog.topInput.value;
@@ -853,12 +392,8 @@ function onAccept()
dump("paperWidth "+print_paper_width+"\n");
dump("paperHeight "+print_paper_height+"\n");
dump("paperName '"+print_paper_name+"'\n");
dump("plexName '"+print_plex_name+"'\n");
dump("resolutionName '"+print_resolution_name+"'\n");
dump("colorspace '"+print_colorspace+"'\n");
dump("printInColor "+gPrintSettings.printInColor+"\n");
dump("downloadFonts "+gPrintSettings.downloadFonts+"\n");
}
} else {
dump("************ onAccept gPrintSettings: "+gPrintSettings+"\n");

45
toolkit/components/printing/content/printjoboptions.xul
View File

@@ -47,42 +47,6 @@
</menulist>
</row>
<row id="plexGroup">
<hbox align="center" pack="end">
<label id="plexLabel"
value="&plexInput.label;"
accesskey="&plexInput.accesskey;"
control="plexList"/>
</hbox>
<menulist id="plexList" flex="1">
<menupopup/>
</menulist>
</row>
<row id="resolutionGroup">
<hbox align="center" pack="end">
<label id="resolutionLabel"
value="&resolutionInput.label;"
accesskey="&resolutionInput.accesskey;"
control="resolutionList"/>
</hbox>
<menulist id="resolutionList" flex="1">
<menupopup/>
</menulist>
</row>
<row id="colorspaceGroup">
<hbox align="center" pack="end">
<label id="colorspaceLabel"
value="&colorspaceInput.label;"
accesskey="&colorspaceInput.accesskey;"
control="colorspaceList"/>
</hbox>
<menulist id="colorspaceList" flex="1">
<menupopup/>
</menulist>
</row>
<row id="colorGroup">
<hbox align="center" pack="end">
<label control="colorRadioGroup" value="&colorGroup.label;"/>
@@ -96,15 +60,6 @@
accesskey="&colorRadio.accesskey;"/>
</radiogroup>
</row>
<row id="fontsGroup">
<hbox align="center" pack="end">
<label value="&fontsGroup.label;"/>
</hbox>
<checkbox id="downloadFonts"
label="&downloadFonts.label;"
accesskey="&downloadFonts.accesskey;"/>
</row>
</rows>
</grid>

13
toolkit/locales/en-US/chrome/global/printjoboptions.dtd
View File

@@ -9,12 +9,6 @@
<!ENTITY paperInput.label "Paper Size:">
<!ENTITY paperInput.accesskey "P">
<!ENTITY plexInput.label "Plex mode:">
<!ENTITY plexInput.accesskey "m">
<!ENTITY resolutionInput.label "Resolution/Quality:">
<!ENTITY resolutionInput.accesskey "e">
<!ENTITY jobTitleInput.label "Job Title:">
<!ENTITY jobTitleInput.accesskey "J">
@@ -24,13 +18,6 @@
<!ENTITY colorRadio.label "Color">
<!ENTITY colorRadio.accesskey "C">
<!ENTITY colorspaceInput.label "Colorspace:">
<!ENTITY colorspaceInput.accesskey "s">
<!ENTITY fontsGroup.label "Fonts:">
<!ENTITY downloadFonts.label "Download fonts to printer">
<!ENTITY downloadFonts.accesskey "D">
<!ENTITY edgeMarginInput.label "Gap from edge of paper to Margin">
<!ENTITY topInput.label "Top:">
<!ENTITY topInput.accesskey "T">

12
widget/gtk/nsDeviceContextSpecG.cpp
View File

@@ -437,18 +437,6 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const char16_
aPrintSettings->SetIsInitializedFromPrinter(true);
/* PostScript module does not support changing the plex mode... */
DO_PR_DEBUG_LOG(("setting default plex to '%s'\n", "default"));
aPrintSettings->SetPlexName(MOZ_UTF16("default"));
/* PostScript module does not support changing the resolution mode... */
DO_PR_DEBUG_LOG(("setting default resolution to '%s'\n", "default"));
aPrintSettings->SetResolutionName(MOZ_UTF16("default"));
/* PostScript module does not support changing the colorspace... */
DO_PR_DEBUG_LOG(("setting default colorspace to '%s'\n", "default"));
aPrintSettings->SetColorspace(MOZ_UTF16("default"));
return NS_OK;
}

17
widget/nsIPrintSettings.idl
View File

@@ -22,7 +22,7 @@ interface nsIPrintSession;
/**
* Simplified graphics interface for JS rendering.
*/
[scriptable, uuid(ec3d43bb-3fe0-4f9a-9502-eebcc511555b)]
[scriptable, uuid(04dd3a01-a74e-44aa-8d49-2c30478fd7b8)]
interface nsIPrintSettings : nsISupports
{
@@ -56,12 +56,10 @@ interface nsIPrintSettings : nsISupports
const unsigned long kInitSavePageDelay = 0x00800000;
const unsigned long kInitSaveMargins = 0x01000000;
const unsigned long kInitSaveNativeData = 0x02000000;
const unsigned long kInitSavePlexName = 0x04000000;
const unsigned long kInitSaveShrinkToFit = 0x08000000;
const unsigned long kInitSaveScaling = 0x10000000;
const unsigned long kInitSaveColorspace = 0x20000000;
const unsigned long kInitSaveResolutionName = 0x40000000;
const unsigned long kInitSaveDownloadFonts = 0x80000000;
const unsigned long kInitSaveAll = 0xFFFFFFFF;
/* Print Option Flags for Bit Field*/
@@ -231,15 +229,6 @@ interface nsIPrintSettings : nsISupports
attribute double paperHeight; /* height of the paper in inches or mm */
attribute short paperSizeUnit; /* paper is in inches or mm */
attribute wstring plexName; /* name of plex mode (like "simplex", "duplex",
* "tumble" and various custom values) */
attribute wstring colorspace; /* device-specific name of colorspace, overrides |printInColor| */
attribute wstring resolutionName;/* device-specific identifer of resolution or quality
* (like "600", "600x300", "600x300x12", "high-res",
* "med-res". "low-res", etc.) */
attribute boolean downloadFonts; /* enable font download to printer? */
attribute boolean printReversed;
attribute boolean printInColor; /* a false means grayscale */
attribute long orientation; /* see orientation consts */

86
widget/nsPrintOptionsImpl.cpp
View File

@@ -59,15 +59,11 @@ static const char kPrintFooterStrRight[] = "print_footerright";
static const char kPrintReversed[] = "print_reversed";
static const char kPrintInColor[] = "print_in_color";
static const char kPrintPaperName[] = "print_paper_name";
static const char kPrintPlexName[] = "print_plex_name";
static const char kPrintPaperSizeType[] = "print_paper_size_type";
static const char kPrintPaperData[] = "print_paper_data";
static const char kPrintPaperSizeUnit[] = "print_paper_size_unit";
static const char kPrintPaperWidth[] = "print_paper_width";
static const char kPrintPaperHeight[] = "print_paper_height";
static const char kPrintColorspace[] = "print_colorspace";
static const char kPrintResolutionName[]= "print_resolution_name";
static const char kPrintDownloadFonts[] = "print_downloadfonts";
static const char kPrintOrientation[] = "print_orientation";
static const char kPrinterName[] = "print_printer";
static const char kPrintToFile[] = "print_to_file";
@@ -181,19 +177,6 @@ nsPrintOptions::SerializeToPrintData(nsIPrintSettings* aSettings,
aSettings->GetPaperHeight(&data->paperHeight());
aSettings->GetPaperSizeUnit(&data->paperSizeUnit());
nsXPIDLString plexName;
aSettings->GetPlexName(getter_Copies(plexName));
data->plexName() = plexName;
nsXPIDLString colorspace;
aSettings->GetColorspace(getter_Copies(colorspace));
data->colorspace() = colorspace;
nsXPIDLString resolutionName;
aSettings->GetResolutionName(getter_Copies(resolutionName));
data->resolutionName() = resolutionName;
aSettings->GetDownloadFonts(&data->downloadFonts());
aSettings->GetPrintReversed(&data->printReversed());
aSettings->GetPrintInColor(&data->printInColor());
aSettings->GetOrientation(&data->orientation());
@@ -303,13 +286,6 @@ nsPrintOptions::DeserializeToPrintSettings(const PrintData& data,
settings->SetPaperHeight(data.paperHeight());
settings->SetPaperSizeUnit(data.paperSizeUnit());
settings->SetPlexName(data.plexName().get());
settings->SetColorspace(data.colorspace().get());
settings->SetResolutionName(data.resolutionName().get());
settings->SetDownloadFonts(data.downloadFonts());
settings->SetPrintReversed(data.printReversed());
settings->SetPrintInColor(data.printInColor());
settings->SetOrientation(data.orientation());
@@ -650,13 +626,6 @@ nsPrintOptions::ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName,
}
}
if (aFlags & nsIPrintSettings::kInitSavePlexName) {
if (GETSTRPREF(kPrintPlexName, &str)) {
aPS->SetPlexName(str.get());
DUMP_STR(kReadStr, kPrintPlexName, str.get());
}
}
if (aFlags & nsIPrintSettings::kInitSavePaperData) {
if (GETINTPREF(kPrintPaperData, &iVal)) {
aPS->SetPaperData(iVal);
@@ -664,27 +633,6 @@ nsPrintOptions::ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName,
}
}
if (aFlags & nsIPrintSettings::kInitSaveColorspace) {
if (GETSTRPREF(kPrintColorspace, &str)) {
aPS->SetColorspace(str.get());
DUMP_STR(kReadStr, kPrintColorspace, str.get());
}
}
if (aFlags & nsIPrintSettings::kInitSaveResolutionName) {
if (GETSTRPREF(kPrintResolutionName, &str)) {
aPS->SetResolutionName(str.get());
DUMP_STR(kReadStr, kPrintResolutionName, str.get());
}
}
if (aFlags & nsIPrintSettings::kInitSaveDownloadFonts) {
if (GETBOOLPREF(kPrintDownloadFonts, &b)) {
aPS->SetDownloadFonts(b);
DUMP_BOOL(kReadStr, kPrintDownloadFonts, b);
}
}
if (aFlags & nsIPrintSettings::kInitSaveOrientation) {
if (GETINTPREF(kPrintOrientation, &iVal)) {
aPS->SetOrientation(iVal);
@@ -942,13 +890,6 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
}
}
if (aFlags & nsIPrintSettings::kInitSavePlexName) {
if (NS_SUCCEEDED(aPS->GetPlexName(&uStr))) {
DUMP_STR(kWriteStr, kPrintPlexName, uStr);
Preferences::SetString(GetPrefName(kPrintPlexName, aPrinterName), uStr);
}
}
if (aFlags & nsIPrintSettings::kInitSavePaperData) {
if (NS_SUCCEEDED(aPS->GetPaperData(&iVal16))) {
DUMP_INT(kWriteStr, kPrintPaperData, iVal16);
@@ -957,28 +898,6 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
}
}
if (aFlags & nsIPrintSettings::kInitSaveColorspace) {
if (NS_SUCCEEDED(aPS->GetColorspace(&uStr))) {
DUMP_STR(kWriteStr, kPrintColorspace, uStr);
Preferences::SetString(GetPrefName(kPrintColorspace, aPrinterName), uStr);
}
}
if (aFlags & nsIPrintSettings::kInitSaveResolutionName) {
if (NS_SUCCEEDED(aPS->GetResolutionName(&uStr))) {
DUMP_STR(kWriteStr, kPrintResolutionName, uStr);
Preferences::SetString(GetPrefName(kPrintResolutionName, aPrinterName),
uStr);
}
}
if (aFlags & nsIPrintSettings::kInitSaveDownloadFonts) {
if (NS_SUCCEEDED(aPS->GetDownloadFonts(&b))) {
DUMP_BOOL(kWriteStr, kPrintDownloadFonts, b);
Preferences::SetBool(GetPrefName(kPrintDownloadFonts, aPrinterName), b);
}
}
if (aFlags & nsIPrintSettings::kInitSaveOrientation) {
if (NS_SUCCEEDED(aPS->GetOrientation(&iVal))) {
DUMP_INT(kWriteStr, kPrintOrientation, iVal);
@@ -1481,7 +1400,6 @@ Tester::Tester()
ps->SetFooterStrCenter(NS_ConvertUTF8toUTF16("Center").get());
ps->SetFooterStrRight(NS_ConvertUTF8toUTF16("Right").get());
ps->SetPaperName(NS_ConvertUTF8toUTF16("Paper Name").get());
ps->SetPlexName(NS_ConvertUTF8toUTF16("Plex Name").get());
ps->SetPaperSizeType(10);
ps->SetPaperData(1);
ps->SetPaperWidth(100.0);
@@ -1513,13 +1431,9 @@ Tester::Tester()
{kPrintBGImages, nsIPrintSettings::kInitSaveBGImages},
{kPrintShrinkToFit, nsIPrintSettings::kInitSaveShrinkToFit},
{kPrintPaperSize, nsIPrintSettings::kInitSavePaperSize},
{kPrintPlexName, nsIPrintSettings::kInitSavePlexName},
{kPrintPaperData, nsIPrintSettings::kInitSavePaperData},
{kPrintReversed, nsIPrintSettings::kInitSaveReversed},
{kPrintInColor, nsIPrintSettings::kInitSaveInColor},
{kPrintColorspace, nsIPrintSettings::kInitSaveColorspace},
{kPrintResolutionName, nsIPrintSettings::kInitSaveResolutionName},
{kPrintDownloadFonts, nsIPrintSettings::kInitSaveDownloadFonts},
{kPrintOrientation, nsIPrintSettings::kInitSaveOrientation},
{kPrinterName, nsIPrintSettings::kInitSavePrinterName},
{kPrintToFile, nsIPrintSettings::kInitSavePrintToFile},

78
widget/nsPrintSettingsImpl.cpp
View File

@@ -41,7 +41,6 @@ nsPrintSettings::nsPrintSettings() :
mPrintReversed(false),
mPrintInColor(true),
mOrientation(kPortraitOrientation),
mDownloadFonts(false),
mNumCopies(1),
mPrintToFile(false),
mOutputFormat(kOutputFormatNative),
@@ -177,48 +176,6 @@ NS_IMETHODIMP nsPrintSettings::SetOrientation(int32_t aOrientation)
return NS_OK;
}
/* attribute wstring colorspace; */
NS_IMETHODIMP nsPrintSettings::GetColorspace(char16_t * *aColorspace)
{
NS_ENSURE_ARG_POINTER(aColorspace);
if (!mColorspace.IsEmpty()) {
*aColorspace = ToNewUnicode(mColorspace);
} else {
*aColorspace = nullptr;
}
return NS_OK;
}
NS_IMETHODIMP nsPrintSettings::SetColorspace(const char16_t * aColorspace)
{
if (aColorspace) {
mColorspace = aColorspace;
} else {
mColorspace.SetLength(0);
}
return NS_OK;
}
/* attribute wstring resolutionname; */
NS_IMETHODIMP nsPrintSettings::GetResolutionName(char16_t * *aResolutionName)
{
NS_ENSURE_ARG_POINTER(aResolutionName);
if (!mResolutionName.IsEmpty()) {
*aResolutionName = ToNewUnicode(mResolutionName);
} else {
*aResolutionName = nullptr;
}
return NS_OK;
}
NS_IMETHODIMP nsPrintSettings::SetResolutionName(const char16_t * aResolutionName)
{
if (aResolutionName) {
mResolutionName = aResolutionName;
} else {
mResolutionName.SetLength(0);
}
return NS_OK;
}
/* attribute wstring resolution; */
NS_IMETHODIMP nsPrintSettings::GetResolution(int32_t *aResolution)
{
@@ -245,19 +202,6 @@ NS_IMETHODIMP nsPrintSettings::SetDuplex(const int32_t aDuplex)
return NS_OK;
}
/* attribute boolean downloadFonts; */
NS_IMETHODIMP nsPrintSettings::GetDownloadFonts(bool *aDownloadFonts)
{
//NS_ENSURE_ARG_POINTER(aDownloadFonts);
*aDownloadFonts = mDownloadFonts;
return NS_OK;
}
NS_IMETHODIMP nsPrintSettings::SetDownloadFonts(bool aDownloadFonts)
{
mDownloadFonts = aDownloadFonts;
return NS_OK;
}
/* attribute wstring printer; */
NS_IMETHODIMP nsPrintSettings::GetPrinterName(char16_t * *aPrinter)
{
@@ -884,27 +828,6 @@ NS_IMETHODIMP nsPrintSettings::SetPaperName(const char16_t * aPaperName)
return NS_OK;
}
/* attribute wstring plexName; */
NS_IMETHODIMP nsPrintSettings::GetPlexName(char16_t * *aPlexName)
{
NS_ENSURE_ARG_POINTER(aPlexName);
if (!mPlexName.IsEmpty()) {
*aPlexName = ToNewUnicode(mPlexName);
} else {
*aPlexName = nullptr;
}
return NS_OK;
}
NS_IMETHODIMP nsPrintSettings::SetPlexName(const char16_t * aPlexName)
{
if (aPlexName) {
mPlexName = aPlexName;
} else {
mPlexName.SetLength(0);
}
return NS_OK;
}
/* attribute boolean howToEnableFrameUI; */
NS_IMETHODIMP nsPrintSettings::GetHowToEnableFrameUI(int16_t *aHowToEnableFrameUI)
{
@@ -1157,7 +1080,6 @@ nsPrintSettings& nsPrintSettings::operator=(const nsPrintSettings& rhs)
mShrinkToFit = rhs.mShrinkToFit;
mShowPrintProgress = rhs.mShowPrintProgress;
mPaperName = rhs.mPaperName;
mPlexName = rhs.mPlexName;
mPaperSizeType = rhs.mPaperSizeType;
mPaperData = rhs.mPaperData;
mPaperWidth = rhs.mPaperWidth;

4
widget/nsPrintSettingsImpl.h
View File

@@ -81,7 +81,6 @@ protected:
nsString mFooterStrs[NUM_HEAD_FOOT];
nsString mPaperName;
nsString mPlexName;
int16_t mPaperData;
int16_t mPaperSizeType;
double mPaperWidth;
@@ -91,11 +90,8 @@ protected:
bool mPrintReversed;
bool mPrintInColor; // a false means grayscale
int32_t mOrientation; // see orientation consts
nsString mColorspace;
nsString mResolutionName;
int32_t mResolution;
int32_t mDuplex;
bool mDownloadFonts;
int32_t mNumCopies;
nsXPIDLString mPrinter;
bool mPrintToFile;