i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store page and job settings separately.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6656 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer
2004-02-19 20:05:26 +00:00
parent 863fc0b752
commit 77348f7a0c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/print/drivers/pdf/source/Driver.cpp
+5 -5
View File
@@ -71,7 +71,7 @@ config_page(BNode *spoolDir, BMessage *msg)
pagesetupMsg = new BMessage(*msg); pagesetupMsg = new BMessage(*msg);
PrinterSettings::Update(spoolDir, pagesetupMsg); PrinterSettings::Read(spoolDir, pagesetupMsg, PrinterSettings::kPageSettings);
// retrieve the printer (spool) name. // retrieve the printer (spool) name.
printerName = NULL; printerName = NULL;
@@ -82,7 +82,7 @@ config_page(BNode *spoolDir, BMessage *msg)
driver = instanciate_driver(spoolDir); driver = instanciate_driver(spoolDir);
if (driver->PageSetup(pagesetupMsg, printerName) == B_OK) { if (driver->PageSetup(pagesetupMsg, printerName) == B_OK) {
pagesetupMsg->what = 'okok'; pagesetupMsg->what = 'okok';
PrinterSettings::Update(spoolDir, pagesetupMsg); PrinterSettings::Update(spoolDir, pagesetupMsg, PrinterSettings::kPageSettings);
} else { } else {
delete pagesetupMsg; delete pagesetupMsg;
pagesetupMsg = NULL; pagesetupMsg = NULL;
@@ -105,7 +105,7 @@ config_job(BNode *spoolDir, BMessage *msg)
jobsetupMsg = new BMessage(*msg); jobsetupMsg = new BMessage(*msg);
PrinterSettings::Update(spoolDir, jobsetupMsg); PrinterSettings::Read(spoolDir, jobsetupMsg, PrinterSettings::kJobSettings);
// retrieve the printer (spool) name. // retrieve the printer (spool) name.
printerName = NULL; printerName = NULL;
@@ -115,7 +115,7 @@ config_job(BNode *spoolDir, BMessage *msg)
driver = instanciate_driver(spoolDir); driver = instanciate_driver(spoolDir);
if (driver->JobSetup(jobsetupMsg, printerName) == B_OK) { if (driver->JobSetup(jobsetupMsg, printerName) == B_OK) {
jobsetupMsg->what = 'okok'; jobsetupMsg->what = 'okok';
PrinterSettings::Update(spoolDir, jobsetupMsg); PrinterSettings::Update(spoolDir, jobsetupMsg, PrinterSettings::kJobSettings);
} else { } else {
delete jobsetupMsg; delete jobsetupMsg;
jobsetupMsg = NULL; jobsetupMsg = NULL;
@@ -153,7 +153,7 @@ default_settings(BNode* printer)
{ {
BMessage *msg = new BMessage(); BMessage *msg = new BMessage();
PrinterSettings::Update(printer, msg); PrinterSettings::Read(printer, msg, PrinterSettings::kPageSettings);
return msg; return msg;
} }
src/add-ons/print/drivers/pdf/source/PrinterDriver.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ PrinterDriver::PrintJob
msg->Unflatten(fJobFile); msg->Unflatten(fJobFile);
// We have to load the settings here for Dano/Zeta because they don't store // We have to load the settings here for Dano/Zeta because they don't store
// all fields from the message returned by config_job in the job file! // all fields from the message returned by config_job in the job file!
PrinterSettings::Update(printerNode, msg); PrinterSettings::Read(printerNode, msg, PrinterSettings::kJobSettings);
if (msg->HasInt32("copies")) { if (msg->HasInt32("copies")) {
copies = msg->FindInt32("copies"); copies = msg->FindInt32("copies");