diff --git a/src/AutoPilotPlugins/Common/RadioComponent.qml b/src/AutoPilotPlugins/Common/RadioComponent.qml
index c4f6b57ea7c731da98df445e891536b9dc77cb96..d37133f3d711cabbfb3d4b794a634a62b4534aec 100644
--- a/src/AutoPilotPlugins/Common/RadioComponent.qml
+++ b/src/AutoPilotPlugins/Common/RadioComponent.qml
@@ -7,10 +7,10 @@
*
****************************************************************************/
-
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.11
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
@@ -348,9 +348,8 @@ SetupPage {
}
Connections {
- target: controller
-
- onThrottleChannelRCValueChanged: throttleLoader.item.rcValue = rcValue
+ target: controller
+ onThrottleChannelRCValueChanged: throttleLoader.item.rcValue = rcValue
}
}
} // Column - Attitude Control labels
@@ -362,15 +361,13 @@ SetupPage {
QGCButton {
id: skipButton
text: qsTr("Skip")
-
- onClicked: controller.skipButtonClicked()
+ onClicked: controller.skipButtonClicked()
}
QGCButton {
id: cancelButton
text: qsTr("Cancel")
-
- onClicked: controller.cancelButtonClicked()
+ onClicked: controller.cancelButtonClicked()
}
QGCButton {
@@ -395,11 +392,6 @@ SetupPage {
wrapMode: Text.WordWrap
}
- Item {
- width: 10
- height: defaultTextHeight * 4
- }
-
Rectangle {
width: parent.width
height: 1
@@ -409,42 +401,50 @@ SetupPage {
QGCLabel { text: qsTr("Additional Radio setup:") }
- QGCButton {
- id: bindButton
- text: qsTr("Spektrum Bind")
-
- onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
- }
+ GridLayout {
+ id: switchSettingsGrid
+ anchors.left: parent.left
+ anchors.right: parent.right
+ columns: 2
+ columnSpacing: ScreenTools.defaultFontPixelWidth
- QGCButton {
- text: qsTr("Copy Trims")
- onClicked: showDialog(copyTrimsDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
- }
+ Repeater {
+ model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ?
+ (QGroundControl.multiVehicleManager.activeVehicle.multiRotor ?
+ [ "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"] :
+ [ "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"]) :
+ 0
- Repeater {
- model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ?
- (QGroundControl.multiVehicleManager.activeVehicle.multiRotor ?
- [ "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"] :
- [ "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"]) :
- 0
+ RowLayout {
+ Layout.fillWidth: true
- Row {
- spacing: ScreenTools.defaultFontPixelWidth
- property Fact fact: controller.getParameterFact(-1, modelData)
+ property Fact fact: controller.getParameterFact(-1, modelData)
- QGCLabel {
- anchors.baseline: optCombo.baseline
- text: fact.shortDescription + ":"
+ QGCLabel {
+ Layout.fillWidth: true
+ text: fact.shortDescription
+ }
+ FactComboBox {
+ width: ScreenTools.defaultFontPixelWidth * 15
+ fact: parent.fact
+ indexModel: false
+ }
}
+ }
+ }
- FactComboBox {
- id: optCombo
- width: ScreenTools.defaultFontPixelWidth * 15
- fact: parent.fact
- indexModel: false
- }
+ RowLayout {
+ QGCButton {
+ id: bindButton
+ text: qsTr("Spektrum Bind")
+ onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
}
- } // Repeater
+
+ QGCButton {
+ text: qsTr("Copy Trims")
+ onClicked: showDialog(copyTrimsDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
+ }
+ }
} // Column - Left Column
Item {
@@ -458,7 +458,7 @@ SetupPage {
id: rightColumn
anchors.top: parent.top
anchors.right: parent.right
- width: Math.min(radioPage.defaultTextWidth * 35, availableWidth * 0.4)
+ width: ScreenTools.defaultFontPixelWidth * 40
spacing: ScreenTools.defaultFontPixelHeight / 2
Row {
@@ -491,7 +491,8 @@ SetupPage {
}
RCChannelMonitor {
- width: parent.width
+ width: parent.width
+ twoColumn: true
}
} // Column - Right Column
} // Item
diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc
index f1c600c27964b4b746c472d7d9cdc3c0f2e947a7..9eee0deed51211b332c28917e1a420286ac012af 100644
--- a/src/comm/MockLink.cc
+++ b/src/comm/MockLink.cc
@@ -1220,16 +1220,10 @@ void MockLink::_sendRCChannels(void)
_mavlinkChannel,
&msg,
0, // time_boot_ms
- 8, // chancount
- 1500, // chan1_raw
- 1500, // chan2_raw
- 1500, // chan3_raw
- 1500, // chan4_raw
- 1500, // chan5_raw
- 1500, // chan6_raw
- 1500, // chan7_raw
- 1500, // chan8_raw
- UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX,
+ 16, // chancount
+ 1500, 1500, 1500, 1500, 1500, 1500, 1500, 1500, // channel 1-8
+ 1500, 1500, 1500, 1500, 1500, 1500, 1500, 1500, // channel 9-16
+ UINT16_MAX, UINT16_MAX,
0); // rssi
respondWithMavlinkMessage(msg);
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 565761c0d6843c007681d6bbb107b8d4027ebffc..1116629e60237f72481e74b31e23e430b8b4c3d5 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -131,9 +131,6 @@ MainWindow::MainWindow()
emit initStatusChanged(tr("Setting up user interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
_ui.setupUi(this);
- // Make sure tool bar elements all fit before changing minimum width
- setMinimumWidth(1024);
- setMinimumHeight(620);
configureWindowName();
// Setup central widget with a layout to hold the views
diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui
index 312c86da80de3a401b64819bf102ee7ab92c0165..8464ddce8d4c0fc65d823f75b798e94a3507a213 100644
--- a/src/ui/MainWindow.ui
+++ b/src/ui/MainWindow.ui
@@ -10,12 +10,6 @@
600
-
-
- 640
- 400
-
-
1100
@@ -31,20 +25,7 @@
-
-
-
- 0
- 0
-
-
-
-
- 200
- 150
-
-
-
+