Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
0f974ebc
Commit
0f974ebc
authored
Aug 27, 2019
by
Gus Grubba
Browse files
Moving pairing UI to custom-example as this is where it will reside for the time being.
parent
e5d6dbfa
Changes
11
Hide whitespace changes
Inline
Side-by-side
custom-example/custom.qrc
View file @
0f974ebc
...
...
@@ -10,6 +10,7 @@
<file alias="CustomModeIndicator.qml">res/MainToolbar/CustomModeIndicator.qml</file>
<file alias="CustomMultiVehicleSelector.qml">res/MainToolbar/CustomMultiVehicleSelector.qml</file>
<file alias="CustomRCRSSIIndicator.qml">res/MainToolbar/CustomRCRSSIIndicator.qml</file>
<file alias="PairingIndicator.qml">res/PairingIndicator.qml</file>
<file alias="PreFlightCheckList.qml">res/PreFlightCheckList.qml</file>
</qresource>
<qresource prefix="custom/img">
...
...
@@ -25,12 +26,16 @@
<file alias="compass_pointer.svg">res/Images/compass_pointer.svg</file>
<file alias="distance.svg">res/Images/distance.svg</file>
<file alias="gimbal_icon.svg">res/Images/gimbal_icon.svg</file>
<file alias="gimbal_position.svg">res/Images/gimbal_position.svg</file>
<file alias="gimbal_pitch_indoors.svg">res/Images/gimbal_pitch_indoors.svg</file>
<file alias="gimbal_pitch_outdoors.svg">res/Images/gimbal_pitch_outdoors.svg</file>
<file alias="gimbal_position.svg">res/Images/gimbal_position.svg</file>
<file alias="horizontal_speed.svg">res/Images/horizontal_speed.svg</file>
<file alias="microSD.svg">res/Images/microSD.svg</file>
<file alias="odometer.svg">res/Images/odometer.svg</file>
<file alias="PairingButton.svg">res/Images/PairingButton.svg</file>
<file alias="PairingConnected.svg">res/Images/PairingConnected.svg</file>
<file alias="PairingError.svg">res/Images/PairingError.svg</file>
<file alias="PairingIcon.svg">res/Images/PairingIcon.svg</file>
<file alias="thermal-brightness.svg">res/Images/thermal-brightness.svg</file>
<file alias="thermal-palette.svg">res/Images/thermal-palette.svg</file>
<file alias="thermal-pip.svg">res/Images/thermal-pip.svg</file>
...
...
src/PairingManager
/Images/PairingButton.svg
→
custom-example/res
/Images/PairingButton.svg
View file @
0f974ebc
File moved
src/PairingManager
/Images/PairingConnected.svg
→
custom-example/res
/Images/PairingConnected.svg
View file @
0f974ebc
File moved
src/PairingManager
/Images/PairingError.svg
→
custom-example/res
/Images/PairingError.svg
View file @
0f974ebc
File moved
src/PairingManager
/Images/PairingIcon.svg
→
custom-example/res
/Images/PairingIcon.svg
View file @
0f974ebc
File moved
src/PairingManager
/Images/PairingIconLight.svg
→
custom-example/res
/Images/PairingIconLight.svg
View file @
0f974ebc
File moved
custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml
View file @
0f974ebc
...
...
@@ -87,7 +87,7 @@ Item {
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.margins
:
_indicatorMargins
source
:
"
/
toolbar
/PairingIndicator.qml
"
source
:
"
/
custom
/PairingIndicator.qml
"
}
}
//-------------------------------------------------------------------------
...
...
src/ui/toolbar
/PairingIndicator.qml
→
custom-example/res
/PairingIndicator.qml
View file @
0f974ebc
...
...
@@ -66,7 +66,7 @@ Item {
height
:
parent
.
height
width
:
height
color
:
qgcPal
.
text
source
:
"
/
qmlimages
/PairingIcon.svg
"
source
:
"
/
custom/img
/PairingIcon.svg
"
sourceSize.width
:
width
fillMode
:
Image
.
PreserveAspectFit
smooth
:
true
...
...
@@ -138,7 +138,7 @@ Item {
QGCColoredImage
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
6
width
:
height
source
:
"
/
qmlimages
/PairingButton.svg
"
source
:
"
/
custom/img
/PairingButton.svg
"
sourceSize.height
:
height
fillMode
:
Image
.
PreserveAspectFit
mipmap
:
true
...
...
@@ -306,7 +306,7 @@ Item {
Image
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
4
width
:
height
source
:
"
/
qmlimages
/PairingError.svg
"
source
:
"
/
custom/img
/PairingError.svg
"
sourceSize.height
:
height
fillMode
:
Image
.
PreserveAspectFit
mipmap
:
true
...
...
@@ -319,7 +319,7 @@ Item {
id
:
connectedIndicator
height
:
width
*
0.2
width
:
_contentWidth
source
:
"
/
qmlimages
/PairingConnected.svg
"
source
:
"
/
custom/img
/PairingConnected.svg
"
sourceSize.height
:
height
fillMode
:
Image
.
PreserveAspectFit
mipmap
:
true
...
...
custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
View file @
0f974ebc
...
...
@@ -56,7 +56,7 @@ CustomFirmwarePlugin::toolBarIndicators(const Vehicle* vehicle)
Q_UNUSED
(
vehicle
);
if
(
_toolBarIndicatorList
.
size
()
==
0
)
{
#if defined(QGC_ENABLE_PAIRING)
_toolBarIndicatorList
.
append
(
QVariant
::
fromValue
(
QUrl
::
fromUserInput
(
"qrc:/
toolbar
/PairingIndicator.qml"
)));
_toolBarIndicatorList
.
append
(
QVariant
::
fromValue
(
QUrl
::
fromUserInput
(
"qrc:/
custom
/PairingIndicator.qml"
)));
#endif
_toolBarIndicatorList
.
append
(
QVariant
::
fromValue
(
QUrl
::
fromUserInput
(
"qrc:/toolbar/GPSIndicator.qml"
)));
_toolBarIndicatorList
.
append
(
QVariant
::
fromValue
(
QUrl
::
fromUserInput
(
"qrc:/toolbar/TelemetryRSSIIndicator.qml"
)));
...
...
qgcimages.qrc
View file @
0f974ebc
...
...
@@ -121,10 +121,6 @@
<file alias="no-logging-light.svg">src/AutoPilotPlugins/PX4/Images/no-logging-light.svg</file>
<file alias="no-logging.svg">src/AutoPilotPlugins/PX4/Images/no-logging.svg</file>
<file alias="ObjectAvoidance.svg">src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg</file>
<file alias="PairingButton.svg">src/PairingManager/Images/PairingButton.svg</file>
<file alias="PairingConnected.svg">src/PairingManager/Images/PairingConnected.svg</file>
<file alias="PairingError.svg">src/PairingManager/Images/PairingError.svg</file>
<file alias="PairingIcon.svg">src/PairingManager/Images/PairingIcon.svg</file>
<file alias="PaperPlane.svg">src/ui/toolbar/Images/PaperPlane.svg</file>
<file alias="PiP.svg">src/FlightMap/Images/PiP.svg</file>
<file alias="pipHide.svg">src/FlightMap/Images/pipHide.svg</file>
...
...
qgroundcontrol.qrc
View file @
0f974ebc
...
...
@@ -14,7 +14,6 @@
<file alias="MessageIndicator.qml">src/ui/toolbar/MessageIndicator.qml</file>
<file alias="ModeIndicator.qml">src/ui/toolbar/ModeIndicator.qml</file>
<file alias="MultiVehicleSelector.qml">src/ui/toolbar/MultiVehicleSelector.qml</file>
<file alias="PairingIndicator.qml">src/ui/toolbar/PairingIndicator.qml</file>
<file alias="RCRSSIIndicator.qml">src/ui/toolbar/RCRSSIIndicator.qml</file>
<file alias="TelemetryRSSIIndicator.qml">src/ui/toolbar/TelemetryRSSIIndicator.qml</file>
<file alias="VTOLModeIndicator.qml">src/ui/toolbar/VTOLModeIndicator.qml</file>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment