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

Bug 396278 - "should take edge values from print settings instead of prefs" [p=chpe r+sr=roc r=gavin a1.9=schrep]

Browse Source
This commit is contained in:
2007-11-13 11:14:07 -08:00
parent cafa2adc87
commit dafe7b2822
11 changed files with 190 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,6 +408,7 @@ function onAccept()
if (saveToPrefs && printService != null) {
var flags = gPrintSetInterface.kInitSavePaperSize |
gPrintSetInterface.kInitSaveColorSpace |
gPrintSetInterface.kInitSaveEdges |
gPrintSetInterface.kInitSaveInColor |
gPrintSetInterface.kInitSaveResolutionName |
gPrintSetInterface.kInitSaveDownloadFonts |

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

@@ -836,26 +836,10 @@ function loadDialog()
dialog.cmdInput.value = print_command;
dialog.jobTitleInput.value = print_jobtitle;
/* First initialize with the hardcoded defaults... */
dialog.topInput.value = "0.04";
dialog.bottomInput.value = "0.04";
dialog.leftInput.value = "0.04";
dialog.rightInput.value = "0.04";
try {
/* ... then try to get the generic settings ... */
dialog.topInput.value = gPrefs.getIntPref("print.print_edge_top") / 100.0;
dialog.bottomInput.value = gPrefs.getIntPref("print.print_edge_bottom") / 100.0;
dialog.leftInput.value = gPrefs.getIntPref("print.print_edge_left") / 100.0;
dialog.rightInput.value = gPrefs.getIntPref("print.print_edge_right") / 100.0;
/* ... and then the printer specific settings. */
var printername = gPrintSettings.printerName;
dialog.topInput.value = gPrefs.getIntPref("print.printer_"+printername+".print_edge_top") / 100.0;
dialog.bottomInput.value = gPrefs.getIntPref("print.printer_"+printername+".print_edge_bottom") / 100.0;
dialog.leftInput.value = gPrefs.getIntPref("print.printer_"+printername+".print_edge_left") / 100.0;
dialog.rightInput.value = gPrefs.getIntPref("print.printer_"+printername+".print_edge_right") / 100.0;
} catch (e) { }
dialog.topInput.value = gPrintSettings.edgeTop.toFixed(2);
dialog.bottomInput.value = gPrintSettings.edgeBottom.toFixed(2);
dialog.leftInput.value = gPrintSettings.edgeLeft.toFixed(2);
dialog.rightInput.value = gPrintSettings.edgeRight.toFixed(2);
}
//---------------------------------------------------
@@ -922,22 +906,10 @@ function onAccept()
gPrintSettings.printCommand = dialog.cmdInput.value;
gPrintSettings.title = dialog.jobTitleInput.value;
//
try {
var printerName = gPrintSettings.printerName;
var i = dialog.topInput.value * 100;
gPrefs.setIntPref("print.printer_"+printerName+".print_edge_top", i);
i = dialog.bottomInput.value * 100;
gPrefs.setIntPref("print.printer_"+printerName+".print_edge_bottom", i);
i = dialog.leftInput.value * 100;
gPrefs.setIntPref("print.printer_"+printerName+".print_edge_left", i);
i = dialog.rightInput.value * 100;
gPrefs.setIntPref("print.printer_"+printerName+".print_edge_right", i);
} catch (e) {
}
gPrintSettings.edgeTop = dialog.topInput.value;
gPrintSettings.edgeBottom = dialog.bottomInput.value;
gPrintSettings.edgeLeft = dialog.leftInput.value;
gPrintSettings.edgeRight = dialog.rightInput.value;
if (doDebug) {
dump("onAccept******************************\n");