Skip to content

Q
qgroundcontrol
Commit 75f419d6 authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent 6aa0c7cf
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 44 deletions
src/AutoPilotPlugins/Common/RadioComponent.qml
View file @ 75f419d6
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
* *
****************************************************************************/ ****************************************************************************/
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.11
import QGroundControl 1.0 import QGroundControl 1.0
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
...@@ -348,9 +348,8 @@ SetupPage { ...@@ -348,9 +348,8 @@ SetupPage {
} }
Connections { Connections {
target: controller target: controller
onThrottleChannelRCValueChanged: throttleLoader.item.rcValue = rcValue
onThrottleChannelRCValueChanged: throttleLoader.item.rcValue = rcValue
} }
} }
} // Column - Attitude Control labels } // Column - Attitude Control labels
...@@ -362,15 +361,13 @@ SetupPage { ...@@ -362,15 +361,13 @@ SetupPage {
QGCButton { QGCButton {
id: skipButton id: skipButton
text: qsTr("Skip") text: qsTr("Skip")
onClicked: controller.skipButtonClicked()
onClicked: controller.skipButtonClicked()
} }
QGCButton { QGCButton {
id: cancelButton id: cancelButton
text: qsTr("Cancel") text: qsTr("Cancel")
onClicked: controller.cancelButtonClicked()
onClicked: controller.cancelButtonClicked()
} }
QGCButton { QGCButton {
...@@ -395,11 +392,6 @@ SetupPage { ...@@ -395,11 +392,6 @@ SetupPage {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
Item {
width: 10
height: defaultTextHeight * 4
}
Rectangle { Rectangle {
width: parent.width width: parent.width
height: 1 height: 1
...@@ -409,42 +401,50 @@ SetupPage { ...@@ -409,42 +401,50 @@ SetupPage {
QGCLabel { text: qsTr("Additional Radio setup:") } QGCLabel { text: qsTr("Additional Radio setup:") }
QGCButton { GridLayout {
id: bindButton id: switchSettingsGrid
text: qsTr("Spektrum Bind") anchors.left: parent.left
anchors.right: parent.right
onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) columns: 2
} columnSpacing: ScreenTools.defaultFontPixelWidth
QGCButton { Repeater {
text: qsTr("Copy Trims") model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ?
onClicked: showDialog(copyTrimsDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) (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 { RowLayout {
model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ? Layout.fillWidth: true
(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
Row { property Fact fact: controller.getParameterFact(-1, modelData)
spacing: ScreenTools.defaultFontPixelWidth
property Fact fact: controller.getParameterFact(-1, modelData)
QGCLabel { QGCLabel {
anchors.baseline: optCombo.baseline Layout.fillWidth: true
text: fact.shortDescription + ":" text: fact.shortDescription
}
FactComboBox {
width: ScreenTools.defaultFontPixelWidth * 15
fact: parent.fact
indexModel: false
}
} }
}
}
FactComboBox { RowLayout {
id: optCombo QGCButton {
width: ScreenTools.defaultFontPixelWidth * 15 id: bindButton
fact: parent.fact text: qsTr("Spektrum Bind")
indexModel: false 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 } // Column - Left Column
Item { Item {
...@@ -458,7 +458,7 @@ SetupPage { ...@@ -458,7 +458,7 @@ SetupPage {
id: rightColumn id: rightColumn
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
width: Math.min(radioPage.defaultTextWidth * 35, availableWidth * 0.4) width: ScreenTools.defaultFontPixelWidth * 40
spacing: ScreenTools.defaultFontPixelHeight / 2 spacing: ScreenTools.defaultFontPixelHeight / 2
Row { Row {
...@@ -491,7 +491,8 @@ SetupPage { ...@@ -491,7 +491,8 @@ SetupPage {
} }
RCChannelMonitor { RCChannelMonitor {
width: parent.width width: parent.width
twoColumn: true
} }
} // Column - Right Column } // Column - Right Column
} // Item } // Item
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment