diff --git a/python/plugins/GdalTools/GdalTools.py b/python/plugins/GdalTools/GdalTools.py
index 6f5eb9fdf14..ee6ba0c9403 100644
--- a/python/plugins/GdalTools/GdalTools.py
+++ b/python/plugins/GdalTools/GdalTools.py
@@ -96,8 +96,7 @@ class GdalTools:
 
     if rasterMenu == None:
         # no Raster menu, create and insert it before the Help menu
-        self.menu = QMenu()
-        self.menu.setTitle( rasterText )
+        self.menu = QMenu( rasterText, self.iface.mainWindow() )
         lastAction = actions[ len( actions ) - 1 ]
         menu_bar.insertMenu( lastAction, self.menu )
     else:
@@ -105,7 +104,7 @@ class GdalTools:
         self.menu.addSeparator()
 
     # projections menu (Warp (Reproject), Assign projection)
-    self.projectionsMenu = QMenu( QCoreApplication.translate( "GdalTools", "Projections" ) )
+    self.projectionsMenu = QMenu( QCoreApplication.translate( "GdalTools", "Projections" ), self.iface.mainWindow() )
 
     self.warp = QAction( QIcon(":/icons/warp.png"),  QCoreApplication.translate( "GdalTools", "Warp (Reproject)" ), self.iface.mainWindow() )
     self.warp.setStatusTip( QCoreApplication.translate( "GdalTools", "Warp an image into a new coordinate system") )
@@ -122,7 +121,7 @@ class GdalTools:
     self.projectionsMenu.addActions( [ self.warp, self.projection, self.extractProj ] )
 
     # conversion menu (Rasterize (Vector to raster), Polygonize (Raster to vector), Translate, RGB to PCT, PCT to RGB)
-    self.conversionMenu = QMenu( QCoreApplication.translate( "GdalTools", "Conversion" ) )
+    self.conversionMenu = QMenu( QCoreApplication.translate( "GdalTools", "Conversion" ), self.iface.mainWindow() )
 
     if self.GdalVersion >= "1.3":
       self.rasterize = QAction( QIcon(":/icons/rasterize.png"), QCoreApplication.translate( "GdalTools", "Rasterize (Vector to raster)" ), self.iface.mainWindow() )
@@ -151,7 +150,7 @@ class GdalTools:
     self.conversionMenu.addActions( [ self.translate, self.paletted, self.rgb ] )
 
     # extraction menu (Clipper, Contour)
-    self.extractionMenu = QMenu( QCoreApplication.translate( "GdalTools", "Extraction" ) )
+    self.extractionMenu = QMenu( QCoreApplication.translate( "GdalTools", "Extraction" ), self.iface.mainWindow() )
 
     if self.GdalVersion >= "1.6":
       self.contour = QAction( QIcon(":/icons/contour.png"), QCoreApplication.translate( "GdalTools", "Contour" ), self.iface.mainWindow() )
@@ -166,7 +165,7 @@ class GdalTools:
     self.extractionMenu.addActions( [ self.clipper ] )
 
     # analysis menu (DEM (Terrain model), Grid (Interpolation), Near black, Proximity (Raster distance), Sieve)
-    self.analysisMenu = QMenu( QCoreApplication.translate( "GdalTools", "Analysis" ) )
+    self.analysisMenu = QMenu( QCoreApplication.translate( "GdalTools", "Analysis" ), self.iface.mainWindow() )
 
     if self.GdalVersion >= "1.6":
       self.sieve = QAction( QIcon(":/icons/sieve.png"), QCoreApplication.translate( "GdalTools", "Sieve" ), self.iface.mainWindow() )
@@ -207,7 +206,7 @@ class GdalTools:
     #self.analysisMenu.addActions( [  ] )
 
     # miscellaneous menu (Build overviews (Pyramids), Tile index, Information, Merge, Build Virtual Raster (Catalog))
-    self.miscellaneousMenu = QMenu( QCoreApplication.translate( "GdalTools", "Miscellaneous" ) )
+    self.miscellaneousMenu = QMenu( QCoreApplication.translate( "GdalTools", "Miscellaneous" ), self.iface.mainWindow() )
 
     if self.GdalVersion >= "1.6":
       self.buildVRT = QAction( QIcon(":/icons/vrt.png"), QCoreApplication.translate( "GdalTools", "Build Virtual Raster (Catalog)" ), self.iface.mainWindow() )
diff --git a/python/plugins/GdalTools/tools/dialogSRS.py b/python/plugins/GdalTools/tools/dialogSRS.py
index b4e4fc4552f..c886053af20 100644
--- a/python/plugins/GdalTools/tools/dialogSRS.py
+++ b/python/plugins/GdalTools/tools/dialogSRS.py
@@ -5,8 +5,8 @@ from qgis.core import *
 from qgis.gui import *
 
 class GdalToolsSRSDialog(QDialog):
