Merge branch 'unstable' into trackhat

* unstable: (140 commits)
  tracker/pt: increase auto threshold bucket size again
  tracker/pt: limit max amount of extracted blobs
  gui: don't update main window if we're minimized
  tracker/pt: only show widget if the frame is visible
  tracker/pt: don't resize twice in widget
  freetrack/games: regen
  contrib/make-csv: perl sort isn't stable, don't ignore case
  tracker/pt: avoid widget temp QImage allocation
  spline-widget: oops, pass by reference
  tracker/pt: don't allocate temporary dynamic size arrays
  tracker/pt: don't copy points array needlessly
  tracker/pt: don't allocate temporary frame
  tracker/pt: cv::Mat::at<T> is slow, use cv::Mat::ptr
  tracker/pt: avoid widget malloc when able
  tracker/pt: optimize widget
  tracker/pt: update video widget at 40 -> 50 ms
  cmake/mingw-w64: update
  tracker/pt: reduce mutex contention
  gui: fix left margin
  tracker/pt: remove krap
  tracker/pt: move ctor out of the loop
  tracker/pt: nix unused
  tracker/pt: don't fill mask on frame
  pose-widget: also bilinear interpolation of alpha value
  ui: adjust margin
  ui: make more compact
  glwidget: use transparent octopus background
  api/mat: fix typos/breakage
  api/joy: refresh only manually on certain events
  pt: histogram more granular 6 -> 8
  cmake/api: link with strmiids.lib on win32
  tracker/pt: reduce auto thresholding histogram bucket size
  api/keys: prevent idempotent keys
  api/joy: move from header
  api/joy: prevent idempotent keypressed passed to receiver
  compat/options: get rid of std::string usage
  compat/options: move from header
  gui/settings: set parent, otherwise not modal
  gui/settings: don't forget to show a modal dialog before executing
  gui/main: don't raise a new window, it's enough to set visible
  api/joy: speed up poll_axis path
  api/joy: nix static, now that we're not a singleton
  tracker/joy: adapt to non-singleton joy worker
  joystick: no longer singleton, use fake window handle
  api/keys: use a fake window for DirectInput handle
  gui/keys: allow for pausing global keystrokes for options dialog
  api/keys: nix tautological #ifdef
  contrib/aruco: oops, right extension
  contrib/aruco: use @frost555's marker image
  api/camera-names: move to compat/
  ...

1 files changed, 9 insertions, 4 deletions

diff --git a/gui/options-dialog.hpp b/gui/options-dialog.hpp
index 8fc16611..f333c690 100644
--- a/gui/options-dialog.hpp
+++ b/gui/options-dialog.hpp
@@ -10,6 +10,9 @@
 #include "trans_calib.h"
 #include "tracker-pt/ftnoir_tracker_pt.h"
 #include "filter-accela/ftnoir_filter_accela.h"
+#include <QObject>
+#include <QWidget>
+#include <functional>
 
 class OptionsDialog: public QWidget
 {
@@ -17,14 +20,16 @@ class OptionsDialog: public QWidget
 signals:
     void reload();
 public:
-    OptionsDialog(State &state);
+    OptionsDialog(main_settings& main, State& state, std::function<void()> register_global_keys, std::function<void(bool)> pause_keybindings);
 private:
+    main_settings& main;
+    State& state;
+    std::function<void()> register_global_keys;
+    std::function<void(bool)> pause_keybindings;
     Ui::UI_Settings ui;
-    Shortcuts::settings s;
     settings_pt pt;
     settings_accela acc;
     QTimer timer;
-    State& state;
     TranslationCalibrator trans_calib;
     bool trans_calib_running;
 
@@ -42,5 +47,5 @@ private slots:
     void startstop_trans_calib(bool start);
     void poll_tracker_info();
     void trans_calib_step();
-    void bind_key(value<QString>& ret, QLabel* label);
+    void bind_key(key_opts &kopts, QLabel* label);
 };