Make Add Attribute dialog modal and set parent for all dialogs in chain. This fixes incorrect layering of stacked dialogs on Mac (bug #509).

telwertowski · telwertowski · commit 554a74a0c72c · 2007-01-16T20:22:43.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6438 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgisapp.cpp b/src/gui/qgisapp.cpp
@@ -2490,7 +2490,7 @@ void QgisApp::newVectorLayer()
   QGis::WKBTYPE geometrytype;
   QString fileformat;
 
-  QgsGeomTypeDialog geomDialog;
+  QgsGeomTypeDialog geomDialog(this);
   if(geomDialog.exec()==QDialog::Rejected)
   {
     return;
diff --git a/src/gui/qgsaddattrdialog.cpp b/src/gui/qgsaddattrdialog.cpp
@@ -18,8 +18,8 @@
 #include "qgsaddattrdialog.h"
 #include "qgsvectordataprovider.h"
 
-QgsAddAttrDialog::QgsAddAttrDialog(QgsVectorDataProvider* provider)
-: QDialog(), mDataProvider(provider)
+QgsAddAttrDialog::QgsAddAttrDialog(QgsVectorDataProvider* provider, QWidget *parent, Qt::WFlags fl)
+: QDialog(parent, fl), mDataProvider(provider)
 {
     setupUi(this);
     connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept()));
@@ -39,8 +39,8 @@ QgsAddAttrDialog::QgsAddAttrDialog(QgsVectorDataProvider* provider)
     }
 }
 
-QgsAddAttrDialog::QgsAddAttrDialog(const std::list<QString>& typelist)
-: QDialog(), mDataProvider(0)
+QgsAddAttrDialog::QgsAddAttrDialog(const std::list<QString>& typelist, QWidget *parent, Qt::WFlags fl)
+: QDialog(parent, fl), mDataProvider(0)
 {
     setupUi(this);
     connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept()));
diff --git a/src/gui/qgsaddattrdialog.h b/src/gui/qgsaddattrdialog.h
@@ -19,16 +19,18 @@
 #define QGSADDATTRDIALOG_H
 
 #include "ui_qgsaddattrdialogbase.h"
