[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/cups
From:       Casper Boemann <cbr () boemann ! dk>
Date:       2007-05-21 15:44:08
Message-ID: 1179762248.191413.19483.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 667025 by boemann:

The collate option was only transferred to printers in applications that 
let the system handle page ranges. So apps like KWord had nonfunctional 
collate.
THeese is absolutely no need in my mind to prevet collate option to be 
transferred just because page rages is handled differently.

I have not been able to test as I'm unable to test printing in kde4

ccbug:121769



 M  +3 -2      kcupsprinterimpl.cpp  


--- trunk/KDE/kdelibs/kdeprint/cups/kcupsprinterimpl.cpp #667024:667025
@@ -94,7 +94,8 @@
 		printer->setOption("orientation-requested",(o == "5" || o == "6" ? "6" : "3"));
 
 	// translate copies number
-	if (!printer->option("kde-copies").isEmpty()) \
printer->setOption("copies",printer->option("kde-copies")); +	if \
(!printer->option("kde-copies").isEmpty()) +            \
printer->setOption("copies",printer->option("kde-copies"));  
 	// page ranges are handled by CUPS, so application should print all pages
 	if (printer->pageSelection() == KPrinter::SystemSide)
@@ -107,7 +108,6 @@
 		o = printer->option("kde-pageset");
 		if (!o.isEmpty() && o != "0")
 			printer->setOption("page-set",(o == "1" ? "odd" : "even"));
-		printer->setOption("multiple-document-handling",(printer->option("kde-collate") == \
"Collate" ? "separate-documents-collated-copies" : \
"separate-documents-uncollated-copies"));  }
 	else
 	{ // No translation needed (but range => (from,to))
@@ -119,6 +119,7 @@
 			printer->setOption("kde-to",QString::number(s.height()));
 		}
 	}
+	printer->setOption("multiple-document-handling",(printer->option("kde-collate") == \
"Collate" ? "separate-documents-collated-copies" : \
"separate-documents-uncollated-copies"));  
 	// needed for page size and margins
 	KPrinterImpl::preparePrinting(printer);


[prev in list] [next in list] [prev in thread] [next in thread]