diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-14 17:59:21 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-14 17:59:21 +0200 |
commit | f5a465e829ce817e8b0fdaf2d240a34f37ca1c35 (patch) | |
tree | 14681bfff4776ad5ef9eca78483d4adc782401b4 /facetracknoir/facetracknoir.h | |
parent | 475df2d12176e906d99822f4517fbb85579f8683 (diff) |
Move keyboard shortcuts to a new file
Windows build could be interminently broken. Will
resolve in following commits.
Diffstat (limited to 'facetracknoir/facetracknoir.h')
-rw-r--r-- | facetracknoir/facetracknoir.h | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index ab0b8bc5..b1a1cb42 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -53,9 +53,7 @@ #include <QDebug> #include <QElapsedTimer> - #include "ui_facetracknoir.h" -#include "ui_ftnoir_keyboardshortcuts.h" #include "ftnoir_protocol_base/ftnoir_protocol_base.h" #include "ftnoir_tracker_base/ftnoir_tracker_base.h" @@ -70,28 +68,6 @@ class FaceTrackNoIR; class KeybindingWorker; -#if defined(__WIN32) || defined(_WIN32) -extern QList<int> global_windows_key_sequences; -#undef DIRECTINPUT_VERSION -#define DIRECTINPUT_VERSION 0x0800 -#include <dinput.h> -struct Key { - BYTE keycode; - bool shift; - bool ctrl; - bool alt; - bool ever_pressed; - QElapsedTimer timer; -public: - Key() : keycode(0), shift(false), ctrl(false), alt(false), ever_pressed(false) - { - } -}; -#else -typedef unsigned char BYTE; -struct Key { int foo; }; -#endif - class FaceTrackNoIR : public QMainWindow, IDynamicLibraryProvider { Q_OBJECT @@ -209,60 +185,4 @@ private slots: }; -class KeyboardShortcutDialog: public QWidget -{ - Q_OBJECT -public: - - explicit KeyboardShortcutDialog( FaceTrackNoIR *ftnoir, QWidget *parent=0, Qt::WindowFlags f=0 ); - virtual ~KeyboardShortcutDialog(); - void showEvent ( QShowEvent * event ); - -private: - Ui::UICKeyboardShortcutDialog ui; - void loadSettings(); - void save(); - - /** helper **/ - bool settingsDirty; - FaceTrackNoIR *mainApp; - -private slots: - void doOK(); - void doCancel(); -}; - -extern QList<QString> global_key_sequences; -#if defined(__WIN32) || defined(_WIN32) -class KeybindingWorkerDummy { -private: - LPDIRECTINPUT8 din; - LPDIRECTINPUTDEVICE8 dinkeyboard; - Key kCenter; - FaceTrackNoIR& window; -public: - volatile bool should_quit; - ~KeybindingWorkerDummy(); - KeybindingWorkerDummy(FaceTrackNoIR& w, Key keyCenter); - void run(); -}; -#else -class KeybindingWorkerDummy { -public: - KeybindingWorkerDummy(FaceTrackNoIR& w, Key keyCenter); - void run() {} -}; -#endif - -class KeybindingWorker : public QThread, public KeybindingWorkerDummy { - Q_OBJECT -public: - KeybindingWorker(FaceTrackNoIR& w, Key keyCenter) : KeybindingWorkerDummy(w, keyCenter) - { - } - void run() { - KeybindingWorkerDummy::run(); - } -}; - #endif // FaceTrackNoIR_H |