2 files changed, 10 insertions, 10 deletions
diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index c77c35b6..d13fff1c 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -32,7 +32,7 @@ MainWindow::MainWindow() :
     ui.video_frame_label->setPixmap(no_feed_pixmap);
 
     connect(ui.btnEditCurves, SIGNAL(clicked()), this, SLOT(showCurveConfiguration()));
-    connect(ui.btnShortcuts, SIGNAL(clicked()), this, SLOT(showKeyboardShortcuts()));
+    connect(ui.btnShortcuts, SIGNAL(clicked()), this, SLOT(show_options_dialog()));
     connect(ui.btnShowEngineControls, SIGNAL(clicked()), this, SLOT(showTrackerSettings()));
     connect(ui.btnShowServerControls, SIGNAL(clicked()), this, SLOT(showProtocolSettings()));
     connect(ui.btnShowFilterControls, SIGNAL(clicked()), this, SLOT(showFilterSettings()));
@@ -233,7 +233,7 @@ void MainWindow::updateButtonState(bool running, bool inertialp)
     ui.profile_button->setEnabled(not_running);
 }
 
-void MainWindow::bindKeyboardShortcuts()
+void MainWindow::reload_options()
 {
     if (work)
         work->reload_shortcuts();
@@ -266,8 +266,8 @@ void MainWindow::startTracker() {
     
     work = std::make_shared<Work>(s, pose, libs, this, winId());
     
-    bindKeyboardShortcuts();
-    
+    reload_options();
+
     if (pTrackerDialog)
         pTrackerDialog->register_tracker(libs.pTracker.get());
     
@@ -437,9 +437,9 @@ bool mk_window(mem<t>* place, Args... params)
     }
 }
 
-void MainWindow::showKeyboardShortcuts() {
-    if (mk_window(&shortcuts_widget))
-        connect(shortcuts_widget.get(), SIGNAL(reload()), this, SLOT(bindKeyboardShortcuts()));
+void MainWindow::show_options_dialog() {
+    if (mk_window(&options_widget))
+        connect(options_widget.get(), SIGNAL(reload()), this, SLOT(reload_options()));
 }
 
 void MainWindow::showCurveConfiguration() {
diff --git a/facetracknoir/ui.h b/facetracknoir/ui.h
index b05fa81b..6d15e496 100644
--- a/facetracknoir/ui.h
+++ b/facetracknoir/ui.h
@@ -40,7 +40,7 @@ class MainWindow : public QMainWindow, private State
     mem<QSystemTrayIcon> tray;
     QTimer pose_update_timer;
     QTimer det_timer;
-    mem<OptionsDialog> shortcuts_widget;
+    mem<OptionsDialog> options_widget;
     mem<MapWidget> mapping_widget;
     QShortcut kbd_quit;
     QPixmap no_feed_pixmap;
@@ -80,7 +80,7 @@ private slots:
     void showTrackerSettings();
     void showProtocolSettings();
     void showFilterSettings();
-    void showKeyboardShortcuts();
+    void show_options_dialog();
     void showCurveConfiguration();
     void showHeadPose();
 
@@ -94,7 +94,7 @@ private slots:
 
     void startTracker();
     void stopTracker();
-    void bindKeyboardShortcuts();
+    void reload_options();
 public slots:
     void shortcutRecentered();
     void shortcutToggled();