zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

SectionHeader no longer set width automatically

QGC4.4
DonLakeFlyer 6 years ago
parent
788ec0289c
commit
1067b01f7a
10 changed files with 92 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/PlanView/CameraSection.qml
  2. 6
      src/PlanView/CorridorScanEditor.qml
  3. 6
      src/PlanView/FWLandingPatternEditor.qml
  4. 8
      src/PlanView/GeoFenceEditor.qml
  5. 6
      src/PlanView/MissionSettingsEditor.qml
  6. 4
      src/PlanView/StructureScanEditor.qml
  7. 10
      src/PlanView/SurveyItemEditor.qml
  8. 2
      src/QmlControls/ParameterEditor.qml
  9. 2
      src/QmlControls/PreFlightCheckGroup.qml
  10. 2
      src/QmlControls/SectionHeader.qml

2
src/PlanView/CameraSection.qml
Unescape View File

@ -24,6 +24,8 @@ Column { @@ -24,6 +24,8 @@ Column {
SectionHeader {
id: cameraSectionHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Camera")
checked: false
}

6
src/PlanView/CorridorScanEditor.qml
Unescape View File

@ -125,6 +125,8 @@ Rectangle { @@ -125,6 +125,8 @@ Rectangle {
SectionHeader {
id: corridorHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Corridor")
}
@ -183,6 +185,8 @@ Rectangle { @@ -183,6 +185,8 @@ Rectangle {
SectionHeader {
id: terrainHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Terrain")
checked: missionItem.followTerrain
}
@ -229,6 +233,8 @@ Rectangle { @@ -229,6 +233,8 @@ Rectangle {
SectionHeader {
id: statsHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
}

6
src/PlanView/FWLandingPatternEditor.qml
Unescape View File

@ -53,6 +53,8 @@ Rectangle { @@ -53,6 +53,8 @@ Rectangle {
SectionHeader {
id: loiterPointSection
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Loiter point")
}
@ -102,6 +104,8 @@ Rectangle { @@ -102,6 +104,8 @@ Rectangle {
SectionHeader {
id: landingPointSection
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Landing point")
}
@ -182,6 +186,8 @@ Rectangle { @@ -182,6 +186,8 @@ Rectangle {
SectionHeader {
id: cameraSection
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Camera")
visible: _showCameraSection
}

8
src/PlanView/GeoFenceEditor.qml
Unescape View File

@ -111,6 +111,8 @@ QGCFlickable { @@ -111,6 +111,8 @@ QGCFlickable {
SectionHeader {
id: insertSection
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Insert GeoFence")
}
@ -140,6 +142,8 @@ QGCFlickable { @@ -140,6 +142,8 @@ QGCFlickable {
SectionHeader {
id: polygonSection
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Polygon Fences")
}
@ -213,6 +217,8 @@ QGCFlickable { @@ -213,6 +217,8 @@ QGCFlickable {
SectionHeader {
id: circleSection
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Circular Fences")
}
@ -303,6 +309,8 @@ QGCFlickable { @@ -303,6 +309,8 @@ QGCFlickable {
SectionHeader {
id: breachReturnSection
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Breach Return Point")
}

6
src/PlanView/MissionSettingsEditor.qml
Unescape View File

@ -109,6 +109,8 @@ Rectangle { @@ -109,6 +109,8 @@ Rectangle {
SectionHeader {
id: missionEndHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Mission End")
checked: true
}
@ -129,6 +131,8 @@ Rectangle { @@ -129,6 +131,8 @@ Rectangle {
SectionHeader {
id: vehicleInfoSectionHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Vehicle Info")
visible: _offlineEditing && !_waypointsOnlyMode
checked: false
@ -193,6 +197,8 @@ Rectangle { @@ -193,6 +197,8 @@ Rectangle {
SectionHeader {
id: plannedHomePositionSection
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Planned Home Position")
visible: !_vehicleHasHomePosition
checked: false

4
src/PlanView/StructureScanEditor.qml
Unescape View File

@ -131,6 +131,8 @@ Rectangle { @@ -131,6 +131,8 @@ Rectangle {
SectionHeader {
id: scanHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Scan")
}
@ -201,6 +203,8 @@ Rectangle { @@ -201,6 +203,8 @@ Rectangle {
SectionHeader {
id: statsHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
}

10
src/PlanView/SurveyItemEditor.qml
Unescape View File

@ -125,6 +125,8 @@ Rectangle { @@ -125,6 +125,8 @@ Rectangle {
SectionHeader {
id: transectsHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Transects")
}
@ -234,6 +236,8 @@ Rectangle { @@ -234,6 +236,8 @@ Rectangle {
SectionHeader {
id: terrainHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Terrain")
checked: missionItem.followTerrain
}
@ -281,6 +285,8 @@ Rectangle { @@ -281,6 +285,8 @@ Rectangle {
SectionHeader {
id: statsHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
}
@ -357,8 +363,6 @@ Rectangle { @@ -357,8 +363,6 @@ Rectangle {
SectionHeader {
id: presectsTransectsHeader
anchors.left: undefined
anchors.right: undefined
Layout.fillWidth: true
text: qsTr("Transects")
}
@ -401,8 +405,6 @@ Rectangle { @@ -401,8 +405,6 @@ Rectangle {
SectionHeader {
id: presetsStatsHeader
anchors.left: undefined
anchors.right: undefined
Layout.fillWidth: true
text: qsTr("Statistics")
}

2
src/QmlControls/ParameterEditor.qml
Unescape View File

@ -174,6 +174,8 @@ Item { @@ -174,6 +174,8 @@ Item {
SectionHeader {
id: categoryHeader
anchors.left: parent.left
anchors.right: parent.right
text: category
checked: controller.currentCategory === text
exclusiveGroup: sectionGroup

2
src/QmlControls/PreFlightCheckGroup.qml
Unescape View File

@ -44,6 +44,8 @@ Column { @@ -44,6 +44,8 @@ Column {
SectionHeader {
id: header
anchors.left: parent.left
anchors.right: parent.right
text: name + (passed ? qsTr(" (passed)") : "")
}

2
src/QmlControls/SectionHeader.qml
Unescape View File

@ -8,8 +8,6 @@ import QGroundControl.Palette 1.0 @@ -8,8 +8,6 @@ import QGroundControl.Palette 1.0
FocusScope {
id: _root
anchors.left: parent.left
anchors.right: parent.right
height: column.height
property alias text: label.text

Write Preview
Loading…
Cancel
Save