From be0ae02edeaf8c4320c217844b2c7fd507447335 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 17 Jul 2015 09:44:50 +0200
Subject: bundles are now reloaded when settings window is closed

This happens even if closed by alt+f4 or cancel button.
---
 facetracknoir/ui.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'facetracknoir')

diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index 88699810..86996735 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -358,12 +358,12 @@ void MainWindow::showHeadPose()
 }
 
 template<typename t>
-bool mk_dialog(mem<dylib> lib, mem<t>* orig)
+bool mk_dialog(mem<dylib> lib, mem<t>& orig)
 {
-    if (*orig && (*orig)->isVisible())
+    if (orig && orig->isVisible())
     {
-        (*orig)->show();
-        (*orig)->raise();
+        orig->show();
+        orig->raise();
         return false;
     }
 
@@ -373,10 +373,12 @@ bool mk_dialog(mem<dylib> lib, mem<t>* orig)
         dialog->setWindowFlags(Qt::Dialog);
         dialog->setFixedSize(dialog->size());
 
-        *orig = dialog;
+        orig = dialog;
         dialog->show();
         dialog->raise();
 
+        QObject::connect(dialog.get(), &BaseDialog::closing, [&]() -> void { orig = nullptr; });
+
         return true;
     }
 
@@ -385,17 +387,17 @@ bool mk_dialog(mem<dylib> lib, mem<t>* orig)
 
 void MainWindow::showTrackerSettings()
 {
-    if (mk_dialog(current_tracker(), &pTrackerDialog) && libs.pTracker)
+    if (mk_dialog(current_tracker(), pTrackerDialog) && libs.pTracker)
         pTrackerDialog->register_tracker(libs.pTracker.get());
 }
 
 void MainWindow::showProtocolSettings() {
-    if (mk_dialog(current_protocol(), &pProtocolDialog) && libs.pProtocol)
+    if (mk_dialog(current_protocol(), pProtocolDialog) && libs.pProtocol)
         pProtocolDialog->register_protocol(libs.pProtocol.get());
 }
 
 void MainWindow::showFilterSettings() {
-    if (mk_dialog(current_filter(), &pFilterDialog) && libs.pFilter)
+    if (mk_dialog(current_filter(), pFilterDialog) && libs.pFilter)
         pFilterDialog->register_filter(libs.pFilter.get());
 }
 
-- 
cgit v1.2.3


From 180e6f6686c627f342ca282e75d3a9e784f16e52 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 18 Jul 2015 01:53:00 +0200
Subject: octopus 127x128 -> 128x128

---
 facetracknoir/images/facetracknoir.png | Bin 26466 -> 29485 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'facetracknoir')

diff --git a/facetracknoir/images/facetracknoir.png b/facetracknoir/images/facetracknoir.png
index 41b54524..85c06df6 100644
Binary files a/facetracknoir/images/facetracknoir.png and b/facetracknoir/images/facetracknoir.png differ
-- 
cgit v1.2.3


From 3ad67aaa96be824dbcd2c9334dc709d7d4dec08e Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 19 Jul 2015 11:11:40 +0200
Subject: resize UI, looks better on OSX probably

---
 facetracknoir/main.ui | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'facetracknoir')

diff --git a/facetracknoir/main.ui b/facetracknoir/main.ui
index 77a3ef3a..2328be40 100644
--- a/facetracknoir/main.ui
+++ b/facetracknoir/main.ui
@@ -964,6 +964,9 @@
              <property name="bottomMargin">
               <number>4</number>
              </property>
+             <property name="horizontalSpacing">
+              <number>3</number>
+             </property>
              <property name="verticalSpacing">
               <number>2</number>
              </property>
@@ -1007,6 +1010,9 @@
              <property name="bottomMargin">
               <number>4</number>
              </property>
+             <property name="horizontalSpacing">
+              <number>3</number>
+             </property>
              <property name="verticalSpacing">
               <number>2</number>
              </property>
@@ -1050,6 +1056,9 @@
              <property name="bottomMargin">
               <number>4</number>
              </property>
+             <property name="horizontalSpacing">
+              <number>3</number>
+             </property>
              <property name="verticalSpacing">
               <number>2</number>
              </property>
@@ -1074,6 +1083,12 @@
           </item>
           <item row="1" column="0">
            <widget class="QGroupBox" name="groupProfile">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="title">
              <string>Profile</string>
             </property>
@@ -1099,7 +1114,7 @@
              <item row="0" column="0">
               <widget class="QComboBox" name="iconcomboProfile">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -1112,7 +1127,7 @@
              <item row="1" column="0">
               <widget class="QToolButton" name="btnLoad">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -1144,7 +1159,7 @@
                 <bool>true</bool>
                </property>
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+                <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
-- 
cgit v1.2.3


From ffefa511b474ed594a6a5bf5589aeae028f0bed2 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 19 Jul 2015 15:52:48 +0200
Subject: ui: prevent clobbering current profile

Previously "open" always took to the topmost profile.

Fixes #194
---
 facetracknoir/ui.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'facetracknoir')

diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index 86996735..ac58cce8 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -111,8 +111,8 @@ void MainWindow::open() {
                 dir_path,
                 tr("Settings file (*.ini);;All Files (*)"));
     set_working_directory();
-    
-    if (! fileName.isEmpty() ) {
+
+    if (!fileName.isEmpty()) {
         {
             QSettings settings(OPENTRACK_ORG);
             settings.setValue(OPENTRACK_CONFIG_FILENAME_KEY, remove_app_path(fileName));
@@ -186,10 +186,10 @@ void MainWindow::fill_profile_combobox()
 {
      QStringList ini_list = group::ini_list();
      set_title();
+     QString current = QFileInfo(group::ini_pathname()).fileName();
      ui.iconcomboProfile->clear();
      for (auto x : ini_list)
          ui.iconcomboProfile->addItem(QIcon(":/images/settings16.png"), x);
-     QString current = QFileInfo(group::ini_pathname()).fileName();
      ui.iconcomboProfile->setCurrentText(current);
 }
 
-- 
cgit v1.2.3