diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2017-12-07 07:49:02 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2017-12-14 04:33:22 +0000 |
| commit | 46df7355d6985b751773214f4b530fa55974b4d0 (patch) | |
| tree | 6ab082950df5fb604ec916c6c307588fcf6d2110 | |
| parent | 0490261efeb0aa1a97cbc09a654a1d62c1f70f5f (diff) | |
Unify file dialogs
Task-number: QT3DS-644
Change-Id: Ie280c2cc2577ad8ec2cc9209a1107848ae110c25
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | examples/studio3d/widgetviewer/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/Authoring/Studio/_Win/Application/SubPresentationDlg.cpp | 3 | ||||
| -rw-r--r-- | src/Authoring/Studio/_Win/Workspace/Dialogs.cpp | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/examples/studio3d/widgetviewer/mainwindow.cpp b/examples/studio3d/widgetviewer/mainwindow.cpp index b57c1ba2..0b6096e6 100644 --- a/examples/studio3d/widgetviewer/mainwindow.cpp +++ b/examples/studio3d/widgetviewer/mainwindow.cpp @@ -214,7 +214,7 @@ void MainWindow::on_actionOpen_triggered() this, tr("Open File or Project"), m_openFileDir, tr("All supported formats (*.uip *.uia *.uiab);;Studio UI Presentation " "(*.uip);;Application file (*.uia);;Binary Application (*.uiab)"), - NULL); + nullptr, QFileDialog::DontUseNativeDialog); if (filename.size() == 0) return; diff --git a/src/Authoring/Studio/_Win/Application/SubPresentationDlg.cpp b/src/Authoring/Studio/_Win/Application/SubPresentationDlg.cpp index d77b3c6b..3e9a6a31 100644 --- a/src/Authoring/Studio/_Win/Application/SubPresentationDlg.cpp +++ b/src/Authoring/Studio/_Win/Application/SubPresentationDlg.cpp @@ -154,7 +154,8 @@ void CSubPresentationDlg::browseFile() if (m_subPresentation.m_type == QStringLiteral("presentation-qml")) filter = QStringLiteral("*.qml"); const QString file = QDir::toNativeSeparators( - QFileDialog::getOpenFileName(nullptr, nullptr, m_directory, filter)); + QFileDialog::getOpenFileName(nullptr, nullptr, m_directory, filter, nullptr, + QFileDialog::DontUseNativeDialog)); QString shortFile = file; int subdir = file.indexOf(m_directory); if (subdir >= 0) diff --git a/src/Authoring/Studio/_Win/Workspace/Dialogs.cpp b/src/Authoring/Studio/_Win/Workspace/Dialogs.cpp index 8522bbe6..76c5cf72 100644 --- a/src/Authoring/Studio/_Win/Workspace/Dialogs.cpp +++ b/src/Authoring/Studio/_Win/Workspace/Dialogs.cpp @@ -377,7 +377,8 @@ QString CDialogs::ConfirmRefreshModelFile(const QString &inFile) return QFileDialog::getOpenFileName(qApp->activeWindow(), QObject::tr("Open"), - inFile, theFileFilter); + inFile, theFileFilter, nullptr, + QFileDialog::DontUseNativeDialog); } //============================================================================== @@ -779,6 +780,7 @@ std::pair<Qt3DSFile, bool> CDialogs::GetSaveAsChoice(const Q3DStudio::CString &i : fi.path()); theFileDlg.setAcceptMode(QFileDialog::AcceptSave); theFileDlg.setDefaultSuffix(theFileExt.toQString()); + theFileDlg.setOption(QFileDialog::DontUseNativeDialog, true); if (inDialogTitle != "") theFileDlg.setWindowTitle(inDialogTitle.toQString()); @@ -862,6 +864,7 @@ Qt3DSFile CDialogs::GetFileOpenChoice(const Q3DStudio::CString &inInitialDirecto : inInitialDirectory.toQString(), theImportFilter.toQString()); theFileDlg.setAcceptMode(QFileDialog::AcceptOpen); + theFileDlg.setOption(QFileDialog::DontUseNativeDialog, true); if (theFileDlg.exec() == QDialog::Accepted) { QFileInfo fi(theFileDlg.selectedFiles().first()); |