-  def __init__(self, title):
-      QDialog.__init__(self)
+  def __init__(self, title, parent):
+      QDialog.__init__(self, parent)
       self.setWindowTitle( title )
 
       layout = QVBoxLayout()
diff --git a/python/plugins/GdalTools/tools/doClipper.py b/python/plugins/GdalTools/tools/doClipper.py
index 2d4f3cae951..798bfd259c8 100644
--- a/python/plugins/GdalTools/tools/doClipper.py
+++ b/python/plugins/GdalTools/tools/doClipper.py
@@ -16,7 +16,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
       self.canvas = self.iface.mapCanvas()
 
       self.setupUi(self)
-      BasePluginWidget.__init__(self, self.iface, "gdal_translate", self.iface.mainWindow())
+      BasePluginWidget.__init__(self, self.iface, "gdal_translate")
 
       self.outSelector.setType( self.outSelector.FILE )
       self.extentSelector.setCanvas(self.canvas)
diff --git a/python/plugins/GdalTools/tools/doExtractProj.py b/python/plugins/GdalTools/tools/doExtractProj.py
index 3d4b158e799..ec988520869 100644
--- a/python/plugins/GdalTools/tools/doExtractProj.py
+++ b/python/plugins/GdalTools/tools/doExtractProj.py
@@ -21,7 +21,7 @@ except ImportError, e:
 
 class GdalToolsDialog( QDialog, Ui_Dialog ):
   def __init__( self, iface ):
-    QDialog.__init__( self )
+    QDialog.__init__( self, iface.mainWindow() )
     self.setupUi( self )
     self.iface = iface
 
diff --git a/python/plugins/GdalTools/tools/widgetBatchBase.py b/python/plugins/GdalTools/tools/widgetBatchBase.py
index 006afbda3de..228bdb2363d 100644
--- a/python/plugins/GdalTools/tools/widgetBatchBase.py
+++ b/python/plugins/GdalTools/tools/widgetBatchBase.py
@@ -9,8 +9,8 @@ import GdalTools_utils as Utils
 
 class GdalToolsBaseBatchWidget(BasePluginWidget):
 
-  def __init__(self, iface, commandName, helpFileBaseName = None):
-      BasePluginWidget.__init__(self, iface, commandName, helpFileBaseName)
+  def __init__(self, iface, commandName):
+      BasePluginWidget.__init__(self, iface, commandName)
 
   def getBatchArguments(self, inFile, outFile = None):
       arguments = QStringList()
diff --git a/python/plugins/GdalTools/tools/widgetPluginBase.py b/python/plugins/GdalTools/tools/widgetPluginBase.py
index f93b5c50964..75ab85b1c59 100644
--- a/python/plugins/GdalTools/tools/widgetPluginBase.py
+++ b/python/plugins/GdalTools/tools/widgetPluginBase.py
@@ -9,10 +9,10 @@ import GdalTools_utils as Utils
 
 class GdalToolsBasePluginWidget:
 
-  def __init__(self, iface, commandName, parent = None):
+  def __init__(self, iface, commandName):
       self.iface = iface
       self.initialized = False
-      self.base = BaseDialog(parent, iface, self, self.windowTitle(), commandName)
+      self.base = BaseDialog( iface.mainWindow(), iface, self, self.windowTitle(), commandName)
 
       self.connect(self.base, SIGNAL("processError(QProcess::ProcessError)"), self.onError)
       self.connect(self.base, SIGNAL("processFinished(int, QProcess::ExitStatus)"), self.onFinished)
diff --git a/python/plugins/fTools/tools/doDefineProj.py b/python/plugins/fTools/tools/doDefineProj.py
index 6fd325cabb3..9c1392554b5 100644
--- a/python/plugins/fTools/tools/doDefineProj.py
+++ b/python/plugins/fTools/tools/doDefineProj.py
@@ -38,7 +38,7 @@ from ui_frmReProject import Ui_Dialog
 
 class Dialog(QDialog, Ui_Dialog):
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         self.setupUi(self)
         self.toolOut.setEnabled(False)
diff --git a/python/plugins/fTools/tools/doGeometry.py b/python/plugins/fTools/tools/doGeometry.py
index 0b06f7383e4..5a141178e77 100644
--- a/python/plugins/fTools/tools/doGeometry.py
+++ b/python/plugins/fTools/tools/doGeometry.py
@@ -41,7 +41,7 @@ from sets import Set
 class GeometryDialog(QDialog, Ui_Dialog):
 
   def __init__(self, iface, function):
