Merge branch 'unstable' into trackhat

1 files changed, 22 insertions, 0 deletions

diff --git a/proto-vjoy/ftnoir_protocol_vjoy_dialog.cpp b/proto-vjoy/ftnoir_protocol_vjoy_dialog.cpp
new file mode 100644
index 00000000..08c65558
--- /dev/null
+++ b/proto-vjoy/ftnoir_protocol_vjoy_dialog.cpp
@@ -0,0 +1,22 @@
+#include "ftnoir_protocol_vjoy.h"
+#include "opentrack/plugin-api.hpp"
+
+VJoyControls::VJoyControls()
+{
+	ui.setupUi( this );
+	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
+}
+
+void VJoyControls::doOK() {
+	save();
+	this->close();
+}
+
+void VJoyControls::doCancel() {
+    this->close();
+}
+
+void VJoyControls::save() {
+}
+