Skip to content

Q
qgroundcontrol
Commit c61889db authored by Jacob Walser's avatar Jacob Walser
Browse files
Options

Fix NMEA settings layout

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