Show current position when sliding

Replace \d files selected with \d/\d files.

3 files changed, 7 insertions, 5 deletions

diff --git a/filepropertiesdialog.cpp b/filepropertiesdialog.cpp
index 468da04..14b8c8a 100644
--- a/filepropertiesdialog.cpp
+++ b/filepropertiesdialog.cpp
@@ -133,6 +133,7 @@ void FilePropertiesDialog::movieDataRecursive(QJsonValue start, SmTreeItem *appe
 }
 
 void FilePropertiesDialog::pictureData(){
+    // the sheer numbers...
     QImage img = QImage(mFile);
     if(img.isNull()){
         return;
@@ -145,6 +146,8 @@ void FilePropertiesDialog::pictureData(){
     appendItem(QList<QVariant>() << tr("qt format") << img.format(), rootItem);
     appendItem(QList<QVariant>() << tr("byte count") << img.byteCount(), rootItem);
     mPicModel->setRoot(rootItem);
+
+    //now let's see if the file is already in the archive
     QString md5sum = Helper::md5Sum(mFile);
     QSqlDatabase db = QSqlDatabase::database("treedb");
     db.open();
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index 16f9e98..1de6ef9 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -586,7 +586,7 @@ void PictureViewer2::constructInfoItem(const PicData &data, QSize picSize, bool
         QPixmap pm = QPixmap(data.at(PicFilesModel::FullPath).toString());
         picSize = pm.size();
     }
-    mFnItem = new PictureViewer2Item(data, mTotal, picSize);
+    mFnItem = new PictureViewer2Item(data, mTotal, mNextSlideCtr, picSize);
     if(mShowMarkItem){
         if(mMarkedFiles.contains(data)){
             mFnItem->appendText("<span style=\"color:green\">marked</span>");
@@ -814,8 +814,7 @@ void PictureViewerSlideDlg::noSlideToggled(bool checked){
     }
 }
 
-PictureViewer2Item::PictureViewer2Item(const PicData &data, const int numSelected, const QSize &picSize, QGraphicsItem *parent) : QGraphicsItem(parent), mDoc(0){
-    QStringList textList;
+PictureViewer2Item::PictureViewer2Item(const PicData &data, const int numSelected, int cur, const QSize &picSize, QGraphicsItem *parent) : QGraphicsItem(parent), mDoc(0){
     //prevent QStaticText from wrapping filesnames with spaces
     //we shouldn't allow this in the first place
     mTextList << data.at(PicFilesModel::FileName).toString().replace(' ', '_');
@@ -824,7 +823,7 @@ PictureViewer2Item::PictureViewer2Item(const PicData &data, const int numSelecte
     mTextList << QString(QObject::tr("%1 bytes")).arg(l.toString(data.at(PicFilesModel::Size).toInt()));
     mTextList << l.toString(data.at(PicFilesModel::Added).toDate());
     mTextList << data.at(PicFilesModel::MimeType).toString();
-    mTextList << QString(QObject::tr("%1 files selected")).arg(QString::number(numSelected));
+    mTextList << QString(QObject::tr("%1/%2 files")).arg(QString::number(cur + 1)).arg(QString::number(numSelected));
     setZValue(1);
 }
 
diff --git a/pictureviewer2.h b/pictureviewer2.h
index f414b9a..c4a7a52 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -176,7 +176,7 @@ class PictureViewerSlideDlg : public QDialog {
 
 class PictureViewer2Item : public QGraphicsItem {
     public:
-        explicit PictureViewer2Item(const PicData &data, const int numSelected, const QSize &picSize = QSize(), QGraphicsItem *parent = 0);
+        explicit PictureViewer2Item(const PicData &data, const int numSelected, int cur, const QSize &picSize = QSize(), QGraphicsItem *parent = 0);
         explicit PictureViewer2Item(QTextDocument *doc, QGraphicsItem *parent = 0);
         ~PictureViewer2Item();
         QRectF boundingRect() const;