Skip to content

Commit 01eb65a

Browse files
committedJun 15, 2020
Common control for Pattern tab bar
1 parent 30403d2 commit 01eb65a

7 files changed

+24
-0
lines changed
 

Diff for: ‎qgcimages.qrc

+4
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@
125125
<file alias="no-logging.svg">src/AutoPilotPlugins/PX4/Images/no-logging.svg</file>
126126
<file alias="ObjectAvoidance.svg">src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg</file>
127127
<file alias="PaperPlane.svg">src/ui/toolbar/Images/PaperPlane.svg</file>
128+
<file alias="PatternCamera.png">resources/PatternCamera.png</file>
129+
<file alias="PatternGrid.png">resources/PatternGrid.png</file>
130+
<file alias="PatternPresets.png">resources/PatternPresets.png</file>
131+
<file alias="PatternTerrain.png">resources/PatternTerrain.png</file>
128132
<file alias="PiP.svg">src/FlightMap/Images/PiP.svg</file>
129133
<file alias="pipHide.svg">src/FlightMap/Images/pipHide.svg</file>
130134
<file alias="pipResize.svg">src/FlightMap/Images/pipResize.svg</file>

Diff for: ‎qgroundcontrol.qrc

+2
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
<file alias="QGroundControl/Controls/TakeoffItemMapVisual.qml">src/PlanView/TakeoffItemMapVisual.qml</file>
182182
<file alias="QGroundControl/Controls/ToolStrip.qml">src/QmlControls/ToolStrip.qml</file>
183183
<file alias="QGroundControl/Controls/TransectStyleComplexItemStats.qml">src/PlanView/TransectStyleComplexItemStats.qml</file>
184+
<file alias="QGroundControl/Controls/TransectStyleComplexItemTabBar.qml">src/PlanView/TransectStyleComplexItemTabBar.qml</file>
185+
<file alias="QGroundControl/Controls/TransectStyleComplexItemTerrainFollow.qml">src/PlanView/TransectStyleComplexItemTerrainFollow.qml</file>
184186
<file alias="QGroundControl/Controls/VehicleRotationCal.qml">src/QmlControls/VehicleRotationCal.qml</file>
185187
<file alias="QGroundControl/Controls/VehicleSummaryRow.qml">src/QmlControls/VehicleSummaryRow.qml</file>
186188
<file alias="QGroundControl/Controls/VerticalFactValueGrid.qml">src/QmlControls/VerticalFactValueGrid.qml</file>

Diff for: ‎resources/PatternCamera.png

1.99 KB
Loading

Diff for: ‎resources/PatternGrid.png

460 Bytes
Loading

Diff for: ‎resources/PatternPresets.png

15.1 KB
Loading

Diff for: ‎resources/PatternTerrain.png

8.53 KB
Loading

Diff for: ‎src/PlanView/TransectStyleComplexItemTabBar.qml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import QtQuick 2.3
2+
3+
import QGroundControl 1.0
4+
import QGroundControl.ScreenTools 1.0
5+
import QGroundControl.Controls 1.0
6+
7+
QGCTabBar {
8+
id: tabBar
9+
anchors.left: parent.left
10+
anchors.right: parent.right
11+
12+
Component.onCompleted: currentIndex = QGroundControl.settingsManager.planViewSettings.displayPresetsTabFirst.rawValue ? 2 : 0
13+
14+
QGCTabButton { icon.source: "/qmlimages/PatternGrid.png"; icon.height: ScreenTools.defaultFontPixelHeight }
15+
QGCTabButton { icon.source: "/qmlimages/PatternCamera.png"; icon.height: ScreenTools.defaultFontPixelHeight }
16+
QGCTabButton { icon.source: "/qmlimages/PatternTerrain.png"; icon.height: ScreenTools.defaultFontPixelHeight }
17+
QGCTabButton { icon.source: "/qmlimages/PatternPresets.png"; icon.height: ScreenTools.defaultFontPixelHeight }
18+
}

0 commit comments

Comments
 (0)
Please sign in to comment.