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. 20
      src/PlanView/CorridorScanEditor.qml
  3. 20
      src/PlanView/FWLandingPatternEditor.qml
  4. 24
      src/PlanView/GeoFenceEditor.qml
  5. 28
      src/PlanView/MissionSettingsEditor.qml
  6. 12
      src/PlanView/StructureScanEditor.qml
  7. 28
      src/PlanView/SurveyItemEditor.qml
  8. 2
      src/QmlControls/ParameterEditor.qml
  9. 6
      src/QmlControls/PreFlightCheckGroup.qml
  10. 6
      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
} }

20
src/PlanView/CorridorScanEditor.qml
Unescape View File

@ -124,8 +124,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: corridorHeader id: corridorHeader
text: qsTr("Corridor") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Corridor")
} }
GridLayout { GridLayout {
@ -182,9 +184,11 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: terrainHeader id: terrainHeader
text: qsTr("Terrain") anchors.left: parent.left
checked: missionItem.followTerrain anchors.right: parent.right
text: qsTr("Terrain")
checked: missionItem.followTerrain
} }
ColumnLayout { ColumnLayout {
@ -228,8 +232,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: statsHeader id: statsHeader
text: qsTr("Statistics") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
} }
TransectStyleComplexItemStats { } TransectStyleComplexItemStats { }

20
src/PlanView/FWLandingPatternEditor.qml
Unescape View File

@ -52,8 +52,10 @@ Rectangle {
visible: !editorColumnNeedLandingPoint.visible visible: !editorColumnNeedLandingPoint.visible
SectionHeader { SectionHeader {
id: loiterPointSection id: loiterPointSection
text: qsTr("Loiter point") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Loiter point")
} }
Column { Column {
@ -101,8 +103,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: landingPointSection id: landingPointSection
text: qsTr("Landing point") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Landing point")
} }
Column { Column {
@ -181,9 +185,11 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: cameraSection id: cameraSection
text: qsTr("Camera") anchors.left: parent.left
visible: _showCameraSection anchors.right: parent.right
text: qsTr("Camera")
visible: _showCameraSection
} }
Column { Column {

24
src/PlanView/GeoFenceEditor.qml
Unescape View File

@ -110,8 +110,10 @@ QGCFlickable {
} }
SectionHeader { SectionHeader {
id: insertSection id: insertSection
text: qsTr("Insert GeoFence") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Insert GeoFence")
} }
QGCButton { QGCButton {
@ -139,8 +141,10 @@ QGCFlickable {
} }
SectionHeader { SectionHeader {
id: polygonSection id: polygonSection
text: qsTr("Polygon Fences") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Polygon Fences")
} }
QGCLabel { QGCLabel {
@ -212,8 +216,10 @@ QGCFlickable {
} // GridLayout } // GridLayout
SectionHeader { SectionHeader {
id: circleSection id: circleSection
text: qsTr("Circular Fences") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Circular Fences")
} }
QGCLabel { QGCLabel {
@ -302,8 +308,10 @@ QGCFlickable {
} // GridLayout } // GridLayout
SectionHeader { SectionHeader {
id: breachReturnSection id: breachReturnSection
text: qsTr("Breach Return Point") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Breach Return Point")
} }
QGCButton { QGCButton {

28
src/PlanView/MissionSettingsEditor.qml
Unescape View File

@ -108,9 +108,11 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: missionEndHeader id: missionEndHeader
text: qsTr("Mission End") anchors.left: parent.left
checked: true anchors.right: parent.right
text: qsTr("Mission End")
checked: true
} }
Column { Column {
@ -128,10 +130,12 @@ Rectangle {
SectionHeader { SectionHeader {
id: vehicleInfoSectionHeader id: vehicleInfoSectionHeader
text: qsTr("Vehicle Info") anchors.left: parent.left
visible: _offlineEditing && !_waypointsOnlyMode anchors.right: parent.right
checked: false text: qsTr("Vehicle Info")
visible: _offlineEditing && !_waypointsOnlyMode
checked: false
} }
GridLayout { GridLayout {
@ -192,10 +196,12 @@ Rectangle {
} // GridLayout } // GridLayout
SectionHeader { SectionHeader {
id: plannedHomePositionSection id: plannedHomePositionSection
text: qsTr("Planned Home Position") anchors.left: parent.left
visible: !_vehicleHasHomePosition anchors.right: parent.right
checked: false text: qsTr("Planned Home Position")
visible: !_vehicleHasHomePosition
checked: false
} }
Column { Column {

12
src/PlanView/StructureScanEditor.qml
Unescape View File

@ -130,8 +130,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: scanHeader id: scanHeader
text: qsTr("Scan") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Scan")
} }
Column { Column {
@ -200,8 +202,10 @@ Rectangle {
} // Column - Scan } // Column - Scan
SectionHeader { SectionHeader {
id: statsHeader id: statsHeader
text: qsTr("Statistics") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
} }
Grid { Grid {

28
src/PlanView/SurveyItemEditor.qml
Unescape View File

@ -124,8 +124,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: transectsHeader id: transectsHeader
text: qsTr("Transects") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Transects")
} }
GridLayout { GridLayout {
@ -233,9 +235,11 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: terrainHeader id: terrainHeader
text: qsTr("Terrain") anchors.left: parent.left
checked: missionItem.followTerrain anchors.right: parent.right
text: qsTr("Terrain")
checked: missionItem.followTerrain
} }
ColumnLayout { ColumnLayout {
@ -280,8 +284,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: statsHeader id: statsHeader
text: qsTr("Statistics") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
} }
TransectStyleComplexItemStats { TransectStyleComplexItemStats {
@ -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")
} }
@ -400,11 +404,9 @@ 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")
} }
TransectStyleComplexItemStats { TransectStyleComplexItemStats {

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

6
src/QmlControls/PreFlightCheckGroup.qml
Unescape View File

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

6
src/QmlControls/SectionHeader.qml
Unescape View File

@ -7,10 +7,8 @@ import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
FocusScope { FocusScope {
id: _root id: _root
anchors.left: parent.left height: column.height
anchors.right: parent.right
height: column.height
property alias text: label.text property alias text: label.text
property bool checked: true property bool checked: true

Write Preview
Loading…
Cancel
Save