new style for the progressbars, display more info

[case] / src / fileoperator.h

diff --git a/src/fileoperator.h b/src/fileoperator.h
index b73e45a..076250d 100644 (file)
--- a/src/fileoperator.h
+++ b/src/fileoperator.h
@@ -24,6 +24,7 @@
 #include <QMutex>
 #include <QWaitCondition>
 #include <QDir>
+#include <QFSFileEngine>
 #include <QMap>
 #include <QSet>
 
@@ -64,6 +65,7 @@ public slots:
     void remove(FileManipulatorThread* manipulator);
     void setBarSize(FileManipulatorThread* manipulator, unsigned int size);
     void updateProgress(FileManipulatorThread* manipulator, int value);
+    void updateMainText(FileManipulatorThread* manipulator, const QString &text);
     void showPaused(FileManipulatorThread* manipulator);
 
     void togglePauseOperation(FileManipulatorThread* manipulator);
@@ -73,6 +75,7 @@ protected:
     void caterNewThread(FileManipulatorThread *thread);
 
     QList<FileManipulatorThread*> manipulatorList;
+    QPixmap deleteIcon, inverseDeleteIcon, copyIcon, inverseCopyIcon, moveIcon, inverseMoveIcon;
 };
 
 
@@ -118,6 +121,8 @@ protected:
 
     void waitOnCond();
 
+    bool checkSequentialFile(const QFSFileEngine &engine);
+
     QWaitCondition waitCond;
 
     // files to process by the operation
@@ -140,8 +145,8 @@ protected:
     // 1 for a file and file count for dirs (or both for copy&delete)
     QMap<QString, qint64> fileSizeMap;
 
-    // the name of the file thats being processed (for progressBar) and the text of the progressBar (the format)
-    QString fileName, barText;
+    // the text of the progressBar (the format)
+    QString barText;
     // stamp of the last ETA recalculation - done every second
     time_t lastTimeUpdate;
     time_t startTime, waitTime;
@@ -156,6 +161,7 @@ signals:
     void finished(FileManipulatorThread*);
     void setBarSize(FileManipulatorThread*, unsigned int);
     void updateProgress(FileManipulatorThread*, int);
+    void updateFileName(FileManipulatorThread*, QString);
     void operationPaused(FileManipulatorThread*);
 };