From bd17446dbb598ca46e308d9295178882b8d81e8f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 18 Dec 2015 00:55:46 +0100 Subject: ui: make more compact --- gui/main.ui | 1632 +++++++++++++++++++++++++++++------------------------------ gui/ui.cpp | 2 - gui/ui.h | 1 - 3 files changed, 803 insertions(+), 832 deletions(-) diff --git a/gui/main.ui b/gui/main.ui index 5b276dbb..a3d1896b 100644 --- a/gui/main.ui +++ b/gui/main.ui @@ -7,8 +7,8 @@ 0 0 - 716 - 537 + 654 + 485 @@ -31,16 +31,16 @@ 0 - 0 + 6 0 - 0 + 6 - 0 + 6 @@ -53,7 +53,10 @@ 0 - + + + 0 + 0 @@ -66,10 +69,7 @@ 0 - - 0 - - + QFrame::NoFrame @@ -93,21 +93,15 @@ - + 0 0 - 480 - 360 - - - - - 480 - 360 + 320 + 240 @@ -115,12 +109,12 @@ 0 0 - 480 - 360 + 320 + 240 - + 0 0 @@ -130,8 +124,8 @@ 0 0 - 480 - 360 + 320 + 240 @@ -142,921 +136,718 @@ - 480 - 360 + 320 + 240 - 480 - 360 + 320 + 240 + + :/images/no-feed.png + + + true + - - - QFrame::NoFrame + + + + 0 + 0 + - - 0 + + + 320 + 240 + - - - 12 - + + + + + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + 0 + + + + 0 + + + 0 + + + 0 + + + 0 + + + 4 + + + + + + 0 + 0 + + + + Raw tracker data + + - 6 + 0 - 12 + 0 - 8 + 0 - 4 + 0 - - + + 0 + + + + + true + - + 0 0 - - - 80 - 90 - + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline - - + + + + true + - + 0 0 - - Raw tracker data + + false + + + QFrame::Raised + + + TZ - - - 0 - - - 0 - - - 0 - - - 0 - - - 3 - - - 2 - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - yaw - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - roll - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - TZ - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - pitch - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - TX - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - TY - - - - - - + + - + 0 0 - - Game data + + QFrame::Raised + + + pitch + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + true + + + + 0 + 0 + + + + false + + + QFrame::Raised + + + TY + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + TX + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + roll + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + yaw + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 1 + + + true + + + 4 + + + QLCDNumber::Outline - - - 0 - - - 0 - - - 0 - - - 0 - - - 3 - - - 2 - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - TY - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - pitch - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - yaw - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - roll - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - TZ - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - TX - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - - - - - 0 - 0 - - - - - 4 - - - 8 - - - 10 - - - 0 - - - 4 - - - 0 - - - + + - - 4 + + 0 0 - Settings - - - true + Game data - - - 3 - + - 4 + 0 - 2 + 0 0 - 6 + 0 - - + + 0 + + + + + true + - + 0 - 2 + 0 - - - 0 - - - 0 - - - 2 - - - 2 - - - - - true - - - - 0 - 0 - - - - Profile - - - QToolButton::InstantPopup - - - Qt::ToolButtonTextBesideIcon - - - true - - - Qt::DownArrow - - - - - - - - 0 - 0 - - - - 20 - - - - + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + - - + + + + true + - + + 0 + 0 + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + 0 - 3 + 0 + + QFrame::Raised + - Mapping + TX - - - :/images/curves.png:/images/curves.png + + + + + + true + + + + 0 + 0 + + + + false + + + QFrame::Raised + + + TY + + + + + + + true + + + + 0 + 0 + + + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + pitch + + + + + + + + 0 + 0 + + + + QFrame::Raised + + + roll + + + + + + + + 0 + 0 + + + + QFrame::Raised - - - 80 - 24 - + + yaw - - + + + + true + - + 0 - 3 + 0 - - Options + + false - - - :/images/tools.png:/images/tools.png + + QFrame::Raised - - - 80 - 24 - + + TZ - - - - - - - - 3 - 0 - - - - Controls - - - true - - - - 8 - - - 0 - - - 8 - - - 0 - - - 9 - - - + + + + true + - + 0 0 - - Start + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat - - + + - false + true - + 0 0 - - Stop + + QFrame::NoFrame + + + true + + + 4 + + + QLCDNumber::Flat - + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + @@ -1218,6 +1009,188 @@ + + + + + 4 + 0 + + + + 0 + + + + 3 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + Profile + + + QToolButton::InstantPopup + + + Qt::ToolButtonTextBesideIcon + + + true + + + Qt::DownArrow + + + + + + + 20 + + + + + + + + + + Options + + + + :/images/tools.png:/images/tools.png + + + + 80 + 24 + + + + + + + + Mapping + + + + :/images/curves.png:/images/curves.png + + + + 80 + 24 + + + + + + + + + 3 + 0 + + + + Controls + + + true + + + + 8 + + + 0 + + + 8 + + + 0 + + + 9 + + + + + + 0 + 0 + + + + Start + + + + + + + false + + + + 0 + 0 + + + + Stop + + + + + + + + + @@ -1235,7 +1208,6 @@ - btnStartTracker btnStopTracker iconcomboTrackerSource btnShowEngineControls @@ -1245,8 +1217,10 @@ btnShowFilterControls profile_button iconcomboProfile - btnEditCurves btnShortcuts + btnEditCurves + profile_button + iconcomboProfile diff --git a/gui/ui.cpp b/gui/ui.cpp index 2bd8e72a..c19e4840 100644 --- a/gui/ui.cpp +++ b/gui/ui.cpp @@ -22,7 +22,6 @@ MainWindow::MainWindow() : pose_update_timer(this), kbd_quit(QKeySequence("Ctrl+Q"), this), - no_feed_pixmap(":/images/no-feed.png"), is_refreshing_profiles(false), keys_paused(false) { @@ -31,7 +30,6 @@ MainWindow::MainWindow() : setFixedSize(size()); updateButtonState(false, false); - ui.video_frame_label->setPixmap(no_feed_pixmap); connect(ui.btnEditCurves, SIGNAL(clicked()), this, SLOT(showCurveConfiguration())); connect(ui.btnShortcuts, SIGNAL(clicked()), this, SLOT(show_options_dialog())); diff --git a/gui/ui.h b/gui/ui.h index ee0a3ce7..deeb116d 100644 --- a/gui/ui.h +++ b/gui/ui.h @@ -49,7 +49,6 @@ class MainWindow : public QMainWindow, private State mem options_widget; mem mapping_widget; QShortcut kbd_quit; - QPixmap no_feed_pixmap; mem pFilterDialog; mem pProtocolDialog; mem pTrackerDialog; -- cgit v1.2.3