More tweaks all around

2 files changed, 35 insertions, 11 deletions

diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index d64eeb5cf..f9e39d386 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -521,7 +521,13 @@ KviKvsCallbackFileDialog::KviKvsCallbackFileDialog(
 		const QString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow,bool modal)
-	: KviFileDialog(szInitialSelection,szFilter,pWindow,0,modal), KviKvsCallbackObject("dialog.file",pWindow,szCode,pMagicParams,0)
+	: KviFileDialog(
+		szInitialSelection,
+		szFilter,
+		NULL, // parent
+		0,
+		modal
+	), KviKvsCallbackObject("dialog.file",pWindow,szCode,pMagicParams,0)
 {
 	g_pDialogModuleDialogList->append(this);
 	setWindowTitle(szCaption);
@@ -627,18 +633,21 @@ static bool dialog_kvs_cmd_file(KviKvsModuleCallbackCommandCall * c)
 		KVSM_PARAMETER("filter",KVS_PT_STRING,KVS_PF_OPTIONAL,szFilter)
 		KVSM_PARAMETER("magic",KVS_PT_VARIANTLIST,KVS_PF_OPTIONAL,params)
 	KVSM_PARAMETERS_END(c)
-	bool modal;
-	if(c->hasSwitch('b',"modal")) modal=true;
-	else modal=false;
+
+	bool modal = c->hasSwitch('b',"modal");
+
 	QString szCmd = c->callback()->code();
 
 	KviKvsCallbackFileDialog * box = new KviKvsCallbackFileDialog(szCaption,szInitialSelection,szFilter,szCmd,&params,c->window(),modal);
 
 	KviFileDialog::FileMode md = KviFileDialog::ExistingFile;
 
-	if(KviQString::equalCI(szMode,"openm"))md = KviFileDialog::ExistingFiles;
-	else if(KviQString::equalCI(szMode,"save"))md = KviFileDialog::AnyFile;
-	else if(KviQString::equalCI(szMode,"dir"))md = KviFileDialog::DirectoryOnly;
+	if(KviQString::equalCI(szMode,"open"))
+		md = KviFileDialog::ExistingFiles;
+	else if(KviQString::equalCI(szMode,"save"))
+		md = KviFileDialog::AnyFile;
+	else if(KviQString::equalCI(szMode,"dir"))
+		md = KviFileDialog::DirectoryOnly;
 
 	box->setFileMode(md);
 
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 40a0caaeb..ea9b24cf0 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -32,6 +32,7 @@
 #include "KviCommandFormatter.h"
 #include "KviError.h"
 #include "kvi_out.h"
+#include "KviMainWindow.h"
 #include "KviIconManager.h"
 #include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
@@ -218,14 +219,28 @@ static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
 	QString szTmp;
 	c->enterBlockingSection();
 
-	bool bResult = KviFileDialog::askForSaveFileName(szTmp,__tr2qs_ctx("Choose a file to save the screenshot to","theme"),szFileName,"*.png");
+	bool bResult = KviFileDialog::askForSaveFileName(
+			szTmp,
+			__tr2qs_ctx("Choose a file to save the screenshot to","theme"),
+			szFileName,
+			"*.png",
+			false,
+			false,
+			true,
+			g_pMainWindow
+		);
 
-	if(!c->leaveBlockingSection())return false; // need to stop immediately
-	if(!bResult)return true;
+	if(!c->leaveBlockingSection())
+		return false; // need to stop immediately
+
+	if(!bResult)
+		return true;
 
 	szFileName = szTmp;
 
-	if(szFileName.isEmpty())return true; // done
+	if(szFileName.isEmpty())
+		return true; // done
+
 	KviFileUtils::adjustFilePath(szFileName);
 	if(QFileInfo(szFileName).suffix()!="png")
 		szFileName+=".png";