qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FileDialog: set url schema when using the file name text field 

When using the text field to choose a file name inside the non-native
file dialog, the selectedFile property would be updated based on the
currentFolder property and what the newly typed filename was.

However, the schema was ignored.

This patch fixes the issue by also setting the schema in
QQuickFileDialogImpl::setFileName(const QString &fileName).

Fixes: QTBUG-120065
Change-Id: I1860fbbc8209270d0bc6e34a4be6a91bad2253ab
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
(cherry picked from commit 26d9634468)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f839b0ae73)
(cherry picked from commit 53c60c2f94)
This commit is contained in:
Oliver Eftevaag 2023-12-14 17:38:26 +01:00 committed by Qt Cherry-pick Bot
parent b13500e7ec
commit 45479ae9ff
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl.cpp
View File

@ -504,7 +504,10 @@ void QQuickFileDialogImpl::setFileName(const QString &fileName)
if (previous == fileName)
return;
setSelectedFile(QUrl(currentFolder().path() + u'/' + fileName));
QUrl newSelectedFile;
newSelectedFile.setScheme(currentFolder().scheme());
newSelectedFile.setPath(currentFolder().path() + u'/' + fileName);
setSelectedFile(newSelectedFile);
}
QString QQuickFileDialogImpl::currentFolderName() const

42
tests/auto/quickdialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp
View File

@ -91,6 +91,7 @@ private slots:
void selectNewFileViaTextField();
void selectExistingFileShouldWarnUserWhenFileModeEqualsSaveFile();
void fileNameTextFieldOnlyChangesWhenSelectingFiles();
void setSchemeForSelectedFile();
private:
enum DelegateOrderPolicy
@ -1597,6 +1598,47 @@ void tst_QQuickFileDialogImpl::fileNameTextFieldOnlyChangesWhenSelectingFiles()
QCOMPARE(dialogHelper.dialog->selectedFile(), tempFile11Url);
}
void tst_QQuickFileDialogImpl::setSchemeForSelectedFile()
{
const auto tempSubFile1Url = QUrl::fromLocalFile(tempSubFile1->fileName());
const QVariantMap initialProperties = {
{ "tempFile1Url", QVariant::fromValue(tempSubFile1Url) },
{ "fileMode", QVariant::fromValue(QQuickFileDialog::SaveFile) }
};
FileDialogTestHelper dialogHelper(this, "setSelectedFile.qml", {}, initialProperties);
OPEN_QUICK_DIALOG();
QQuickTest::qWaitForPolish(dialogHelper.window());
QQuickTextField *fileNameTextField =
dialogHelper.quickDialog->findChild<QQuickTextField *>("fileNameTextField");
QVERIFY(fileNameTextField);
QVERIFY(!tempSubFile1Url.scheme().isEmpty());
QVERIFY(!dialogHelper.dialog->selectedFile().scheme().isEmpty());
QCOMPARE(tempSubFile1Url, dialogHelper.dialog->selectedFile());
fileNameTextField->clear();
const QPoint textFieldCenterPos =
fileNameTextField->mapToScene({ fileNameTextField->width() / 2, fileNameTextField->height() / 2 }).toPoint();
QTest::mouseClick(dialogHelper.window(), Qt::LeftButton, Qt::NoModifier, textFieldCenterPos);
const QByteArray newFileName("helloworld.txt");
for (const auto &c : newFileName)
QTest::keyClick(dialogHelper.window(), c);
QTest::keyClick(dialogHelper.window(), Qt::Key_Enter, Qt::NoModifier);
QTRY_COMPARE(fileNameTextField->text(), QString::fromLatin1(newFileName));
const auto newFilePath =
QUrl::fromLocalFile(QFileInfo(tempSubFile1Url.toLocalFile()).dir().absolutePath() + u'/' + newFileName);
QVERIFY(!newFilePath.scheme().isEmpty());
QVERIFY(!dialogHelper.dialog->selectedFile().scheme().isEmpty());
QCOMPARE(dialogHelper.dialog->selectedFile(), newFilePath);
}
QTEST_MAIN(tst_QQuickFileDialogImpl)
#include "tst_qquickfiledialogimpl.moc"