From dc4456a2f54c792b768b77f6f32b3f0cfce9be93 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Wed, 3 Mar 2010 02:50:00 +0000
Subject: [PATCH] refs #1283  added debug printing

---
 build_num                 |  2 +-
 src/gui/FWWindowPrint.cpp | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build_num b/build_num
index d81e8d07d..3f0a3a9b9 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2643
+#define BUILD_NUM 2644
diff --git a/src/gui/FWWindowPrint.cpp b/src/gui/FWWindowPrint.cpp
index 5b9d2e534..7cb81c882 100644
--- a/src/gui/FWWindowPrint.cpp
+++ b/src/gui/FWWindowPrint.cpp
@@ -58,7 +58,7 @@ void FWWindow::filePrint()
 {
     if (!activeProject())
     {
-        if (fwbdebug) qDebug("There isn't any selected subwindow");
+        if (fwbdebug) qDebug() << "There isn't any selected subwindow";
         return;
     }
 
@@ -146,18 +146,24 @@ void FWWindow::filePrint()
         //printer->setResolution(resolution);
         printer->setFullPage(fullPage);
 
+        if (fwbdebug) qDebug() << "Running QPrintDialog";
+
         QPrintDialog pdialog(printer, this);
 
+        pdialog.setWindowTitle(tr("Print configuration of %1")
+                               .arg(firewall_to_print->getName().c_str()));
         pdialog.addEnabledOption(QAbstractPrintDialog::PrintPageRange);
         pdialog.setMinMax(1,9999);
         pdialog.setPrintRange(QAbstractPrintDialog::AllPages);
 
-        if (pdialog.exec())
+        if (pdialog.exec() == QDialog::Accepted)
         {
+            if (fwbdebug) qDebug() << "QPrintDialog finished";
+
             int fromPage = printer->fromPage();
             int toPage = printer->toPage();
-            if (fromPage==0) fromPage=1;
-            if (toPage==0) toPage=9999;
+            if (fromPage==0) fromPage = 1;
+            if (toPage==0) toPage = 9999;
 
             showStatusBarMessage(tr("Printing..." ));
 
@@ -177,7 +183,7 @@ void FWWindow::filePrint()
             pr.setFromTo(fromPage, toPage);
 
             if (fwbdebug)
-                qDebug("Printer resolution: %d dpi", printer->resolution());
+                qDebug() << "Printer resolution (dpi):" << printer->resolution();
 
             if ( !pr.begin())
             {
@@ -211,6 +217,7 @@ void FWWindow::filePrint()
 
         } else
         {
+            if (fwbdebug) qDebug() << "QPrintDialog cancelled";
             showStatusBarMessage(tr("Printing cancelled"));
         }