--- Vago/trunk/Vago/converter.h	2013/04/13 13:44:29	815
+++ Vago/trunk/Vago/converter.h	2016/09/16 22:51:26	1047
@@ -3,28 +3,40 @@
 #include <QProcess>
 #include <QProgressBar>
 #include <QThread>
+#ifdef Q_OS_WIN
+#include <QWinTaskbarProgress>
+#endif
 
-#include "logger.h"
-#include "util.h"
-//#include <QDebug>
+#include "utilvago.h"
 
 class Converter : public QThread
 {
      Q_OBJECT
 public:
     Converter(QString AppDir, Logger *myLogger, QStringList *myData);
+
+    #ifdef Q_OS_WIN
+    Converter(QString AppDir, Logger *myLogger, QStringList *myData, QWinTaskbarProgress *win7TaskBarProgress);
+    #endif
 private:
     QString AppDir;
     Logger *myLogger;
     QStringList *myData;
+    QProcess *myProcess;
+    bool processHasKilled;
+    #ifdef Q_OS_WIN
+    QWinTaskbarProgress *win7TaskBarProgress = nullptr;
+    #endif
 
 protected:
     void run(); //for thread
 private slots:
+    void terminateCurrProcess();
 signals:
     void setupPB(int numberTasks);
     void taskDone();
     void resultConversion(QString result, int numErrors);
+    void conversionAborted();
 };