From 417f1d258667d6731e274e256ec2a342285bcd19 Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Wed, 30 Mar 2016 15:33:54 +0200
Subject: Show current position when sliding

Replace \d files selected with \d/\d files.
---
 pictureviewer2.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'pictureviewer2.cpp')

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);
 }
 
-- 
cgit v1.2.3-70-g09d2