trackhat: some stubs

4 files changed, 218 insertions, 329 deletions

diff --git a/facetracknoir/main.ui b/facetracknoir/main.ui
index 77a3ef3a..b6211698 100644
--- a/facetracknoir/main.ui
+++ b/facetracknoir/main.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>708</width>
-    <height>504</height>
+    <width>750</width>
+    <height>511</height>
    </rect>
   </property>
   <property name="windowIcon">
@@ -53,94 +53,7 @@
       <property name="lineWidth">
        <number>0</number>
       </property>
-      <layout class="QFormLayout" name="formLayout">
-       <property name="horizontalSpacing">
-        <number>0</number>
-       </property>
-       <property name="verticalSpacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item row="0" column="0">
-        <widget class="QFrame" name="video_feed">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>480</width>
-           <height>360</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>480</width>
-           <height>360</height>
-          </size>
-         </property>
-         <widget class="QFrame" name="video_frame">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>480</width>
-            <height>360</height>
-           </rect>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <widget class="QLabel" name="video_frame_label">
-           <property name="geometry">
-            <rect>
-             <x>0</x>
-             <y>0</y>
-             <width>480</width>
-             <height>360</height>
-            </rect>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>480</width>
-             <height>360</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>480</width>
-             <height>360</height>
-            </size>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </widget>
-        </widget>
-       </item>
+      <layout class="QGridLayout" name="gridLayout">
        <item row="0" column="1">
         <widget class="QFrame" name="top_display">
          <property name="frameShape">
@@ -802,8 +715,83 @@
          </layout>
         </widget>
        </item>
+       <item row="0" column="0">
+        <widget class="QFrame" name="video_feed">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>480</width>
+           <height>360</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>480</width>
+           <height>360</height>
+          </size>
+         </property>
+         <widget class="QFrame" name="video_frame">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>480</width>
+            <height>360</height>
+           </rect>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <widget class="QLabel" name="video_frame_label">
+           <property name="geometry">
+            <rect>
+             <x>0</x>
+             <y>0</y>
+             <width>480</width>
+             <height>360</height>
+            </rect>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>480</width>
+             <height>360</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>480</width>
+             <height>360</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </widget>
+        </widget>
+       </item>
        <item row="1" column="0" colspan="2">
-        <widget class="QFrame" name="bottom_controls">
+        <widget class="QFrame" name="frame_2">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Plain</enum>
+         </property>
          <layout class="QGridLayout" name="gridLayout_2">
           <property name="topMargin">
            <number>0</number>
@@ -811,152 +799,120 @@
           <property name="bottomMargin">
            <number>0</number>
           </property>
-          <property name="horizontalSpacing">
-           <number>6</number>
-          </property>
           <property name="verticalSpacing">
            <number>0</number>
           </property>
-          <item row="1" column="1">
-           <widget class="QGroupBox" name="groupStartStop">
+          <item row="0" column="0">
+           <widget class="QGroupBox" name="groupProfile">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="title">
-             <string notr="true">Controls</string>
+             <string>Profile</string>
             </property>
             <property name="flat">
              <bool>true</bool>
             </property>
-            <layout class="QGridLayout" name="gridLayout_5">
+            <layout class="QGridLayout" name="gridLayout_7">
              <property name="leftMargin">
               <number>4</number>
              </property>
              <property name="topMargin">
-              <number>12</number>
+              <number>0</number>
              </property>
              <property name="rightMargin">
               <number>4</number>
              </property>
              <property name="bottomMargin">
-              <number>12</number>
+              <number>4</number>
              </property>
-             <item row="0" column="1">
-              <widget class="QToolButton" name="btnStopTracker">
+             <property name="verticalSpacing">
+              <number>2</number>
+             </property>
+             <item row="1" column="1">
+              <widget class="QToolButton" name="btnSaveAs">
                <property name="enabled">
-                <bool>false</bool>
+                <bool>true</bool>
                </property>
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>Stop</string>
+                <string>Save...</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="0">
-              <widget class="QToolButton" name="btnStartTracker">
+             <item row="1" column="0">
+              <widget class="QToolButton" name="btnLoad">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>Start</string>
+                <string>Load</string>
                </property>
               </widget>
              </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QGroupBox" name="groupWindows">
