diff options
| author |  Szymon Tomasz Stefanek | 2015-08-25 05:09:21 +0200 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2015-08-25 05:09:21 +0200 |
| commit | a95bc713e341abf1d28247e22af5f1ca43147c4f (patch) | |
| tree | 3c68840dd4ec27c09cf018da7b3867d9c3b8426f /src/modules/dialog/libkvidialog.cpp | |
| parent | File dialogs seem to always require a parent. Without it Qt5 enters in a kind... (diff) | |
| download | KVIrc-a95bc713e341abf1d28247e22af5f1ca43147c4f.tar.gz KVIrc-a95bc713e341abf1d28247e22af5f1ca43147c4f.tar.bz2 KVIrc-a95bc713e341abf1d28247e22af5f1ca43147c4f.zip | |
More tweaks all around
Diffstat (limited to 'src/modules/dialog/libkvidialog.cpp')
| -rw-r--r-- | src/modules/dialog/libkvidialog.cpp | 23 |
1 files changed, 16 insertions, 7 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,¶ms,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); |