Browse Source

Moving pairing UI to custom-example as this is where it will reside for the time being.

QGC4.4
Gus Grubba 6 years ago
parent
commit
0f974ebc76
  1. 7
      custom-example/custom.qrc
  2. 0
      custom-example/res/Images/PairingButton.svg
  3. 0
      custom-example/res/Images/PairingConnected.svg
  4. 0
      custom-example/res/Images/PairingError.svg
  5. 0
      custom-example/res/Images/PairingIcon.svg
  6. 0
      custom-example/res/Images/PairingIconLight.svg
  7. 2
      custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml
  8. 8
      custom-example/res/PairingIndicator.qml
  9. 2
      custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
  10. 4
      qgcimages.qrc
  11. 1
      qgroundcontrol.qrc

7
custom-example/custom.qrc

@ -10,6 +10,7 @@ @@ -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 @@ @@ -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>

0
src/PairingManager/Images/PairingButton.svg → custom-example/res/Images/PairingButton.svg

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
src/PairingManager/Images/PairingConnected.svg → custom-example/res/Images/PairingConnected.svg

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

0
src/PairingManager/Images/PairingError.svg → custom-example/res/Images/PairingError.svg

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 694 B

0
src/PairingManager/Images/PairingIcon.svg → custom-example/res/Images/PairingIcon.svg

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
src/PairingManager/Images/PairingIconLight.svg → custom-example/res/Images/PairingIconLight.svg

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

2
custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml

@ -87,7 +87,7 @@ Item { @@ -87,7 +87,7 @@ Item {
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.margins: _indicatorMargins
source: "/toolbar/PairingIndicator.qml"
source: "/custom/PairingIndicator.qml"
}
}
//-------------------------------------------------------------------------

8
src/ui/toolbar/PairingIndicator.qml → custom-example/res/PairingIndicator.qml

@ -66,7 +66,7 @@ Item { @@ -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 { @@ -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 { @@ -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 { @@ -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

2
custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc

@ -56,7 +56,7 @@ CustomFirmwarePlugin::toolBarIndicators(const Vehicle* vehicle) @@ -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")));

4
qgcimages.qrc

@ -121,10 +121,6 @@ @@ -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>

1
qgroundcontrol.qrc

@ -14,7 +14,6 @@ @@ -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>

Loading…
Cancel
Save