diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gui/curve-config.cpp | 6 | ||||
| -rw-r--r-- | gui/curve-config.h | 2 | ||||
| -rw-r--r-- | gui/keyboard.h | 4 | ||||
| -rw-r--r-- | gui/options-dialog.hpp | 2 | ||||
| -rw-r--r-- | gui/ui.cpp | 2 | ||||
| -rw-r--r-- | gui/ui.h | 10 |
7 files changed, 14 insertions, 13 deletions
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 08534795..b7448b4c 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -17,6 +17,7 @@ if(NOT WIN32) endif() target_link_libraries(opentrack + opentrack-logic opentrack-spline-widget opentrack-pose-widget opentrack-version diff --git a/gui/curve-config.cpp b/gui/curve-config.cpp index e4396e01..61459c1c 100644 --- a/gui/curve-config.cpp +++ b/gui/curve-config.cpp @@ -7,7 +7,7 @@ */ #include "curve-config.h" -#include "opentrack/main-settings.hpp" +#include "opentrack-logic/main-settings.hpp" MapWidget::MapWidget(Mappings& m, main_settings& s) : m(m) { @@ -54,12 +54,12 @@ MapWidget::MapWidget(Mappings& m, main_settings& s) : qfc.setEnabled(qfcs[i].checkbox->isChecked()); qfc.force_redraw(); } - + if (qfcs[i].axis >= 3) qfcs[i].qfc->set_snap(2, 5); else qfcs[i].qfc->set_snap(1, 5); - + qfcs[i].qfc->setConfig(conf, name); } } diff --git a/gui/curve-config.h b/gui/curve-config.h index 0cbc7055..9a9475b9 100644 --- a/gui/curve-config.h +++ b/gui/curve-config.h @@ -1,6 +1,6 @@ #pragma once #include <QWidget> -#include "opentrack/mappings.hpp" +#include "opentrack-logic/mappings.hpp" #include "ui_mapping.h" class MapWidget: public QWidget diff --git a/gui/keyboard.h b/gui/keyboard.h index 696df605..07f326ea 100644 --- a/gui/keyboard.h +++ b/gui/keyboard.h @@ -1,8 +1,8 @@ #pragma once #include "ui_keyboard_listener.h" #ifdef _WIN32 -#include "opentrack/win32-shortcuts.h" -#include "opentrack/keybinding-worker.hpp" +#include "opentrack-logic/win32-shortcuts.h" +#include "opentrack-logic/keybinding-worker.hpp" #endif #include <QLabel> #include <QKeyEvent> diff --git a/gui/options-dialog.hpp b/gui/options-dialog.hpp index a879a208..eee9d090 100644 --- a/gui/options-dialog.hpp +++ b/gui/options-dialog.hpp @@ -1,7 +1,7 @@ #pragma once #include "ui_settings.h" -#include "opentrack/shortcuts.h" +#include "opentrack-logic/shortcuts.h" #include <QObject> #include <QWidget> #include <functional> @@ -7,7 +7,7 @@ */ #include "ui.h" -#include "opentrack/tracker.h" +#include "opentrack-logic/tracker.h" #include "opentrack-compat/options.hpp" #include "new_file_dialog.h" #include <QFileDialog> @@ -23,12 +23,12 @@ #include "ui_main.h" #include "opentrack-compat/options.hpp" -#include "opentrack/main-settings.hpp" +#include "opentrack-logic/main-settings.hpp" #include "opentrack/plugin-support.hpp" -#include "opentrack/tracker.h" -#include "opentrack/shortcuts.h" -#include "opentrack/work.hpp" -#include "opentrack/state.hpp" +#include "opentrack-logic/tracker.h" +#include "opentrack-logic/shortcuts.h" +#include "opentrack-logic/work.hpp" +#include "opentrack-logic/state.hpp" #include "curve-config.h" #include "options-dialog.hpp" #include "process_detector.h" |