From 27b53bf092615771360e526f6ec48aca563a4dfe Mon Sep 17 00:00:00 2001 From: Chris Pember Date: Sat, 14 Jul 2012 21:26:38 -0700 Subject: [PATCH 1/2] deleted the commented lines, tried resizing the margins and I couldnt get it to look quite right, so I ditched it. --- .../src/plugins/config/camerastabilization.ui | 32 +++++++++++++++---- .../src/plugins/config/outputchannelform.cpp | 17 ---------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui index f935b6dcb..0f7b8f980 100644 --- a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui @@ -17,6 +17,9 @@ 12 + + 12 + @@ -33,13 +36,7 @@ 12 - - 12 - - - 12 - - + 12 @@ -90,6 +87,9 @@ + + 12 + @@ -131,6 +131,12 @@ false + + 12 + + + 12 + @@ -345,6 +351,12 @@ margin:1px; Advanced Settings (Control) + + 12 + + + 12 + @@ -756,6 +768,9 @@ value. Messages + + 12 + @@ -772,6 +787,9 @@ value. + + 12 + diff --git a/ground/openpilotgcs/src/plugins/config/outputchannelform.cpp b/ground/openpilotgcs/src/plugins/config/outputchannelform.cpp index 813c32a94..0aaa900ab 100644 --- a/ground/openpilotgcs/src/plugins/config/outputchannelform.cpp +++ b/ground/openpilotgcs/src/plugins/config/outputchannelform.cpp @@ -35,23 +35,6 @@ OutputChannelForm::OutputChannelForm(const int index, QWidget *parent, const boo m_inChannelTest(false) { ui.setupUi(this); -// if(!showLegend) -// { -// // Remove legend -// QGridLayout *grid_layout = dynamic_cast(layout()); -// Q_ASSERT(grid_layout); -// for (int col = 0; col < grid_layout->columnCount(); col++) -// { // remove every item in first row -// QLayoutItem *item = grid_layout->itemAtPosition(0, col); -// if (!item) continue; -// // get widget from layout item -// QWidget *legend_widget = item->widget(); -// if (!legend_widget) continue; -// // delete widget -// grid_layout->removeWidget(legend_widget); -// delete legend_widget; -// } -// } // The convention for OP is Channel 1 to Channel 10. ui.actuatorNumber->setText(QString("%1:").arg(m_index+1)); From 719a556b784f33bd70a8eefa5f413064cef7bd42 Mon Sep 17 00:00:00 2001 From: Chris Pember Date: Tue, 17 Jul 2012 21:54:38 -0700 Subject: [PATCH 2/2] fixed the colos for all the forms so its not a topographic map greyscale look now, still converting the buttons all back to non style sheet --- .../src/plugins/config/airframe.ui | 190 +++++++++++++-- .../src/plugins/config/camerastabilization.ui | 85 ++++++- .../config/configstabilizationwidget.cpp | 3 +- .../openpilotgcs/src/plugins/config/input.ui | 229 ++++++++++++++++-- .../openpilotgcs/src/plugins/config/output.ui | 77 +++++- .../src/plugins/config/stabilization.ui | 210 +++++++++++++++- .../openpilotgcs/src/plugins/config/txpid.ui | 77 +++++- 7 files changed, 792 insertions(+), 79 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui index 0018812be..1221aae5d 100644 --- a/ground/openpilotgcs/src/plugins/config/airframe.ui +++ b/ground/openpilotgcs/src/plugins/config/airframe.ui @@ -6,7 +6,7 @@ 0 0 - 828 + 839 1007 @@ -28,10 +28,74 @@ - 12 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + QFrame::NoFrame @@ -43,8 +107,8 @@ 0 0 - 782 - 835 + 809 + 874 @@ -77,7 +141,7 @@ - 40 + 20 20 @@ -95,7 +159,7 @@ - 0 + 1 @@ -138,7 +202,7 @@ - 40 + 20 20 @@ -642,9 +706,12 @@ margin:1px; Qt::Horizontal + + QSizePolicy::MinimumExpanding + - 40 + 20 20 @@ -888,8 +955,8 @@ margin:1px; - 110 - 110 + 80 + 80 @@ -912,9 +979,12 @@ margin:1px; Qt::Horizontal + + QSizePolicy::MinimumExpanding + - 40 + 10 20 @@ -922,6 +992,12 @@ margin:1px; + + + 0 + 0 + + Throtte Curve @@ -952,8 +1028,8 @@ margin:1px; - 120 - 120 + 80 + 80 @@ -1339,9 +1415,12 @@ margin:1px; Qt::Horizontal + + QSizePolicy::MinimumExpanding + - 40 + 20 20 @@ -2513,17 +2592,75 @@ margin:1px; Advanced Settings - - 12 - - - 12 - - - 12 + + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + QFrame::NoFrame @@ -2535,8 +2672,8 @@ margin:1px; 0 0 - 249 - 303 + 809 + 874 @@ -2883,9 +3020,12 @@ p, li { white-space: pre-wrap; } Qt::Horizontal + + QSizePolicy::MinimumExpanding + - 40 + 20 20 diff --git a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui index 0f7b8f980..b41aac015 100644 --- a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui @@ -13,6 +13,9 @@ Form + + false + 12 @@ -22,6 +25,9 @@ + + false + 0 @@ -29,6 +35,9 @@ Qt::ElideMiddle + + false + Camera Stabilization @@ -37,10 +46,74 @@ 12 - 12 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + false @@ -58,8 +131,8 @@ 0 0 - 766 - 622 + 790 + 646 @@ -764,6 +837,9 @@ value. + + false + Messages @@ -783,6 +859,9 @@ value. + + false + diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index 0ee0875ab..319803ca8 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -44,7 +44,8 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa // To bring old style sheet back without adding it manually do this: // Alternatively apply a global stylesheet to the QGroupBox // setStyleSheet("QGroupBox {background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); border: 1px outset #999; border-radius: 3; }"); - setStyleSheet("QPushButton {\nborder: 1px outset #999;\nborder-radius: 5;\nbackground-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255));\n}\n\nQPushButton:pressed {\n\n border-style: inset;\n background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255));\n\n}\n\n\nQPushButton:hover {\n border: 1px outset #999; \nborder-color: rgb(83, 83, 83);\nborder-radius: 4;\n}"); + //setStyleSheet("QPushButton {\nborder: 1px outset #999;\nborder-radius: 5;\nbackground-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255));\n}\n\nQPushButton:pressed {\n\n border-style: inset;\n background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255));\n\n}\n\n\nQPushButton:hover {\n border: 1px outset #999; \nborder-color: rgb(83, 83, 83);\nborder-radius: 4;\n}"); + //setStyleSheet("background-color: rgb(230, 230, 230);"); autoLoadWidgets(); realtimeUpdates=new QTimer(this); diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index 0533913fa..a6532ed53 100644 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -24,17 +24,78 @@ RC Input - + 12 - - 12 - - - 12 + + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + QFrame::NoFrame @@ -46,8 +107,8 @@ 0 0 - 639 - 721 + 663 + 745 @@ -244,17 +305,78 @@ Flight Mode Switch Settings - + 12 - - 12 - - - 12 + + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + QFrame::NoFrame @@ -266,7 +388,7 @@ 0 0 - 624 + 648 776 @@ -718,17 +840,78 @@ margin:1px; Arming Settings - + 12 - - 12 - - - 12 + + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + QFrame::NoFrame @@ -740,8 +923,8 @@ margin:1px; 0 0 - 639 - 721 + 663 + 745 diff --git a/ground/openpilotgcs/src/plugins/config/output.ui b/ground/openpilotgcs/src/plugins/config/output.ui index dc12661b6..a74281ab0 100644 --- a/ground/openpilotgcs/src/plugins/config/output.ui +++ b/ground/openpilotgcs/src/plugins/config/output.ui @@ -30,17 +30,78 @@ Output - + 12 - - 12 - - - 12 + + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + QFrame::NoFrame @@ -52,8 +113,8 @@ 0 0 - 812 - 776 + 836 + 800 diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index f51be1530..9aa5eb445 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -6,7 +6,7 @@ 0 0 - 757 + 786 993 @@ -493,8 +493,75 @@ 12 + + 0 + + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + QFrame::NoFrame @@ -509,8 +576,8 @@ 0 0 - 703 - 832 + 756 + 856 @@ -10574,8 +10641,75 @@ Attitude 12 + + 0 + + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + QFrame::NoFrame @@ -10587,7 +10721,7 @@ Attitude 0 0 - 470 + 741 923 @@ -23648,7 +23782,7 @@ border-radius: 5; 0 - 75 + 79 @@ -24199,7 +24333,7 @@ border-radius: 5; - 150 + 300 20 @@ -24239,7 +24373,25 @@ border-radius: 5; Useful if you have accidentally changed some settings. - + QPushButton { +border: 1px outset #999; +border-radius: 5; +background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255)); +} + +QPushButton:pressed { + + border-style: inset; + background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255)); + +} + + +QPushButton:hover { + border: 1px outset #999; +border-color: rgb(83, 83, 83); +border-radius: 4; + } Reload Board Data @@ -24270,7 +24422,25 @@ Useful if you have accidentally changed some settings. Send settings to the board but do not save to the non-volatile memory - + QPushButton { +border: 1px outset #999; +border-radius: 5; +background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255)); +} + +QPushButton:pressed { + + border-style: inset; + background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255)); + +} + + +QPushButton:hover { + border: 1px outset #999; +border-color: rgb(83, 83, 83); +border-radius: 4; + } Apply @@ -24300,7 +24470,25 @@ Useful if you have accidentally changed some settings. Send settings to the board and save to the non-volatile memory - + QPushButton { +border: 1px outset #999; +border-radius: 5; +background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0.28 rgba(236, 236, 236, 255), stop:1 rgba(252, 252, 252, 255)); +} + +QPushButton:pressed { + + border-style: inset; + background-color: qlineargradient(spread:pad, x1:0.502, y1:0.664864, x2:0.502, y2:0.034, stop:0.358209 rgba(250, 250, 250, 255), stop:0.626866 rgba(235, 235, 235, 255)); + +} + + +QPushButton:hover { + border: 1px outset #999; +border-color: rgb(83, 83, 83); +border-radius: 4; + } Save @@ -24315,14 +24503,14 @@ Useful if you have accidentally changed some settings. - + 0 0 - 300 + 136 20 diff --git a/ground/openpilotgcs/src/plugins/config/txpid.ui b/ground/openpilotgcs/src/plugins/config/txpid.ui index 94ee7ae17..45eb17a61 100644 --- a/ground/openpilotgcs/src/plugins/config/txpid.ui +++ b/ground/openpilotgcs/src/plugins/config/txpid.ui @@ -27,17 +27,78 @@ Tx PID - + 12 - - 12 - - - 12 + + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + QFrame::NoFrame @@ -49,8 +110,8 @@ 0 0 - 654 - 659 + 678 + 683