Skip to content

Q
qgroundcontrol
Unverified Commit 0cffebcb authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6048 from bluerobotics/formatting-fix 

Fix NMEA settings layout
parents 5a2a5dc5 c61889db
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 10 deletions
src/ui/preferences/GeneralSettings.qml
View file @ 0cffebcb
......@@ -491,20 +491,21 @@ QGCView {
}
Row {
width: parent.width
spacing: ScreenTools.defaultFontPixelWidth
visible: !ScreenTools.isMobile
&& QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaPort.visible
&& QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaBaud.visible
anchors.horizontalCenter: parent.horizontalCenter
spacing: ScreenTools.defaultFontPixelWidth
visible: !ScreenTools.isMobile
&& QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaPort.visible
&& QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaBaud.visible
QGCLabel {
anchors.baseline: nmeaPortCombo.baseline
text: qsTr("NMEA GPS Device:")
text: qsTr("NMEA GPS Device:")
width: _labelWidth
}
QGCComboBox {
id: nmeaPortCombo
width: parent.width/3
width: _editFieldWidth
model: ListModel {
ListElement { text: "disabled" }
}
......@@ -522,15 +523,22 @@ QGCView {
nmeaPortCombo.currentIndex = index;
}
}
}
Row {
anchors.horizontalCenter: parent.horizontalCenter
spacing: ScreenTools.defaultFontPixelWidth
visible: !ScreenTools.isMobile
&& QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaPort.visible
&& QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaBaud.visible
QGCLabel {
anchors.baseline: nmeaBaudCombo.baseline
text: qsTr("NMEA GPS Baudrate:")
text: qsTr("NMEA GPS Baudrate:")
width: _labelWidth
}
QGCComboBox {
id: nmeaBaudCombo
width: parent.width/3
width: _editFieldWidth
model: [4800, 9600, 19200, 38400, 57600, 115200]
onActivated: {
......
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