Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

FileViewList: Sort files with QCollator in numeric mode 

Fixes #977
This commit is contained in:
Jonas Kvinge 2022-06-14 17:21:59 +02:00
parent 4487d292e8
commit 629d9e7ae0
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/widgets/fileviewlist.cpp
View File

@ -29,6 +29,7 @@
#include <QDir> #include <QDir>
#include <QMenu> #include <QMenu>
#include <QUrl> #include <QUrl>
#include <QCollator>
#include <QtEvents> #include <QtEvents>
#include "core/iconloader.h" #include "core/iconloader.h"
@ -68,14 +69,22 @@ void FileViewList::contextMenuEvent(QContextMenuEvent *e) {
QList<QUrl> FileViewList::UrlListFromSelection() const { QList<QUrl> FileViewList::UrlListFromSelection() const {
QList<QUrl> urls; QStringList filenames;
const QModelIndexList indexes = menu_selection_.indexes(); const QModelIndexList indexes = menu_selection_.indexes();
for (const QModelIndex &index : indexes) { for (const QModelIndex &index : indexes) {
if (index.column() == 0) { if (index.column() == 0) {
urls << QUrl::fromLocalFile(qobject_cast<QFileSystemModel*>(model())->fileInfo(index).canonicalFilePath()); filenames << qobject_cast<QFileSystemModel*>(model())->fileInfo(index).canonicalFilePath();
} }
} }
std::sort(urls.begin(), urls.end());
QCollator collator;
collator.setNumericMode(true);
std::sort(filenames.begin(), filenames.end(), collator);
QList<QUrl> urls;
for (const QString &filename : filenames) {
urls << QUrl::fromLocalFile(filename);
}
return urls; return urls;
@ -127,6 +136,11 @@ QStringList FileViewList::FilenamesFromSelection() const {
filenames << qobject_cast<QFileSystemModel*>(model())->filePath(index); filenames << qobject_cast<QFileSystemModel*>(model())->filePath(index);
} }
} }
QCollator collator;
collator.setNumericMode(true);
std::sort(filenames.begin(), filenames.end(), collator);
return filenames; return filenames;
} }