X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b8208bda888214f0e0981683c266883adc10e3cb..6d31653c440538916811b957769a89f24eb39d63:/client/proxguiqt.h?ds=sidebyside

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index b3a3e85a..5f7199fc 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -28,6 +28,7 @@
 class Plot: public QWidget
 {
 private:
+	QWidget *master;
 	int GraphStart;
 	double GraphPixelsPerPoint;
 	int CursorAPos;
@@ -88,6 +89,18 @@ class ProxWidget : public QWidget
 		void vchange_dthr_down(int v);
 };
 
+class WorkerThread : public QThread {
+		Q_OBJECT;
+	public:
+		WorkerThread(char*, char*, bool);
+		~WorkerThread();
+		void run();
+	private:
+		char *script_cmds_file = NULL;
+		char *script_cmd = NULL;
+		bool usb_present;
+};
+
 class ProxGuiQT : public QObject
 {
 	Q_OBJECT;
@@ -97,10 +110,10 @@ class ProxGuiQT : public QObject
 		ProxWidget *plotwidget;
 		int argc;
 		char **argv;
-		void (*main_func)(void);
+		WorkerThread *proxmarkThread;
 	
 	public:
-		ProxGuiQT(int argc, char **argv);
+		ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
 		~ProxGuiQT(void);
 		void ShowGraphWindow(void);
 		void RepaintGraphWindow(void);
@@ -112,10 +125,12 @@ class ProxGuiQT : public QObject
 		void _RepaintGraphWindow(void);
 		void _HideGraphWindow(void);
 		void _Exit(void);
+		void _StartProxmarkThread(void);
 	signals:
 		void ShowGraphWindowSignal(void);
 		void RepaintGraphWindowSignal(void);
 		void HideGraphWindowSignal(void);
 		void ExitSignal(void);
 };
+
 #endif // PROXGUI_QT