-    QDialog.__init__(self)
+    QDialog.__init__(self, iface.mainWindow())
     self.iface = iface
     self.setupUi(self)
     self.myFunction = function
diff --git a/python/plugins/fTools/tools/doGeoprocessing.py b/python/plugins/fTools/tools/doGeoprocessing.py
index 06746b9f49e..841ad491a06 100644
--- a/python/plugins/fTools/tools/doGeoprocessing.py
+++ b/python/plugins/fTools/tools/doGeoprocessing.py
@@ -40,7 +40,7 @@ import sys
 
 class GeoprocessingDialog( QDialog, Ui_Dialog ):
   def __init__( self, iface, function ):
-    QDialog.__init__( self )
+    QDialog.__init__( self, iface.mainWindow() )
     self.iface = iface
     self.setupUi( self )
     self.param.setValidator(QDoubleValidator(self.param))
diff --git a/python/plugins/fTools/tools/doIntersectLines.py b/python/plugins/fTools/tools/doIntersectLines.py
index 0b95947eae8..8e370c14bb8 100644
--- a/python/plugins/fTools/tools/doIntersectLines.py
+++ b/python/plugins/fTools/tools/doIntersectLines.py
@@ -37,7 +37,7 @@ from ui_frmIntersectLines import Ui_Dialog
 class Dialog(QDialog, Ui_Dialog):
 
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         # Set up the user interface from Designer.
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doMeanCoords.py b/python/plugins/fTools/tools/doMeanCoords.py
index 34eb1200ba2..d224fedcd34 100644
--- a/python/plugins/fTools/tools/doMeanCoords.py
+++ b/python/plugins/fTools/tools/doMeanCoords.py
@@ -37,7 +37,7 @@ from ui_frmMeanCoords import Ui_Dialog
 
 class Dialog(QDialog, Ui_Dialog):
     def __init__(self, iface, function):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         self.function = function
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doMergeShapes.py b/python/plugins/fTools/tools/doMergeShapes.py
index aa0abe51430..fe600e071ef 100644
--- a/python/plugins/fTools/tools/doMergeShapes.py
+++ b/python/plugins/fTools/tools/doMergeShapes.py
@@ -12,7 +12,7 @@ from ui_frmMergeShapes import Ui_Dialog
 
 class Dialog( QDialog, Ui_Dialog ):
   def __init__( self, iface ):
-    QDialog.__init__( self )
+    QDialog.__init__( self, iface.mainWindow() )
     self.setupUi( self )
     self.iface = iface
 
diff --git a/python/plugins/fTools/tools/doPointDistance.py b/python/plugins/fTools/tools/doPointDistance.py
index 00a8231cb87..b09d2e91edb 100644
--- a/python/plugins/fTools/tools/doPointDistance.py
+++ b/python/plugins/fTools/tools/doPointDistance.py
@@ -73,7 +73,7 @@ class UnicodeWriter:
 
 class Dialog(QDialog, Ui_Dialog):
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         # Set up the user interface from Designer.
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doPointsInPolygon.py b/python/plugins/fTools/tools/doPointsInPolygon.py
index ea3c228d452..3e4ee3a4040 100644
--- a/python/plugins/fTools/tools/doPointsInPolygon.py
+++ b/python/plugins/fTools/tools/doPointsInPolygon.py
@@ -37,7 +37,7 @@ from ui_frmPointsInPolygon import Ui_Dialog
 class Dialog(QDialog, Ui_Dialog):
 
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         # Set up the user interface from Designer.
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doRandPoints.py b/python/plugins/fTools/tools/doRandPoints.py
index 423f39f9409..6c643ba2f29 100644
--- a/python/plugins/fTools/tools/doRandPoints.py
+++ b/python/plugins/fTools/tools/doRandPoints.py
@@ -38,7 +38,7 @@ from ui_frmRandPoints import Ui_Dialog
 
 class Dialog(QDialog, Ui_Dialog):
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         self.setupUi(self)
         QObject.connect(self.toolOut, SIGNAL("clicked()"), self.outFile)
diff --git a/python/plugins/fTools/tools/doRandom.py b/python/plugins/fTools/tools/doRandom.py
index 928e8c07f29..e817f6805c7 100644
--- a/python/plugins/fTools/tools/doRandom.py
+++ b/python/plugins/fTools/tools/doRandom.py
@@ -37,7 +37,7 @@ from ui_frmRandom import Ui_Dialog
 import random
 class Dialog(QDialog, Ui_Dialog):
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         # Set up the user interface from Designer.
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doRegPoints.py b/python/plugins/fTools/tools/doRegPoints.py
index 0d3a19e7590..69d84adb4f5 100644
--- a/python/plugins/fTools/tools/doRegPoints.py
+++ b/python/plugins/fTools/tools/doRegPoints.py
@@ -38,7 +38,7 @@ from ui_frmRegPoints import Ui_Dialog
 
 class Dialog(QDialog, Ui_Dialog):
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         self.setupUi(self)
         self.xMin.setValidator(QDoubleValidator(self.xMin))
