OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4554 Use "..." in display of effective filter as notion of recursive search

Browse Source 
Fix display of multiple extensions
Replace "**" with * in path text
This commit is contained in:
Jacob Støren 2019-08-15 14:18:46 +02:00
parent f3c0c4ff82
commit e1c061fd15
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ApplicationCode/Commands/RicFileHierarchyDialog.cpp
View File

@ -71,7 +71,6 @@ static const QChar SEPARATOR = RiaFilePathTools::SEPARATOR;
static QStringList prefixStrings(const QStringList& strings, const QString& prefix);
static QStringList trimLeftStrings(const QStringList& strings, const QString& trimText);
static void sortStringsByLength(QStringList& strings, bool ascending = true);
static QString effectivePathFilter(const QString& enteredPathFilter);
//--------------------------------------------------------------------------------------------------
///
@ -216,7 +215,7 @@ QString RicFileHierarchyDialog::rootDir() const
//--------------------------------------------------------------------------------------------------
QString RicFileHierarchyDialog::pathFilter() const
{
return RiaFilePathTools::toInternalSeparator(m_pathFilter->text().trimmed());
return RiaFilePathTools::toInternalSeparator(m_pathFilter->text().trimmed()).replace(QString("**"), QString("*"));
}
//--------------------------------------------------------------------------------------------------
@ -477,7 +476,7 @@ void RicFileHierarchyDialog::buildDirectoryListRecursiveSimple(const QString& cu
QStringList RicFileHierarchyDialog::findFilesInDirs(const QStringList& dirs)
{
QStringList allFiles;
QStringList filters = createNameFilterList(fileNameFilter(), fileExtensions());
QStringList filters = createFileNameFilterList();
for (const auto& dir : dirs)
{
@ -501,8 +500,11 @@ QStringList RicFileHierarchyDialog::findFilesInDirs(const QStringList& dirs)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RicFileHierarchyDialog::createNameFilterList(const QString &fileNameFilter, const QStringList &fileExtensions)
QStringList RicFileHierarchyDialog::createFileNameFilterList()
{
QString fileNameFilter = this->fileNameFilter();
QStringList fileExtensions = this->fileExtensions();
QStringList nameFilter;
QString effectiveFileNameFilter = !fileNameFilter.isEmpty() ? fileNameFilter : "*";
@ -536,24 +538,28 @@ bool RicFileHierarchyDialog::pathFilterMatch(const QString& pathFilter, const QS
//--------------------------------------------------------------------------------------------------
void RicFileHierarchyDialog::updateEffectiveFilter()
{
QString effFilter = QString("%1/%2/%3%4")
.arg(m_rootDir->text())
.arg(effectivePathFilter(m_pathFilter->text()))
.arg(fileNameFilter())
.arg(fileExtensionsText());
QString pathFilterText = pathFilter();
if (pathFilterText == "*" || pathFilterText.endsWith(QString(SEPARATOR) + "*"))
{
pathFilterText.chop(1);
pathFilterText = pathFilterText + "...";
}
QString internalFilter(RiaFilePathTools::toInternalSeparator(effFilter));
QString effFilterText = QString("%1/%2/%3")
.arg(rootDir())
.arg(pathFilterText)
.arg(createFileNameFilterList().join("|"));
// Remove duplicate separators
int len;
do
{
len = internalFilter.size();
internalFilter.replace(QString("%1%1").arg(SEPARATOR), SEPARATOR);
} while (internalFilter.size() != len);
len = effFilterText.size();
effFilterText.replace(QString("%1%1").arg(SEPARATOR), SEPARATOR);
} while (effFilterText.size() != len);
// Present native separators to the user
m_effectiveFilter->setText(QDir::toNativeSeparators(internalFilter));
m_effectiveFilter->setText(QDir::toNativeSeparators(effFilterText));
}
//--------------------------------------------------------------------------------------------------
@ -811,11 +817,3 @@ void sortStringsByLength(QStringList& strings, bool ascending /*= true*/)
}
QString effectivePathFilter(const QString& enteredPathFilter)
{
QString p = RiaFilePathTools::toInternalSeparator(enteredPathFilter);
if (p == "*" || p.endsWith(QString(SEPARATOR) + "*")) return p + "*";
else return p;
}

3
ApplicationCode/Commands/RicFileHierarchyDialog.h
View File

@ -77,8 +77,7 @@ private:
QStringList findFilesInDirs(const QStringList& dirs);
QStringList createNameFilterList(const QString& fileNameFilter,
const QStringList& fileExtensions);
QStringList createFileNameFilterList();
bool pathFilterMatch(const QString& pathFilter, const QString& relPath);