Use QCollator in playlist

Author: smplayer-dev

src/playlist.cpp

@@ -123,6 +123,33 @@ class PlaylistDelegate : public QStyledItemDelegate {
 };
 #endif
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
+#include <QCollator>
+
+class PlaylistSortProxy : public QSortFilterProxyModel {
+public:
+	explicit PlaylistSortProxy(QObject *parent = nullptr)
+		: QSortFilterProxyModel(parent)
+	{
+		collator.setNumericMode(true);                  // ORDEN NATURAL
+		collator.setCaseSensitivity(Qt::CaseInsensitive);
+	}
+
+protected:
+	bool lessThan(const QModelIndex &left,
+				  const QModelIndex &right) const override
+	{
+		QString l = sourceModel()->data(left, sortRole()).toString();
+		QString r = sourceModel()->data(right, sortRole()).toString();
+		return collator.compare(l, r) < 0;
+	}
+
+private:
+	mutable QCollator collator;
+};
+#endif
+
+
 /* ----------------------------------------------------------- */
 
 
@@ -432,7 +459,11 @@ void Playlist::createTable() {
 	table->setColumnCount(COL_SHUFFLE + 1);
 	//table->setSortRole(Qt::UserRole + 1);
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
+	proxy = new PlaylistSortProxy(this);
+#else
 	proxy = new QSortFilterProxyModel(this);
+#endif
 	proxy->setSourceModel(table);
 	proxy->setSortRole(Qt::UserRole + 1);
 	proxy->setFilterRole(Qt::UserRole + 1);