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

List:       kde-commits
Subject:    qt-copy
From:       David Faure <faure () kde ! org>
Date:       2008-07-22 18:46:18
Message-ID: 1216752378.259347.15755.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 836672 by dfaure:

Patch by Thomas Zander to fix "[Bug 162793] Qt handles real printers as local file".
CCBUG: 162793
CCMAIL: kde-packager@kde.org


 M  +1 -2      patches/0237-printdialog-assert.diff  
 A             patches/0240-printdialog-print-into-real-printer.diff  
 M  +1 -1      patches/README  
 M  +6 -3      src/gui/dialogs/qprintdialog_unix.cpp  


--- trunk/qt-copy/patches/0237-printdialog-assert.diff #836671:836672
@@ -4,8 +4,7 @@
 applied: yes
 author: TT (TZ)
 
-Fix assert when opening print dialog. Might also fix the use of the wrong printer
-when QAbstractPrintDialog::PrintToFile is unset, let's see...
+Fix assert when opening print dialog.
 
 --- src/gui/dialogs/qprintdialog_unix.cpp
 +++ src/gui/dialogs/qprintdialog_unix.cpp
--- trunk/qt-copy/patches/README #836671:836672
@@ -1,5 +1,5 @@
 Please assign the numbers incrementally, and don't reuse them. The next one:
-#0240
+#0241
 
 This directory contains patches for Qt that haven't been accepted by TrollTech
 yet. All patches in this directory itself shouldn't make qt-copy incompatible
--- trunk/qt-copy/src/gui/dialogs/qprintdialog_unix.cpp #836671:836672
@@ -936,9 +936,12 @@
 
 void QUnixPrintWidgetPrivate::setupPrinter()
 {
-    // printer or file name
-    if (widget.printers->currentIndex() >= widget.printers->count() - 2) {
-        if (widget.printers->currentIndex() == widget.printers->count() - 2)
+    const int printerCount = widget.printers->count();
+    const int index = widget.printers->currentIndex();
+
+    if (filePrintersAdded && index > printerCount - 3) { // PDF or postscript
+        Q_ASSERT(index != printerCount - 3); // separator
+        if (index == printerCount - 2)
             printer->setOutputFormat(QPrinter::PdfFormat);
         else
             printer->setOutputFormat(QPrinter::PostScriptFormat);
[prev in list] [next in list] [prev in thread] [next in thread]