Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / kitemviews / private / kbaloorolesprovider.cpp

diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 3d3923b1b761125c83c6b96ed03ae1a06664344a..0f7100faae197d6217bf700d90d82ca149e4bf1c 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -56,31 +56,39 @@ QHash<QByteArray, QVariant> KBalooRolesProvider::roleValues(const Baloo::File& f
 {
     QHash<QByteArray, QVariant> values;
 
 {
     QHash<QByteArray, QVariant> values;
 

-    QMapIterator<KFileMetaData::Property::Property, QVariant> it(file.properties());
-    while (it.hasNext()) {
-        it.next();
+    using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>;
+
+    const auto& propMap = file.properties();
+    auto rangeBegin = propMap.constKeyValueBegin();
+
+    while (rangeBegin != propMap.constKeyValueEnd()) {
+        auto key = (*rangeBegin).first;
+        const KFileMetaData::PropertyInfo propertyInfo(key);
+        const QByteArray role = roleForProperty(propertyInfo.name());
+
+        auto rangeEnd = std::find_if(rangeBegin, propMap.constKeyValueEnd(),
+            [key](const entry& e) { return e.first != key; });

 
 

-        const KFileMetaData::PropertyInfo pi(it.key());
-        const QString property = pi.name();
-        const QByteArray role = roleForProperty(property);

         if (role.isEmpty() || !roles.contains(role)) {
         if (role.isEmpty() || !roles.contains(role)) {

+            rangeBegin = rangeEnd;

             continue;
         }
 
             continue;
         }
 

-        const QVariant value = it.value();
-
-        if (role == "orientation") {
-            const QString orientation = orientationFromValue(value.toInt());
-            values.insert(role, orientation);
-        } else if (role == "duration") {
-            const QString duration = durationFromValue(value.toInt());
-            values.insert(role, duration);
-        } else if (role == "bitrate") {
-            const QString bitrate = bitrateFromValue(value.toInt());
-            values.insert(role, bitrate);
+        auto distance = std::distance(rangeBegin, rangeEnd);
+        if (distance > 1) {
+            QVariantList list;
+            list.reserve(static_cast<int>(distance));
+            std::for_each(rangeBegin, rangeEnd, [&list](const entry& s) { list.append(s.second); });
+            values.insert(role, propertyInfo.formatAsDisplayString(list));

         } else {
         } else {

-            values.insert(role, value.toString());
+            if (propertyInfo.valueType() == QVariant::DateTime) {
+                // Let dolphin format later Dates
+                values.insert(role, (*rangeBegin).second);
+            } else {
+                values.insert(role, propertyInfo.formatAsDisplayString((*rangeBegin).second));
+            }

         }
         }

+        rangeBegin = rangeEnd;

     }
 
     KFileMetaData::UserMetaData md(file.path());
     }
 
     KFileMetaData::UserMetaData md(file.path());


@@ -127,12 +135,14 @@ KBalooRolesProvider::KBalooRolesProvider() :
         { "width",         "width" },
         { "height",        "height" },
         { "imageDateTime",   "imageDateTime"},
         { "width",         "width" },
         { "height",        "height" },
         { "imageDateTime",   "imageDateTime"},

-        { "nexif.orientation", "orientation", },
+        { "imageOrientation", "orientation", },

         { "artist",     "artist" },
         { "genre",     "genre"  },
         { "album",    "album" },
         { "duration",      "duration" },
         { "bitRate", "bitrate" },
         { "artist",     "artist" },
         { "genre",     "genre"  },
         { "album",    "album" },
         { "duration",      "duration" },
         { "bitRate", "bitrate" },

+        { "aspectRatio", "aspectRatio" },
+        { "frameRate", "frameRate" },

         { "releaseYear",    "releaseYear" },
         { "trackNumber",   "track" },
         { "originUrl", "originUrl" }
         { "releaseYear",    "releaseYear" },
         { "trackNumber",   "track" },
         { "originUrl", "originUrl" }


@@ -150,39 +160,5 @@ QString KBalooRolesProvider::tagsFromValues(const QStringList& values) const
     QCollator coll;
     coll.setNumericMode(true);
     std::sort(alphabeticalOrderTags.begin(), alphabeticalOrderTags.end(), [&](const QString& s1, const QString& s2){ return coll.compare(s1, s2) < 0; });
     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 string;
-    switch (value) {
-    case 1: string = i18nc("@item:intable Image orientation", "Unchanged"); break;
-    case 2: string = i18nc("@item:intable Image orientation", "Horizontally flipped"); break;
-    case 3: string = i18nc("@item:intable image orientation", "180° rotated"); break;
-    case 4: string = i18nc("@item:intable image orientation", "Vertically flipped"); break;
-    case 5: string = i18nc("@item:intable image orientation", "Transposed"); break;
-    case 6: string = i18nc("@item:intable image orientation", "90° rotated"); break;
-    case 7: string = i18nc("@item:intable image orientation", "Transversed"); break;
-    case 8: string = i18nc("@item:intable image orientation", "270° rotated"); break;
-    default:
-        break;
-    }
-    return string;
+    return alphabeticalOrderTags.join(QLatin1String(", "));

 }
 }

-
-QString KBalooRolesProvider::durationFromValue(int value) const
-{
-    QTime duration(0, 0, 0);
-    duration = duration.addSecs(value);
-    return duration.toString(QStringLiteral("hh:mm:ss"));
-}
-
-
-QString KBalooRolesProvider::bitrateFromValue(int value) const
-{
-    KFormat form;
-    QString bitrate = i18nc("@label bitrate (per second)", "%1/s", form.formatByteSize(value, 1, KFormat::MetricBinaryDialect));
-    return bitrate;
-}
-