Add parameter for QgsMessageViewer to disable deleteOnClose, allows retrieving checkBoxState after dialog has closed

nyalldawson · nyalldawson · commit a3573cedf442 · 2013-05-06T08:39:29.000+10:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -2079,24 +2079,25 @@ void QgsComposer::showBlendModePrintingWarning()
 {
   if ( ! mComposition->printAsRaster() )
   {
-    QgsMessageViewer* m = new QgsMessageViewer( this );
+    QgsMessageViewer* m = new QgsMessageViewer( this, QgisGui::ModalDialogFlags, false );
     m->setWindowTitle( tr( "Project contains blend modes" ) );
     m->setMessage( tr( "Blend modes are enabled in this project, which cannot be printed as vectors. Printing as a raster is recommended." ), QgsMessageOutput::MessageText );
     m->setCheckBoxText( tr( "Print as raster" ) );
     m->setCheckBoxState( Qt::Checked );
     m->setCheckBoxVisible( true );
     m->showMessage( true );
 
-    // TODO - fix this - checkBoxState is never true
     // also need to make sure composer print as raster checkbox is updated
     if ( m->checkBoxState() == Qt::Checked )
     {
       mComposition->setPrintAsRaster( true );
     }
     else
     {
-      mComposition->setPrintAsRaster( true );
+      mComposition->setPrintAsRaster( false );
     }
+
+    delete m;
   }
 }
 
diff --git a/src/gui/qgsmessageviewer.cpp b/src/gui/qgsmessageviewer.cpp
@@ -18,12 +18,14 @@
 #include "qgsmessageviewer.h"
 #include <QSettings>
 
-QgsMessageViewer::QgsMessageViewer( QWidget *parent, Qt::WFlags fl )
+QgsMessageViewer::QgsMessageViewer( QWidget *parent, Qt::WFlags fl, bool deleteOnClose )
     : QDialog( parent, fl )
 {
   setupUi( this );
-  setAttribute( Qt::WA_DeleteOnClose );
-
+  if ( deleteOnClose )
+  {
+    setAttribute( Qt::WA_DeleteOnClose );
+  }
   // Default state for the checkbox
   setCheckBoxVisible( false );
   setCheckBoxState( Qt::Unchecked );
diff --git a/src/gui/qgsmessageviewer.h b/src/gui/qgsmessageviewer.h
@@ -31,7 +31,7 @@ class GUI_EXPORT QgsMessageViewer: public QDialog, public QgsMessageOutput, priv
 {
     Q_OBJECT
   public:
-    QgsMessageViewer( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsMessageViewer( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags, bool deleteOnClose = true );
     ~QgsMessageViewer();
 
     virtual void setMessage( const QString& message, MessageType msgType );

Original file line number	Diff line number	Diff line change
`@@ -2079,24 +2079,25 @@ void QgsComposer::showBlendModePrintingWarning()`
`2079`	`2079`	`{`
`2080`	`2080`	`if ( ! mComposition->printAsRaster() )`
`2081`	`2081`	`{`
`2082`		`- QgsMessageViewer* m = new QgsMessageViewer( this );`
	`2082`	`+ QgsMessageViewer* m = new QgsMessageViewer( this, QgisGui::ModalDialogFlags, false );`
`2083`	`2083`	`m->setWindowTitle( tr( "Project contains blend modes" ) );`
`2084`	`2084`	`m->setMessage( tr( "Blend modes are enabled in this project, which cannot be printed as vectors. Printing as a raster is recommended." ), QgsMessageOutput::MessageText );`
`2085`	`2085`	`m->setCheckBoxText( tr( "Print as raster" ) );`
`2086`	`2086`	`m->setCheckBoxState( Qt::Checked );`
`2087`	`2087`	`m->setCheckBoxVisible( true );`
`2088`	`2088`	`m->showMessage( true );`
`2089`	`2089`
`2090`		`- // TODO - fix this - checkBoxState is never true`
`2091`	`2090`	`// also need to make sure composer print as raster checkbox is updated`
`2092`	`2091`	`if ( m->checkBoxState() == Qt::Checked )`
`2093`	`2092`	`{`
`2094`	`2093`	`mComposition->setPrintAsRaster( true );`
`2095`	`2094`	`}`
`2096`	`2095`	`else`
`2097`	`2096`	`{`
`2098`		`- mComposition->setPrintAsRaster( true );`
	`2097`	`+ mComposition->setPrintAsRaster( false );`
`2099`	`2098`	`}`
	`2099`	`+`
	`2100`	`+ delete m;`
`2100`	`2101`	`}`
`2101`	`2102`	`}`
`2102`	`2103`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class GUI_EXPORT QgsMessageViewer: public QDialog, public QgsMessageOutput, priv`
`31`	`31`	`{`
`32`	`32`	`Q_OBJECT`
`33`	`33`	`public:`
`34`		`- QgsMessageViewer( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );`
	`34`	`+ QgsMessageViewer( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags, bool deleteOnClose = true );`
`35`	`35`	`~QgsMessageViewer();`
`36`	`36`
`37`	`37`	`virtual void setMessage( const QString& message, MessageType msgType );`