-            <property name="title">
-             <string>Settings</string>
-            </property>
-            <property name="flat">
-             <bool>true</bool>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_6">
-             <property name="leftMargin">
-              <number>4</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>4</number>
-             </property>
-             <property name="bottomMargin">
-              <number>4</number>
-             </property>
-             <property name="verticalSpacing">
-              <number>2</number>
-             </property>
-             <item row="1" column="0">
-              <widget class="QPushButton" name="btnShortcuts">
+             <item row="0" column="0">
+              <widget class="QComboBox" name="iconcomboProfile">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
-               <property name="text">
-                <string>Options</string>
-               </property>
-               <property name="icon">
-                <iconset resource="ui-res.qrc">
-                 <normaloff>:/images/tools.png</normaloff>:/images/tools.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>80</width>
-                 <height>24</height>
-                </size>
+               <property name="maxVisibleItems">
+                <number>10</number>
                </property>
               </widget>
              </item>
-             <item row="0" column="0">
-              <widget class="QPushButton" name="btnEditCurves">
+             <item row="0" column="1">
+              <widget class="QToolButton" name="btnSave">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>Mapping</string>
-               </property>
-               <property name="icon">
-                <iconset resource="ui-res.qrc">
-                 <normaloff>:/images/curves.png</normaloff>:/images/curves.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>80</width>
-                 <height>24</height>
-                </size>
+                <string>Save</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QGroupBox" name="groupFilter">
+          <item row="0" column="1">
+           <widget class="QGroupBox" name="groupStartStop">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="title">
-             <string>Filter</string>
+             <string notr="true">Controls</string>
             </property>
             <property name="flat">
              <bool>true</bool>
             </property>
-            <layout class="QGridLayout" name="gridLayout_3">
+            <layout class="QGridLayout" name="gridLayout_5">
              <property name="leftMargin">
               <number>4</number>
              </property>
              <property name="topMargin">
-              <number>0</number>
+              <number>12</number>
              </property>
              <property name="rightMargin">
               <number>4</number>
@@ -964,193 +920,142 @@
              <property name="bottomMargin">
               <number>4</number>
              </property>
-             <property name="verticalSpacing">
-              <number>2</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QComboBox" name="iconcomboFilter"/>
-             </item>
              <item row="0" column="1">
-              <widget class="QToolButton" name="btnShowFilterControls">
+              <widget class="QToolButton" name="btnStopTracker">
                <property name="enabled">
-                <bool>true</bool>
+                <bool>false</bool>
                </property>
-               <property name="text">
-                <string>...</string>
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
                </property>
-               <property name="flat" stdset="0">
-                <bool>false</bool>
+               <property name="text">
+                <string>Stop</string>
                </property>
               </widget>
              </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QGroupBox" name="groupTrackerSource">
-            <property name="title">
-             <string>Tracker</string>
-            </property>
-            <property name="flat">
-             <bool>true</bool>
-            </property>
-            <layout class="QGridLayout" name="gridLayout">
-             <property name="leftMargin">
-              <number>4</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>4</number>
-             </property>
-             <property name="bottomMargin">
-              <number>4</number>
-             </property>
-             <property name="verticalSpacing">
-              <number>2</number>
-             </property>
              <item row="0" column="0">
-              <widget class="QComboBox" name="iconcomboTrackerSource"/>
-             </item>
-             <item row="0" column="1">
-              <widget class="QToolButton" name="btnShowEngineControls">
-               <property name="enabled">
-                <bool>true</bool>
+              <widget class="QToolButton" name="btnStartTracker">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
                </property>
                <property name="text">
-                <string>...</string>
-               </property>
-               <property name="flat" stdset="0">
-                <bool>false</bool>
+                <string>Start</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QGroupBox" name="groupGameProtocol">
+          <item row="0" column="2">
+           <widget class="QGroupBox" name="groupWindows">
+            <property name="styleSheet">
+             <string notr="true">QGroupBox { border: 0; }</string>
+            </property>
             <property name="title">
