summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-03-21 16:45:50 +0100
committerStanislaw Halik <sthalik@misaki.pl>2017-03-21 16:59:11 +0100
commit50378f83803314a1eba50b80d66bd5884e9a4443 (patch)
tree668192e7ea9663447e0c97d411fcefe6aa441de4
parentda2fe3c89a24a67ade9ebf73551b1816007363ac (diff)
gui: remove needless options
-rw-r--r--gui/main-window.cpp12
-rw-r--r--gui/options-dialog.cpp10
2 files changed, 15 insertions, 7 deletions
diff --git a/gui/main-window.cpp b/gui/main-window.cpp
index 7efec930..f7706ed2 100644
--- a/gui/main-window.cpp
+++ b/gui/main-window.cpp
@@ -61,7 +61,7 @@ MainWindow::MainWindow() :
if (!refresh_config_list())
return;
- connect(ui.btnEditCurves, SIGNAL(clicked()), this, SLOT(showCurveConfiguration()));
+ //connect(ui.btnEditCurves, SIGNAL(clicked()), this, SLOT(showCurveConfiguration()));
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()));
@@ -130,8 +130,10 @@ MainWindow::MainWindow() :
[&](const QString&) { if (pFilterDialog) pFilterDialog = nullptr; save_modules(); });
}
+#if 0
tie_setting(m.tracker_dll, ui.iconcomboTrackerSource);
tie_setting(m.protocol_dll, ui.iconcomboProtocol);
+#endif
tie_setting(m.filter_dll, ui.iconcomboFilter);
connect(this, &MainWindow::emit_start_tracker,
@@ -162,7 +164,7 @@ MainWindow::MainWindow() :
}
register_shortcuts();
- det_timer.start(1000);
+ //det_timer.start(1000);
config_list_timer.start(1000 * 5);
kbd_quit.setEnabled(true);
}
@@ -422,9 +424,9 @@ void MainWindow::updateButtonState(bool running, bool inertialp)
ui.iconcomboProfile->setEnabled(not_running);
ui.btnStartTracker->setEnabled(not_running);
ui.btnStopTracker->setEnabled(running);
- ui.iconcomboProtocol->setEnabled(not_running);
+ //ui.iconcomboProtocol->setEnabled(not_running);
ui.iconcomboFilter->setEnabled(not_running);
- ui.iconcomboTrackerSource->setEnabled(not_running);
+ //ui.iconcomboTrackerSource->setEnabled(not_running);
ui.profile_button->setEnabled(not_running);
ui.video_frame_label->setVisible(not_running || inertialp);
if(not_running)
@@ -643,7 +645,7 @@ void MainWindow::show_options_dialog()
void MainWindow::showCurveConfiguration()
{
- mk_window(mapping_widget, pose);
+ //mk_window(mapping_widget, pose);
}
void MainWindow::exit()
diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp
index 51da498a..f53b890d 100644
--- a/gui/options-dialog.cpp
+++ b/gui/options-dialog.cpp
@@ -47,6 +47,8 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :
tie_setting(main.tray_enabled, ui.trayp);
tie_setting(main.tray_start, ui.tray_start);
+#if 0
+
tie_setting(main.center_at_startup, ui.center_at_startup);
tie_setting(main.tcomp_p, ui.tcomp_enable);
@@ -94,6 +96,8 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :
tie_setting(main.neck_enable, ui.neck_enable);
+#endif
+
ui.disable_translation->setChecked(QSettings(OPENTRACK_ORG).value("disable-translation", false).toBool());
struct tmp
@@ -109,6 +113,7 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :
{ main.key_toggle1, ui.toggle_text, ui.bind_toggle },
{ main.key_toggle2, ui.toggle_text_2, ui.bind_toggle_2 },
+#if 0
{ main.key_toggle_press1, ui.toggle_held_text, ui.bind_toggle_held },
{ main.key_toggle_press2, ui.toggle_held_text_2, ui.bind_toggle_held_2 },
@@ -117,6 +122,7 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :
{ main.key_zero_press1, ui.zero_held_text, ui.bind_zero_held },
{ main.key_zero_press2, ui.zero_held_text_2, ui.bind_zero_held_2 },
+#endif
{ main.key_start_tracking1, ui.start_tracking_text, ui.bind_start },
{ main.key_start_tracking2, ui.start_tracking_text_2, ui.bind_start_2 },
@@ -211,7 +217,7 @@ void OptionsDialog::doOK()
return;
main.b->save();
- ui.game_detector->save();
+ //ui.game_detector->save();
set_disable_translation_state(ui.disable_translation->isChecked());
emit closing();
}
@@ -225,7 +231,7 @@ void OptionsDialog::doCancel()
return;
main.b->reload();
- ui.game_detector->revert();
+ //ui.game_detector->revert();
emit closing();
}