Commit 0da64bc3 authored by Michael Reeves's avatar Michael Reeves

Merge branch 'fix-QfileDialog-filter' into '1.8'

Fix QFileDialog filter

See merge request kde/kdiff3!2
parents 64804a64 de06e561
Pipeline #15062 passed with stage
in 6 minutes and 57 seconds
......@@ -231,8 +231,8 @@ void OpenDialog::selectURL(QComboBox* pLine, bool bDir, int i, bool bSave)
currentUrl = QUrl::fromUserInput(current, QString(), QUrl::AssumeLocalFile);
QUrl newURL = bDir ? QFileDialog::getExistingDirectoryUrl(this, i18n("Open Directory"), currentUrl)
: bSave ? QFileDialog::getSaveFileUrl(this, i18n("Select Output File"), currentUrl, QLatin1Literal("all/allfiles"))
: QFileDialog::getOpenFileUrl(this, i18n("Open File"), currentUrl, QLatin1Literal("all/allfiles"));
: bSave ? QFileDialog::getSaveFileUrl(this, i18n("Select Output File"), currentUrl, QLatin1Literal("all/allfiles (*)"))
: QFileDialog::getOpenFileUrl(this, i18n("Open File"), currentUrl, QLatin1Literal("all/allfiles (*)"));
if(!newURL.isEmpty()) {
/*
Since we are selecting a directory open in the parent directory
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment