Put duration and size in one Field (SmDirModel)

Consolidate duration and size in one Field, like in the archive, to be
consistent. Also rename the Role and Field accordingly.

1 files changed, 12 insertions, 16 deletions

diff --git a/smdirmodel.cpp b/smdirmodel.cpp
index cdec768..8a6c961 100644
--- a/smdirmodel.cpp
+++ b/smdirmodel.cpp
@@ -51,14 +51,12 @@ QVariant SmDirModel::data(const QModelIndex &index, int role) const{
             return i->data(Created);
         case Md5sumRole:
             return i->data(Md5sum);
-        case DurationRole:
-            return i->data(Duration);
+        case DurSizeRole:
+            return i->data(DurSize);
         case BitrateRole:
             return i->data(Bitrate);
         case FullPathRole:
             return i->data(FullPath);
-        case PicSizeRole:
-            return i->data(PicSize);
         case Qt::DecorationRole: {
             if(index.column() == 0){
                 QStringList mime = i->data(Type).toString().split('/');
@@ -72,20 +70,18 @@ QVariant SmDirModel::data(const QModelIndex &index, int role) const{
             }
         }
         case Qt::DisplayRole: {
-            if(index.column() == Duration){
-                Helper::Duration d = i->data(Duration).value<Helper::Duration>();
-                if(d.isNull()){
-                    return QVariant();
+            if(index.column() == DurSize){
+                QVariant d = i->data(DurSize);
+                if(d.canConvert<Helper::Duration>()){
+                    Helper::Duration dur = d.value<Helper::Duration>();
+                    return dur.toString();
                 }
-                return d.toString();
-            }
-            if(index.column() == PicSize){
-                QSize size = i->data(PicSize).value<QSize>();
-                if(!size.isValid()){
-                    return QVariant();
+                if(d.canConvert<QSize>()){
+                    QSize size = d.value<QSize>();
+                    QString retval = QString(tr("%1x%2 px").arg(QString::number(size.width())).arg(QString::number(size.height())));
+                    return retval;
                 }
-                QString retval = QString(tr("%1x%2 px").arg(QString::number(size.width())).arg(QString::number(size.height())));
-                return retval;
+                return QVariant();
             }
         }