diff --git a/python/plugins/fTools/tools/doSelectByLocation.py b/python/plugins/fTools/tools/doSelectByLocation.py
index 1c05e500f40..aca7b41a934 100644
--- a/python/plugins/fTools/tools/doSelectByLocation.py
+++ b/python/plugins/fTools/tools/doSelectByLocation.py
@@ -37,7 +37,7 @@ from ui_frmPointsInPolygon import Ui_Dialog
 class Dialog(QDialog, Ui_Dialog):
 
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         # Set up the user interface from Designer.
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doSimplify.py b/python/plugins/fTools/tools/doSimplify.py
index 821a7da83be..f3673f2bb1f 100644
--- a/python/plugins/fTools/tools/doSimplify.py
+++ b/python/plugins/fTools/tools/doSimplify.py
@@ -40,7 +40,7 @@ from ui_frmSimplify import Ui_Dialog
 
 class Dialog( QDialog, Ui_Dialog ):
   def __init__( self, iface, function ):
-    QDialog.__init__( self )
+    QDialog.__init__( self, iface.mainWindow() )
     self.setupUi( self )
     self.iface = iface
     self.myFunction = function
diff --git a/python/plugins/fTools/tools/doSpatialIndex.py b/python/plugins/fTools/tools/doSpatialIndex.py
index 9372d539bfd..7ca10d608f1 100644
--- a/python/plugins/fTools/tools/doSpatialIndex.py
+++ b/python/plugins/fTools/tools/doSpatialIndex.py
@@ -29,7 +29,7 @@ from ui_frmSpatialIndex import Ui_Dialog
 
 class Dialog( QDialog, Ui_Dialog ):
   def __init__( self, iface ):
-    QDialog.__init__( self )
+    QDialog.__init__( self, iface.mainWindow() )
     self.setupUi( self )
     self.iface = iface
 
diff --git a/python/plugins/fTools/tools/doSpatialJoin.py b/python/plugins/fTools/tools/doSpatialJoin.py
index b502b83fa03..23276bc84f3 100644
--- a/python/plugins/fTools/tools/doSpatialJoin.py
+++ b/python/plugins/fTools/tools/doSpatialJoin.py
@@ -54,7 +54,7 @@ def myself(L):
 class Dialog(QDialog, Ui_Dialog):
 
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         # Set up the user interface from Designer.
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doSubsetSelect.py b/python/plugins/fTools/tools/doSubsetSelect.py
index 1f7c1a7d440..e1872c36655 100644
--- a/python/plugins/fTools/tools/doSubsetSelect.py
+++ b/python/plugins/fTools/tools/doSubsetSelect.py
@@ -37,7 +37,7 @@ from ui_frmSubsetSelect import Ui_Dialog
 class Dialog(QDialog, Ui_Dialog):
 
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         # Set up the user interface from Designer.
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doSumLines.py b/python/plugins/fTools/tools/doSumLines.py
index f04be8eaa44..49b68e1dcca 100644
--- a/python/plugins/fTools/tools/doSumLines.py
+++ b/python/plugins/fTools/tools/doSumLines.py
@@ -37,7 +37,7 @@ from ui_frmSumLines import Ui_Dialog
 class Dialog(QDialog, Ui_Dialog):
 
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         # Set up the user interface from Designer.
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doValidate.py b/python/plugins/fTools/tools/doValidate.py
index f72c946c54e..be740a7725e 100644
--- a/python/plugins/fTools/tools/doValidate.py
+++ b/python/plugins/fTools/tools/doValidate.py
@@ -67,11 +67,11 @@ class MarkerErrorGeometry():
 
 class ValidateDialog( QDialog, Ui_Dialog ):
   def __init__(self, iface):
-    QDialog.__init__(self)
+    QDialog.__init__(self, iface.mainWindow())
     self.iface = iface
     self.setupUi(self)
-    self.setModal(False) # we want to be able to interact with the featuresmc.extent().width()
-    self.setWindowFlags( Qt.SubWindow )
+#   self.setModal(False) # we want to be able to interact with the featuresmc.extent().width()
+#   self.setWindowFlags( Qt.SubWindow )
     # adjust user interface
     self.setWindowTitle( self.tr( "Check geometry validity" ) )
     self.cmbField.setVisible( False )
