Skip to content

Q
qgroundcontrol
Commit 20bf53f5 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Remove unused pairing settings

parent 23ab840c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 139 deletions
custom-example/src/CustomPlugin.cc
View file @ 20bf53f5
......@@ -136,9 +136,6 @@ CustomPlugin::settingsPages()
if(_customSettingsList.isEmpty()) {
addSettingsEntry(tr("General"), "qrc:/qml/GeneralSettings.qml", "qrc:/res/gear-white.svg");
addSettingsEntry(tr("Comm Links"), "qrc:/qml/LinkSettings.qml", "qrc:/res/waves.svg");
#if defined(QGC_ENABLE_PAIRING)
addSettingsEntry(tr("Pairing"), "qrc:/qml/PairingSettings.qml", "qrc:/res/waves.svg");
#endif
addSettingsEntry(tr("Offline Maps"),"qrc:/qml/OfflineMap.qml", "qrc:/res/waves.svg");
#if defined(QGC_GST_MICROHARD_ENABLED)
addSettingsEntry(tr("Microhard"), "qrc:/qml/MicrohardSettings.qml");
......
qgroundcontrol.qrc
View file @ 20bf53f5
......@@ -6,7 +6,6 @@
<file alias="ArmedIndicator.qml">src/ui/toolbar/ArmedIndicator.qml</file>
<file alias="BatteryIndicator.qml">src/ui/toolbar/BatteryIndicator.qml</file>
<file alias="GPSIndicator.qml">src/ui/toolbar/GPSIndicator.qml</file>
<file alias="PairingIndicator.qml">src/ui/toolbar/PairingIndicator.qml</file>
<file alias="GPSRTKIndicator.qml">src/ui/toolbar/GPSRTKIndicator.qml</file>
<file alias="JoystickIndicator.qml">src/ui/toolbar/JoystickIndicator.qml</file>
<file alias="LinkIndicator.qml">src/ui/toolbar/LinkIndicator.qml</file>
......@@ -15,6 +14,7 @@
<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>
......@@ -56,7 +56,6 @@
<file alias="MockLinkSettings.qml">src/ui/preferences/MockLinkSettings.qml</file>
<file alias="MotorComponent.qml">src/AutoPilotPlugins/Common/MotorComponent.qml</file>
<file alias="OfflineMap.qml">src/QtLocationPlugin/QMLControl/OfflineMap.qml</file>
<file alias="PairingSettings.qml">src/PairingManager/PairingSettings.qml</file>
<file alias="PlanToolBar.qml">src/PlanView/PlanToolBar.qml</file>
<file alias="PlanToolBarIndicators.qml">src/PlanView/PlanToolBarIndicators.qml</file>
<file alias="PlanView.qml">src/PlanView/PlanView.qml</file>
......
src/PairingManager/PairingSettings.qml deleted 100644 → 0
View file @ 23ab840c
/****************************************************************************
*
* (c) 2019 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
import QtGraphicalEffects 1.0
import QtMultimedia 5.5
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtLocation 5.3
import QtPositioning 5.3
import QGroundControl 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.SettingsManager 1.0
Rectangle {
id: _root
color: qgcPal.window
anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
property real _labelWidth: ScreenTools.defaultFontPixelWidth * 26
property real _valueWidth: ScreenTools.defaultFontPixelWidth * 20
property real _panelWidth: _root.width * _internalWidthRatio
readonly property real _internalWidthRatio: 0.8
ExclusiveGroup { id: pairingLinkGroup }
QGCFlickable {
clip: true
anchors.fill: parent
contentHeight: settingsColumn.height
contentWidth: settingsColumn.width
Column {
id: settingsColumn
width: _root.width
spacing: ScreenTools.defaultFontPixelHeight * 0.5
anchors.margins: ScreenTools.defaultFontPixelWidth
Item {
width: _panelWidth
height: generalLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter
QGCLabel {
id: pairingMethodsLabel
text: qsTr("Pairing methods:")
font.family: ScreenTools.demiboldFontFamily
}
}
Repeater {
id: repeater
model: QGroundControl.pairingManager.pairingLinkTypeStrings
anchors.horizontalCenter: parent.horizontalCenter
delegate: QGCButton {
width: _root.width * 0.2
text: modelData
exclusiveGroup: pairingLinkGroup
anchors.horizontalCenter: settingsColumn.horizontalCenter
onClicked: {
checked = true
if (index === QGroundControl.pairingManager.nfcIndex) {
QGroundControl.pairingManager.startNFCScan();
} else if (index === QGroundControl.pairingManager.microhardIndex) {
QGroundControl.pairingManager.startMicrohardPairing();
}
}
}
}
Item {
width: _panelWidth
height: generalLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: settingsColumn.horizontalCenter
QGCLabel {
id: generalLabel
text: QGroundControl.pairingManager.pairingStatusStr
font.family: ScreenTools.demiboldFontFamily
}
}
Item {
width: _panelWidth
height: generalLabel.height
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: settingsColumn.horizontalCenter
QGCLabel {
id: pairingsLabel
text: qsTr("Paired UAVs:")
font.family: ScreenTools.demiboldFontFamily
}
}
Repeater {
model: QGroundControl.pairingManager.pairedDeviceNameList
delegate: QGCButton {
text: modelData
width: _root.width * 0.3
anchors.horizontalCenter: parent.horizontalCenter
exclusiveGroup: pairingLinkGroup
onClicked: {
checked = true
QGroundControl.pairingManager.connectToPairedDevice(text)
}
}
}
}
}
}
src/api/QGCCorePlugin.cc
View file @ 20bf53f5
......@@ -42,10 +42,6 @@ public:
delete pCommLinks;
if(pOfflineMaps)
delete pOfflineMaps;
#if defined(QGC_ENABLE_PAIRING)
if(pPairing)
delete pPairing;
#endif
#if defined(QGC_GST_TAISYNC_ENABLED)
if(pTaisync)
delete pTaisync;
......@@ -76,9 +72,6 @@ public:
QmlComponentInfo* pGeneral = nullptr;
QmlComponentInfo* pCommLinks = nullptr;
#if defined(QGC_ENABLE_PAIRING)
QmlComponentInfo* pPairing = nullptr;
#endif
QmlComponentInfo* pOfflineMaps = nullptr;
#if defined(QGC_GST_TAISYNC_ENABLED)
QmlComponentInfo* pTaisync = nullptr;
......@@ -225,12 +218,6 @@ QVariantList &QGCCorePlugin::settingsPages()
QUrl::fromUserInput("qrc:/qml/LinkSettings.qml"),
QUrl::fromUserInput("qrc:/res/waves.svg"));
_p->settingsList.append(QVariant::fromValue(reinterpret_cast<QmlComponentInfo*>(_p->pCommLinks)));
#if defined(QGC_ENABLE_PAIRING)
_p->pPairing = new QmlComponentInfo(tr("Pairing"),
QUrl::fromUserInput("qrc:/qml/PairingSettings.qml"),
QUrl::fromUserInput(""));
_p->settingsList.append(QVariant::fromValue(reinterpret_cast<QmlComponentInfo*>(_p->pPairing)));
#endif
_p->pOfflineMaps = new QmlComponentInfo(tr("Offline Maps"),
QUrl::fromUserInput("qrc:/qml/OfflineMap.qml"),
QUrl::fromUserInput("qrc:/res/waves.svg"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment