diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-06 05:13:23 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-06 05:13:23 +0200 |
| commit | 58ceabb21192742a46c9edf321459e54de23f0aa (patch) | |
| tree | fc2ca5528f9dee68aa9013fb1b7424cd54bf45b1 /ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp | |
| parent | 873667c7b59aeb02ffc813630736c87b11664c9b (diff) | |
| parent | 0f7a4ba62369a42cf6b513ce0fa59d117551f0ed (diff) | |
Merge branch 'unstable' into trackhat-ui
* unstable:
ui: sort combobox items according to their name, not filename
mouse: remove GPL, has since been rewritten
mouse: decruft
freetrack: new game definitions
Diffstat (limited to 'ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp')
| -rw-r--r-- | ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp index 6633ee8c..bb5fe3b8 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp @@ -1,51 +1,12 @@ -/******************************************************************************** -* FaceTrackNoIR This program is a private project of some enthusiastic * -* gamers from Holland, who don't like to pay much for * -* head-tracking. * -* * -* Copyright (C) 2012 Wim Vriend (Developing) * -* Ron Hendriks (Researching and Testing) * -* * -* Homepage * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU General Public License as published by the * -* Free Software Foundation; either version 3 of the License, or (at your * -* option) any later version. * -* * -* This program is distributed in the hope that it will be useful, but * -* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * -* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * -* more details. * -* * -* You should have received a copy of the GNU General Public License along * -* with this program; if not, see <http://www.gnu.org/licenses/>. * -* * -********************************************************************************/ #include "ftnoir_protocol_mouse.h" #include "opentrack/plugin-api.hpp" MOUSEControls::MOUSEControls() { ui.setupUi( this ); - ui.cbxSelectMouse_X->addItem("None"); - ui.cbxSelectMouse_X->addItem("X"); - ui.cbxSelectMouse_X->addItem("Y"); - ui.cbxSelectMouse_X->addItem("Z"); - ui.cbxSelectMouse_X->addItem("Yaw"); - ui.cbxSelectMouse_X->addItem("Pitch"); - ui.cbxSelectMouse_X->addItem("Roll"); - ui.cbxSelectMouse_Y->addItem("None"); - ui.cbxSelectMouse_Y->addItem("X"); - ui.cbxSelectMouse_Y->addItem("Y"); - ui.cbxSelectMouse_Y->addItem("Z"); - ui.cbxSelectMouse_Y->addItem("Yaw"); - ui.cbxSelectMouse_Y->addItem("Pitch"); - ui.cbxSelectMouse_Y->addItem("Roll"); - - connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK())); - connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel())); + connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); + connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); tie_setting(s.Mouse_X, ui.cbxSelectMouse_X); tie_setting(s.Mouse_Y, ui.cbxSelectMouse_Y); |