From 24128cad6973583f5ff26ff8853281a2ff752514 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 31 May 2015 11:51:41 +0200 Subject: ui: introduce options dialog Move the non-mapping contents of mapping dialog to new options dialog. The latter now also contains what used to be in the shortcuts dialog. --- facetracknoir/curve-config.cpp | 27 - facetracknoir/keyboard.ui | 333 ---------- facetracknoir/main.ui | 2 +- facetracknoir/mapping.ui | 753 +--------------------- facetracknoir/options-dialog.cpp | 77 +++ facetracknoir/options-dialog.hpp | 21 + facetracknoir/settings.ui | 1276 +++++++++++++++++++++++++++++++++++++ facetracknoir/shortcut-dialog.cpp | 49 -- facetracknoir/shortcut-dialog.hpp | 21 - facetracknoir/ui.cpp | 2 +- facetracknoir/ui.h | 4 +- 11 files changed, 1379 insertions(+), 1186 deletions(-) delete mode 100644 facetracknoir/keyboard.ui create mode 100644 facetracknoir/options-dialog.cpp create mode 100644 facetracknoir/options-dialog.hpp create mode 100644 facetracknoir/settings.ui delete mode 100644 facetracknoir/shortcut-dialog.cpp delete mode 100644 facetracknoir/shortcut-dialog.hpp (limited to 'facetracknoir') diff --git a/facetracknoir/curve-config.cpp b/facetracknoir/curve-config.cpp index ac34e57a..f6c78f79 100644 --- a/facetracknoir/curve-config.cpp +++ b/facetracknoir/curve-config.cpp @@ -52,33 +52,6 @@ MapWidget::MapWidget(Mappings& m, main_settings& s) : tie_setting(s.a_yaw.altp, ui.rx_altp); tie_setting(s.a_pitch.altp, ui.ry_altp); tie_setting(s.a_roll.altp, ui.rz_altp); - - tie_setting(s.tcomp_p, ui.tcomp_enable); - tie_setting(s.tcomp_tz, ui.tcomp_rz); - - tie_setting(s.a_x.zero, ui.pos_tx); - tie_setting(s.a_y.zero, ui.pos_ty); - tie_setting(s.a_z.zero, ui.pos_tz); - tie_setting(s.a_yaw.zero, ui.pos_rx); - tie_setting(s.a_pitch.zero, ui.pos_ry); - tie_setting(s.a_roll.zero, ui.pos_rz); - - tie_setting(s.a_yaw.invert, ui.invert_yaw); - tie_setting(s.a_pitch.invert, ui.invert_pitch); - tie_setting(s.a_roll.invert, ui.invert_roll); - tie_setting(s.a_x.invert, ui.invert_x); - tie_setting(s.a_y.invert, ui.invert_y); - tie_setting(s.a_z.invert, ui.invert_z); - - tie_setting(s.a_yaw.src, ui.src_yaw); - tie_setting(s.a_pitch.src, ui.src_pitch); - tie_setting(s.a_roll.src, ui.src_roll); - tie_setting(s.a_x.src, ui.src_x); - tie_setting(s.a_y.src, ui.src_y); - tie_setting(s.a_z.src, ui.src_z); - - tie_setting(s.camera_yaw, ui.camera_yaw); - tie_setting(s.camera_pitch, ui.camera_pitch); } void MapWidget::doOK() { diff --git a/facetracknoir/keyboard.ui b/facetracknoir/keyboard.ui deleted file mode 100644 index 13a1804d..00000000 --- a/facetracknoir/keyboard.ui +++ /dev/null @@ -1,333 +0,0 @@ - - - UICKeyboardShortcutDialog - - - - 0 - 0 - 461 - 431 - - - - - 0 - 0 - - - - Keyboard shortcuts - - - - images/facetracknoir.pngimages/facetracknoir.png - - - Qt::LeftToRight - - - false - - - - - - QFrame::StyledPanel - - - QFrame::Plain - - - - - - - 50 - 16777215 - - - - Shift - - - - - - - - 50 - 16777215 - - - - Ctrl - - - - - - - - 50 - 16777215 - - - - Shift - - - - - - - - 0 - 0 - - - - Zero - - - false - - - - - - - - 50 - 16777215 - - - - Alt - - - - - - - - 50 - 16777215 - - - - Ctrl - - - - - - - - 0 - 0 - - - - Keyboard - - - Qt::AlignCenter - - - false - - - - - - - - 50 - 16777215 - - - - Alt - - - - - - - - 50 - 16777215 - - - - Ctrl - - - - - - - - 50 - 16777215 - - - - Shift - - - - - - - - 0 - 0 - - - - Center - - - false - - - - - - - - 90 - 0 - - - - Select Number - - - QComboBox::InsertAlphabetically - - - - - - - - 0 - 0 - - - - Toggle - - - false - - - - - - - - 90 - 0 - - - - Select Number - - - QComboBox::InsertAlphabetically - - - - - - - - 50 - 16777215 - - - - Alt - - - - - - - - 90 - 0 - - - - Select Number - - - QComboBox::InsertAlphabetically - - - - - - - - - - Center at startup - - - - - - - Minimize to tray - - - - - - - Game detection - - - - - - - 0 - 0 - - - - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - process_detector - QWidget -
facetracknoir/process_detector.h
- - - - - - startEngineClicked() - stopEngineClicked() - cameraSettingsClicked() - - diff --git a/facetracknoir/main.ui b/facetracknoir/main.ui index ecf106be..77a3ef3a 100644 --- a/facetracknoir/main.ui +++ b/facetracknoir/main.ui @@ -903,7 +903,7 @@ - Keys + Options diff --git a/facetracknoir/mapping.ui b/facetracknoir/mapping.ui index 47e91daf..379bbe08 100644 --- a/facetracknoir/mapping.ui +++ b/facetracknoir/mapping.ui @@ -51,7 +51,7 @@ QTabWidget::North - 6 + 0 @@ -353,750 +353,6 @@ - - - Options - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Center pose - - - Qt::AlignCenter - - - true - - - false - - - - - - deg. - - - 3 - - - -180.000000000000000 - - - 180.000000000000000 - - - - - - - cm - - - 3 - - - -100.000000000000000 - - - 100.000000000000000 - - - - - - - TX - - - - - - - cm - - - 3 - - - -100.000000000000000 - - - 100.000000000000000 - - - - - - - RY - - - - - - - TY - - - - - - - deg. - - - 3 - - - -180.000000000000000 - - - 180.000000000000000 - - - - - - - TZ - - - - - - - RZ - - - - - - - cm - - - 3 - - - -100.000000000000000 - - - 100.000000000000000 - - - - - - - RX - - - - - - - deg. - - - 3 - - - -180.000000000000000 - - - 180.000000000000000 - - - - - - - - - - - 65536 - 65536 - - - - - true - - - - Output remap - - - Qt::AlignCenter - - - true - - - false - - - - QLayout::SetMinAndMaxSize - - - 6 - - - - - Assign input axis to output axis. - - - Qt::AlignJustify|Qt::AlignVCenter - - - true - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - - - - - - - - - - Roll - - - - - - - X - - - - - - - Invert - - - - - - - - X - - - - - Y - - - - - Z - - - - - Yaw - - - - - Pitch - - - - - Roll - - - - - Disabled - - - - - - - - Pitch - - - - - - - - X - - - - - Y - - - - - Z - - - - - Yaw - - - - - Pitch - - - - - Roll - - - - - Disabled - - - - - - - - - X - - - - - Y - - - - - Z - - - - - Yaw - - - - - Pitch - - - - - Roll - - - - - Disabled - - - - - - - - - - - - - - - Y - - - - - - - Destination - - - - - - - - - - - - - - Yaw - - - - - - - - - - - - - - Source - - - - - - - - X - - - - - Y - - - - - Z - - - - - Yaw - - - - - Pitch - - - - - Roll - - - - - Disabled - - - - - - - - - - - - - - - - X - - - - - Y - - - - - Z - - - - - Yaw - - - - - Pitch - - - - - Roll - - - - - Disabled - - - - - - - - Z - - - - - - - - X - - - - - Y - - - - - Z - - - - - Yaw - - - - - Pitch - - - - - Roll - - - - - Disabled - - - - - - - - - - - - - label_15 - label_13 - label_14 - src_yaw - invert_yaw - label_7 - src_pitch - label_8 - invert_pitch - label_9 - src_roll - invert_roll - label_10 - src_x - invert_x - label_11 - src_y - invert_y - label_12 - src_z - invert_z - - - - - - - - - - 0 - 0 - - - - - - - Translation compensation - - - true - - - - - - - 0 - 0 - - - - - - - Enable - - - - - - - - - - Disable Z axis compensation - - - - - - - With compensation on, translation is applied after rotation. For example, rotating +180 degrees yaw and moving backwards results in moving forward as a result of that rotation. - - - Qt::AlignJustify|Qt::AlignVCenter - - - true - - - - - - - - - - - 0 - 0 - - - - Camera offset - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - - - - 0 - 0 - - - - Yaw - - - - - - - - 0 - 0 - - - - -90 - - - 90 - - - - - - - - 0 - 0 - - - - Pitch - - - - - - - - 0 - 0 - - - - -90 - - - 90 - - - - - - - - - - Specify an angle for off-center camera as a basis for which direction is which, avoiding axis interconnect. - - - Qt::AlignJustify|Qt::AlignVCenter - - - true - - - - - - - - @@ -1116,21 +372,14 @@ - pos_rx - pos_ry - pos_rz ry_altp rz_altp tx_altp ty_altp tz_altp - tcomp_enable tabWidget - pos_tx buttonBox - pos_ty rx_altp - pos_tz diff --git a/facetracknoir/options-dialog.cpp b/facetracknoir/options-dialog.cpp new file mode 100644 index 00000000..4489e502 --- /dev/null +++ b/facetracknoir/options-dialog.cpp @@ -0,0 +1,77 @@ +#include "options-dialog.hpp" + +OptionsDialog::OptionsDialog() +{ + ui.setupUi( this ); + + connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); + connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); + + for ( int i = 0; i < global_key_sequences.size(); i++) { + ui.cbxCenterKey->addItem(global_key_sequences.at(i)); + ui.cbxToggleKey->addItem(global_key_sequences.at(i)); + ui.cbxZeroKey->addItem(global_key_sequences.at(i)); + } + + tie_setting(s.center.key_index, ui.cbxCenterKey); + tie_setting(s.center.alt, ui.chkCenterAlt); + tie_setting(s.center.shift, ui.chkCenterShift); + tie_setting(s.center.ctrl, ui.chkCenterCtrl); + + tie_setting(s.toggle.key_index, ui.cbxToggleKey); + tie_setting(s.toggle.alt, ui.chkToggleAlt); + tie_setting(s.toggle.shift, ui.chkToggleShift); + tie_setting(s.toggle.ctrl, ui.chkToggleCtrl); + + tie_setting(s.zero.key_index, ui.cbxZeroKey); + tie_setting(s.zero.alt, ui.chkZeroAlt); + tie_setting(s.zero.shift, ui.chkZeroShift); + tie_setting(s.zero.ctrl, ui.chkZeroCtrl); + + tie_setting(s.s_main.tray_enabled, ui.trayp); + + tie_setting(s.s_main.center_at_startup, ui.center_at_startup); + + tie_setting(s.s_main.tcomp_p, ui.tcomp_enable); + tie_setting(s.s_main.tcomp_tz, ui.tcomp_rz); + + tie_setting(s.s_main.a_x.zero, ui.pos_tx); + tie_setting(s.s_main.a_y.zero, ui.pos_ty); + tie_setting(s.s_main.a_z.zero, ui.pos_tz); + tie_setting(s.s_main.a_yaw.zero, ui.pos_rx); + tie_setting(s.s_main.a_pitch.zero, ui.pos_ry); + tie_setting(s.s_main.a_roll.zero, ui.pos_rz); + + tie_setting(s.s_main.a_yaw.invert, ui.invert_yaw); + tie_setting(s.s_main.a_pitch.invert, ui.invert_pitch); + tie_setting(s.s_main.a_roll.invert, ui.invert_roll); + tie_setting(s.s_main.a_x.invert, ui.invert_x); + tie_setting(s.s_main.a_y.invert, ui.invert_y); + tie_setting(s.s_main.a_z.invert, ui.invert_z); + + tie_setting(s.s_main.a_yaw.src, ui.src_yaw); + tie_setting(s.s_main.a_pitch.src, ui.src_pitch); + tie_setting(s.s_main.a_roll.src, ui.src_roll); + tie_setting(s.s_main.a_x.src, ui.src_x); + tie_setting(s.s_main.a_y.src, ui.src_y); + tie_setting(s.s_main.a_z.src, ui.src_z); + + tie_setting(s.s_main.camera_yaw, ui.camera_yaw); + tie_setting(s.s_main.camera_pitch, ui.camera_pitch); + tie_setting(s.s_main.camera_roll, ui.camera_roll); +} + +void OptionsDialog::doOK() { + s.b->save(); + s.s_main.b->save(); + ui.game_detector->save(); + this->close(); + emit reload(); +} + +void OptionsDialog::doCancel() { + s.b->reload(); + s.s_main.b->reload(); + ui.game_detector->revert(); + close(); +} diff --git a/facetracknoir/options-dialog.hpp b/facetracknoir/options-dialog.hpp new file mode 100644 index 00000000..71a3acda --- /dev/null +++ b/facetracknoir/options-dialog.hpp @@ -0,0 +1,21 @@ +#pragma once + +#include +#include +#include "ui_settings.h" +#include "opentrack/shortcuts.h" + +class OptionsDialog: public QWidget +{ + Q_OBJECT +signals: + void reload(); +public: + OptionsDialog(); +private: + Ui::UI_Settings ui; + Shortcuts::settings s; +private slots: + void doOK(); + void doCancel(); +}; diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui new file mode 100644 index 00000000..5fffe509 --- /dev/null +++ b/facetracknoir/settings.ui @@ -0,0 +1,1276 @@ + + + UI_Settings + + + + 0 + 0 + 399 + 531 + + + + + 0 + 0 + + + + Options + + + + images/facetracknoir.pngimages/facetracknoir.png + + + Qt::LeftToRight + + + false + + + + + + 0 + + + + Shortcuts + + + + + + Global shortcuts + + + + + + + 0 + 0 + + + + <html><head/><body><p><span style=" font-weight:600;">Center</span> - use current pose as looking perfectly forward.<br/><span style=" font-weight:600;">Toggle</span> - keep looking at same spot until next toggle keypress.<br/><span style=" font-weight:600;">Zero</span> - keep looking perfectly forward while the key is pressed.<br/></p></body></html> + + + true + + + + + + + + 0 + 0 + + + + QGroupBox { border: 0; } + + + + + + + 0 + 0 + + + + Toggle + + + false + + + + + + + + 50 + 16777215 + + + + Shift + + + + + + + + 50 + 16777215 + + + + Ctrl + + + + + + + + 90 + 0 + + + + Select Number + + + QComboBox::InsertAlphabetically + + + + + + + + 0 + 0 + + + + Center + + + false + + + + + + + + 50 + 16777215 + + + + Alt + + + + + + + + 0 + 0 + + + + Zero + + + false + + + + + + + + 50 + 16777215 + + + + Alt + + + + + + + + 50 + 16777215 + + + + Ctrl + + + + + + + + 50 + 16777215 + + + + Alt + + + + + + + + 50 + 16777215 + + + + Ctrl + + + + + + + + 50 + 16777215 + + + + Shift + + + + + + + + 90 + 0 + + + + Select Number + + + QComboBox::InsertAlphabetically + + + + + + + + 50 + 16777215 + + + + Shift + + + + + + + + 90 + 0 + + + + Select Number + + + QComboBox::InsertAlphabetically + + + + + + + + + + + + + Center at startup + + + + + + + Minimize to tray + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Game detection + + + + + + Game detection + + + + + + + 0 + 0 + + + + + + + + + + + + Camera + + + + + + + 0 + 0 + + + + Camera offset + + + + + + Specify an angle for off-center camera as a basis for which direction is which, avoiding axis interconnect. + + + Qt::AlignJustify|Qt::AlignVCenter + + + true + + + 2 + + + + + + + QGroupBox +{ + border: 0; +} + + + + + + + 0 + 0 + + + + Roll + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + -90 + + + 90 + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + -90 + + + 90 + + + + + + + + 0 + 0 + + + + Pitch + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + -90 + + + 90 + + + + + + + + 0 + 0 + + + + Yaw + + + + + + + + + + + + + Center pose offset + + + + + + Alter the centered position sent to games by a fixed amount. + + + true + + + 2 + + + + + + + + 0 + 0 + + + + QGroupBox { + border: 0; +} + + + + + + Qt::AlignCenter + + + false + + + false + + + + + + deg. + + + 3 + + + -180.000000000000000 + + + 180.000000000000000 + + + + + + + cm + + + 3 + + + -100.000000000000000 + + + 100.000000000000000 + + + + + + + TX + + + + + + + cm + + + 3 + + + -100.000000000000000 + + + 100.000000000000000 + + + + + + + RY + + + + + + + TY + + + + + + + deg. + + + 3 + + + -180.000000000000000 + + + 180.000000000000000 + + + + + + + TZ + + + + + + + RZ + + + + + + + cm + + + 3 + + + -100.000000000000000 + + + 100.000000000000000 + + + + + + + RX + + + + + + + deg. + + + 3 + + + -180.000000000000000 + + + 180.000000000000000 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Output + + + + + + + 0 + 0 + + + + + + + Translation compensation + + + false + + + + + + With compensation on, translation is applied after rotation. For example, rotating +180 degrees yaw and moving backwards results in moving forward as a result of that rotation. + + + Qt::AlignJustify|Qt::AlignVCenter + + + true + + + 2 + + + + + + + + 0 + 0 + + + + + + + Enable + + + + + + + + + + Disable Z axis compensation + + + + + + + + + + + 65536 + 65536 + + + + + true + + + + Output remap + + + Qt::AlignCenter + + + false + + + false + + + + QLayout::SetMinAndMaxSize + + + 6 + + + + + Assign input axis to output axis. + + + Qt::AlignJustify|Qt::AlignVCenter + + + true + + + + + + + QGroupBox +{ + border: 0; +} + + + + + + + + + + + + + Roll + + + + + + + X + + + + + + + Invert + + + + + + + + X + + + + + Y + + + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll + + + + + Disabled + + + + + + + + Pitch + + + + + + + + X + + + + + Y + + + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll + + + + + Disabled + + + + + + + + + X + + + + + Y + + + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll + + + + + Disabled + + + + + + + + + + + + + + + Y + + + + + + + Destination + + + + + + + + + + + + + + Yaw + + + + + + + + + + + + + + Source + + + + + + + + X + + + + + Y + + + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll + + + + + Disabled + + + + + + + + + + + + + + + + X + + + + + Y + + + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll + + + + + Disabled + + + + + + + + Z + + + + + + + + X + + + + + Y + + + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll + + + + + Disabled + + + + + + + + + + + + + label_15 + label_13 + label_14 + src_yaw + invert_yaw + label_7 + src_pitch + label_8 + invert_pitch + label_9 + src_roll + invert_roll + label_10 + src_x + invert_x + label_11 + src_y + invert_y + label_12 + src_z + invert_z + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + process_detector + QWidget +
facetracknoir/process_detector.h
+ + + + chkCenterShift + tabWidget + chkCenterAlt + cbxCenterKey + chkToggleShift + chkToggleCtrl + chkToggleAlt + cbxToggleKey + chkZeroShift + chkZeroCtrl + chkZeroAlt + cbxZeroKey + center_at_startup + trayp + chkCenterCtrl + camera_yaw + camera_pitch + camera_roll + pos_rx + pos_ry + pos_rz + pos_tx + pos_ty + pos_tz + tcomp_enable + tcomp_rz + src_yaw + invert_yaw + src_pitch + invert_pitch + src_roll + invert_roll + src_x + invert_x + src_y + invert_y + src_z + invert_z + + + + + startEngineClicked() + stopEngineClicked() + cameraSettingsClicked() + + diff --git a/facetracknoir/shortcut-dialog.cpp b/facetracknoir/shortcut-dialog.cpp deleted file mode 100644 index b4c236c6..00000000 --- a/facetracknoir/shortcut-dialog.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "shortcut-dialog.hpp" - -KeyboardShortcutDialog::KeyboardShortcutDialog() -{ - ui.setupUi( this ); - - connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); - connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); - - for ( int i = 0; i < global_key_sequences.size(); i++) { - ui.cbxCenterKey->addItem(global_key_sequences.at(i)); - ui.cbxToggleKey->addItem(global_key_sequences.at(i)); - ui.cbxZeroKey->addItem(global_key_sequences.at(i)); - } - - tie_setting(s.center.key_index, ui.cbxCenterKey); - tie_setting(s.center.alt, ui.chkCenterAlt); - tie_setting(s.center.shift, ui.chkCenterShift); - tie_setting(s.center.ctrl, ui.chkCenterCtrl); - - tie_setting(s.toggle.key_index, ui.cbxToggleKey); - tie_setting(s.toggle.alt, ui.chkToggleAlt); - tie_setting(s.toggle.shift, ui.chkToggleShift); - tie_setting(s.toggle.ctrl, ui.chkToggleCtrl); - - tie_setting(s.zero.key_index, ui.cbxZeroKey); - tie_setting(s.zero.alt, ui.chkZeroAlt); - tie_setting(s.zero.shift, ui.chkZeroShift); - tie_setting(s.zero.ctrl, ui.chkZeroCtrl); - - tie_setting(s.s_main.tray_enabled, ui.trayp); - - tie_setting(s.s_main.center_at_startup, ui.center_at_startup); -} - -void KeyboardShortcutDialog::doOK() { - s.b->save(); - s.s_main.b->save(); - ui.game_detector->save(); - this->close(); - emit reload(); -} - -void KeyboardShortcutDialog::doCancel() { - s.b->reload(); - s.s_main.b->reload(); - ui.game_detector->revert(); - close(); -} diff --git a/facetracknoir/shortcut-dialog.hpp b/facetracknoir/shortcut-dialog.hpp deleted file mode 100644 index 2a364822..00000000 --- a/facetracknoir/shortcut-dialog.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include -#include -#include "ui_keyboard.h" -#include "opentrack/shortcuts.h" - -class KeyboardShortcutDialog: public QWidget -{ - Q_OBJECT -signals: - void reload(); -public: - KeyboardShortcutDialog(); -private: - Ui::UICKeyboardShortcutDialog ui; - Shortcuts::settings s; -private slots: - void doOK(); - void doCancel(); -}; diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp index cb7669ce..997af5f0 100644 --- a/facetracknoir/ui.cpp +++ b/facetracknoir/ui.cpp @@ -385,7 +385,7 @@ void MainWindow::showFilterSettings() { } void MainWindow::showKeyboardShortcuts() { - shortcuts_widget = std::make_shared(); + shortcuts_widget = std::make_shared(); shortcuts_widget->setWindowFlags(Qt::Dialog); connect(shortcuts_widget.get(), SIGNAL(reload()), this, SLOT(bindKeyboardShortcuts())); shortcuts_widget->show(); diff --git a/facetracknoir/ui.h b/facetracknoir/ui.h index d0ea4e75..1705553b 100644 --- a/facetracknoir/ui.h +++ b/facetracknoir/ui.h @@ -54,7 +54,7 @@ #include "opentrack/work.hpp" #include "opentrack/state.hpp" #include "curve-config.h" -#include "shortcut-dialog.hpp" +#include "options-dialog.hpp" #include "process_detector.h" using namespace options; @@ -67,7 +67,7 @@ class MainWindow : public QMainWindow, private State mem tray; QTimer pose_update_timer; QTimer det_timer; - mem shortcuts_widget; + mem shortcuts_widget; mem mapping_widget; QShortcut kbd_quit; QPixmap no_feed_pixmap; -- cgit v1.2.3