From 75044583226009200159f72cb5100f5a7d65e877 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 23 May 2022 20:56:26 +0200 Subject: trackhat: add simplified ui --- opentrack/defs.hpp | 21 +- opentrack/lang/nl_NL.ts | 44 -- opentrack/lang/ru_RU.ts | 44 -- opentrack/lang/stub.ts | 44 -- opentrack/lang/zh_CN.ts | 44 -- opentrack/main-window.ui | 1091 ++++++---------------------------------------- 6 files changed, 142 insertions(+), 1146 deletions(-) diff --git a/opentrack/defs.hpp b/opentrack/defs.hpp index e3826474..f3522d50 100644 --- a/opentrack/defs.hpp +++ b/opentrack/defs.hpp @@ -1,14 +1,11 @@ #pragma once -//#define UI_FORCED_TRACKER "pt" -//#define UI_FORCED_FILTER "accela" - -//#define UI_NO_TRACKER_COMBOBOX -//#define UI_NO_FILTER_COMBOBOX - -//#define UI_NO_TRACKER_SETTINGS_BUTTON -//#define UI_NO_FILTER_SETTINGS_BUTTON - -//#define UI_NO_RAW_DATA -//#define UI_NO_GAME_DATA -//define UI_ACCELA_OLD_STAIRCASE +#define UI_FORCED_TRACKER "trackhat" +#define UI_FORCED_FILTER "accela" +#define UI_NO_TRACKER_COMBOBOX +#define UI_NO_FILTER_COMBOBOX +#define UI_NO_TRACKER_SETTINGS_BUTTON +#define UI_NO_FILTER_SETTINGS_BUTTON +#define UI_NO_RAW_DATA +#define UI_NO_GAME_DATA +#define UI_ACCELA_OLD_STAIRCASE diff --git a/opentrack/lang/nl_NL.ts b/opentrack/lang/nl_NL.ts index 7a465820..15acd701 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 @@ -58,10 +26,6 @@ Mapping - - Tracking - - Start @@ -70,10 +34,6 @@ Stop - - Input - - 🔨 @@ -82,10 +42,6 @@ Output - - Filter - - Running as root is bad diff --git a/opentrack/lang/ru_RU.ts b/opentrack/lang/ru_RU.ts index 684a8212..c869bae8 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 Профиль @@ -126,10 +94,6 @@ Exiting now. Mapping Кривые - - Tracking - Статус работы трекера - Start Запустить @@ -138,10 +102,6 @@ Exiting now. Stop Остановить - - Input - Источник данных - 🔨 @@ -150,10 +110,6 @@ Exiting now. Output Выходной интерфейс - - Filter - Фильтрация/сглаживание - Running as root is bad diff --git a/opentrack/lang/stub.ts b/opentrack/lang/stub.ts index 04555dd0..66917925 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 @@ -58,10 +26,6 @@ Mapping - - Tracking - - Start @@ -70,10 +34,6 @@ Stop - - Input - - 🔨 @@ -82,10 +42,6 @@ Output - - Filter - - Running as root is bad diff --git a/opentrack/lang/zh_CN.ts b/opentrack/lang/zh_CN.ts index 15609d70..fd9ea20f 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 配置文件 @@ -58,10 +26,6 @@ Mapping 映射 - - Tracking - 跟踪 - Start 开始 @@ -70,10 +34,6 @@ Stop 停止 - - Input - 输入 - 🔨 @@ -82,10 +42,6 @@ Output 输出 - - Filter - 过滤器 - Running as root is bad 以管理员运行不是什么好主意 diff --git a/opentrack/main-window.ui b/opentrack/main-window.ui index 32c9f57a..7a1ee993 100644 --- a/opentrack/main-window.ui +++ b/opentrack/main-window.ui @@ -8,21 +8,15 @@ 0 0 655 - 502 + 349 - + 0 0 - - - 0 - 500 - - :/images/opentrack.png:/images/opentrack.png @@ -33,24 +27,18 @@ - + 0 0 - + 0 0 - - 9 - - - 9 - @@ -158,12 +146,6 @@ - - - 0 - 0 - - 320 @@ -173,673 +155,25 @@ - - - - 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 0 - 315 + 310 0 - + - 4 + 3 - 0 + 6 0 @@ -851,143 +185,74 @@ 0 - + 0 0 - - - 0 - + + Output + + 4 - 0 + 4 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 + + 6 - + 0 - - + + - + 0 0 - - Options - - - - :/images/tools.png:/images/tools.png - - - - 80 - 24 - + + Qt::TabFocus - - + + + + true + - + 0 0 - - Mapping + + + DejaVu Sans + PreferAntialias + false + - - - :/images/curves.png:/images/curves.png + + Qt::ClickFocus - - - 80 - 24 - + + 🔨 + + + false @@ -995,9 +260,9 @@ - + - + 4 0 @@ -1008,12 +273,9 @@ 0 - - Tracking - - 7 + 6 4 @@ -1025,12 +287,12 @@ 4 - 4 + 0 - + 0 0 @@ -1058,7 +320,7 @@ false - + 0 0 @@ -1086,26 +348,26 @@ - - + + - - 0 - 0 + + 4 + 1 - 310 + 315 0 - + 4 - 4 + 0 0 @@ -1117,137 +379,73 @@ 0 - - - Input - - + + + + 0 + - 4 + 0 - 4 + 0 - 4 + 0 - 4 - - - 6 - - 0 - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - + + true - + 0 0 - - - DejaVu Sans - PreferAntialias - false - - - Qt::ClickFocus + Qt::StrongFocus - 🔨 + Profile - - false + + QToolButton::InstantPopup - - - - - - - - - Output - - - - 4 - - - 4 - - - 4 - - - 4 - - - 6 - - - 0 - - - - - - 0 - 0 - + + Qt::ToolButtonTextBesideIcon - - Qt::TabFocus + + true + + + Qt::DownArrow - - - - true - + + - + 0 0 - - - DejaVu Sans - PreferAntialias - false - + + + 245 + 0 + - Qt::ClickFocus - - - 🔨 + Qt::StrongFocus - - false + + 20 @@ -1255,72 +453,49 @@ - - - Filter + + + + 0 + 0 + + + + Options + + + + :/images/tools.png:/images/tools.png + + + + 80 + 24 + + + + + + + + + 0 + 0 + + + + Mapping + + + + :/images/curves.png:/images/curves.png + + + + 80 + 24 + - - - 4 - - - 4 - - - 4 - - - 4 - - - 6 - - - 0 - - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - - - true - - - - 0 - 0 - - - - - DejaVu Sans - PreferAntialias - false - - - - Qt::ClickFocus - - - 🔨 - - - false - - - - -- cgit v1.2.3