Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2

Resolved conflicts manually in files:
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 26 insertions, 0 deletions

diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
new file mode 100644
index 00000000..bb54c354
--- /dev/null
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
@@ -0,0 +1,26 @@
+#include "ftnoir_protocol_libevdev.h"
+#include "facetracknoir/global-settings.h"
+
+LibevdevControls::LibevdevControls() : QWidget()
+{
+	ui.setupUi( this );
+	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
+}
+
+void LibevdevControls::doOK() {
+	save();
+	this->close();
+}
+
+void LibevdevControls::doCancel() {
+    this->close();
+}
+
+void LibevdevControls::save() {
+}
+
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+{
+    return new LibevdevControls;
+}