From 8e022f0d1ad5628c2bf9a97a16b16fd1cff5196c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 18 Jun 2015 10:43:31 +0200 Subject: minor fixes now --- facetracknoir/options-dialog.cpp | 4 +- facetracknoir/settings.ui | 97 ++++++++++++++++++++++++---------------- facetracknoir/ui.cpp | 2 - 3 files changed, 62 insertions(+), 41 deletions(-) (limited to 'facetracknoir') diff --git a/facetracknoir/options-dialog.cpp b/facetracknoir/options-dialog.cpp index 08c92ee8..705f7672 100644 --- a/facetracknoir/options-dialog.cpp +++ b/facetracknoir/options-dialog.cpp @@ -67,7 +67,7 @@ OptionsDialog::OptionsDialog(State& state) : state(state), trans_calib_running(f tie_setting(pt.fov, ui.camera_fov); - tie_setting(pt.is_cap, ui.model_cap); + tie_setting(pt.model_used, ui.model_used); tie_setting(acc.rot_threshold, ui.rotation_slider); tie_setting(acc.trans_threshold, ui.translation_slider); @@ -84,6 +84,7 @@ void OptionsDialog::doOK() { s.b->save(); pt.b->save(); s.s_main.b->save(); + acc.b->save(); ui.game_detector->save(); this->close(); emit reload(); @@ -93,6 +94,7 @@ void OptionsDialog::doCancel() { s.b->reload(); pt.b->reload(); s.s_main.b->reload(); + acc.b->reload(); ui.game_detector->revert(); close(); } diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui index 5c6c7f32..29919d91 100644 --- a/facetracknoir/settings.ui +++ b/facetracknoir/settings.ui @@ -7,7 +7,7 @@ 0 0 462 - 522 + 605 @@ -629,42 +629,13 @@ - - - - 10 - 10 - 82 - 17 - - - - Cap - - - true - - - - - - 10 - 140 - 82 - 17 - - - - Clip - - - 80 - 0 - 171 - 121 + 40 + 40 + 206 + 156 @@ -680,10 +651,10 @@ - 70 - 130 - 201 - 161 + 135 + 150 + 221 + 191 @@ -696,6 +667,39 @@ true + + + + 10 + 310 + 61 + 16 + + + + Model used + + + + + + 90 + 305 + 81 + 22 + + + + + Cap + + + + + Clip + + + @@ -1668,6 +1672,23 @@ background:none; + + + 5 + + + 5 + + + true + + + true + + + true + + startEngineClicked() stopEngineClicked() diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp index 9620dce3..c646808c 100644 --- a/facetracknoir/ui.cpp +++ b/facetracknoir/ui.cpp @@ -55,8 +55,6 @@ MainWindow::MainWindow() : connect(ui.btnShortcuts, SIGNAL(clicked()), this, SLOT(showKeyboardShortcuts())); connect(ui.btnShowServerControls, SIGNAL(clicked()), this, SLOT(showProtocolSettings())); - modules.filters().push_front(std::make_shared("", dylib::Filter)); - for (auto x : modules.protocols()) ui.iconcomboProtocol->addItem(x->icon, x->name); -- cgit v1.2.3