summaryrefslogtreecommitdiffstats
path: root/smdirmodel.cpp
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2013-04-06 05:39:29 +0200
committerArno <am@disconnect.de>2013-04-06 05:39:29 +0200
commit02335902fb63e7bc1ebd5931dae93b754dc469ea (patch)
treecfe6ecdef2743db36bc5915497626993f554b884 /smdirmodel.cpp
parent046503ba7830427fcd055da569326f0ac814b979 (diff)
downloadSheMov-02335902fb63e7bc1ebd5931dae93b754dc469ea.tar.gz
SheMov-02335902fb63e7bc1ebd5931dae93b754dc469ea.tar.bz2
SheMov-02335902fb63e7bc1ebd5931dae93b754dc469ea.zip
Show pic size in SmDirModel
If file is an image, grab the size and add it to the model. Also, remove some leftover debug statements from SmTreeView.
Diffstat (limited to 'smdirmodel.cpp')
-rw-r--r--smdirmodel.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/smdirmodel.cpp b/smdirmodel.cpp
index 00857ab..82527a0 100644
--- a/smdirmodel.cpp
+++ b/smdirmodel.cpp
@@ -16,7 +16,7 @@
#include "helper.h"
SmDirModel::SmDirModel(const QStringList &headers, QObject *parent) : SmTreeModel(headers, parent), mHeaders(headers){
- mWatch = new SmDirWatcher(this);
+ mWatch = new SmDirWatcher(NumFields, this);
connect(mWatch, SIGNAL(needRefresh()), this, SLOT(refresh()));
mRunTimer = new QTimer(this);
mRunTimer->setInterval(2000);
@@ -57,6 +57,8 @@ QVariant SmDirModel::data(const QModelIndex &index, int role) const{
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('/');
@@ -77,6 +79,14 @@ QVariant SmDirModel::data(const QModelIndex &index, int role) const{
}
return d.toString();
}
+ if(index.column() == PicSize){
+ QSize size = i->data(PicSize).value<QSize>();
+ if(!size.isValid()){
+ return QVariant();
+ }
+ QString retval = QString(tr("%1x%2 px").arg(QString::number(size.width())).arg(QString::number(size.height())));
+ return retval;
+ }
}
default:
@@ -215,5 +225,10 @@ const QList<QVariant> SmDirModel::fileData(const QFileInfo &fi) const{
}
data << Helper::md5Sum(fi.absoluteFilePath());
data << si << fi.absoluteFilePath();
+ if(mime.startsWith("image")){
+ data << QImage(fi.absoluteFilePath()).size();;
+ }else{
+ data << QVariant();
+ }
return data;
}