Sort the tag-values alphabetically in the "Tags" column

Up until now tag-values have appeared unsorted in the Tags column
when the selected View Mode is "Details".
In older versions of Dolphin (in KDE4) the tags-values were
alphabetically sorted in the Tags column, which means that back then
this was the desired behavior.
This commit restores this functionality.

BUG: 377589
FIXED-IN: 17.04.1
REVIEW: 130068

diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 16e3935ca9477134045d0fb1ee7031d0108025cd..d6c15afcdbb42ac5ba0d563d00e5d36cf92cc58b 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -29,6 +29,7 @@
 
 #include <QTime>
 #include <QMap>
 
 #include <QTime>
 #include <QMap>

+#include <QCollator>

 
 struct KBalooRolesProviderSingleton
 {
 
 struct KBalooRolesProviderSingleton
 {


@@ -159,7 +160,11 @@ KBalooRolesProvider::KBalooRolesProvider() :
 
 QString KBalooRolesProvider::tagsFromValues(const QStringList& values) const
 {
 
 QString KBalooRolesProvider::tagsFromValues(const QStringList& values) const
 {

-    return values.join(QStringLiteral(", "));
+    QStringList alphabeticalOrderTags = values;
+    QCollator coll;
+    coll.setNumericMode(true);
+    std::sort(alphabeticalOrderTags.begin(), alphabeticalOrderTags.end(), [&](const QString& s1, const QString& s2){ return coll.compare(s1, s2) < 0; });
+    return alphabeticalOrderTags.join(QStringLiteral(", "));

 }
 
 QString KBalooRolesProvider::orientationFromValue(int value) const
 }
 
 QString KBalooRolesProvider::orientationFromValue(int value) const

diff --git a/src/kitemviews/private/kbaloorolesprovider.h b/src/kitemviews/private/kbaloorolesprovider.h
index a9bd2e8ef335f50bcaba1d990beba352ab505b2c..65b59793cdca051c8acb45fd36a1c37fb4157f90 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.h
+++ b/src/kitemviews/private/kbaloorolesprovider.h
@@ -62,6 +62,7 @@ protected:
 private:
     /**
      * @return User visible string for the given tag-values.
 private:
     /**
      * @return User visible string for the given tag-values.

+     *         The tag-values are sorted in alphabetical order.

      */
     QString tagsFromValues(const QStringList& values) const;
 
      */
     QString tagsFromValues(const QStringList& values) const;