From 3451e3b3b70dae1f641e32c4e8236a2b959c58dc Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 4 Jan 2023 13:34:23 +0100 Subject: opentrack: add compact ui --- opentrack/defs.hpp | 2 +- opentrack/lang/nl_NL.ts | 40 -- opentrack/lang/ru_RU.ts | 40 -- opentrack/lang/stub.ts | 40 -- opentrack/lang/zh_CN.ts | 40 -- opentrack/main-window.ui | 1423 ++++++++-------------------------------------- 6 files changed, 225 insertions(+), 1360 deletions(-) (limited to 'opentrack') diff --git a/opentrack/defs.hpp b/opentrack/defs.hpp index 64c45095..891652ab 100644 --- a/opentrack/defs.hpp +++ b/opentrack/defs.hpp @@ -11,7 +11,7 @@ #define UI_NO_RAW_DATA #define UI_NO_GAME_DATA -//#define UI_NO_VIDEO_FEED +#define UI_NO_VIDEO_FEED //define UI_ACCELA_OLD_STAIRCASE diff --git a/opentrack/lang/nl_NL.ts b/opentrack/lang/nl_NL.ts index 7a465820..4e87d35a 100644 --- a/opentrack/lang/nl_NL.ts +++ b/opentrack/lang/nl_NL.ts @@ -14,38 +14,6 @@ main_window - - Raw tracker data - - - - Z - - - - Pitch - - - - Y - - - - X - - - - Roll - - - - Yaw - - - - Game data - - Profile @@ -70,10 +38,6 @@ Stop - - Input - - 🔨 @@ -82,10 +46,6 @@ Output - - Filter - - Running as root is bad diff --git a/opentrack/lang/ru_RU.ts b/opentrack/lang/ru_RU.ts index 684a8212..62760343 100644 --- a/opentrack/lang/ru_RU.ts +++ b/opentrack/lang/ru_RU.ts @@ -86,38 +86,6 @@ Exiting now. :: :: - - Raw tracker data - Исходные данные - - - Z - Z - - - Pitch - Pitch - - - Y - Y - - - X - X - - - Roll - Roll - - - Yaw - Yaw - - - Game data - Игровые данные - Profile Профиль @@ -138,10 +106,6 @@ Exiting now. Stop Остановить - - Input - Источник данных - 🔨 @@ -150,10 +114,6 @@ Exiting now. Output Выходной интерфейс - - Filter - Фильтрация/сглаживание - Running as root is bad diff --git a/opentrack/lang/stub.ts b/opentrack/lang/stub.ts index 04555dd0..9a274581 100644 --- a/opentrack/lang/stub.ts +++ b/opentrack/lang/stub.ts @@ -14,38 +14,6 @@ main_window - - Raw tracker data - - - - Z - - - - Pitch - - - - Y - - - - X - - - - Roll - - - - Yaw - - - - Game data - - Profile @@ -70,10 +38,6 @@ Stop - - Input - - 🔨 @@ -82,10 +46,6 @@ Output - - Filter - - Running as root is bad diff --git a/opentrack/lang/zh_CN.ts b/opentrack/lang/zh_CN.ts index 15609d70..f88bb039 100644 --- a/opentrack/lang/zh_CN.ts +++ b/opentrack/lang/zh_CN.ts @@ -14,38 +14,6 @@ main_window - - Raw tracker data - 跟踪器原始数据 - - - Z - - - - Pitch - 仰俯 - - - Y - - - - X - - - - Roll - 横滚 - - - Yaw - 偏航 - - - Game data - 游戏得到的数据 - Profile 配置文件 @@ -70,10 +38,6 @@ Stop 停止 - - Input - 输入 - 🔨 @@ -82,10 +46,6 @@ Output 输出 - - Filter - 过滤器 - Running as root is bad 以管理员运行不是什么好主意 diff --git a/opentrack/main-window.ui b/opentrack/main-window.ui index 32c9f57a..138c8a51 100644 --- a/opentrack/main-window.ui +++ b/opentrack/main-window.ui @@ -7,8 +7,8 @@ 0 0 - 655 - 502 + 338 + 415 @@ -17,1111 +17,114 @@ 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 - - - - - - - - - - - 4 - 0 - - - - - 315 - 0 - - - - - 4 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - - - 4 - - - 0 - - - 4 - - - 0 - - - - - true - - - - 0 - 0 - - - - Qt::StrongFocus - - - Profile - - - QToolButton::InstantPopup - - - Qt::ToolButtonTextBesideIcon - - - true - - - Qt::DownArrow - - - - - - - - 0 - 0 - - - - - 245 - 0 - - - - Qt::StrongFocus - - - 20 - - - - - - - - - - - 4 - - - 0 - - - 4 - - - 0 - - - - - - 0 - 0 - - - - Options - - - - :/images/tools.png:/images/tools.png - - - - 80 - 24 - - - - - - - - - 0 - 0 - - - - Mapping - - - - :/images/curves.png:/images/curves.png - - - - 80 - 24 - - - - - - - - - - - - 4 - 0 - - - - - 0 - 0 - - - - Tracking - - - - 7 - - - 4 - - - 4 - - - 4 - - - 4 - - - - - - 0 - 0 - - - - - 0 - 34 - - - - - 75 - true - - - - Start - - - - - - - false - - - - 0 - 0 - - - - - 0 - 34 - - - - - 75 - true - - - - Stop - - - - - - - - - - - + + + :/images/opentrack.png:/images/opentrack.png + + + #video_feed { border: 0; } + + + + + + 0 + 0 + + + + + 6 + + + 6 + + + - + 0 0 - 310 - 0 + 320 + 240 - - - 4 - - - 4 - - - 0 - - - 0 - + + + + + + + 0 + 0 + + + 0 - - + + + + + 0 + 0 + + + + Options + + + + :/images/tools.png:/images/tools.png + + + + 80 + 24 + + + + + + + + + 0 + 0 + + + + Mapping + + + + :/images/curves.png:/images/curves.png + + + + 80 + 24 + + + + + + + + + 0 + 0 + + - Input + Output - + 4 @@ -1132,18 +135,12 @@ 4 - 4 - - 6 - - 0 - - - + + - + 0 0 @@ -1151,10 +148,13 @@ Qt::TabFocus + + QComboBox::AdjustToMinimumContentsLengthWithIcon + - - + + true @@ -1185,12 +185,18 @@ - - + + + + + 0 + 0 + + - Output + Profile - + 4 @@ -1201,122 +207,52 @@ 4 - 4 - - 6 - - 0 - - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - + + true - + 0 0 - - - DejaVu Sans - PreferAntialias - false - - - Qt::ClickFocus + Qt::StrongFocus - 🔨 + - - false + + QToolButton::InstantPopup - - - - - - - - - Filter - - - - 4 - - - 4 - - - 4 - - - 4 - - - 6 - - - 0 - - - - - - 0 - 0 - + + Qt::ToolButtonIconOnly - - Qt::TabFocus + + true + + + Qt::DownArrow - - - - true - + + - - 0 + + 1 0 - - - DejaVu Sans - PreferAntialias - false - - - Qt::ClickFocus - - - 🔨 + Qt::StrongFocus - - false + + 20 @@ -1326,6 +262,95 @@ + + + + + 4 + 0 + + + + + 0 + 0 + + + + Tracking + + + + 7 + + + 4 + + + 3 + + + 4 + + + 2 + + + + + + 0 + 0 + + + + + 0 + 34 + + + + + 75 + true + + + + Start + + + + + + + false + + + + 0 + 0 + + + + + 0 + 34 + + + + + 75 + true + + + + Stop + + + + + + -- cgit v1.2.3