summaryrefslogtreecommitdiffhomepage
path: root/facetracknoir/ui.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-05-31 11:51:41 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-05-31 11:51:41 +0200
commit24128cad6973583f5ff26ff8853281a2ff752514 (patch)
tree80eaabeffda3cb20e8eb3d22c31746322ebd9519 /facetracknoir/ui.h
parentf414b6d4e003532ec65eacf6052c2c888b892906 (diff)
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.
Diffstat (limited to 'facetracknoir/ui.h')
-rw-r--r--facetracknoir/ui.h4
1 files changed, 2 insertions, 2 deletions
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<QSystemTrayIcon> tray;
QTimer pose_update_timer;
QTimer det_timer;
- mem<KeyboardShortcutDialog> shortcuts_widget;
+ mem<OptionsDialog> shortcuts_widget;
mem<MapWidget> mapping_widget;
QShortcut kbd_quit;
QPixmap no_feed_pixmap;