minor fixes now

3 files changed, 62 insertions, 41 deletions

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 @@
     <x>0</x>
     <y>0</y>
     <width>462</width>
-    <height>522</height>
+    <height>605</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -629,42 +629,13 @@
          <property name="title">
           <string/>
          </property>
-         <widget class="QRadioButton" name="model_cap">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>10</y>
-            <width>82</width>
-            <height>17</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Cap</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-         <widget class="QRadioButton" name="model_clip">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>140</y>
-            <width>82</width>
-            <height>17</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Clip</string>
-          </property>
-         </widget>
          <widget class="QLabel" name="label_3">
           <property name="geometry">
            <rect>
-            <x>80</x>
-            <y>0</y>
-            <width>171</width>
-            <height>121</height>
+            <x>40</x>
+            <y>40</y>
+            <width>206</width>
+            <height>156</height>
            </rect>
           </property>
           <property name="text">
@@ -680,10 +651,10 @@
          <widget class="QLabel" name="label_4">
           <property name="geometry">
            <rect>
-            <x>70</x>
-            <y>130</y>
-            <width>201</width>
-            <height>161</height>
+            <x>135</x>
+            <y>150</y>
+            <width>221</width>
+            <height>191</height>
            </rect>
           </property>
           <property name="text">
@@ -696,6 +667,39 @@
            <bool>true</bool>
           </property>
          </widget>
+         <widget class="QLabel" name="label_31">
+          <property name="geometry">
+           <rect>
+            <x>10</x>
+            <y>310</y>
+            <width>61</width>
+            <height>16</height>
+           </rect>
+          </property>
+          <property name="text">
+           <string>Model used</string>
+          </property>
+         </widget>
+         <widget class="QComboBox" name="model_used">
+          <property name="geometry">
+           <rect>
+            <x>90</x>
+            <y>305</y>
+            <width>81</width>
+            <height>22</height>
+           </rect>
+          </property>
+          <item>
+           <property name="text">
+            <string>Cap</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Clip</string>
+           </property>
+          </item>
+         </widget>
         </widget>
        </item>
        <item>
@@ -1668,6 +1672,23 @@ background:none;</string>
   <include location="ui-res.qrc"/>
  </resources>
  <connections/>
+ <designerdata>
+  <property name="gridDeltaX">
+   <number>5</number>
+  </property>
+  <property name="gridDeltaY">
+   <number>5</number>
+  </property>
+  <property name="gridSnapX">
+   <bool>true</bool>
+  </property>
+  <property name="gridSnapY">
+   <bool>true</bool>
+  </property>
+  <property name="gridVisible">
+   <bool>true</bool>
+  </property>
+ </designerdata>
  <slots>
   <slot>startEngineClicked()</slot>
   <slot>stopEngineClicked()</slot>
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>("", dylib::Filter));
-
     for (auto x : modules.protocols())
         ui.iconcomboProtocol->addItem(x->icon, x->name);