1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows file dialogs: Use FOS_NOREADONLYRETURN only for mode AcceptSave.

Browse Source 
Task-number: QTBUG-36886

Change-Id: I727abb92675187f15d1357b1df60f2fb609dc4d5
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2014-02-25 09:27:35 +01:00 committed by The Qt Project
parent 32794abe72
commit a0ebaca9cb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -880,7 +880,7 @@ public:
inline static QWindowsNativeFileDialogBase *create(QFileDialogOptions::AcceptMode am, const QWindowsFileDialogSharedData &data); inline static QWindowsNativeFileDialogBase *create(QFileDialogOptions::AcceptMode am, const QWindowsFileDialogSharedData &data);
virtual void setWindowTitle(const QString &title); virtual void setWindowTitle(const QString &title);
inline void setMode(QFileDialogOptions::FileMode mode, QFileDialogOptions::FileDialogOptions options); inline void setMode(QFileDialogOptions::FileMode mode, QFileDialogOptions::AcceptMode acceptMode, QFileDialogOptions::FileDialogOptions options);
inline void setDirectory(const QString &directory); inline void setDirectory(const QString &directory);
inline void updateDirectory() { setDirectory(m_data.directory().toLocalFile()); } inline void updateDirectory() { setDirectory(m_data.directory().toLocalFile()); }
inline QString directory() const; inline QString directory() const;
@ -1037,14 +1037,17 @@ void QWindowsNativeFileDialogBase::doExec(HWND owner)
} }
} }
void QWindowsNativeFileDialogBase::setMode(QFileDialogOptions::FileMode mode, QFileDialogOptions::FileDialogOptions options) void QWindowsNativeFileDialogBase::setMode(QFileDialogOptions::FileMode mode,
QFileDialogOptions::AcceptMode acceptMode,
QFileDialogOptions::FileDialogOptions options)
{ {
DWORD flags = FOS_PATHMUSTEXIST | FOS_FORCESHOWHIDDEN; DWORD flags = FOS_PATHMUSTEXIST | FOS_FORCESHOWHIDDEN;
if (options & QFileDialogOptions::DontResolveSymlinks) if (options & QFileDialogOptions::DontResolveSymlinks)
flags |= FOS_NODEREFERENCELINKS; flags |= FOS_NODEREFERENCELINKS;
switch (mode) { switch (mode) {
case QFileDialogOptions::AnyFile: case QFileDialogOptions::AnyFile:
flags |= FOS_NOREADONLYRETURN; if (acceptMode == QFileDialogOptions::AcceptSave)
flags |= FOS_NOREADONLYRETURN;
if (!(options & QFileDialogOptions::DontConfirmOverwrite)) if (!(options & QFileDialogOptions::DontConfirmOverwrite))
flags |= FOS_OVERWRITEPROMPT; flags |= FOS_OVERWRITEPROMPT;
break; break;
@ -1059,8 +1062,9 @@ void QWindowsNativeFileDialogBase::setMode(QFileDialogOptions::FileMode mode, QF
flags |= FOS_FILEMUSTEXIST | FOS_ALLOWMULTISELECT; flags |= FOS_FILEMUSTEXIST | FOS_ALLOWMULTISELECT;
break; break;
} }
qCDebug(lcQpaDialogs) << __FUNCTION__ << " mode=" << mode << " options" qCDebug(lcQpaDialogs) << __FUNCTION__ << "mode=" << mode
<< options << " results in 0x" << flags; << "acceptMode=" << acceptMode << "options=" << options
<< "results in" << showbase << hex << flags;
if (FAILED(m_fileDialog->SetOptions(flags))) if (FAILED(m_fileDialog->SetOptions(flags)))
qErrnoWarning("%s: SetOptions() failed", __FUNCTION__); qErrnoWarning("%s: SetOptions() failed", __FUNCTION__);
@ -1592,7 +1596,7 @@ QWindowsNativeDialogBase *QWindowsFileDialogHelper::createNativeDialog()
m_data.fromOptions(opts); m_data.fromOptions(opts);
const QFileDialogOptions::FileMode mode = opts->fileMode(); const QFileDialogOptions::FileMode mode = opts->fileMode();
result->setWindowTitle(opts->windowTitle()); result->setWindowTitle(opts->windowTitle());
result->setMode(mode, opts->options()); result->setMode(mode, opts->acceptMode(), opts->options());
result->setHideFiltersDetails(opts->testOption(QFileDialogOptions::HideNameFilterDetails)); result->setHideFiltersDetails(opts->testOption(QFileDialogOptions::HideNameFilterDetails));
const QStringList nameFilters = opts->nameFilters(); const QStringList nameFilters = opts->nameFilters();
if (!nameFilters.isEmpty()) if (!nameFilters.isEmpty())