From 0f974ebc7665c5f90a9df80157b1e6f451b41f3e Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 27 Aug 2019 21:16:29 -0400 Subject: [PATCH] Moving pairing UI to custom-example as this is where it will reside for the time being. --- custom-example/custom.qrc | 7 ++++++- .../res}/Images/PairingButton.svg | 0 .../res}/Images/PairingConnected.svg | 0 .../res}/Images/PairingError.svg | 0 .../res}/Images/PairingIcon.svg | 0 .../res}/Images/PairingIconLight.svg | 0 .../res/MainToolbar/CustomMainToolBarIndicators.qml | 2 +- .../toolbar => custom-example/res}/PairingIndicator.qml | 8 ++++---- custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc | 2 +- qgcimages.qrc | 4 ---- qgroundcontrol.qrc | 1 - 11 files changed, 12 insertions(+), 12 deletions(-) rename {src/PairingManager => custom-example/res}/Images/PairingButton.svg (100%) rename {src/PairingManager => custom-example/res}/Images/PairingConnected.svg (100%) rename {src/PairingManager => custom-example/res}/Images/PairingError.svg (100%) rename {src/PairingManager => custom-example/res}/Images/PairingIcon.svg (100%) rename {src/PairingManager => custom-example/res}/Images/PairingIconLight.svg (100%) rename {src/ui/toolbar => custom-example/res}/PairingIndicator.qml (98%) diff --git a/custom-example/custom.qrc b/custom-example/custom.qrc index 08de536f4..1c8f6a95f 100644 --- a/custom-example/custom.qrc +++ b/custom-example/custom.qrc @@ -10,6 +10,7 @@ res/MainToolbar/CustomModeIndicator.qml res/MainToolbar/CustomMultiVehicleSelector.qml res/MainToolbar/CustomRCRSSIIndicator.qml + res/PairingIndicator.qml res/PreFlightCheckList.qml @@ -25,12 +26,16 @@ res/Images/compass_pointer.svg res/Images/distance.svg res/Images/gimbal_icon.svg - res/Images/gimbal_position.svg res/Images/gimbal_pitch_indoors.svg res/Images/gimbal_pitch_outdoors.svg + res/Images/gimbal_position.svg res/Images/horizontal_speed.svg res/Images/microSD.svg res/Images/odometer.svg + res/Images/PairingButton.svg + res/Images/PairingConnected.svg + res/Images/PairingError.svg + res/Images/PairingIcon.svg res/Images/thermal-brightness.svg res/Images/thermal-palette.svg res/Images/thermal-pip.svg diff --git a/src/PairingManager/Images/PairingButton.svg b/custom-example/res/Images/PairingButton.svg similarity index 100% rename from src/PairingManager/Images/PairingButton.svg rename to custom-example/res/Images/PairingButton.svg diff --git a/src/PairingManager/Images/PairingConnected.svg b/custom-example/res/Images/PairingConnected.svg similarity index 100% rename from src/PairingManager/Images/PairingConnected.svg rename to custom-example/res/Images/PairingConnected.svg diff --git a/src/PairingManager/Images/PairingError.svg b/custom-example/res/Images/PairingError.svg similarity index 100% rename from src/PairingManager/Images/PairingError.svg rename to custom-example/res/Images/PairingError.svg diff --git a/src/PairingManager/Images/PairingIcon.svg b/custom-example/res/Images/PairingIcon.svg similarity index 100% rename from src/PairingManager/Images/PairingIcon.svg rename to custom-example/res/Images/PairingIcon.svg diff --git a/src/PairingManager/Images/PairingIconLight.svg b/custom-example/res/Images/PairingIconLight.svg similarity index 100% rename from src/PairingManager/Images/PairingIconLight.svg rename to custom-example/res/Images/PairingIconLight.svg diff --git a/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml b/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml index 858bb85bb..a86c52d58 100644 --- a/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml +++ b/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml @@ -87,7 +87,7 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom anchors.margins: _indicatorMargins - source: "/toolbar/PairingIndicator.qml" + source: "/custom/PairingIndicator.qml" } } //------------------------------------------------------------------------- diff --git a/src/ui/toolbar/PairingIndicator.qml b/custom-example/res/PairingIndicator.qml similarity index 98% rename from src/ui/toolbar/PairingIndicator.qml rename to custom-example/res/PairingIndicator.qml index b1006bd48..e003dc072 100644 --- a/src/ui/toolbar/PairingIndicator.qml +++ b/custom-example/res/PairingIndicator.qml @@ -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 diff --git a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc index 420c72a5d..a460de252 100644 --- a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc +++ b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc @@ -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"))); diff --git a/qgcimages.qrc b/qgcimages.qrc index 8d12d67fa..e025d9c09 100644 --- a/qgcimages.qrc +++ b/qgcimages.qrc @@ -121,10 +121,6 @@ src/AutoPilotPlugins/PX4/Images/no-logging-light.svg src/AutoPilotPlugins/PX4/Images/no-logging.svg src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg - src/PairingManager/Images/PairingButton.svg - src/PairingManager/Images/PairingConnected.svg - src/PairingManager/Images/PairingError.svg - src/PairingManager/Images/PairingIcon.svg src/ui/toolbar/Images/PaperPlane.svg src/FlightMap/Images/PiP.svg src/FlightMap/Images/pipHide.svg diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index b1bc3f585..148e3fa81 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -14,7 +14,6 @@ src/ui/toolbar/MessageIndicator.qml src/ui/toolbar/ModeIndicator.qml src/ui/toolbar/MultiVehicleSelector.qml - src/ui/toolbar/PairingIndicator.qml src/ui/toolbar/RCRSSIIndicator.qml src/ui/toolbar/TelemetryRSSIIndicator.qml src/ui/toolbar/VTOLModeIndicator.qml -- 2.22.0