From a53158bec180534e2139d0afcf047dc135f522d7 Mon Sep 17 00:00:00 2001 From: Chris Pember Date: Sat, 21 Jul 2012 11:26:37 -0700 Subject: [PATCH] removed all the pushbutton stylesheets, hid all the apply buttons, applied same design ideas to the HW and the attitude forms --- .../src/plugins/config/airframe.ui | 12 + .../src/plugins/config/camerastabilization.ui | 12 + .../src/plugins/config/cc_hw_settings.ui | 569 +++++++++++------- .../src/plugins/config/ccattitude.ui | 544 ++++++++++------- 4 files changed, 718 insertions(+), 419 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui index 85abfa7af..e3bb54aa9 100644 --- a/ground/openpilotgcs/src/plugins/config/airframe.ui +++ b/ground/openpilotgcs/src/plugins/config/airframe.ui @@ -3009,6 +3009,18 @@ p, li { white-space: pre-wrap; } + + + 0 + 0 + + + + + 0 + 75 + + diff --git a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui index 6b24feff8..116bab28a 100644 --- a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui @@ -837,6 +837,18 @@ value. + + + 0 + 0 + + + + + 0 + 50 + + false diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui index e64800124..3c9540105 100644 --- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui +++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui @@ -6,210 +6,347 @@ 0 0 - 517 - 487 + 691 + 849 Form - + + + 12 + - - - QFrame::StyledPanel + + + 0 - - QFrame::Raised + + + HW settings + + + + 0 + + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + + + 0 + 0 + 661 + 652 + + + + + + + + + + + + true + + + + + + + + + + + + + MainPort + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + + + + + + + FlexiPort + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + USB HID Port + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + + + USB VCP Port + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + + + RcvrPort + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + + + Telemetry speed: + + + + + + + + 55 + 0 + + + + GPS speed: + + + + + + + + 55 + 0 + + + + ComUsbBridge speed: + + + + + + + Select the speed here. + + + + + + + Select the speed here. + + + + + + + Select the speed here. + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 328 + + + + + + + + + 75 + true + + + + Changes on this page only take effect after board reset or power cycle + + + Qt::AlignCenter + + + true + + + + + + + + + + + + + + + + 0 + 0 + - - - - - - - - - - true - - - - - - - - - - - - - MainPort - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - - - - - - - FlexiPort - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - USB HID Port - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - - - USB VCP Port - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - - - RcvrPort - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - - Telemetry speed: - - - - - - - - 55 - 0 - - - - GPS speed: - - - - - - - - 55 - 0 - - - - ComUsbBridge speed: - - - - - - - Select the speed here. - - - - - - - Select the speed here. - - - - - - - Select the speed here. - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - + + + 0 + 50 + + + + Problems + + @@ -229,24 +366,32 @@ - - - - - 75 - true - - - - Changes on this page only take effect after board reset or power cycle - - - true - - - + + + + + + + + 0 + 0 + + + + + 0 + 75 + + + + + + + + 4 + diff --git a/ground/openpilotgcs/src/plugins/config/ccattitude.ui b/ground/openpilotgcs/src/plugins/config/ccattitude.ui index 49a7ab649..c3585866b 100644 --- a/ground/openpilotgcs/src/plugins/config/ccattitude.ui +++ b/ground/openpilotgcs/src/plugins/config/ccattitude.ui @@ -6,226 +6,356 @@ 0 0 - 455 - 428 + 606 + 576 Form - - - - - Rotate virtual attitude relative to board + + + + + 0 - - - - - Roll - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - -180 - - - 180 - - - - - - - Pitch - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - -90 - - - 90 - - - - - - - Yaw - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - -180 - - - 180 - - - - - - - - - - Calibration - - - - - - Place aircraft very flat, and then click level to compute the accelerometer and gyro bias - - - true - - - - - - - Launch horizontal calibration. - - - Level - - - - - - - 0 - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 10 - - - - - - - - If enabled, a fast recalibration of gyro zero point will be done + + + Attitude + + + + 0 + + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + + + 0 + 0 + 576 + 439 + + + + + + + Rotate virtual attitude relative to board + + + + + + Roll + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + -180 + + + 180 + + + + + + + Pitch + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + -90 + + + 90 + + + + + + + Yaw + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + -180 + + + 180 + + + + + + + + + + Calibration + + + + + + Place aircraft very flat, and then click level to compute the accelerometer and gyro bias + + + true + + + + + + + Launch horizontal calibration. + + + Level + + + + + + + 0 + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 10 + + + + + + + + If enabled, a fast recalibration of gyro zero point will be done whenever the frame is armed. Do not move the airframe while arming it in that case! + + + Zero gyros while arming aircraft + + + + + + + + + + Qt::Vertical + + + + 20 + 91 + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 75 + + + + + + + + + + 4 - - Zero gyros while arming aircraft - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 32 + 32 + + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 32 + 32 + + + + true + + + + + + + Apply + + + + + + + Click to permanently save the accel bias in the CopterControl Flash. + + + Save + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 32 - 32 - - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 32 - 32 - - - - true - - - - - - - Apply - - - - - - - Click to permanently save the accel bias in the CopterControl Flash. - - - Save - - - - -