1 files changed, 31 insertions, 22 deletions

diff --git a/proto-ft/ftnoir_protocol_ft_dialog.cpp b/proto-ft/ftnoir_protocol_ft_dialog.cpp
index 36846273..90ff059a 100644
--- a/proto-ft/ftnoir_protocol_ft_dialog.cpp
+++ b/proto-ft/ftnoir_protocol_ft_dialog.cpp
@@ -8,6 +8,8 @@
  * purpose with or without fee is hereby granted, provided that the above        *
  * copyright notice and this permission notice appear in all copies.             *
  */
+
+#include "compat/library-path.hpp"
 #include "ftnoir_protocol_ft.h"
 #include <QDebug>
 #include <QFileDialog>
@@ -20,26 +22,16 @@ FTControls::FTControls()
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
     connect(ui.bntLocateNPClient, SIGNAL(clicked()), this, SLOT(selectDLL()));
 
-    tie_setting(s.useTIRViews, ui.chkTIRViews);
-    tie_setting(s.close_protocols_on_exit, ui.close_on_exit);
-
-    ui.cbxSelectInterface->addItem("Enable both");
-    ui.cbxSelectInterface->addItem("Use FreeTrack, hide TrackIR");
-    ui.cbxSelectInterface->addItem("Use TrackIR, hide FreeTrack");
-
-    tie_setting(s.intUsedInterface, ui.cbxSelectInterface);
+    tie_setting(s.used_interface, ui.cbxSelectInterface);
+    tie_setting(s.ephemeral_library_location, ui.ephemeral_registry_entry);
+    tie_setting(s.custom_location_pathname, ui.custom_location);
+    tie_setting(s.use_custom_location, ui.enable_custom_location);
 
-    QFile memhacks_pathname(QCoreApplication::applicationDirPath() + "/TIRViews.dll");
-    if (!memhacks_pathname.exists()) {
-        ui.chkTIRViews->setChecked( false );
-        ui.chkTIRViews->setEnabled ( false );
-    }
-    else {
-        ui.chkTIRViews->setEnabled ( true );
-    }
+    connect(ui.set_custom_location, &QAbstractButton::clicked, this, &FTControls::set_custom_location);
 }
 
-void FTControls::doOK() {
+void FTControls::doOK()
+{
     s.b->save();
     close();
 }
@@ -49,13 +41,30 @@ void FTControls::doCancel()
     close();
 }
 
-void FTControls::selectDLL() {
-    QString filename = QFileDialog::getOpenFileName( this, tr("Select the desired NPClient DLL"), QCoreApplication::applicationDirPath() + "/NPClient.dll", tr("Dll file (*.dll);;All Files (*)"));
+void FTControls::selectDLL()
+{
+    QString filename = QFileDialog::getOpenFileName(this,
+                                                    tr("Select the desired NPClient DLL"),
+                                                    OPENTRACK_BASE_PATH + OPENTRACK_LIBRARY_PATH "/NPClient.dll",
+                                                    tr("Dll file (*.dll);;All Files (*)"));
 
-    if (! filename.isEmpty() ) {
+    if (!filename.isEmpty())
+    {
             QSettings node("NaturalPoint", "NATURALPOINT\\NPClient Location");
             QFileInfo dllname(filename);
-            node.setValue( "Path" , dllname.dir().path() );
+            node.setValue("Path", dllname.dir().path());
     }
 }
-
+void FTControls::set_custom_location()
+{
+    static const auto program_directory = OPENTRACK_BASE_PATH + OPENTRACK_LIBRARY_PATH;
+    auto previous_location = *s.custom_location_pathname;
+    if (!s.use_custom_location || previous_location.isEmpty() || !QDir{previous_location}.exists())
+        previous_location = program_directory;
+    auto dir = QFileDialog::getExistingDirectory(this, tr("Select library location"), previous_location);
+    if (dir.isEmpty() || !QDir{dir}.exists())
+        dir = QString{};
+    else
+        ui.enable_custom_location->setEnabled(true);
+    ui.custom_location->setText(dir);
+}