Skip to content

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

Merge pull request #7167 from DonLakeFlyer/Console 

Console: Fix GStreamer Debug positioning
parents 6a56f545 181ed113
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 23 deletions
src/QmlControls/AppMessages.qml
View file @ ff43eabe
...@@ -157,31 +157,23 @@ QGCView { ...@@ -157,31 +157,23 @@ QGCView {
} }
QGCLabel { QGCLabel {
id: gstLabel id: gstLabel
anchors.baseline: gstCombo.baseline anchors.left: writeButton.right
anchors.right: gstCombo.left anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.rightMargin: ScreenTools.defaultFontPixelWidth anchors.baseline: gstCombo.baseline
text: qsTr("GStreamer Debug Level:") text: qsTr("GStreamer Debug")
visible: QGroundControl.settingsManager.appSettings.gstDebugLevel.visible visible: QGroundControl.settingsManager.appSettings.gstDebugLevel.visible
} }
FactComboBox { FactComboBox {
id: gstCombo id: gstCombo
anchors.right: followTail.left anchors.left: gstLabel.right
anchors.rightMargin: ScreenTools.defaultFontPixelWidth*20 anchors.leftMargin: ScreenTools.defaultFontPixelWidth / 2
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: ScreenTools.defaultFontPixelWidth*20 width: ScreenTools.defaultFontPixelWidth * 10
model: ["disabled", "1", "2", "3", "4", "5", "6", "7", "8"] model: ["Disabled", "1", "2", "3", "4", "5", "6", "7", "8"]
fact: QGroundControl.settingsManager.appSettings.gstDebugLevel fact: QGroundControl.settingsManager.appSettings.gstDebugLevel
visible: QGroundControl.settingsManager.appSettings.gstDebugLevel.visible visible: QGroundControl.settingsManager.appSettings.gstDebugLevel.visible
}
BusyIndicator {
id: writeBusy
anchors.bottom: writeButton.bottom
anchors.left: writeButton.right
height: writeButton.height
visible: !writeButton.enabled
} }
QGCButton { QGCButton {
...@@ -204,7 +196,7 @@ QGCView { ...@@ -204,7 +196,7 @@ QGCView {
id: filterButton id: filterButton
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Set logging") text: qsTr("Set Logging")
onClicked: showDialog(filtersDialogComponent, qsTr("Turn on logging categories"), qgcView.showDialogDefaultWidth, StandardButton.Close) onClicked: showDialog(filtersDialogComponent, qsTr("Turn on logging categories"), qgcView.showDialogDefaultWidth, StandardButton.Close)
} }
} }
......
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