From 181ed11323121e5d7c9ce051c459edb918151a93 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 19 Jan 2019 20:47:11 -0800 Subject: [PATCH] Fix GStreamer Debug positioning --- src/QmlControls/AppMessages.qml | 38 +++++++++++++-------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml index af00cceed..096c5a59e 100644 --- a/src/QmlControls/AppMessages.qml +++ b/src/QmlControls/AppMessages.qml @@ -157,31 +157,23 @@ QGCView { } QGCLabel { - id: gstLabel - anchors.baseline: gstCombo.baseline - anchors.right: gstCombo.left - anchors.rightMargin: ScreenTools.defaultFontPixelWidth - text: qsTr("GStreamer Debug Level:") - visible: QGroundControl.settingsManager.appSettings.gstDebugLevel.visible + id: gstLabel + anchors.left: writeButton.right + anchors.leftMargin: ScreenTools.defaultFontPixelWidth + anchors.baseline: gstCombo.baseline + text: qsTr("GStreamer Debug") + visible: QGroundControl.settingsManager.appSettings.gstDebugLevel.visible } FactComboBox { - id: gstCombo - anchors.right: followTail.left - anchors.rightMargin: ScreenTools.defaultFontPixelWidth*20 - anchors.bottom: parent.bottom - width: ScreenTools.defaultFontPixelWidth*20 - model: ["disabled", "1", "2", "3", "4", "5", "6", "7", "8"] - fact: QGroundControl.settingsManager.appSettings.gstDebugLevel - visible: QGroundControl.settingsManager.appSettings.gstDebugLevel.visible - } - - BusyIndicator { - id: writeBusy - anchors.bottom: writeButton.bottom - anchors.left: writeButton.right - height: writeButton.height - visible: !writeButton.enabled + id: gstCombo + anchors.left: gstLabel.right + anchors.leftMargin: ScreenTools.defaultFontPixelWidth / 2 + anchors.bottom: parent.bottom + width: ScreenTools.defaultFontPixelWidth * 10 + model: ["Disabled", "1", "2", "3", "4", "5", "6", "7", "8"] + fact: QGroundControl.settingsManager.appSettings.gstDebugLevel + visible: QGroundControl.settingsManager.appSettings.gstDebugLevel.visible } QGCButton { @@ -204,7 +196,7 @@ QGCView { id: filterButton anchors.bottom: parent.bottom anchors.right: parent.right - text: qsTr("Set logging") + text: qsTr("Set Logging") onClicked: showDialog(filtersDialogComponent, qsTr("Turn on logging categories"), qgcView.showDialogDefaultWidth, StandardButton.Close) } } -- 2.22.0