Skip to content

sort items in tree-browsers caseinsensitively in alphabetical order #5875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Spekular merged 4 commits into from
Jan 7, 2021
Merged

sort items in tree-browsers caseinsensitively in alphabetical order #5875

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
673df26
sort items in tree-browsers caseinsensitively in alphabetical order
Jan 4, 2021
3e8ec2d
rm unnecessary filename sorting that takes no influence on the list p…
Jan 6, 2021
2154218
rm whitespace for codestyle
Jan 6, 2021
86bd945
Revert last whitespace change
Spekular Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/gui/FileBrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ bool FileBrowser::filterItems( const QString & filter, QTreeWidgetItem * item )
void FileBrowser::reloadTree( void )
{
QList<QString> expandedDirs = m_fileBrowserTreeWidget->expandedDirs();

const QString text = m_filterEdit->text();
m_filterEdit->clear();
m_fileBrowserTreeWidget->clear();
Expand Down Expand Up @@ -262,7 +263,6 @@ void FileBrowser::giveFocusToFilter()
}



void FileBrowser::addItems(const QString & path )
{
if( m_dirsAsItems )
Expand All @@ -274,6 +274,7 @@ void FileBrowser::addItems(const QString & path )
// try to add all directories from file system alphabetically into the tree
QDir cdir( path );
QStringList files = cdir.entryList( QDir::Dirs, QDir::Name );
files.sort(Qt::CaseInsensitive);
for( QStringList::const_iterator it = files.constBegin();
it != files.constEnd(); ++it )
{
Expand Down Expand Up @@ -1081,8 +1082,13 @@ bool Directory::addItems(const QString & path )
}
}

// sorts the path alphabetically instead of just appending to the bottom (see "orphans")
if (added_something)
sortChildren(0, Qt::AscendingOrder);

QList<QTreeWidgetItem*> items;
files = thisDir.entryList( QDir::Files, QDir::Name );
files.sort(Qt::CaseInsensitive);
for( QStringList::const_iterator it = files.constBegin();
it != files.constEnd(); ++it )
{
Expand Down