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
Unified 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 {
SectionHeader { SectionHeader {
id: cameraSectionHeader id: cameraSectionHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Camera") text: qsTr("Camera")
checked: false checked: false
} }

6
src/PlanView/CorridorScanEditor.qml
Unescape View File

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

6
src/PlanView/FWLandingPatternEditor.qml
Unescape View File

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

8
src/PlanView/GeoFenceEditor.qml
Unescape View File

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

6
src/PlanView/MissionSettingsEditor.qml
Unescape View File

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

4
src/PlanView/StructureScanEditor.qml
Unescape View File

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

10
src/PlanView/SurveyItemEditor.qml
Unescape View File

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

2
src/QmlControls/ParameterEditor.qml
Unescape View File

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

2
src/QmlControls/PreFlightCheckGroup.qml
Unescape View File

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

2
src/QmlControls/SectionHeader.qml
Unescape View File

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

Write Preview
Loading…
Cancel
Save