Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
0f974ebc
Commit
0f974ebc
authored
Aug 27, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Showing
11 changed files
with
12 additions
and
12 deletions
+12
-12
custom.qrc
custom-example/custom.qrc
+6
-1
PairingButton.svg
custom-example/res/Images/PairingButton.svg
+0
-0
PairingConnected.svg
custom-example/res/Images/PairingConnected.svg
+0
-0
PairingError.svg
custom-example/res/Images/PairingError.svg
+0
-0
PairingIcon.svg
custom-example/res/Images/PairingIcon.svg
+0
-0
PairingIconLight.svg
custom-example/res/Images/PairingIconLight.svg
+0
-0
CustomMainToolBarIndicators.qml
...m-example/res/MainToolbar/CustomMainToolBarIndicators.qml
+1
-1
PairingIndicator.qml
custom-example/res/PairingIndicator.qml
+4
-4
CustomFirmwarePlugin.cc
custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
+1
-1
qgcimages.qrc
qgcimages.qrc
+0
-4
qgroundcontrol.qrc
qgroundcontrol.qrc
+0
-1
No files found.
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
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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