-             <string>Protocol</string>
+             <string/>
             </property>
             <property name="flat">
              <bool>true</bool>
             </property>
-            <layout class="QGridLayout" name="gridLayout_4">
-             <property name="leftMargin">
-              <number>4</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>4</number>
+            <layout class="QVBoxLayout" name="verticalLayout">
+             <property name="spacing">
+              <number>6</number>
              </property>
              <property name="bottomMargin">
               <number>4</number>
              </property>
-             <property name="verticalSpacing">
-              <number>2</number>
-             </property>
-             <item row="0" column="1">
-              <widget class="QToolButton" name="btnShowServerControls">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="text">
-                <string>...</string>
+             <item>
+              <widget class="QGroupBox" name="groupGameProtocol">
+               <property name="title">
+                <string>Protocol</string>
                </property>
-               <property name="flat" stdset="0">
+               <property name="flat">
                 <bool>false</bool>
                </property>
+               <layout class="QHBoxLayout" name="horizontalLayout">
+                <property name="spacing">
+                 <number>5</number>
+                </property>
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>18</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <widget class="QComboBox" name="iconcomboProtocol"/>
+                </item>
+                <item>
+                 <widget class="QToolButton" name="btnShowServerControls">
+                  <property name="enabled">
+                   <bool>true</bool>
+                  </property>
+                  <property name="text">
+                   <string>...</string>
+                  </property>
+                  <property name="flat" stdset="0">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
               </widget>
              </item>
-             <item row="0" column="0">
-              <widget class="QComboBox" name="iconcomboProtocol"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QGroupBox" name="groupProfile">
-            <property name="title">
-             <string>Profile</string>
-            </property>
-            <property name="flat">
-             <bool>true</bool>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_7">
-             <property name="leftMargin">
-              <number>4</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>4</number>
-             </property>
-             <property name="bottomMargin">
-              <number>4</number>
-             </property>
-             <property name="verticalSpacing">
-              <number>2</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QComboBox" name="iconcomboProfile">
+             <item>
+              <widget class="QPushButton" name="btnEditCurves">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
-               <property name="maxVisibleItems">
-                <number>10</number>
+               <property name="text">
+                <string>Mapping</string>
                </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QToolButton" name="btnLoad">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
+               <property name="icon">
+                <iconset resource="ui-res.qrc">
+                 <normaloff>:/images/curves.png</normaloff>:/images/curves.png</iconset>
                </property>
-               <property name="text">
-                <string>Load</string>
+               <property name="iconSize">
+                <size>
+                 <width>80</width>
+                 <height>24</height>
+                </size>
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QToolButton" name="btnSave">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
+             <item>
+              <widget class="QPushButton" name="btnShortcuts">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>Save</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QToolButton" name="btnSaveAs">
-               <property name="enabled">
-                <bool>true</bool>
+                <string>Options</string>
                </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
+               <property name="icon">
+                <iconset resource="ui-res.qrc">
+                 <normaloff>:/images/tools.png</normaloff>:/images/tools.png</iconset>
                </property>
-               <property name="text">
-                <string>Save...</string>
+               <property name="iconSize">
+                <size>
+                 <width>80</width>
+                 <height>24</height>
+                </size>
                </property>
               </widget>
              </item>
@@ -1176,12 +1081,8 @@
  <tabstops>
   <tabstop>btnStartTracker</tabstop>
   <tabstop>btnStopTracker</tabstop>
-  <tabstop>iconcomboTrackerSource</tabstop>
-  <tabstop>btnShowEngineControls</tabstop>
   <tabstop>iconcomboProtocol</tabstop>
   <tabstop>btnShowServerControls</tabstop>
-  <tabstop>iconcomboFilter</tabstop>
-  <tabstop>btnShowFilterControls</tabstop>
   <tabstop>iconcomboProfile</tabstop>
   <tabstop>btnLoad</tabstop>
   <tabstop>btnSave</tabstop>
diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index 284367ce..d1d43a24 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -51,26 +51,16 @@ MainWindow::MainWindow() :
 
     connect(ui.btnEditCurves, SIGNAL(clicked()), this, SLOT(showCurveConfiguration()));
     connect(ui.btnShortcuts, SIGNAL(clicked()), this, SLOT(showKeyboardShortcuts()));
-    connect(ui.btnShowEngineControls, SIGNAL(clicked()), this, SLOT(showTrackerSettings()));
     connect(ui.btnShowServerControls, SIGNAL(clicked()), this, SLOT(showProtocolSettings()));
-    connect(ui.btnShowFilterControls, SIGNAL(clicked()), this, SLOT(showFilterSettings()));
 
     modules.filters().push_front(std::make_shared<dylib>("", dylib::Filter));
 
-    for (auto x : modules.trackers())
-        ui.iconcomboTrackerSource->addItem(x->icon, x->name);
-
     for (auto x : modules.protocols())
         ui.iconcomboProtocol->addItem(x->icon, x->name);
 
-    for (auto x : modules.filters())
-        ui.iconcomboFilter->addItem(x->icon, x->name);
-
     fill_profile_combobox();
 
-    tie_setting(s.tracker_dll, ui.iconcomboTrackerSource);
     tie_setting(s.protocol_dll, ui.iconcomboProtocol);
-    tie_setting(s.filter_dll, ui.iconcomboFilter);
 
     connect(ui.btnStartTracker, SIGNAL(clicked()), this, SLOT(startTracker()));
     connect(ui.btnStopTracker, SIGNAL(clicked()), this, SLOT(stopTracker()));
@@ -184,7 +174,7 @@ void MainWindow::fill_profile_combobox()
 {
      QStringList ini_list = group::ini_list();
      QString current = QFileInfo(group::ini_pathname()).fileName();
-     setWindowTitle(QString( const_cast<const char*>(opentrack_version) + QStringLiteral(" :: ")) + current);
+     setWindowTitle(QStringLiteral("TrackHat") + QString( const_cast<const char*>(opentrack_version) + QStringLiteral(" :: ")) + current);
      ui.iconcomboProfile->clear();
      for (auto x : ini_list)
          ui.iconcomboProfile->addItem(QIcon(":/images/settings16.png"), x);
@@ -198,8 +188,6 @@ void MainWindow::updateButtonState(bool running, bool inertialp)
     ui.btnStartTracker->setEnabled ( not_running );
     ui.btnStopTracker->setEnabled ( running );
     ui.iconcomboProtocol->setEnabled ( not_running );
-    ui.iconcomboFilter->setEnabled ( not_running );
-    ui.iconcomboTrackerSource->setEnabled(not_running);
     ui.video_frame_label->setVisible(not_running || inertialp);
     ui.btnSaveAs->setEnabled(not_running);
     ui.btnLoad->setEnabled(not_running);
diff --git a/facetracknoir/ui.h b/facetracknoir/ui.h
index f2758d81..10f5c814 100644
--- a/facetracknoir/ui.h
+++ b/facetracknoir/ui.h
@@ -78,7 +78,7 @@ class MainWindow : public QMainWindow, private State
 
     mem<dylib> current_tracker()
     {
-        return modules.trackers().value(ui.iconcomboTrackerSource->currentIndex(), nullptr);
+        return modules.trackers().value(0, nullptr);
     }
     mem<dylib> current_protocol()
     {
@@ -86,7 +86,7 @@ class MainWindow : public QMainWindow, private State
     }
     mem<dylib> current_filter()
     {
-        return modules.filters().value(ui.iconcomboFilter->currentIndex(), nullptr);
+        return modules.filters().value(0, nullptr);
     }
 
     void changeEvent(QEvent* e) override;
diff --git a/opentrack/options.hpp b/opentrack/options.hpp
index c33c2f53..a8880cad 100644
--- a/opentrack/options.hpp
+++ b/opentrack/options.hpp
@@ -97,7 +97,7 @@ namespace options {
             }
             conf.endGroup();
         }
-        static constexpr const char* org = "opentrack-2.3";
+        static constexpr const char* org = "trackhat opentrack-2.3";
 
         void save()
         {