Skip to content

Commit 413c9f8

Browse files
DonLakeFlyerDonLakeFlyer
committed
Rename FlightDisplay dir to FlyView to better match QGC terminology
1 parent 857bbad commit 413c9f8

78 files changed

Lines changed: 291 additions & 291 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎custom-example/custom.qrc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<file alias="PaperPlane.svg">res/Images/CustomVehicleIcon.svg</file>
2020
</qresource>
2121
<qresource prefix="/Custom/qml">
22-
<file alias="QGroundControl/FlightDisplay/CustomGuidedActionsController.qml">src/CustomGuidedActionsController.qml</file>
23-
<file alias="QGroundControl/FlightDisplay/FlyViewCustomLayer.qml">src/FlyViewCustomLayer.qml</file>
24-
<file alias="QGroundControl/FlightDisplay/FlyViewToolStripActionList.qml">src/FlyViewToolStripActionList.qml</file>
22+
<file alias="QGroundControl/FlyView/CustomGuidedActionsController.qml">src/CustomGuidedActionsController.qml</file>
23+
<file alias="QGroundControl/FlyView/FlyViewCustomLayer.qml">src/FlyViewCustomLayer.qml</file>
24+
<file alias="QGroundControl/FlyView/FlyViewToolStripActionList.qml">src/FlyViewToolStripActionList.qml</file>
2525
</qresource>
2626
<qresource prefix="/Custom/res">
2727
<file alias="QGCLogoFull.svg">res/Images/QGCLogoFull.svg</file>

‎docs/en/qgc-dev-guide/custom_build/fly_view.md‎

Lines changed: 3 additions & 3 deletions

‎src/API/QGCOptions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class QGCOptions : public QObject
113113
virtual bool showMissionStatus() const { return true; }
114114

115115
/// Provides an optional, custom preflight checklist
116-
virtual QUrl preFlightChecklistUrl() const { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/FlightDisplay/PreFlightCheckList.qml")); }
116+
virtual QUrl preFlightChecklistUrl() const { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/FlyView/PreFlightCheckList.qml")); }
117117

118118
/// Allows replacing the toolbar Light Theme color
119119
virtual QColor toolbarBackgroundLight() const { return QColorConstants::White; }

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ add_subdirectory(Camera)
3636
add_subdirectory(Comms)
3737
add_subdirectory(FactSystem)
3838
add_subdirectory(FirmwarePlugin)
39-
add_subdirectory(FlightDisplay)
39+
add_subdirectory(FlyView)
4040
add_subdirectory(FlightMap)
4141
add_subdirectory(FollowMe)
4242
add_subdirectory(Gimbal)
@@ -134,7 +134,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
134134
AutoPilotPluginsCommonModule
135135
FactControlsModule
136136
FirstRunPromptDialogsModule
137-
FlightDisplayModule
137+
FlyViewModule
138138
FlightMapModule
139139
QGroundControlControlsModule
140140
QGroundControlModule

‎src/FlightMap/MapItems/ProximityRadarMapView.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import QGroundControl
1515

1616

1717
import QGroundControl.Controls
18-
import QGroundControl.FlightDisplay
18+
import QGroundControl.FlyView
1919

2020
MapQuickItem {
2121
id: _root

‎src/FlightMap/Widgets/IntegratedAttitudeIndicator.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import QtQuick
1212
import QGroundControl
1313
import QGroundControl.Controls
1414

15-
import QGroundControl.FlightDisplay
15+
import QGroundControl.FlyView
1616
import QGroundControl.FlightMap
1717

1818
Item {

‎src/FlightMap/Widgets/IntegratedCompassAttitude.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import QtQuick
1212
import QGroundControl
1313
import QGroundControl.Controls
1414

15-
import QGroundControl.FlightDisplay
15+
import QGroundControl.FlyView
1616
import QGroundControl.FlightMap
1717

1818
Item {

src/FlightDisplay/CMakeLists.txt renamed to src/FlyView/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# In-flight view, telemetry displays, and vehicle control UI
44
# ============================================================================
55

6-
qt_add_library(FlightDisplayModule STATIC)
6+
qt_add_library(FlyViewModule STATIC)
77

8-
qt_add_qml_module(FlightDisplayModule
9-
URI QGroundControl.FlightDisplay
8+
qt_add_qml_module(FlyViewModule
9+
URI QGroundControl.FlyView
1010
VERSION 1.0
1111
RESOURCE_PREFIX /qml
1212
QML_FILES

src/FlightDisplay/CustomGuidedActionsController.qml renamed to src/FlyView/CustomGuidedActionsController.qml

File renamed without changes.

src/FlightDisplay/DefaultChecklist.qml renamed to src/FlyView/DefaultChecklist.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import QtQml.Models
1414
import QGroundControl
1515

1616
import QGroundControl.Controls
17-
import QGroundControl.FlightDisplay
17+
import QGroundControl.FlyView
1818

1919

2020
Item {

0 commit comments

Comments
 (0)