Merge branch 'unstable' into trackhat-ui

Sponsored-by: TrackHat

* unstable: (112 commits)
  Revert "accela: try more complex deadzone algorithm"
  pt: add wiki link for calibration instructions
  qfc: more gray colors when graph is disabled
  qfc, mapping: disallow editing and change color when checkbox disabled
  qfc: don't allow editing when disabled
  plugin-support: workaround multiple copies of modules
  accela: change translation gain
  accela: change rotation gain
  pt: change extraction code
  freepie-udp: add license
  freepie-udp: update
  accela: try more complex deadzone algorithm
  accela: add helpful comment
  accela: revert to more quadratic spline at start
  also save if save pending when start tracking
  ui: force saving if saving timer is pending
  accela: slightly more linear function
  pose-widget: simplify
  freepie-udp: nix harmless warning
  pose-widget: add comment
  simple-mat: add __restrict for GNU
  ui: save settings on a timer
  ui: show a warning if configuration directory can't be used
  aruco: tune min/max marker size
  win32-joystick: fix duplicate device name selection logic
  ui: no need to reset settings on tracking start
  ui: save profile when combobox text changes, not merely index
  ui: save current tracker/filter/proto, not last
  win32-joystick: fix COM failure path
  win32-joystick: nix unused variable
  win32-joystick: allow for unique selection of joysticks
  qfc: also draw line from function start while moving
  no need to save on tracking start anymore
  save axis opts, not just spline control points
  tracker: change centering order again
  fix typo
  cmake: don't say "opentrack" twice for osx build
  ui: really don't switch profiles while refreshing combobox
  pt: fix type mismatch
  ui: save prior to switching configs
  tracker_rs: adjusted tracker's name
  ui: don't reload settings if config wasn't changed
  ui: save everything before switching profiles
  options: return .ini basename easier
  tracker_rs: more readable icon
  tracker_rs: prevent potential thread starvation
  ui: switch to newly-created config
  ui: decruft
  ui: also bail on new config if its name is ".ini"
  ui: auto-refresh config list
  ui: display up to 20 profiles w/o scrolling
  ui: create an empty config properly in another code branch
  udp-tracker: silence harmless warning
  plugin-support: fix typo
  plugin-support: set more sane RTLD flags
  plugin-support: free modules from address space when needed
  ui: rename symbol to reflect current usage
  ui: move some slots to private
  ui, shortcuts: these are slots, actually
  ui: no need to write anything to new empty config
  ui: avoid potential memory leak
  ft: new game support
  game-data: chomp newlines in extractor
  ui: append extension in the right place
  simple-mat: fix arglist SFINAE
  simple-mat: can use static_cast here
  nix default empty config. it gets created on its own.
  ui: these aren't qt slots
  ui: nix wrong headers
  ui: remove GNU GPL
  ui: simplify condition
  props changed only
  main, ui: store config files in a predefined directory
  pt: show extracted points' areas and success count
  close dialogs on switch to new module
  ...

1 files changed, 42 insertions, 17 deletions

diff --git a/opentrack/options.hpp b/opentrack/options.hpp
index 9768bc43..f2c09479 100644
--- a/opentrack/options.hpp
+++ b/opentrack/options.hpp
@@ -30,6 +30,7 @@
 #include <QCoreApplication>
 #include <QFileInfo>
 #include <QDir>
+#include <QStandardPaths>
 
 #include <cinttypes>
 
@@ -38,8 +39,8 @@
 #include <memory>
 template<typename t> using mem = std::shared_ptr<t>;
 
-#define OPENTRACK_CONFIG_FILENAME_KEY "settings-file"
-#define OPENTRACK_DEFAULT_CONFIG_PATH "/settings/default.ini"
+#define OPENTRACK_CONFIG_FILENAME_KEY "settings-filename"
+#define OPENTRACK_DEFAULT_CONFIG "default.ini"
 #define OPENTRACK_ORG "TrackHat opentrack-2.3"
 
 namespace options {
@@ -90,30 +91,30 @@ namespace options {
     public:
         group(const string& name) : name(name)
         {
-            QSettings conf(ini_pathname(), QSettings::IniFormat);
+            auto conf = ini_file();
             auto q_name = QString::fromStdString(name);
-            conf.beginGroup(q_name);
-            for (auto& k_ : conf.childKeys())
+            conf->beginGroup(q_name);
+            for (auto& k_ : conf->childKeys())
             {
                 auto tmp = k_.toUtf8();
                 string k(tmp);
-                kvs[k] = conf.value(k_);
+                kvs[k] = conf->value(k_);
             }
-            conf.endGroup();
+            conf->endGroup();
         }
 
         void save()
         {
-            QSettings s(ini_pathname(), QSettings::IniFormat);
+            auto s = ini_file();
             auto q_name = QString::fromStdString(name);
-            s.beginGroup(q_name);
+            s->beginGroup(q_name);
             for (auto& i : kvs)
             {
                 auto k = QString::fromStdString(i.first);
-                s.setValue(k, i.second);
+                s->setValue(k, i.second);
             }
-            s.endGroup();
-            s.sync();
+            s->endGroup();
+            s->sync();
         }
 
         template<typename t>
@@ -132,22 +133,46 @@ namespace options {
             return kvs.count(s) != 0;
         }
 
-        static const QString ini_pathname()
+        static QString ini_directory()
         {
+            const auto dirs = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation);
+            if (dirs.size() == 0)
+                return "";
+            if (QDir(dirs[0]).mkpath(OPENTRACK_ORG))
+                return dirs[0] + "/" OPENTRACK_ORG;
+            return "";
+        }
+
+        static QString ini_filename()
+        {
+            QSettings settings(OPENTRACK_ORG);
+            return settings.value(OPENTRACK_CONFIG_FILENAME_KEY, OPENTRACK_DEFAULT_CONFIG).toString();
+        }
+
+        static QString ini_pathname()
+        {
+            const auto dir = ini_directory();
+            if (dir == "")
+                return "";
             QSettings settings(OPENTRACK_ORG);
-            return settings.value(OPENTRACK_CONFIG_FILENAME_KEY, QCoreApplication::applicationDirPath() + OPENTRACK_DEFAULT_CONFIG_PATH).toString();
+            return dir + "/" + settings.value(OPENTRACK_CONFIG_FILENAME_KEY, OPENTRACK_DEFAULT_CONFIG).toString();
         }
         
         static const QStringList ini_list()
         {
-            QFileInfo info(group::ini_pathname());
-            QDir settings_dir(info.dir());
+            const auto dirname = ini_directory();
+            if (dirname == "")
+                return QStringList();
+            QDir settings_dir(dirname);
             return settings_dir.entryList( QStringList { "*.ini" } , QDir::Files, QDir::Name );
         }
         
         static const mem<QSettings> ini_file()
         {
-            return std::make_shared<QSettings>(ini_pathname(), QSettings::IniFormat);
+            const auto pathname = ini_pathname();
+            if (pathname != "")
+                return std::make_shared<QSettings>(ini_pathname(), QSettings::IniFormat);
+            return std::make_shared<QSettings>();
         }
     };