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

Silently strip leading dot off QFileDialog default suffixes.

Browse Source 
Change-Id: Ie41fafe8c2ce7e8ac8dd595ca3809c1da3b386f4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2013-04-23 13:48:49 +02:00 committed by The Qt Project
parent b88b09fb16
commit d934ddc297
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/changes-5.2.0 vendored
View File

@ -29,3 +29,5 @@ QtWidgets
- [QTBUG-4206] QTableView resizeToContents will now adjust to actual contents - [QTBUG-4206] QTableView resizeToContents will now adjust to actual contents
and not just visible area. QHeaderView::setAutoResizePrecision() has been and not just visible area. QHeaderView::setAutoResizePrecision() has been
introduced to control how precise the autoResize should be. introduced to control how precise the autoResize should be.
- QFileDialog::setDefaultSuffix() removes leading dot characters.

2
src/gui/kernel/qplatformdialoghelper.cpp
View File

@ -495,6 +495,8 @@ QStringList QFileDialogOptions::nameFilters() const
void QFileDialogOptions::setDefaultSuffix(const QString &suffix) void QFileDialogOptions::setDefaultSuffix(const QString &suffix)
{ {
d->defaultSuffix = suffix; d->defaultSuffix = suffix;
if (d->defaultSuffix.size() > 1 && d->defaultSuffix.startsWith(QLatin1Char('.')))
d->defaultSuffix.remove(0, 1); // Silently change ".txt" -> "txt".
} }
QString QFileDialogOptions::defaultSuffix() const QString QFileDialogOptions::defaultSuffix() const

2
src/widgets/dialogs/qfiledialog.cpp
View File

@ -1552,6 +1552,8 @@ bool QFileDialog::confirmOverwrite() const
filename if it has no suffix already. The suffix is typically filename if it has no suffix already. The suffix is typically
used to indicate the file type (e.g. "txt" indicates a text used to indicate the file type (e.g. "txt" indicates a text
file). file).
If the first character is a dot ('.'), it is removed.
*/ */
void QFileDialog::setDefaultSuffix(const QString &suffix) void QFileDialog::setDefaultSuffix(const QString &suffix)
{ {

2
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
View File

@ -621,6 +621,8 @@ void tst_QFiledialog::defaultSuffix()
QCOMPARE(fd.defaultSuffix(), QString()); QCOMPARE(fd.defaultSuffix(), QString());
fd.setDefaultSuffix("txt"); fd.setDefaultSuffix("txt");
QCOMPARE(fd.defaultSuffix(), QString("txt")); QCOMPARE(fd.defaultSuffix(), QString("txt"));
fd.setDefaultSuffix(".txt");
QCOMPARE(fd.defaultSuffix(), QString("txt"));
fd.setDefaultSuffix(QString()); fd.setDefaultSuffix(QString());
QCOMPARE(fd.defaultSuffix(), QString()); QCOMPARE(fd.defaultSuffix(), QString());
} }