diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-29 11:05:27 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-29 11:05:27 +0100 |
| commit | 232c2ba8aca7900eaa950c48813ddfaca8a749a8 (patch) | |
| tree | c08da2e256be5b5e80fac3f611f956fef275f142 /ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp | |
| parent | 7128fe581ee2ed25fe8e43ec2be9644e2539e2ad (diff) | |
| parent | 06a0a71f27134a86d19612fd786bfc2ca6f4c4bb (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
fix vtable mess
xargs sed -i -e s/'FaceTrackNoIR Error/Error/g'
support rift 0.2.5, 0.4.2, 0.8.0
rift: finish 0.2.5 support
buffer flush
rename "clientfiles/" to "contrib/" as customary
add dropbox uploader to contrib
add description on wiki for camera offset
Diffstat (limited to 'ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp')
| -rw-r--r-- | ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp index 90cdeec1..3ef1a764 100644 --- a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp +++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp @@ -37,7 +37,7 @@ TrackerControls::TrackerControls() : theTracker(NULL), settingsDirty(false), tim // Stop if no SerialPort dispo if (ui.cbSerialPort->count()<1) { - QMessageBox::critical(this,"FaceTrackNoIR Error", "No SerialPort avaible"); + QMessageBox::critical(this,"Error", "No SerialPort avaible"); } else { int indxport =ui.cbSerialPort->findText(settings.SerialPortName,Qt::MatchExactly ); @@ -45,7 +45,7 @@ TrackerControls::TrackerControls() : theTracker(NULL), settingsDirty(false), tim ui.cbSerialPort->setCurrentIndex(indxport); } else { if (settings.SerialPortName != "") - QMessageBox::warning(this,"FaceTrackNoIR Error", "Selected SerialPort modified"); + QMessageBox::warning(this,"Error", "Selected SerialPort modified"); ui.cbSerialPort-> setCurrentIndex(indxport); } } |