Fix modality of option dialogs

6 files changed, 13 insertions, 10 deletions

diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 5013e3d89..c4a1b5543 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -143,6 +143,7 @@ KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircSe
 	QString capt = __tr2qs("Remote mIRC servers.ini Import Wizard");
 	setWindowTitle(capt);
 
+	setModal(true);
 
 	m_pRequest = 0;
 	m_pFilter = f;
diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index 99fd32dec..72d5a78dc 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -99,7 +99,7 @@ OptionsDialogTreeWidgetItem::~OptionsDialogTreeWidgetItem()
 {
 }
 
-OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup)
+OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal)
 : QDialog(par)
 {
 	setObjectName("general_options_dialog");
@@ -270,6 +270,9 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup)
 	}
 
 	new QShortcut(Qt::Key_Escape,this,SLOT(close()));
+	
+	if(bModal)
+		setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal);
 }
 
 OptionsDialog::~OptionsDialog()
diff --git a/src/modules/options/OptionsDialog.h b/src/modules/options/OptionsDialog.h
index d3f7b98bc..c218486e2 100644
--- a/src/modules/options/OptionsDialog.h
+++ b/src/modules/options/OptionsDialog.h
@@ -64,7 +64,7 @@ class OptionsDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	OptionsDialog(QWidget * par,const QString &szGroup);
+	OptionsDialog(QWidget * par,const QString &szGroup,bool bModal);
 	~OptionsDialog();
 private:
 	QTreeWidget                  * m_pTreeWidget;
diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index 9c39fbf84..2c1938805 100644
--- a/src/modules/options/OptionsWidgetContainer.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -52,7 +52,7 @@ OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par,bool bModal)
 	m_pOptionsWidget = NULL;
 
 	if(bModal)
-		setWindowModality(Qt::ApplicationModal);
+		setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal);
 }
 
 OptionsWidgetContainer::~OptionsWidgetContainer()
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index bc247d567..ee1ce7a29 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -1844,10 +1844,10 @@ void OptionsWidget_servers::importPopupAboutToShow()
 	for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next())
 	{
 		if(d->icon())
-            pAction = m_pImportPopup->addAction(*(d->icon()),d->visibleName());
+			pAction = m_pImportPopup->addAction(*(d->icon()),d->visibleName());
 		else
-            pAction = m_pImportPopup->addAction(d->visibleName());
-        pAction->setData(d->id());
+			pAction = m_pImportPopup->addAction(d->visibleName());
+		pAction->setData(d->id());
 	}
 }
 
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index d818da6be..2327f496e 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -122,13 +122,12 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 	} else {
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			d = new OptionsDialog(0,szGroup);
+			d = new OptionsDialog(g_pMainWindow,szGroup,true);
 		} else {
-			d = new OptionsDialog(g_pMainWindow->splitter(),szGroup);
+			d = new OptionsDialog(g_pMainWindow->splitter(),szGroup,false);
 		}
 		g_pOptionsDialogDict->insert(szGroup,d);
 	}
-	d->setModal(true);
 	d->raise();
 	d->show();
 	d->setFocus();
@@ -217,7 +216,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	}
 
 	OptionsWidgetContainer * wc = new OptionsWidgetContainer(
-			0,
+			g_pMainWindow,
 			!c->hasSwitch('n',"non-modal")
 		);