From ce49db43e9e67462efa472d0ae576d2ae75bb4a9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 16 Dec 2021 14:52:57 +0100 Subject: trackhat: add simplified UI --- opentrack/main-window.hpp | 5 + opentrack/main-window.ui | 2344 +++++++++++++++++++++++---------------------- 2 files changed, 1187 insertions(+), 1162 deletions(-) diff --git a/opentrack/main-window.hpp b/opentrack/main-window.hpp index 495300c1..22b129e3 100644 --- a/opentrack/main-window.hpp +++ b/opentrack/main-window.hpp @@ -34,6 +34,11 @@ #include "ui_main-window.h" +#define UI_NO_TRACKER_COMBOBOX +#define UI_NO_FILTER_COMBOBOX +#define UI_NO_TRACKER_SETTINGS_BUTTON +#define UI_NO_FILTER_SETTINGS_BUTTON + class main_window final : public QMainWindow, private State { Q_DECLARE_TR_FUNCTIONS(main_window) diff --git a/opentrack/main-window.ui b/opentrack/main-window.ui index 32c9f57a..b8b7d987 100644 --- a/opentrack/main-window.ui +++ b/opentrack/main-window.ui @@ -7,836 +7,67 @@ 0 0 - 655 - 502 + 649 + 440 - + 0 0 - - - 0 - 500 - - - - - :/images/opentrack.png:/images/opentrack.png - - - #video_feed { border: 0; } - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 9 - - - 9 - - - - - - 0 - 0 - - - - - 320 - 240 - - - - - 320 - 240 - - - - 0 - - - - - 0 - 0 - 320 - 240 - - - - - 0 - 0 - - - - - 320 - 240 - - - - - 320 - 240 - - - - - - 0 - 0 - 320 - 240 - - - - - 0 - 0 - - - - - 320 - 240 - - - - - 320 - 240 - - - - - Candara - 37 - 50 - false - true - - - - - - - :/images/tracking-not-started.png - - - false - - - Qt::AlignCenter - - - true - - - - - - - - - - 0 - 0 - - - - - 320 - 240 - - - - - - - - - 316 - 0 - - - - Raw tracker data - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - Z - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Pitch - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - Y - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - X - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Roll - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Yaw - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - - - - 316 - 0 - - - - Game data - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - X - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - Y - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Pitch - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Roll - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Yaw - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - Z - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - + + + :/images/opentrack.png:/images/opentrack.png + + + #video_feed { border: 0; } + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + - - 4 + + 0 0 - - - 315 - 0 - + + QFrame::NoFrame + + + QFrame::Raised - + + 0 + + - 4 + 0 0 @@ -850,143 +81,159 @@ 0 - - + + - + 0 0 - + + + 0 + 240 + + + + + 640 + 16777215 + + + 0 - 4 + 0 0 - 4 + 0 - 0 + 4 - - - - true - - - - 0 - 0 - - - - Qt::StrongFocus - - - Profile - - - QToolButton::InstantPopup - - - Qt::ToolButtonTextBesideIcon - - - true - - - Qt::DownArrow - - - - - + + - + 0 0 - 245 - 0 + 320 + 240 - - Qt::StrongFocus - - - 20 - - - - - - - - - - - 4 - - - 0 - - - 4 - - - 0 - - - - - - 0 - 0 - - - - Options - - - - :/images/tools.png:/images/tools.png - - + - 80 - 24 + 320 + 240 + + 0 + + + + + 0 + 0 + 320 + 240 + + + + + 0 + 0 + + + + + 320 + 240 + + + + + 320 + 240 + + + + + + 0 + 0 + 320 + 240 + + + + + 0 + 0 + + + + + 320 + 240 + + + + + 320 + 240 + + + + + Candara + 37 + 50 + false + true + + + + + + + :/images/tracking-not-started.png + + + false + + + Qt::AlignCenter + + + true + + + - + - + 0 0 - - Mapping - - - - :/images/curves.png:/images/curves.png - - + - 80 - 24 + 320 + 240 @@ -995,329 +242,1094 @@ - + - - 4 + + 0 0 - - - 0 - 0 - + + QFrame::NoFrame - - Tracking + + 0 - + - 7 + 6 - 4 + 5 - 4 + 0 - 4 + 0 - 4 + 6 - + - + 0 0 - 0 - 34 + 316 + 0 - - - 75 - true - - - - Start + + Raw tracker data + + + 6 + + + 0 + + + 0 + + + 6 + + + 0 + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + true + + + + 0 + 0 + + + + false + + + QFrame::Raised + + + Z + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + Pitch + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + true + + + + 0 + 0 + + + + false + + + QFrame::Raised + + + Y + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + X + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + Roll + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + Yaw + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + - - - false - + - + 0 0 - 0 - 34 + 316 + 0 - - - 75 - true - - - - Stop + + Game data + + + 6 + + + 0 + + + 0 + + + 6 + + + 0 + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + X + + + + + + + true + + + + 0 + 0 + + + + false + + + QFrame::Raised + + + Y + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + Pitch + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + Roll + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + Yaw + + + + + + + true + + + + 0 + 0 + + + + false + + + QFrame::Raised + + + Z + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + true + + + + 0 + 0 + + + + + NoAntialias + false + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + - - - - - - - - 0 - 0 - - - - - 310 - 0 - - - - - 4 - - - 4 - - - 0 - - - 0 - - - 0 - - - - Input + + + + 0 + 0 + - - - 4 - - - 4 - - - 4 - - - 4 - - - 6 - - - 0 - - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - - - true - - - - 0 - 0 - - - - - DejaVu Sans - PreferAntialias - false - - - - Qt::ClickFocus - - - 🔨 - - - false - - - - - - - - - - Output + + + 16777215 + 180 + - + - 4 + 6 - 4 + 0 - 4 + 0 - 4 + 0 - + 6 - - 0 - - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - - true - + - - 0 + + 4 0 - - - DejaVu Sans - PreferAntialias - false - - - - Qt::ClickFocus - - - 🔨 + + + 315 + 0 + - - false + + 0 + + + 3 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + + 0 + 0 + + + + Qt::StrongFocus + + + Profile + + + QToolButton::InstantPopup + + + Qt::ToolButtonTextBesideIcon + + + true + + + Qt::DownArrow + + + + + + + + 0 + 0 + + + + + 245 + 0 + + + + Qt::StrongFocus + + + 20 + + + + + + + + + + + 0 + 0 + + + + Options + + + + :/images/tools.png:/images/tools.png + + + + 80 + 24 + + + + + + + + + 0 + 0 + + + + Mapping + + + + :/images/curves.png:/images/curves.png + + + + 80 + 24 + + + + + - - - - - - - Filter - - - - 4 - - - 4 - - - 4 - - - 4 - - - 6 - - - 0 - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - - - true - + 0 0 - - - DejaVu Sans - PreferAntialias - false - - - - Qt::ClickFocus + + + 310 + 0 + - - 🔨 + + QFrame::NoFrame - - false + + QFrame::Raised + + + 2 + + + 3 + + + 2 + + + 3 + + + 8 + + + + + + 0 + 0 + + + + Output + + + + 4 + + + 0 + + + 0 + + + 0 + + + 3 + + + 0 + + + + + + 0 + 0 + + + + Qt::TabFocus + + + + + + + true + + + + 0 + 0 + + + + + DejaVu Sans + PreferAntialias + false + + + + Qt::ClickFocus + + + 🔨 + + + false + + + + + + + + + + + 4 + 0 + + + + + 0 + 0 + + + + + + + true + + + + 8 + + + 0 + + + 6 + + + 0 + + + 6 + + + + + + 0 + 0 + + + + + 0 + 34 + + + + + 75 + true + + + + Start + + + + + + + false + + + + 0 + 0 + + + + + 0 + 34 + + + + + 75 + true + + + + Stop + + + + + + + @@ -1336,6 +1348,14 @@
pose-widget/pose-widget.hpp
+ + btnStartTracker + btnStopTracker + profile_button + iconcomboProfile + btnShortcuts + btnEditCurves + -- cgit v1.2.3