Skip to content

Q
qgroundcontrol
Commit e7c55ec9 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Cleanup layout issues throughout QGC

parent 77b6dc5e
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 84 deletions
src/AnalyzeView/LogDownloadPage.qml
View file @ e7c55ec9
...@@ -51,8 +51,7 @@ AnalyzePage { ...@@ -51,8 +51,7 @@ AnalyzePage {
TableView { TableView {
id: tableView id: tableView
anchors.top: parent.top Layout.fillHeight: true
anchors.bottom: parent.bottom
model: logController.model model: logController.model
selectionMode: SelectionMode.MultiSelection selectionMode: SelectionMode.MultiSelection
Layout.fillWidth: true Layout.fillWidth: true
......
src/AnalyzeView/MavlinkConsolePage.qml
View file @ e7c55ec9
...@@ -26,7 +26,7 @@ AnalyzePage { ...@@ -26,7 +26,7 @@ AnalyzePage {
pageName: qsTr("Mavlink Console") pageName: qsTr("Mavlink Console")
pageDescription: qsTr("Mavlink Console provides a connection to the vehicle's system shell.") pageDescription: qsTr("Mavlink Console provides a connection to the vehicle's system shell.")
property bool loaded: false property bool isLoaded: false
Component { Component {
id: pageComponent id: pageComponent
...@@ -41,7 +41,7 @@ AnalyzePage { ...@@ -41,7 +41,7 @@ AnalyzePage {
onDataChanged: { onDataChanged: {
// Keep the view in sync if the button is checked // Keep the view in sync if the button is checked
if (loaded) { if (isLoaded) {
if (followTail.checked) { if (followTail.checked) {
listview.positionViewAtEnd(); listview.positionViewAtEnd();
} }
...@@ -69,11 +69,10 @@ AnalyzePage { ...@@ -69,11 +69,10 @@ AnalyzePage {
QGCListView { QGCListView {
Component.onCompleted: { Component.onCompleted: {
loaded = true isLoaded = true
} }
Layout.fillHeight: true Layout.fillHeight: true
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right
clip: true clip: true
id: listview id: listview
model: conController model: conController
...@@ -86,8 +85,7 @@ AnalyzePage { ...@@ -86,8 +85,7 @@ AnalyzePage {
} }
RowLayout { RowLayout {
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right
QGCTextField { QGCTextField {
id: command id: command
Layout.fillWidth: true Layout.fillWidth: true
...@@ -105,7 +103,7 @@ AnalyzePage { ...@@ -105,7 +103,7 @@ AnalyzePage {
checked: true checked: true
onCheckedChanged: { onCheckedChanged: {
if (checked && loaded) { if (checked && isLoaded) {
listview.positionViewAtEnd(); listview.positionViewAtEnd();
} }
} }
......
src/AutoPilotPlugins/PX4/CameraComponent.qml
View file @ e7c55ec9
...@@ -121,14 +121,14 @@ SetupPage { ...@@ -121,14 +121,14 @@ SetupPage {
} }
QGCLabel { QGCLabel {
anchors.baseline: camTrigCombo.baseline Layout.alignment: Qt.AlignVCenter
text: qsTr("Trigger mode") text: qsTr("Trigger mode")
} }
FactComboBox { FactComboBox {
id: camTrigCombo
fact: _camTriggerMode fact: _camTriggerMode
indexModel: false indexModel: false
enabled: !_rebooting enabled: !_rebooting
Layout.alignment: Qt.AlignVCenter
Layout.minimumWidth: _editFieldWidth Layout.minimumWidth: _editFieldWidth
onActivated: { onActivated: {
applyAndRestart.visible = true applyAndRestart.visible = true
...@@ -136,14 +136,14 @@ SetupPage { ...@@ -136,14 +136,14 @@ SetupPage {
} }
QGCLabel { QGCLabel {
anchors.baseline: camInterfaceCombo.baseline Layout.alignment: Qt.AlignVCenter
text: qsTr("Trigger interface") text: qsTr("Trigger interface")
} }
FactComboBox { FactComboBox {
id: camInterfaceCombo
fact: _camTriggerInterface fact: _camTriggerInterface
indexModel: false indexModel: false
enabled: !_rebooting && (_camTriggerInterface ? true : false) enabled: !_rebooting && (_camTriggerInterface ? true : false)
Layout.alignment: Qt.AlignVCenter
Layout.minimumWidth: _editFieldWidth Layout.minimumWidth: _editFieldWidth
onActivated: { onActivated: {
applyAndRestart.visible = true applyAndRestart.visible = true
...@@ -152,7 +152,7 @@ SetupPage { ...@@ -152,7 +152,7 @@ SetupPage {
QGCLabel { QGCLabel {
text: qsTr("Time Interval") text: qsTr("Time Interval")
anchors.baseline: timeIntervalField.baseline Layout.alignment: Qt.AlignVCenter
color: qgcPal.text color: qgcPal.text
visible: timeIntervalField.visible visible: timeIntervalField.visible
} }
...@@ -161,12 +161,13 @@ SetupPage { ...@@ -161,12 +161,13 @@ SetupPage {
fact: controller.getParameterFact(-1, "TRIG_INTERVAL", false) fact: controller.getParameterFact(-1, "TRIG_INTERVAL", false)
showUnits: true showUnits: true
Layout.minimumWidth: _editFieldWidth Layout.minimumWidth: _editFieldWidth
Layout.alignment: Qt.AlignVCenter
visible: _camTriggerMode.value === 2 visible: _camTriggerMode.value === 2
} }
QGCLabel { QGCLabel {
text: qsTr("Distance Interval") text: qsTr("Distance Interval")
anchors.baseline: trigDistField.baseline Layout.alignment: Qt.AlignVCenter
color: qgcPal.text color: qgcPal.text
visible: trigDistField.visible visible: trigDistField.visible
} }
...@@ -174,6 +175,7 @@ SetupPage { ...@@ -174,6 +175,7 @@ SetupPage {
id: trigDistField id: trigDistField
fact: controller.getParameterFact(-1, "TRIG_DISTANCE", false) fact: controller.getParameterFact(-1, "TRIG_DISTANCE", false)
showUnits: true showUnits: true
Layout.alignment: Qt.AlignVCenter
Layout.minimumWidth: _editFieldWidth Layout.minimumWidth: _editFieldWidth
visible: _camTriggerMode.value === 3 visible: _camTriggerMode.value === 3
} }
...@@ -199,8 +201,8 @@ SetupPage { ...@@ -199,8 +201,8 @@ SetupPage {
} }
Row { Row {
spacing: _margins spacing: _margins
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
GridLayout { GridLayout {
rows: 2 rows: 2
......
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @ e7c55ec9
...@@ -348,9 +348,9 @@ SetupPage { ...@@ -348,9 +348,9 @@ SetupPage {
} // QGCGroupBox - Battery settings } // QGCGroupBox - Battery settings
QGCGroupBox { QGCGroupBox {
anchors.left: batteryGroup.left Layout.maximumWidth: batteryGroup.width
anchors.right: batteryGroup.right Layout.fillWidth: true
title: qsTr("ESC PWM Minimum and Maximum Calibration") title: qsTr("ESC PWM Minimum and Maximum Calibration")
ColumnLayout { ColumnLayout {
anchors.left: parent.left anchors.left: parent.left
...@@ -383,10 +383,10 @@ SetupPage { ...@@ -383,10 +383,10 @@ SetupPage {
} }
QGCGroupBox { QGCGroupBox {
anchors.left: batteryGroup.left Layout.maximumWidth: batteryGroup.width
anchors.right: batteryGroup.right Layout.fillWidth: true
title: qsTr("UAVCAN Bus Configuration") title: qsTr("UAVCAN Bus Configuration")
visible: showUAVCAN.checked visible: showUAVCAN.checked
Row { Row {
id: uavCanConfigRow id: uavCanConfigRow
...@@ -407,10 +407,10 @@ SetupPage { ...@@ -407,10 +407,10 @@ SetupPage {
} }
QGCGroupBox { QGCGroupBox {
anchors.left: batteryGroup.left Layout.maximumWidth: batteryGroup.width
anchors.right: batteryGroup.right Layout.fillWidth: true
title: qsTr("UAVCAN Motor Index and Direction Assignment") title: qsTr("UAVCAN Motor Index and Direction Assignment")
visible: showUAVCAN.checked visible: showUAVCAN.checked
ColumnLayout { ColumnLayout {
anchors.left: parent.left anchors.left: parent.left
...@@ -456,10 +456,10 @@ SetupPage { ...@@ -456,10 +456,10 @@ SetupPage {
} }
QGCGroupBox { QGCGroupBox {
anchors.left: batteryGroup.left Layout.maximumWidth: batteryGroup.width
anchors.right: batteryGroup.right Layout.fillWidth: true
title: qsTr("Advanced Power Settings") title: qsTr("Advanced Power Settings")
visible: showAdvanced.checked visible: showAdvanced.checked
ColumnLayout { ColumnLayout {
anchors.left: parent.left anchors.left: parent.left
...@@ -487,7 +487,7 @@ SetupPage { ...@@ -487,7 +487,7 @@ SetupPage {
text: qsTr("Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full ") + text: qsTr("Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full ") +
qsTr("throttle, divided by the number of battery cells. Leave at the default if unsure. ") + qsTr("throttle, divided by the number of battery cells. Leave at the default if unsure. ") +
highlightPrefix + qsTr("If this value is set too high, the battery might be deep discharged and damaged.") + highlightSuffix highlightPrefix + qsTr("If this value is set too high, the battery might be deep discharged and damaged.") + highlightSuffix
Layout.fillWidth: true Layout.maximumWidth: ScreenTools.defaultFontPixelWidth * 60
} }
Row { Row {
......
src/FlightDisplay/FlightDisplayView.qml
View file @ e7c55ec9
...@@ -193,9 +193,9 @@ QGCView { ...@@ -193,9 +193,9 @@ QGCView {
QGCButton { QGCButton {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
text: qsTr("Leave plan on vehicle") text: qsTr("Leave plan on vehicle")
anchors.horizontalCenter: parent.horizontalCenter onClicked: hideDialog()
onClicked: hideDialog()
} }
} }
} }
......
src/FlightDisplay/MultiVehicleList.qml
View file @ e7c55ec9
...@@ -107,8 +107,7 @@ Item { ...@@ -107,8 +107,7 @@ Item {
spacing: _margin spacing: _margin
RowLayout { RowLayout {
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.left
QGCLabel { QGCLabel {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
...@@ -121,14 +120,14 @@ Item { ...@@ -121,14 +120,14 @@ Item {
spacing: _margin spacing: _margin
FlightModeMenu { FlightModeMenu {
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
font.pointSize: ScreenTools.largeFontPointSize font.pointSize: ScreenTools.largeFontPointSize
color: _textColor color: _textColor
activeVehicle: _vehicle activeVehicle: _vehicle
} }
QGCLabel { QGCLabel {
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
text: _vehicle.armed ? qsTr("Armed") : qsTr("Disarmed") text: _vehicle.armed ? qsTr("Armed") : qsTr("Disarmed")
color: _textColor color: _textColor
} }
......
src/PlanView/PlanToolBar.qml
View file @ e7c55ec9
...@@ -157,11 +157,10 @@ Rectangle { ...@@ -157,11 +157,10 @@ Rectangle {
columns: 3 columns: 3
GridLayout { GridLayout {
anchors.verticalCenter: parent.verticalCenter
columns: 8 columns: 8
rowSpacing: _rowSpacing rowSpacing: _rowSpacing
columnSpacing: _labelToValueSpacing columnSpacing: _labelToValueSpacing
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
QGCLabel { QGCLabel {
text: qsTr("Selected Waypoint") text: qsTr("Selected Waypoint")
...@@ -212,11 +211,10 @@ Rectangle { ...@@ -212,11 +211,10 @@ Rectangle {
} }
GridLayout { GridLayout {
anchors.verticalCenter: parent.verticalCenter
columns: 5 columns: 5
rowSpacing: _rowSpacing rowSpacing: _rowSpacing
columnSpacing: _labelToValueSpacing columnSpacing: _labelToValueSpacing
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
QGCLabel { QGCLabel {
text: qsTr("Total Mission") text: qsTr("Total Mission")
...@@ -249,11 +247,10 @@ Rectangle { ...@@ -249,11 +247,10 @@ Rectangle {
} }
GridLayout { GridLayout {
anchors.verticalCenter: parent.verticalCenter
columns: 3 columns: 3
rowSpacing: _rowSpacing rowSpacing: _rowSpacing
columnSpacing: _labelToValueSpacing columnSpacing: _labelToValueSpacing
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: _batteryInfoAvailable visible: _batteryInfoAvailable
QGCLabel { QGCLabel {
......
src/PlanView/SectionHeader.qml
View file @ e7c55ec9
...@@ -46,16 +46,14 @@ FocusScope { ...@@ -46,16 +46,14 @@ FocusScope {
} }
QGCLabel { QGCLabel {
id: label id: label
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right
QGCColoredImage { QGCColoredImage {
id: image id: image
width: label.height / 2 width: label.height / 2
height: width height: width
anchors.right: parent.right Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
source: "/qmlimages/arrow-down.png" source: "/qmlimages/arrow-down.png"
color: qgcPal.text color: qgcPal.text
visible: !_root.checked visible: !_root.checked
...@@ -63,10 +61,9 @@ FocusScope { ...@@ -63,10 +61,9 @@ FocusScope {
} }
Rectangle { Rectangle {
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right height: 1
height: 1 color: qgcPal.text
color: qgcPal.text
} }
} }
} }
......
src/PlanView/SurveyItemEditor.qml
View file @ e7c55ec9
...@@ -139,7 +139,7 @@ Rectangle { ...@@ -139,7 +139,7 @@ Rectangle {
QGCCheckBox { QGCCheckBox {
id: relAlt id: relAlt
anchors.left: parent.left Layout.alignment: Qt.AlignLeft
text: qsTr("Relative altitude") text: qsTr("Relative altitude")
checked: missionItem.cameraCalc.distanceToSurfaceRelative checked: missionItem.cameraCalc.distanceToSurfaceRelative
enabled: missionItem.cameraCalc.isManualCamera && !missionItem.followTerrain enabled: missionItem.cameraCalc.isManualCamera && !missionItem.followTerrain
...@@ -173,12 +173,11 @@ Rectangle { ...@@ -173,12 +173,11 @@ Rectangle {
} }
GridLayout { GridLayout {
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right columnSpacing: _margin
columnSpacing: _margin rowSpacing: _margin
rowSpacing: _margin columns: 2
columns: 2 visible: followsTerrainCheckBox.checked
visible: followsTerrainCheckBox.checked
QGCLabel { text: qsTr("Tolerance") } QGCLabel { text: qsTr("Tolerance") }
FactTextField { FactTextField {
......
src/QmlControls/QGCTextField.qml
View file @ e7c55ec9
...@@ -77,7 +77,7 @@ TextField { ...@@ -77,7 +77,7 @@ TextField {
onWidthChanged: control._helpLayoutWidth = unitsHelpLayout.width onWidthChanged: control._helpLayoutWidth = unitsHelpLayout.width
Text { Text {
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
text: control.unitsLabel text: control.unitsLabel
font.pointSize: backgroundItem.showHelp ? ScreenTools.smallFontPointSize : ScreenTools.defaultFontPointSize font.pointSize: backgroundItem.showHelp ? ScreenTools.smallFontPointSize : ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily font.family: ScreenTools.normalFontFamily
...@@ -87,10 +87,9 @@ TextField { ...@@ -87,10 +87,9 @@ TextField {
} }
Rectangle { Rectangle {
anchors.margins: 2 Layout.margins: 2
anchors.top: parent.top Layout.fillHeight: true
anchors.bottom: parent.bottom Layout.alignment: Qt.AlignRight
anchors.right: parent.right
width: height * 0.75 width: height * 0.75
color: control.textColor color: control.textColor
radius: 2 radius: 2
......
src/VehicleSetup/SetupView.qml
View file @ e7c55ec9
...@@ -210,8 +210,7 @@ Rectangle { ...@@ -210,8 +210,7 @@ Rectangle {
spacing: _defaultTextHeight / 2 spacing: _defaultTextHeight / 2
QGCLabel { QGCLabel {
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right
text: qsTr("Vehicle Setup") text: qsTr("Vehicle Setup")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
......
src/ui/AppSettings.qml
View file @ e7c55ec9
...@@ -58,8 +58,7 @@ Rectangle { ...@@ -58,8 +58,7 @@ Rectangle {
property real _maxButtonWidth: 0 property real _maxButtonWidth: 0
QGCLabel { QGCLabel {
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right
text: qsTr("Application Settings") text: qsTr("Application Settings")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
......
src/ui/preferences/GeneralSettings.qml
View file @ e7c55ec9
...@@ -385,11 +385,11 @@ QGCView { ...@@ -385,11 +385,11 @@ QGCView {
visible: _savePath.visible && !ScreenTools.isMobile visible: _savePath.visible && !ScreenTools.isMobile
QGCLabel { QGCLabel {
anchors.baseline: savePathBrowse.baseline Layout.alignment: Qt.AlignVCenter
text: qsTr("File Save Path:") text: qsTr("File Save Path:")
} }
QGCLabel { QGCLabel {
anchors.baseline: savePathBrowse.baseline Layout.alignment: Qt.AlignVCenter
Layout.maximumWidth: _panelWidth * 0.5 Layout.maximumWidth: _panelWidth * 0.5
elide: Text.ElideMiddle elide: Text.ElideMiddle
text: _savePath.rawValue === "" ? qsTr("<not set>") : _savePath.value text: _savePath.rawValue === "" ? qsTr("<not set>") : _savePath.value
......
src/ui/toolbar/MainToolBar.qml
View file @ e7c55ec9
...@@ -81,10 +81,9 @@ Rectangle { ...@@ -81,10 +81,9 @@ Rectangle {
//--------------------------------------------- //---------------------------------------------
// Toolbar Row // Toolbar Row
Row { Row {
id: viewRow id: viewRow
anchors.top: parent.top Layout.fillHeight: true
anchors.bottom: parent.bottom spacing: ScreenTools.defaultFontPixelWidth / 2
spacing: ScreenTools.defaultFontPixelWidth / 2
ExclusiveGroup { id: mainActionGroup } ExclusiveGroup { id: mainActionGroup }
...@@ -153,7 +152,7 @@ Rectangle { ...@@ -153,7 +152,7 @@ Rectangle {
width: ScreenTools.defaultFontPixelHeight * 8 width: ScreenTools.defaultFontPixelHeight * 8
text: "Vehicle " + (_activeVehicle ? _activeVehicle.id : "None") text: "Vehicle " + (_activeVehicle ? _activeVehicle.id : "None")
visible: QGroundControl.multiVehicleManager.vehicles.count > 1 visible: QGroundControl.multiVehicleManager.vehicles.count > 1
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
menu: vehicleMenu menu: vehicleMenu
...@@ -175,14 +174,15 @@ Rectangle { ...@@ -175,14 +174,15 @@ Rectangle {
property var vehicleMenuItems: [] property var vehicleMenuItems: []
function updateVehicleMenu() { function updateVehicleMenu() {
var i;
// Remove old menu items // Remove old menu items
for (var i = 0; i < vehicleMenuItems.length; i++) { for (i = 0; i < vehicleMenuItems.length; i++) {
vehicleMenu.removeItem(vehicleMenuItems[i]) vehicleMenu.removeItem(vehicleMenuItems[i])
} }
vehicleMenuItems.length = 0 vehicleMenuItems.length = 0
// Add new items // Add new items
for (var i=0; i<QGroundControl.multiVehicleManager.vehicles.count; i++) { for (i = 0; i < QGroundControl.multiVehicleManager.vehicles.count; i++) {
var vehicle = QGroundControl.multiVehicleManager.vehicles.get(i) var vehicle = QGroundControl.multiVehicleManager.vehicles.get(i)
var menuItem = vehicleMenuItemComponent.createObject(null, { "text": "Vehicle " + vehicle.id }) var menuItem = vehicleMenuItemComponent.createObject(null, { "text": "Vehicle " + vehicle.id })
vehicleMenuItems.push(menuItem) vehicleMenuItems.push(menuItem)
...@@ -199,10 +199,9 @@ Rectangle { ...@@ -199,10 +199,9 @@ Rectangle {
} }
MainToolBarIndicators { MainToolBarIndicators {
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.66
anchors.top: parent.top
anchors.bottom: parent.bottom
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true
Layout.margins: ScreenTools.defaultFontPixelHeight * 0.66
} }
} }
......
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