New feature: tracker disablement on keystroke

Requested-by: Patrick Ruoff (c14)
Reviewed-by: mm0zct (first commit)

Untested on Win32! Not even compile-time-tested...

Merge remote-tracking branch 'origin/feature/toggle-tracking-enabled-20131016'

1 files changed, 5 insertions, 4 deletions

diff --git a/facetracknoir/shortcuts.h b/facetracknoir/shortcuts.h
index 05c36520..a98211a8 100644
--- a/facetracknoir/shortcuts.h
+++ b/facetracknoir/shortcuts.h
@@ -17,7 +17,7 @@ public:
 
     explicit KeyboardShortcutDialog( FaceTrackNoIR *ftnoir, QWidget *parent );
     virtual ~KeyboardShortcutDialog();
-	void showEvent ( QShowEvent * event );
+    void showEvent (QShowEvent *);
 
 private:
 	Ui::UICKeyboardShortcutDialog ui;
@@ -64,17 +64,18 @@ private:
     LPDIRECTINPUT8 din;
     LPDIRECTINPUTDEVICE8 dinkeyboard;
     Key kCenter;
+    Key kToggle;
     FaceTrackNoIR& window;
 public:
     volatile bool should_quit;
     ~KeybindingWorkerImpl();
-    KeybindingWorkerImpl(FaceTrackNoIR& w, Key keyCenter);
+    KeybindingWorkerImpl(FaceTrackNoIR& w, Key keyCenter, Key keyToggle);
 	void run();
 };
 #else
 class KeybindingWorkerImpl {
 public:
-    KeybindingWorkerImpl(FaceTrackNoIR& w, Key keyCenter);
+    KeybindingWorkerImpl(FaceTrackNoIR& w, Key keyCenter, Key keyToggle);
 	void run() {}
 };
 #endif
@@ -82,7 +83,7 @@ public:
 class KeybindingWorker : public QThread, public KeybindingWorkerImpl {
 	Q_OBJECT
 public:
-	KeybindingWorker(FaceTrackNoIR& w, Key keyCenter) : KeybindingWorkerImpl(w, keyCenter)
+    KeybindingWorker(FaceTrackNoIR& w, Key keyCenter, Key keyToggle) : KeybindingWorkerImpl(w, keyCenter, keyToggle)
 	{
 	}
 	void run() {