File dialogs seem to always require a parent. Without it Qt5 enters in a kind of modal loop that prevents user from interacting with the whole application.

31 files changed, 218 insertions, 60 deletions

diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
index 944400784..d352b2981 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
@@ -651,7 +651,15 @@ namespace KviKvsCoreSimpleCommands
 			QString szTmp;
 			KVSCSC_pContext->enterBlockingSection();
 
-			bool bResult = KviFileDialog::askForOpenFileName(szTmp,__tr2qs_ctx("Choose a file to parse","kvs"),szFileName.toUtf8().data(),"*.kvs");
+			bool bResult = KviFileDialog::askForOpenFileName(
+					szTmp,
+					__tr2qs_ctx("Choose a file to parse","kvs"),
+					szFileName.toUtf8().data(),
+					"*.kvs",
+					false,
+					true,
+					g_pMainWindow
+				);
 
 			if(!KVSCSC_pContext->leaveBlockingSection())return false; // need to stop immediately
 			if(!bResult)return true;
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index 57414c15d..67feaebc8 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -2133,15 +2133,29 @@ void KviIrcView::chooseFont()
 void KviIrcView::chooseBackground()
 {
 	QString f;
-	if(!KviFileDialog::askForOpenFileName(f,__tr2qs("Choose the background image...")))
+	if(
+		!KviFileDialog::askForOpenFileName(
+				f,
+				__tr2qs("Choose the background image..."),
+				QString(),
+				QString(),
+				false,
+				true,
+				this
+			)
+	)
+		return;
+
+	if(f.isEmpty())
 		return;
-	if(f.isEmpty())return;
+
 	QPixmap p(f);
 	if(p.isNull())
 	{
 		QMessageBox::information(this,__tr2qs("Invalid image"),__tr2qs("Failed to load the selected image"),__tr2qs("Ok"));
 		return;
 	}
+
 	setPrivateBackgroundPixmap(p);
 }
 
diff --git a/src/kvirc/ui/KviIrcView_tools.cpp b/src/kvirc/ui/KviIrcView_tools.cpp
index b8377ce39..ed2e5a030 100644
--- a/src/kvirc/ui/KviIrcView_tools.cpp
+++ b/src/kvirc/ui/KviIrcView_tools.cpp
@@ -201,17 +201,13 @@ void KviIrcViewToolWidget::toggleOptions()
 void KviIrcViewToolWidget::filterEnableAll()
 {
 	for(int i=0; i < KVI_NUM_MSGTYPE_OPTIONS; i++)
-	{
 		m_pFilterItems[i]->setOn(true);
-	}
 }
 
 void KviIrcViewToolWidget::filterEnableNone()
 {
 	for(int i=0; i < KVI_NUM_MSGTYPE_OPTIONS; i++)
-	{
 		m_pFilterItems[i]->setOn(false);
-	}
 }
 
 void KviIrcViewToolWidget::filterLoad()
@@ -220,7 +216,7 @@ void KviIrcViewToolWidget::filterLoad()
 	QString szInit;
 	g_pApp->getLocalKvircDirectory(szInit,KviApplication::Filters);
 
