Fixed bugs.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10807 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer 2005-01-17 20:33:03 +00:00
parent d86ffbc9c4
commit 2aa7d54a51
2 changed files with 9 additions and 4 deletions

View File

@ -461,11 +461,15 @@ bool GraphicsDriver::printDocument(SpoolData *spool_data)
copies = fRealJobData->getCopies(); copies = fRealJobData->getCopies();
} }
// printing of even/odd numbered pages only is valid in simplex mode
bool simplex = fRealJobData->getPrintStyle() == JobData::kSimplex;
if (spool_data->startEnum()) { if (spool_data->startEnum()) {
do { do {
DBGMSG(("page index = %d\n", page_index)); DBGMSG(("page index = %d\n", page_index));
if (fRealJobData->getPageSelection() == JobData::kEvenNumberedPages) { if (simplex &&
fRealJobData->getPageSelection() == JobData::kEvenNumberedPages) {
// skip odd numbered page // skip odd numbered page
more = skipPages(spool_data); more = skipPages(spool_data);
} }
@ -478,7 +482,8 @@ bool GraphicsDriver::printDocument(SpoolData *spool_data)
PageDataList pages; PageDataList pages;
more = collectPages(spool_data, &pages); more = collectPages(spool_data, &pages);
if (more && fRealJobData->getPageSelection() == JobData::kOddNumberedPages) { if (more && simplex &&
fRealJobData->getPageSelection() == JobData::kOddNumberedPages) {
// skip even numbered page // skip even numbered page
more = skipPages(spool_data); more = skipPages(spool_data);
} }

View File

@ -364,9 +364,9 @@ void JobData::save(BMessage *msg)
msg->AddInt32(kJDPageOrder, fPageOrder); msg->AddInt32(kJDPageOrder, fPageOrder);
if (msg->HasBool(kJDColor)) if (msg->HasBool(kJDColor))
msg->ReplaceBool(kJDColor, fColor); msg->ReplaceBool(kJDColor, fColor == kColor);
else else
msg->AddBool(kJDColor, fColor); msg->AddBool(kJDColor, fColor == kColor);
if (msg->HasInt32(kJDDitherType)) if (msg->HasInt32(kJDDitherType))
msg->ReplaceInt32(kJDDitherType, fDitherType); msg->ReplaceInt32(kJDDitherType, fDitherType);