diff --git a/python/plugins/fTools/tools/doVectorGrid.py b/python/plugins/fTools/tools/doVectorGrid.py
index 93f839dd48e..f0afff97d4b 100644
--- a/python/plugins/fTools/tools/doVectorGrid.py
+++ b/python/plugins/fTools/tools/doVectorGrid.py
@@ -36,7 +36,7 @@ from ui_frmVectorGrid import Ui_Dialog
 
 class Dialog(QDialog, Ui_Dialog):
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
         self.setupUi(self)
         QObject.connect(self.toolOut, SIGNAL("clicked()"), self.outFile)
diff --git a/python/plugins/fTools/tools/doVectorSplit.py b/python/plugins/fTools/tools/doVectorSplit.py
index 26677fb0872..4bb859061f2 100644
--- a/python/plugins/fTools/tools/doVectorSplit.py
+++ b/python/plugins/fTools/tools/doVectorSplit.py
@@ -36,7 +36,7 @@ from ui_frmVectorSplit import Ui_Dialog
 
 class Dialog(QDialog, Ui_Dialog):
     def __init__(self, iface):
-        QDialog.__init__(self)
+        QDialog.__init__(self, iface.mainWindow())
         self.iface = iface
 
         self.setupUi(self)
diff --git a/python/plugins/fTools/tools/doVisual.py b/python/plugins/fTools/tools/doVisual.py
index 5d5aef0e95e..a26fdfe2222 100644
--- a/python/plugins/fTools/tools/doVisual.py
+++ b/python/plugins/fTools/tools/doVisual.py
@@ -37,7 +37,7 @@ import math
 
 class VisualDialog( QDialog, Ui_Dialog ):
   def __init__( self, iface, function ):
-    QDialog.__init__( self )
+    QDialog.__init__( self, iface.mainWindow() )
     self.iface = iface
     self.setupUi( self )
     self.myFunction = function
diff --git a/python/plugins/mapserver_export/mapserverexport.py b/python/plugins/mapserver_export/mapserverexport.py
index 2c874ec22b3..db2a335c0fb 100755
--- a/python/plugins/mapserver_export/mapserverexport.py
+++ b/python/plugins/mapserver_export/mapserverexport.py
@@ -73,7 +73,7 @@ class MapServerExport:
   # run method that performs all the real work
   def run(self): 
     # create and show the MapServerExport dialog 
-    self.dlg = MapServerExportDialog()
+    self.dlg = MapServerExportDialog(self.iface.mainWindow())
     # attach events to inputs and buttons
     QObject.connect(self.dlg.ui.btnChooseFile, SIGNAL("clicked()"), self.setMapFile)
     QObject.connect(self.dlg.ui.txtMapFilePath, SIGNAL("textChanged(QString)"), self.mapfileChanged)
diff --git a/python/plugins/mapserver_export/mapserverexportdialog.py b/python/plugins/mapserver_export/mapserverexportdialog.py
index a73611cc347..5b422b49aaf 100755
--- a/python/plugins/mapserver_export/mapserverexportdialog.py
+++ b/python/plugins/mapserver_export/mapserverexportdialog.py
@@ -17,23 +17,23 @@
  *                                                                         *
  ***************************************************************************/
 """
-from PyQt4 import QtCore, QtGui 
+from PyQt4 import QtCore, QtGui
 from ms_export import defaults
 from ui_qgsmapserverexportbase import Ui_QgsMapserverExportBase
 # create the dialog for mapserver export
-class MapServerExportDialog(QtGui.QDialog): 
-  def __init__(self):
-    QtGui.QDialog.__init__(self) 
-    # Set up the user interface from Designer. 
-    self.ui = Ui_QgsMapserverExportBase() 
-    self.ui.setupUi(self) 
+class MapServerExportDialog(QtGui.QDialog):
+  def __init__(self, parent):
+    QtGui.QDialog.__init__(self, parent)
+    # Set up the user interface from Designer.
+    self.ui = Ui_QgsMapserverExportBase()
+    self.ui.setupUi(self)
 
     units =  ["meters", "dd", "feet", "miles", "inches", "kilometers"]
     # make them able to be translated
     tr_units = [ QtGui.QApplication.translate("QgsMapserverExportBase", "meters", None, QtGui.QApplication.UnicodeUTF8), QtGui.QApplication.translate("QgsMapserverExportBase", "dd", None, QtGui.QApplication.UnicodeUTF8), QtGui.QApplication.translate("QgsMapserverExportBase", "feet", None, QtGui.QApplication.UnicodeUTF8), QtGui.QApplication.translate("QgsMapserverExportBase", "miles", None, QtGui.QApplication.UnicodeUTF8), QtGui.QApplication.translate("QgsMapserverExportBase", "inches", None, QtGui.QApplication.UnicodeUTF8), QtGui.QApplication.translate("QgsMapserverExportBase", "kilometers", None, QtGui.QApplication.UnicodeUTF8) ]
     for unit in units:
         self.ui.cmbMapUnits.addItem( QtGui.QApplication.translate("QgsMapserverExportBase", unit, None, QtGui.QApplication.UnicodeUTF8), QtCore.QVariant(unit) )
-    
+
     # TODO: set default unit. Is now the first value entered in the unit-list above
 
     # Set defaults from ms_export.py:
diff --git a/python/plugins/osm/OsmAddRelationDlg.py b/python/plugins/osm/OsmAddRelationDlg.py
index c7a48d69f92..ec601c94543 100755
--- a/python/plugins/osm/OsmAddRelationDlg.py
+++ b/python/plugins/osm/OsmAddRelationDlg.py
@@ -37,7 +37,7 @@ class OsmAddRelationDlg(QDialog, Ui_OsmAddRelationDlg):
         @param relationToEdit if relation is given, this dialog is for editing of existing relation, not for creation a new one
         """
 