-#include <QDialog>
+#include "qgisgui.h"
 
 class QgsVectorDataProvider;
 
 class QgsAddAttrDialog: public QDialog, private Ui::QgsAddAttrDialogBase
 {
     Q_OBJECT
  public:
-    QgsAddAttrDialog(QgsVectorDataProvider* provider);
-    QgsAddAttrDialog(const std::list<QString>& typelist);
+    QgsAddAttrDialog(QgsVectorDataProvider* provider,
+                     QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
+    QgsAddAttrDialog(const std::list<QString>& typelist,
+                     QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
     QString name() const;
     QString type() const;
  protected:
diff --git a/src/gui/qgsattributetabledisplay.cpp b/src/gui/qgsattributetabledisplay.cpp
@@ -128,7 +128,7 @@ void QgsAttributeTableDisplay::deleteAttributes()
 
 void QgsAttributeTableDisplay::addAttribute()
 {
-  QgsAddAttrDialog dialog(mLayer->getDataProvider());
+  QgsAddAttrDialog dialog(mLayer->getDataProvider(), this);
   if(dialog.exec()==QDialog::Accepted)
   {
     if(!table()->addAttribute(dialog.name(),dialog.type()))
diff --git a/src/gui/qgsgeomtypedialog.cpp b/src/gui/qgsgeomtypedialog.cpp
@@ -19,7 +19,8 @@
 #include "qgsgeomtypedialog.h"
 #include "qgsaddattrdialog.h"
 
-QgsGeomTypeDialog::QgsGeomTypeDialog(): QDialog()
+QgsGeomTypeDialog::QgsGeomTypeDialog(QWidget *parent, Qt::WFlags fl)
+: QDialog(parent, fl)
 {
     setupUi(this);
     connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept()));
@@ -64,7 +65,7 @@ void QgsGeomTypeDialog::on_mAddAttributeButton_clicked()
     types.push_back("Real");
     types.push_back("Integer");
     types.push_back("String");
-    QgsAddAttrDialog d(types);
+    QgsAddAttrDialog d(types, this);
     if(d.exec()==QDialog::Accepted)
     {
 	Q3ListViewItem* attritem=new Q3ListViewItem(mAttributeView, d.name(), d.type());
diff --git a/src/gui/qgsgeomtypedialog.h b/src/gui/qgsgeomtypedialog.h
@@ -19,16 +19,16 @@
 #define QGSGEOMTYPEDIALOG_H
 
 #include "ui_qgsgeomtypedialogbase.h"
+#include "qgisgui.h"
 #include "qgscontexthelp.h"
-#include <QDialog>
 
 #include "qgis.h"
 
 class QgsGeomTypeDialog: public QDialog, private Ui::QgsGeomTypeDialogBase
 {
   Q_OBJECT
   public:
-  QgsGeomTypeDialog();
+  QgsGeomTypeDialog(QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
   ~QgsGeomTypeDialog();
   /**Returns the selected geometry type*/
   QGis::WKBTYPE selectedType() const;
diff --git a/src/ui/qgsaddattrdialogbase.ui b/src/ui/qgsaddattrdialogbase.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>QgsAddAttrDialogBase</class>
  <widget class="QDialog" name="QgsAddAttrDialogBase" >
   <property name="geometry" >
@@ -15,6 +12,9 @@
   <property name="windowTitle" >
    <string>Add Attribute</string>
   </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
   <layout class="QGridLayout" >
    <property name="margin" >
     <number>9</number>

Original file line number	Diff line number	Diff line change
`@@ -2490,7 +2490,7 @@ void QgisApp::newVectorLayer()`
`2490`	`2490`	`QGis::WKBTYPE geometrytype;`
`2491`	`2491`	`QString fileformat;`
`2492`	`2492`
`2493`		`- QgsGeomTypeDialog geomDialog;`
	`2493`	`+ QgsGeomTypeDialog geomDialog(this);`
`2494`	`2494`	`if(geomDialog.exec()==QDialog::Rejected)`
`2495`	`2495`	`{`
`2496`	`2496`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`	`#include "qgsaddattrdialog.h"`
`19`	`19`	`#include "qgsvectordataprovider.h"`
`20`	`20`
`21`		`-QgsAddAttrDialog::QgsAddAttrDialog(QgsVectorDataProvider* provider)`
`22`		`-: QDialog(), mDataProvider(provider)`
	`21`	`+QgsAddAttrDialog::QgsAddAttrDialog(QgsVectorDataProvider* provider, QWidget *parent, Qt::WFlags fl)`
	`22`	`+: QDialog(parent, fl), mDataProvider(provider)`
`23`	`23`	`{`
`24`	`24`	`setupUi(this);`
`25`	`25`	`connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept()));`
`@@ -39,8 +39,8 @@ QgsAddAttrDialog::QgsAddAttrDialog(QgsVectorDataProvider* provider)`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-QgsAddAttrDialog::QgsAddAttrDialog(const std::list<QString>& typelist)`
`43`		`-: QDialog(), mDataProvider(0)`
	`42`	`+QgsAddAttrDialog::QgsAddAttrDialog(const std::list<QString>& typelist, QWidget *parent, Qt::WFlags fl)`
	`43`	`+: QDialog(parent, fl), mDataProvider(0)`
`44`	`44`	`{`
`45`	`45`	`setupUi(this);`
`46`	`46`	`connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept()));`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ void QgsAttributeTableDisplay::deleteAttributes()`
`128`	`128`
`129`	`129`	`void QgsAttributeTableDisplay::addAttribute()`
`130`	`130`	`{`
`131`		`- QgsAddAttrDialog dialog(mLayer->getDataProvider());`
	`131`	`+ QgsAddAttrDialog dialog(mLayer->getDataProvider(), this);`
`132`	`132`	`if(dialog.exec()==QDialog::Accepted)`
`133`	`133`	`{`
`134`	`134`	`if(!table()->addAttribute(dialog.name(),dialog.type()))`