Merge pull request #1298 from manisandro/composer_window_modal

nyalldawson · nyalldawson · commit 84d3270ace4d · 2014-04-09T12:38:05.000+10:00
Make QgsComposer window WindowModal
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -100,6 +100,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
 {
   setupUi( this );
   setWindowTitle( mTitle );
+  setWindowModality( Qt::WindowModal );
   setupTheme();
 
   QSettings settings;
@@ -3201,3 +3202,4 @@ void QgsComposer::updateAtlasMapLayerAction( bool atlasEnabled )
     connect( mAtlasFeatureAction, SIGNAL( triggeredForFeature( QgsMapLayer*, QgsFeature* ) ), this, SLOT( setAtlasFeature( QgsMapLayer*, QgsFeature* ) ) );
   }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )`
`100`	`100`	`{`
`101`	`101`	`setupUi( this );`
`102`	`102`	`setWindowTitle( mTitle );`
	`103`	`+ setWindowModality( Qt::WindowModal );`
`103`	`104`	`setupTheme();`
`104`	`105`
`105`	`106`	`QSettings settings;`
`@@ -3201,3 +3202,4 @@ void QgsComposer::updateAtlasMapLayerAction( bool atlasEnabled )`
`3201`	`3202`	`connect( mAtlasFeatureAction, SIGNAL( triggeredForFeature( QgsMapLayer, QgsFeature ) ), this, SLOT( setAtlasFeature( QgsMapLayer, QgsFeature ) ) );`
`3202`	`3203`	`}`
`3203`	`3204`	`}`
	`3205`	`+`