-        QDialog.__init__(self,None)
+        QDialog.__init__(self, plugin.iface.mainWindow())
         self.setupUi(self)
         self.dockWidget=plugin.dockWidget
         self.plugin=plugin
diff --git a/python/plugins/osm/OsmDownloadDlg.py b/python/plugins/osm/OsmDownloadDlg.py
index 153eb1ed8f9..cc01488bb5b 100755
--- a/python/plugins/osm/OsmDownloadDlg.py
+++ b/python/plugins/osm/OsmDownloadDlg.py
@@ -46,7 +46,7 @@ class OsmDownloadDlg(QDialog, Ui_OsmDownloadDlg):
         @param plugin is pointer to instance of OSM Plugin.
         """
 
-        QDialog.__init__(self, None)
+        QDialog.__init__(self, plugin.iface.mainWindow())
         self.setupUi(self)
         self.dbm=plugin.dbm
 
diff --git a/python/plugins/osm/OsmImportDlg.py b/python/plugins/osm/OsmImportDlg.py
index 67011efc3bf..bf238c53439 100755
--- a/python/plugins/osm/OsmImportDlg.py
+++ b/python/plugins/osm/OsmImportDlg.py
@@ -53,7 +53,7 @@ class OsmImportDlg(QDialog, Ui_OsmImportDlg):
         @param plugin is pointer to instance of OSM Plugin
         """
 
-        QDialog.__init__(self, None)
+        QDialog.__init__(self, plugin.iface.mainWindow())
         self.setupUi(self)
 
         self.plugin=plugin
diff --git a/python/plugins/osm/OsmLoadDlg.py b/python/plugins/osm/OsmLoadDlg.py
index 18bc3f81e5c..de71a1020c4 100755
--- a/python/plugins/osm/OsmLoadDlg.py
+++ b/python/plugins/osm/OsmLoadDlg.py
@@ -40,7 +40,7 @@ class OsmLoadDlg(QDialog, Ui_OsmLoadDlg):
         @param plugin is pointer to instance of OSM Plugin
         """
 
-        QDialog.__init__(self, None)
+        QDialog.__init__(self, plugin.iface.mainWindow())
         self.setupUi(self)
 
         self.canvas=plugin.canvas
diff --git a/python/plugins/osm/OsmSaveDlg.py b/python/plugins/osm/OsmSaveDlg.py
index 0ffaa7d7f26..94026920957 100755
--- a/python/plugins/osm/OsmSaveDlg.py
+++ b/python/plugins/osm/OsmSaveDlg.py
@@ -31,7 +31,7 @@ class OsmSaveDlg(QDialog, Ui_OsmSaveDlg):
         @param plugin is pointer to instance of OSM Plugin
         """
 
-        QDialog.__init__(self, None)
+        QDialog.__init__(self, plugin.iface.mainWindow())
         self.setupUi(self)
 
         self.plugin=plugin