-	if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Select a Filter File"),szInit))
+	if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Select a Filter File"),szInit,QString(),false,true,this))
 	{
 		QFile f(szFile);
 		if(f.open(QIODevice::ReadOnly))
@@ -245,7 +241,7 @@ void KviIrcViewToolWidget::filterSave()
 	QString szFile;
 	QString szInit;
 	g_pApp->getLocalKvircDirectory(szInit,KviApplication::Filters,"filter.kvf");
-	if(KviFileDialog::askForSaveFileName(szFile,__tr2qs("Select a Name for the Filter File"),szInit,0,false,true))
+	if(KviFileDialog::askForSaveFileName(szFile,__tr2qs("Select a Name for the Filter File"),szInit,QString(),false,false,true,this))
 	{
 		QFile f(szFile);
 		if(f.open(QIODevice::WriteOnly))
diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index b39acf98a..f942823ff 100644
--- a/src/kvirc/ui/KviSelectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -349,10 +349,18 @@ void KviPixmapSelector::commit()
 void KviPixmapSelector::choosePixmap()
 {
 	QString tmp;
-	if(KviFileDialog::askForOpenFileName(tmp,__tr("Choose an Image File - KVIrc")))
-	{
+	if(
+		KviFileDialog::askForOpenFileName(
+			tmp,
+			__tr2qs("Choose an Image File - KVIrc"),
+			QString(),
+			QString(),
+			false,
+			true,
+			this
+		)
+	)
 		setImagePath(tmp);
-	}
 }
 
 void KviPixmapSelector::setImagePath(const QString &path)
@@ -459,13 +467,34 @@ void KviFileSelector::select()
 	QString tmp = *m_pOption;
 	if(m_uFlags & ChooseSaveFileName)
 	{
- 		if(KviFileDialog::askForSaveFileName(tmp,__tr2qs("Choose a File - KVIrc"),tmp,m_szFilter,true,!(m_uFlags & DontConfirmOverwrite)))
+ 		if(
+			KviFileDialog::askForSaveFileName(
+				tmp,
+				__tr2qs("Choose a File - KVIrc"),
+				tmp,
+				m_szFilter,
+				true,
+				!(m_uFlags & DontConfirmOverwrite),
+				true,
+				this
+			)
+		)
 		{
 			m_pLineEdit->setText(tmp);
 			emit selectionChanged(tmp);
 		}
 	} else {
- 		if(KviFileDialog::askForOpenFileName(tmp,__tr2qs("Choose a File - KVIrc"),tmp,m_szFilter,true))
+ 		if(
+			KviFileDialog::askForOpenFileName(
+				tmp,
+				__tr2qs("Choose a File - KVIrc"),
+				tmp,
+				m_szFilter,
+				true,
+				true,
+				this
+			)
+		)
 		{
 			m_pLineEdit->setText(tmp);
 			emit selectionChanged(tmp);
@@ -482,7 +511,17 @@ KviDirectorySelector::KviDirectorySelector(QWidget * par,const QString & txt,QSt
 void KviDirectorySelector::select()
 {
 	QString szTmp;
-	if(KviFileDialog::askForDirectoryName(szTmp,__tr2qs("Choose a Directory - KVIrc"),""))
+	if(
+		KviFileDialog::askForDirectoryName(
+				szTmp,
+				__tr2qs("Choose a Directory - KVIrc"),
+				QString(),
+				QString(),
+				false,
+				true,
+				this
+			)
+	)
 	{
 		m_pLineEdit->setText(szTmp);
 		emit selectionChanged(szTmp);
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 6fee6e827..069442ede 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -685,7 +685,16 @@ void ActionEditor::exportActions()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(
+			szFile,
+			__tr2qs_ctx("Choose a Filename - KVIrc","editor"),
+			szName,
+			KVI_FILTER_SCRIPT,
+			true,
+			true,
+			true,
+			this
+		))return;
 
 	QString szCode;
 
diff --git a/src/modules/addon/AddonManagementDialog.cpp b/src/modules/addon/AddonManagementDialog.cpp
index c8c9a0acb..2afc0f68e 100644
--- a/src/modules/addon/AddonManagementDialog.cpp
+++ b/src/modules/addon/AddonManagementDialog.cpp
@@ -306,7 +306,7 @@ void AddonManagementDialog::installScript()
 	if(!KviFileDialog::askForOpenFileName(
 		szFileName,
 		__tr2qs_ctx("Please select the addon installation file","addon"),
-		QString(),KVI_FILTER_ADDON,false,true
+		QString(),KVI_FILTER_ADDON,false,true,this
 		)) return;
 
 	szFileName.replace("\\","\\\\");
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 1d82ca64f..4aefa59a0 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -39,9 +39,9 @@
 #include "kvi_sourcesdate.h"
 #include "KviMiscUtils.h"
 #include "KviFileUtils.h"
-#include "KviFileDialog.h"
 
 #include <QFileInfo>
+#include <QDir>
 
 QRect g_rectManagementDialogGeometry(0,0,0,0);
 
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index e6efb44a9..31cc618f6 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -38,7 +38,6 @@
 #include "KviMainWindow.h"
 #include "KviQString.h"
 #include "KviKvsAliasManager.h"
-#include "KviFileDialog.h"
 #include "KviCommandFormatter.h"
 #include "KviModule.h"
 #include "KviTalVBox.h"
@@ -723,7 +722,15 @@ void AliasEditorWidget::exportSelectionInSinglesFiles(KviPointerList<AliasEditor
 	}
 	g_pAliasEditorModule->lock();
 
-	if(!KviFileDialog::askForDirectoryName(m_szDir,__tr2qs_ctx("Choose a Directory - KVIrc","editor"),m_szDir)){
+	if(!KviFileDialog::askForDirectoryName(
+			m_szDir,
+			__tr2qs_ctx("Choose a Directory - KVIrc","editor"),
+			m_szDir,
+			false,
+			true,
+			this
+		)
+	){
 		g_pAliasEditorModule->unlock();
 		return;
 	}
@@ -805,7 +812,16 @@ void AliasEditorWidget::exportAliases(bool bSelectedOnly,bool bSingleFiles)
 	}
 	szName += szNameFile;
 	szName += ".kvs";
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,false,true,true))
+	if(!KviFileDialog::askForSaveFileName(
+			szFile,
+			__tr2qs_ctx("Choose a Filename - KVIrc","editor"),
+			szName,
+			KVI_FILTER_SCRIPT,
+			false,
+			true,
+			true,
+			this
+		))
 	{
 		g_pAliasEditorModule->unlock();
 		return;
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index f6a2bc75c..06b01774b 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -146,7 +146,17 @@ void KviAsyncAvatarSelectionDialog::cancelClicked()
 void KviAsyncAvatarSelectionDialog::chooseFileClicked()
 {
 	QString tmp;
-	if(KviFileDialog::askForOpenFileName(tmp,__tr2qs("Choose an Image File - KVIrc")))
+	if(
+		KviFileDialog::askForOpenFileName(
+				tmp,
+				__tr2qs("Choose an Image File - KVIrc"),
+				QString(),
+				QString(),
+				false,
+				true,
+				this
+			)
+		)
 	{
 		m_pLineEdit->setText(tmp);
 	}
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index cc7c71818..48151b0f6 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -40,7 +40,6 @@
 #include "KviKvsKernel.h"
 #include "KviKvsObjectClass.h"
 #include "KviKvsObjectController.h"
-#include "KviFileDialog.h"
 #include "KviCommandFormatter.h"
 #include "KviModule.h"
 #include "KviTalVBox.h"
@@ -1115,7 +1114,14 @@ void ClassEditorWidget::exportSelectionInSinglesFiles(KviPointerList<ClassEditor
 	}
 	g_pClassEditorModule->lock();
 
-	if(!KviFileDialog::askForDirectoryName(m_szDir,__tr2qs_ctx("Choose a Directory - KVIrc","editor"),m_szDir))
+	if(!KviFileDialog::askForDirectoryName(
+			m_szDir,
+			__tr2qs_ctx("Choose a Directory - KVIrc","editor"),
+			m_szDir,
+			false,
+			true,
+			this
+		))
 	{
 		g_pClassEditorModule->unlock();
 		return;
@@ -1225,7 +1231,16 @@ void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles)
 
 	szName += szNameFile;
 	szName += ".kvs";
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,false,true,true))
+	if(!KviFileDialog::askForSaveFileName(
+			szFile,
+			__tr2qs_ctx("Choose a Filename - KVIrc","editor"),
+			szName,
+			KVI_FILTER_SCRIPT,
+			false,
+			true,
+			true,
+			this
+		))
 	{
 		g_pClassEditorModule->unlock();
 		return;
diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp
index fbb254b08..08eb719ce 100644
--- a/src/modules/codetester/CodeTesterWindow.cpp
+++ b/src/modules/codetester/CodeTesterWindow.cpp
@@ -28,7 +28,6 @@
 #include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
-#include "KviFileDialog.h"
 #include "KviFileUtils.h"
 #include "KviScriptEditor.h"
 #include "KviApplication.h"
diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index acd1dfb8c..400474c84 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -41,6 +41,7 @@
 #include "KviApplication.h"
 #include "KviMainWindow.h"
 #include "KviLocale.h"
+#include "KviFileDialog.h"
 #include "KviOptions.h"
 #include "KviConsoleWindow.h"
 #include "KviFileUtils.h"
@@ -163,8 +164,15 @@ void DccBroker::rsendAskForFileName(DccDescriptor * dcc)
 {
 	QStringList filenames;
 	if(
-		KviFileDialog::askForOpenFileNames(filenames,
-		__tr2qs_ctx("Choose Files to Send - KVIrc","dcc"),"")
+		KviFileDialog::askForOpenFileNames(
+				filenames,
+				__tr2qs_ctx("Choose Files to Send - KVIrc","dcc"),
+				QString(),
+				QString(),
+				false,
+				true,
+				g_pMainWindow
+			)
 		) {
 			if(filenames.count() > 0)
 			{
@@ -706,8 +714,16 @@ void DccBroker::chooseSaveFileName(DccDialog *box,DccDescriptor *dcc)
 		QString cleanFilename = dcc->szFileName;
 		KviFileUtils::cleanFileName(cleanFilename);
 		dcc->szLocalFileName.append(cleanFilename);
-		if(KviFileDialog::askForSaveFileName(dcc->szLocalFileName,
-			__tr2qs_ctx("Choose Files to Save - KVIrc","dcc"),dcc->szLocalFileName))
+		if(KviFileDialog::askForSaveFileName(
+				dcc->szLocalFileName,
+				__tr2qs_ctx("Choose Files to Save - KVIrc","dcc"),
+				dcc->szLocalFileName,
+				QString(),
+				false,
+				false,
+				true,
+				g_pMainWindow
+			))
 		{
 			renameOverwriteResume(0,dcc);
 		} else {
@@ -879,7 +895,15 @@ void DccBroker::recvFileExecute(DccDialog *box,DccDescriptor * dcc)
 void DccBroker::sendFileManage(DccDescriptor * dcc)
 {
 	QStringList filenames;
-	if(KviFileDialog::askForOpenFileNames(filenames,__tr2qs_ctx("Choose Files to Send - KVIrc","dcc"),""))
+	if(KviFileDialog::askForOpenFileNames(
+			filenames,
+			__tr2qs_ctx("Choose Files to Send - KVIrc","dcc"),
+			QString(),
+			QString(),
+			false,
+			true,
+			g_pMainWindow
+		))
 	{
 		if(filenames.count() > 0)
 		{
diff --git a/src/modules/dcc/DccDialog.h b/src/modules/dcc/DccDialog.h
index 546c789a4..d93aa39ed 100644
--- a/src/modules/dcc/DccDialog.h
+++ b/src/modules/dcc/DccDialog.h
@@ -26,8 +26,6 @@
 
 #include "DccBroker.h"
 
-#include "KviFileDialog.h"
-
 #include <QWidget>
 
 class DccDialog
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index f71413354..d64eeb5cf 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -521,7 +521,7 @@ KviKvsCallbackFileDialog::KviKvsCallbackFileDialog(
 		const QString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow,bool modal)
-	: KviFileDialog(szInitialSelection,szFilter,0,0,modal), KviKvsCallbackObject("dialog.file",pWindow,szCode,pMagicParams,0)
+	: KviFileDialog(szInitialSelection,szFilter,pWindow,0,modal), KviKvsCallbackObject("dialog.file",pWindow,szCode,pMagicParams,0)
 {
 	g_pDialogModuleDialogList->append(this);
 	setWindowTitle(szCaption);
diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index 1d4f838e3..fb9a365c3 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -923,7 +923,7 @@ void ScriptEditorImplementation::saveToFile()
 	if(KviFileDialog::askForSaveFileName(szFileName,
 		__tr2qs_ctx("Choose a Filename - KVIrc","editor"),
 		QString::null,
-		QString::null,false,true,true))
+		QString::null,false,true,true,this))
 	{
 		QString szBuffer = m_pEditor->toPlainText();
 
@@ -1009,7 +1009,7 @@ void ScriptEditorImplementation::loadFromFile()
 	QString szFileName;
 	if(KviFileDialog::askForOpenFileName(szFileName,
 		__tr2qs_ctx("Load Script File - KVIrc","editor"),
-		QString::null,KVI_FILTER_SCRIPT,false,true))
+		QString::null,KVI_FILTER_SCRIPT,false,true,this))
 	{
 		QString szBuffer;
 		if(KviFileUtils::loadFile(szFileName,szBuffer))
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 821ecd8b7..741238d5c 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -37,7 +37,6 @@
 #include "KviCommandFormatter.h"
 #include "kvi_fileextensions.h"
 #include "KviQString.h"
-#include "KviFileDialog.h"
 #include "KviKvsEventManager.h"
 #include "KviTalVBox.h"
 
@@ -461,7 +460,7 @@ void EventEditor::exportCurrentHandler()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true,this))return;
 
 	QString szOut;
 	getExportEventBuffer(szOut,m_pLastEditedItem);
@@ -502,7 +501,7 @@ void EventEditor::exportAllEvents()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,QString(),true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,QString(),true,true,true,this))return;
 
 	if(!KviFileUtils::writeFile(szFile,out))
 	{
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index 15e5ee050..afda963cc 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -32,6 +32,7 @@
 #include "KviWindow.h"
 #include "KviError.h"
 #include "KviCommandFormatter.h"
+#include "KviMainWindow.h"
 
 static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QString &szFileName,const QString &szCallback)
 {
@@ -57,7 +58,16 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 			// http____path_path2_path3_filename.ext
 			g_pApp->getLocalKvircDirectory(szFileName,KviApplication::Incoming,tmp);
 		} else {
-			if(!KviFileDialog::askForSaveFileName(szFileName,__tr2qs_ctx("Choose a save file name","http")))
+			if(!KviFileDialog::askForSaveFileName(
+					szFileName,
+					__tr2qs_ctx("Choose a save file name","http"),
+					QString(),
+					QString(),
+					false,
+					false,
+					true,
+					g_pMainWindow
+				))
 				return true;
 			if(szFileName.isEmpty())return true;
 		}
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 8c6f6b5e4..2c24bbdb3 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -592,7 +592,15 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile)
 	KviFileUtils::adjustFilePath(szLog);
 
 	// Getting output file path from the user, with overwrite confirmation
-	if(!KviFileDialog::askForSaveFileName(szLog, __tr2qs_ctx("Export Log - KVIrc","log"), szLog, NULL, false, true))
+	if(!KviFileDialog::askForSaveFileName(
+			szLog,
+			__tr2qs_ctx("Export Log - KVIrc","log"),
+			szLog,
+			QString(),
+			false,
+			true,
+			true,
+			this))
 		return;
 
 	/* Save export directory - this directory path is also used in the HTML export
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index c4a1b5543..747c06d55 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -27,6 +27,7 @@
 #include "KviModule.h"
 #include "KviFileDialog.h"
 #include "KviFileUtils.h"
+#include "KviMainWindow.h"
 #include "kvi_fileextensions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
@@ -122,7 +123,7 @@ void KviMircServersIniImport::start()
 {
 	//KviCString buffer;
 	QString buffer;
-	if(!KviFileDialog::askForOpenFileName(buffer,__tr("Choose a servers.ini file"),0,KVI_FILTER_INI,false,true))return;
+	if(!KviFileDialog::askForOpenFileName(buffer,__tr("Choose a servers.ini file"),0,KVI_FILTER_INI,false,true,g_pMainWindow))return;
 
 	doImport(buffer);
 	delete this;
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index d2faae649..eae096383 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -557,7 +557,7 @@ void OptionsWidget_messageColors::save()
 	QString szInit;
 	g_pApp->getLocalKvircDirectory(szInit,KviApplication::MsgColors);
 
-	if(KviFileDialog::askForSaveFileName(szName,__tr2qs_ctx("Choose a Filename - KVIrc","options"),szInit))
+	if(KviFileDialog::askForSaveFileName(szName,__tr2qs_ctx("Choose a Filename - KVIrc","options"),szInit,QString(),false,false,true,this))
 	{
 		if(m_pLastItem)saveLastItem();
 
@@ -612,7 +612,7 @@ void OptionsWidget_messageColors::load()
 	// FIXME: Do it also on windows...
 #endif
 
-	if(KviFileDialog::askForOpenFileName(szName,__tr2qs_ctx("Choose a Filename - KVIrc ","options"),szInit))
+	if(KviFileDialog::askForOpenFileName(szName,__tr2qs_ctx("Choose a Filename - KVIrc ","options"),szInit,QString(),false,true,this))
 	{
 		itemChanged();
 
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index 07dcdeec0..897d6b62a 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -191,7 +191,7 @@ void OptionsWidget_textIcons::iconSelected(KviIconManager::SmallIcon eIcon)
 void OptionsWidget_textIcons::chooseFromFile()
 {
 	QString szFile;
-	KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",QString(),KVI_FILTER_IMAGE,"options");
+	KviFileDialog::askForOpenFileName(szFile,__tr2qs_ctx("Choose icon filename","options"),QString(),KVI_FILTER_IMAGE,false,true,this);
 	if(!szFile.isEmpty())
 	{
 		if(g_pIconManager->getPixmap(szFile))
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index dcdea254a..e8435ae5f 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -1183,7 +1183,7 @@ void PopupEditorWidget::exportCurrentPopup()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true,this))return;
 
 	QString szOut;
 	m_pLastEditedItem->popup()->generateDefPopup(szOut);
@@ -1234,7 +1234,7 @@ void PopupEditorWidget::exportPopups(bool bSelectedOnly)
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true,this))return;
 
 	if(!KviFileUtils::writeFile(szFile,out))
 	{
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 28bca8cc6..4ac5d2efa 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -416,7 +416,7 @@ void RawEditorWidget::exportCurrentHandler()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true,this))return;
 
 	QString szOut;
 	getExportEventBuffer(szOut,m_pLastEditedItem);
@@ -454,7 +454,7 @@ void RawEditorWidget::exportAllEvents()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true,this))return;
 
 	if(!KviFileUtils::writeFile(szFile,out))
 	{
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index 9abe11c24..717a71cf2 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -36,7 +36,6 @@
 #include "KviApplication.h"
 #include "KviOptions.h"
 #include "KviFile.h"
-#include "KviFileDialog.h"
 #include "KviMessageBox.h"
 #include "KviFileUtils.h"
 #include "kvi_settings.h"
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index f8f072bd8..0b56f9234 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -722,7 +722,7 @@ void RegisteredUsersDialog::exportClicked()
 
 	QString buffer;
 
-	if(!KviFileDialog::askForSaveFileName(buffer,__tr2qs_ctx("Choose a Filename - KVIrc","register"),0,0,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(buffer,__tr2qs_ctx("Choose a Filename - KVIrc","register"),0,0,true,true,this))return;
 
 	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
 
@@ -826,7 +826,7 @@ void RegisteredUsersDialog::importClicked()
 	//KviCString buffer;
 	QString buffer;
 
-	if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs_ctx("Choose a Filename - KVIrc","register")))return;
+	if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs_ctx("Choose a Filename - KVIrc","register"),QString(),QString(),false,true,this))return;
 
 	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
 
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index a75a6ed6f..a6c96ce8f 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -746,7 +746,11 @@ void SetupWizard::chooseOldDataPath()
 
 void SetupWizard::chooseDataPath()
 {
-	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pDataPathEdit->text(),__tr2qs("Choose a Configuration Folder - KVIrc Setup"),0);
+	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(
+			m_pDataPathEdit->text(),
+			__tr2qs("Choose a Configuration Folder - KVIrc Setup"),
+			this
+		);
 	KviFileUtils::adjustFilePath(szBuffer);
 	if(!szBuffer.isEmpty())
 	{
@@ -757,7 +761,11 @@ void SetupWizard::chooseDataPath()
 
 void SetupWizard::chooseIncomingPath()
 {
-	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pIncomingPathEdit->text(),__tr2qs("Choose a Download Folder - KVIrc Setup"),0);
+	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(
+			m_pIncomingPathEdit->text(),
+			__tr2qs("Choose a Download Folder - KVIrc Setup"),
+			this
+		);
 	KviFileUtils::adjustFilePath(szBuffer);
 	if(!szBuffer.isEmpty())
 	{
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index 8ddbb2920..ad1365f81 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -133,7 +133,7 @@ void SharedFileEditDialog::browse()
 {
 	QString szBuf;
 	QString szTxt = m_pFilePathEdit->text();
-	if(!KviFileDialog::askForOpenFileName(szBuf,__tr2qs("Choose the file to share"),szTxt))return;
+	if(!KviFileDialog::askForOpenFileName(szBuf,__tr2qs("Choose the file to share"),szTxt,QString(),false,true,this))return;
 	m_pFilePathEdit->setText(szBuf);
 }
 
diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index ac031ba74..f113b8ed8 100644
--- a/src/modules/theme/PackThemeDialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -35,8 +35,6 @@
 #include "KviIconManager.h"
 #include "KviPackageWriter.h"
 #include "kvi_fileextensions.h"
-#include "KviFileDialog.h"
-//#include "KviMessageBox.h"
 #include "KviSelectors.h"
 #include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index 6caab1d0b..adf6fbbd4 100644
--- a/src/modules/theme/SaveThemeDialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -34,7 +34,6 @@
 #include "KviIconManager.h"
 #include "KviPackageWriter.h"
 #include "kvi_fileextensions.h"
-#include "KviFileDialog.h"
 #include "KviMessageBox.h"
 #include "KviSelectors.h"
 #include "KviMiscUtils.h"
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index e6ca012a6..a5eb66db8 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -408,7 +408,15 @@ void ThemeManagementDialog::installFromFile()
 	QString szFileName;
 	QString szError;
 
-	if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs_ctx("Open Theme - KVIrc","theme"),QString(),KVI_FILTER_THEME))
+	if(!KviFileDialog::askForOpenFileName(
+			szFileName,
+			__tr2qs_ctx("Open Theme - KVIrc","theme"),
+			QString(),
+			KVI_FILTER_THEME,
+			false,
+			true,
+			this)
+		)
 		return;
 	if(!ThemeFunctions::installThemePackage(szFileName,szError,this))
 	{
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index 561a36987..bd6712887 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -397,7 +397,7 @@ void CustomizeToolBarsDialog::exportToolBar()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true,this))return;
 
 	QString szCode;