diff --git a/python/plugins/osm/OsmUploadDlg.py b/python/plugins/osm/OsmUploadDlg.py
index c85148f58b9..a592b999b82 100755
--- a/python/plugins/osm/OsmUploadDlg.py
+++ b/python/plugins/osm/OsmUploadDlg.py
@@ -47,7 +47,7 @@ class OsmUploadDlg(QDialog, Ui_OsmUploadDlg):
         @param plugin is pointer to instance of OSM Plugin.
         """
 
-        QDialog.__init__(self,None)
+        QDialog.__init__(self, plugin.iface.mainWindow())
         self.setupUi(self)
 
         self.dockWidget=plugin.dockWidget
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 9cd8d336a14..c9b1a0a0cf7 100755
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -3062,7 +3062,7 @@ void QgisApp::newPrintComposer()
 
 void QgisApp::showComposerManager()
 {
-  QgsComposerManager m;
+  QgsComposerManager m( this );
   m.exec();
 }
 
@@ -5149,7 +5149,7 @@ void QgisApp::addMapLayer( QgsMapLayer *theMapLayer )
 void QgisApp::embedLayers()
 {
   //dialog to select groups/layers from other project files
-  QgsEmbedLayerDialog d;
+  QgsEmbedLayerDialog d( this );
   if ( d.exec() == QDialog::Accepted )
   {
     mMapCanvas->freeze( true );
diff --git a/src/plugins/grass/qgsgrassbrowser.cpp b/src/plugins/grass/qgsgrassbrowser.cpp
index db404e4eb7c..764378465cc 100644
--- a/src/plugins/grass/qgsgrassbrowser.cpp
+++ b/src/plugins/grass/qgsgrassbrowser.cpp
@@ -259,7 +259,7 @@ void QgsGrassBrowser::copyMap()
       typeName = "region";
     }
 
-    QgsGrassElementDialog ed;
+    QgsGrassElementDialog ed( this );
     bool ok;
     QString source;
     QString suggest;
@@ -344,7 +344,7 @@ void QgsGrassBrowser::renameMap()
       typeName = "region";
     }
 
-    QgsGrassElementDialog ed;
+    QgsGrassElementDialog ed( this );
     bool ok;
     QString newName = ed.getItem( element, tr( "New name" ),
                                   tr( "New name for layer \"%1\"" ).arg( map ), "", map, &ok );
diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
index 408539db956..017cad9f84a 100644
--- a/src/plugins/grass/qgsgrassmapcalc.cpp
+++ b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -40,7 +40,7 @@ QgsGrassMapcalc::QgsGrassMapcalc(
   QgsGrassTools *tools, QgsGrassModule *module,
   QgisInterface *iface,
   QWidget * parent, Qt::WFlags f )
-    : QMainWindow( 0, Qt::Dialog )
+    : QMainWindow( iface->mainWindow(), Qt::Dialog )
     , QgsGrassMapcalcBase( )
     , QgsGrassModuleOptions( tools, module, iface )
     , mTool( -1 )
@@ -1255,7 +1255,7 @@ void QgsGrassMapcalc::load()
 {
   QgsDebugMsg( "entered." );
 
-  QgsGrassSelect *sel = new QgsGrassSelect( QgsGrassSelect::MAPCALC );
+  QgsGrassSelect *sel = new QgsGrassSelect( this, QgsGrassSelect::MAPCALC );
   if ( sel->exec() == QDialog::Rejected )
     return;
 
diff --git a/src/plugins/grass/qgsgrassmodule.h b/src/plugins/grass/qgsgrassmodule.h
index cc143c8d4ca..3aa722d6d88 100644
--- a/src/plugins/grass/qgsgrassmodule.h
+++ b/src/plugins/grass/qgsgrassmodule.h
@@ -52,7 +52,7 @@ class QgsGrassModule: public QDialog, private  Ui::QgsGrassModuleBase
   public:
     //! Constructor
     QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisInterface *iface,
-                    QString path, QWidget * parent = 0, Qt::WFlags f = 0 );
+                    QString path, QWidget *parent, Qt::WFlags f = 0 );
 
     //! Destructor
     ~QgsGrassModule();
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
index 6894ea5bf38..4d98dd571f2 100644
--- a/src/plugins/grass/qgsgrassplugin.cpp
+++ b/src/plugins/grass/qgsgrassplugin.cpp
@@ -292,7 +292,7 @@ void QgsGrassPlugin::addVector()
 // QgsDebugMsg("entered.");
   QString uri;
 
-  QgsGrassSelect *sel = new QgsGrassSelect( QgsGrassSelect::VECTOR );
+  QgsGrassSelect *sel = new QgsGrassSelect( qGisInterface->mainWindow(), QgsGrassSelect::VECTOR );
   if ( sel->exec() )
   {
     uri = sel->gisdbase + "/" + sel->location + "/" + sel->mapset + "/" + sel->map + "/" + sel->layer;
@@ -387,7 +387,7 @@ void QgsGrassPlugin::addRaster()
 // QgsDebugMsg("entered.");
   QString uri;
 
-  QgsGrassSelect *sel = new QgsGrassSelect( QgsGrassSelect::RASTER );
+  QgsGrassSelect *sel = new QgsGrassSelect( qGisInterface->mainWindow(), QgsGrassSelect::RASTER );
   if ( sel->exec() )
   {
     QString element;
@@ -520,7 +520,7 @@ void QgsGrassPlugin::newVector()
   bool ok;
   QString name;
 
-  QgsGrassElementDialog dialog;
+  QgsGrassElementDialog dialog( qGisInterface->mainWindow() );
   name = dialog.getItem( "vector", tr( "New vector name" ),
                          tr( "New vector name" ), "", "", &ok );
 
@@ -710,7 +710,7 @@ void QgsGrassPlugin::openMapset()
 
   QString element;
 
-  QgsGrassSelect *sel = new QgsGrassSelect( QgsGrassSelect::MAPSET );
+  QgsGrassSelect *sel = new QgsGrassSelect( qGisInterface->mainWindow(), QgsGrassSelect::MAPSET );
 
   if ( !sel->exec() )
     return;
diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp
index d56c4eb9ca7..98c8b7e25b6 100644
--- a/src/plugins/grass/qgsgrassselect.cpp
+++ b/src/plugins/grass/qgsgrassselect.cpp
@@ -29,7 +29,7 @@ extern "C"
 }
 
 
-QgsGrassSelect::QgsGrassSelect( int type ): QgsGrassSelectBase()
+QgsGrassSelect::QgsGrassSelect( QWidget *parent, int type ): QDialog( parent ), QgsGrassSelectBase()
 {
   QgsDebugMsg( QString( "QgsGrassSelect() type = %1" ).arg( type ) );
 
diff --git a/src/plugins/grass/qgsgrassselect.h b/src/plugins/grass/qgsgrassselect.h
index 90c5a577008..dabce392449 100644
--- a/src/plugins/grass/qgsgrassselect.h
+++ b/src/plugins/grass/qgsgrassselect.h
@@ -28,7 +28,7 @@ class QgsGrassSelect: public QDialog, private Ui::QgsGrassSelectBase
   public:
     //! Constructor
     //QgsGrassSelect(QWidget *parent = 0, int type = VECTOR );
-    QgsGrassSelect( int type = VECTOR );
+    QgsGrassSelect( QWidget *parent, int type = VECTOR );
     //! Destructor
     ~QgsGrassSelect();
 
diff --git a/src/plugins/grass/qgsgrassutils.cpp b/src/plugins/grass/qgsgrassutils.cpp
index 5b7af009ec8..594018d9fa5 100644
--- a/src/plugins/grass/qgsgrassutils.cpp
+++ b/src/plugins/grass/qgsgrassutils.cpp
@@ -65,7 +65,7 @@ bool QgsGrassUtils::itemExists( QString element, QString item )
   return fi.exists();
 }
 
-QgsGrassElementDialog::QgsGrassElementDialog() : QObject()
+QgsGrassElementDialog::QgsGrassElementDialog( QWidget *parent ) : QObject(), mParent( parent )
 {
 }
 
@@ -80,7 +80,7 @@ QString QgsGrassElementDialog::getItem( QString element,
     *ok = false;
   mElement = element;
   mSource = source;
-  mDialog = new QDialog();
+  mDialog = new QDialog( mParent );
   mDialog->setWindowTitle( title );
   QVBoxLayout *layout = new QVBoxLayout( mDialog );
   QHBoxLayout *buttonLayout = new QHBoxLayout( );
diff --git a/src/plugins/grass/qgsgrassutils.h b/src/plugins/grass/qgsgrassutils.h
index cb457bdc081..13bad6a522c 100644
--- a/src/plugins/grass/qgsgrassutils.h
+++ b/src/plugins/grass/qgsgrassutils.h
@@ -58,7 +58,7 @@ class QgsGrassElementDialog: public QObject
 
   public:
     //! Constructor
-    QgsGrassElementDialog();
+    QgsGrassElementDialog( QWidget *parent );
 
     //! Destructor
     ~QgsGrassElementDialog();
@@ -83,6 +83,7 @@ class QgsGrassElementDialog: public QObject
     QLabel *mErrorLabel;
     QPushButton *mOkButton;
     QPushButton *mCancelButton;
+    QWidget *mParent;
 };
 
 #endif // QGSGRASSUTILS_H
diff --git a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
index 79a6a984c8d..95c6539b8bd 100644
--- a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
+++ b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
@@ -20,10 +20,11 @@
 #include "qgsrasterlayer.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
+#include "qgisinterface.h"
 
 #include <QSettings>
 
-QgsZonalStatisticsDialog::QgsZonalStatisticsDialog( QgisInterface* iface ): QDialog(), mIface( iface )
+QgsZonalStatisticsDialog::QgsZonalStatisticsDialog( QgisInterface* iface ): QDialog( iface->mainWindow() ), mIface( iface )
 {
   setupUi( this );