From 2c7705a5887025430859cda80504309e753bcc87 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Mon, 28 Nov 2016 17:44:14 -0500
Subject: [PATCH] Done with this for now.
---
src/FlightDisplay/FlightDisplayView.qml | 2 +-
src/QGCToolbox.cc | 21 +----------
src/api/QGCCorePlugin.cc | 65 +++++++++++++--------------------
src/api/QGCOptions.h | 24 ------------
4 files changed, 27 insertions(+), 85 deletions(-)
diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 3eb92fd..85faa00 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -34,7 +34,7 @@ QGCView {
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
- property bool _mainIsMap: QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_mainIsMapKey, QGroundControl.corePlugin.options.mainViewIsMap) : true
+ property bool _mainIsMap: QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_mainIsMapKey, true) : true
property bool _isPipVisible: QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_PIPVisibleKey, true) : false
property real _roll: _activeVehicle ? _activeVehicle.roll.value : _defaultRoll
diff --git a/src/QGCToolbox.cc b/src/QGCToolbox.cc
index 213c319..24408ea 100644
--- a/src/QGCToolbox.cc
+++ b/src/QGCToolbox.cc
@@ -130,26 +130,7 @@ QGCToolbox::~QGCToolbox()
void QGCToolbox::_scanAndLoadPlugins(QGCApplication* app)
{
-#if defined (QGC_DYNAMIC_PLUGIN)
- //-- Look for plugins (Dynamic)
- QString filter = "*.core.so";
- QString path = QCoreApplication::applicationDirPath();
- QDirIterator it(path, QStringList() << filter, QDir::Files);
- while(it.hasNext()) {
- QString pluginFile = it.next();
- QPluginLoader loader(pluginFile);
- QObject *plugin = loader.instance();
- if(plugin) {
- _pCorePlugin = qobject_cast<IQGCCorePlugin*>(plugin);
- if(_pCorePlugin) {
- _pQGCOptions = _pCorePlugin->uiOptions();
- return;
- }
- } else {
- qWarning() << "Plugin" << pluginFile << " not loaded:" << loader.errorString();
- }
- }
-#elif defined (QGC_CUSTOM_BUILD)
+#if defined (QGC_CUSTOM_BUILD)
//-- Create custom plugin (Static)
_corePlugin = (QGCCorePlugin*) new CUSTOMCLASS(app);
if(_corePlugin) {
diff --git a/src/api/QGCCorePlugin.cc b/src/api/QGCCorePlugin.cc
index 605b7ef..a530547 100644
--- a/src/api/QGCCorePlugin.cc
+++ b/src/api/QGCCorePlugin.cc
@@ -93,49 +93,34 @@ QVariantList &QGCCorePlugin::settings()
{
//-- If this hasn't been overridden, create default set of settings
if(!_p->pGeneral) {
- QGCOptions* pOptions = options();
//-- Default Settings
- if(pOptions->enabledSettings() & QGCOptions::SETTINGS_GENERAL) {
- _p->pGeneral = new QGCSettings(tr("General"),
- QUrl::fromUserInput("qrc:/qml/GeneralSettings.qml"),
- QUrl::fromUserInput("qrc:/res/gear-white.svg"));
- _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pGeneral));
- }
- if(pOptions->enabledSettings() & QGCOptions::SETTINGS_COMM_LINKS) {
- _p->pCommLinks = new QGCSettings(tr("Comm Links"),
- QUrl::fromUserInput("qrc:/qml/LinkSettings.qml"),
- QUrl::fromUserInput("qrc:/res/waves.svg"));
- _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pCommLinks));
- }
- if(pOptions->enabledSettings() & QGCOptions::SETTINGS_OFFLINE_MAPS) {
- _p->pOfflineMaps = new QGCSettings(tr("Offline Maps"),
- QUrl::fromUserInput("qrc:/qml/OfflineMap.qml"),
- QUrl::fromUserInput("qrc:/res/waves.svg"));
- _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pOfflineMaps));
- }
- if(pOptions->enabledSettings() & QGCOptions::SETTINGS_MAVLINK) {
- _p->pMAVLink = new QGCSettings(tr("MAVLink"),
- QUrl::fromUserInput("qrc:/qml/MavlinkSettings.qml"),
- QUrl::fromUserInput("qrc:/res/waves.svg"));
- _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pMAVLink));
- }
- if(pOptions->enabledSettings() & QGCOptions::SETTINGS_CONSOLE) {
- _p->pConsole = new QGCSettings(tr("Console"),
- QUrl::fromUserInput("qrc:/QGroundControl/Controls/AppMessages.qml"));
- _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pConsole));
- }
+ _p->pGeneral = new QGCSettings(tr("General"),
+ QUrl::fromUserInput("qrc:/qml/GeneralSettings.qml"),
+ QUrl::fromUserInput("qrc:/res/gear-white.svg"));
+ _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pGeneral));
+ _p->pCommLinks = new QGCSettings(tr("Comm Links"),
+ QUrl::fromUserInput("qrc:/qml/LinkSettings.qml"),
+ QUrl::fromUserInput("qrc:/res/waves.svg"));
+ _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pCommLinks));
+ _p->pOfflineMaps = new QGCSettings(tr("Offline Maps"),
+ QUrl::fromUserInput("qrc:/qml/OfflineMap.qml"),
+ QUrl::fromUserInput("qrc:/res/waves.svg"));
+ _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pOfflineMaps));
+ _p->pMAVLink = new QGCSettings(tr("MAVLink"),
+ QUrl::fromUserInput("qrc:/qml/MavlinkSettings.qml"),
+ QUrl::fromUserInput("qrc:/res/waves.svg"));
+ _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pMAVLink));
+ _p->pConsole = new QGCSettings(tr("Console"),
+ QUrl::fromUserInput("qrc:/qml/QGroundControl/Controls/AppMessages.qml"));
+ _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pConsole));
#if defined(QT_DEBUG)
//-- These are always present on Debug builds
- if(pOptions->enabledSettings() & QGCOptions::SETTINGS_MOCKLINK) {
- _p->pMockLink = new QGCSettings(tr("Mock Link"),
- QUrl::fromUserInput("qrc:/qml/MockLink.qml"));
- _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pMockLink));
- }
- if(pOptions->enabledSettings() & QGCOptions::SETTINGS_DEBUG) {
- _p->pDebug = new QGCSettings(tr("Debug"),
- QUrl::fromUserInput("qrc:/qml/DebugWindow.qml"));
- _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pDebug));
- }
+ _p->pMockLink = new QGCSettings(tr("Mock Link"),
+ QUrl::fromUserInput("qrc:/qml/MockLink.qml"));
+ _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pMockLink));
+ _p->pDebug = new QGCSettings(tr("Debug"),
+ QUrl::fromUserInput("qrc:/qml/DebugWindow.qml"));
+ _p->settingsList.append(QVariant::fromValue((QGCSettings*)_p->pDebug));
#endif
}
return _p->settingsList;
diff --git a/src/api/QGCOptions.h b/src/api/QGCOptions.h
index b329472..e1e9135 100644
--- a/src/api/QGCOptions.h
+++ b/src/api/QGCOptions.h
@@ -22,24 +22,10 @@ class QGCOptions : public QObject
public:
QGCOptions(QObject* parent = NULL);
- enum BaseSettings {
- SETTINGS_GENERAL = 1 << 1,
- SETTINGS_COMM_LINKS = 1 << 2,
- SETTINGS_OFFLINE_MAPS = 1 << 3,
- SETTINGS_MAVLINK = 1 << 4,
- SETTINGS_CONSOLE = 1 << 5,
- SETTINGS_MOCKLINK = 1 << 6,
- SETTINGS_DEBUG = 1 << 7,
- };
-
- Q_ENUMS(BaseSettings)
-
Q_PROPERTY(bool combineSettingsAndSetup READ combineSettingsAndSetup CONSTANT)
- Q_PROPERTY(bool mainViewIsMap READ mainViewIsMap CONSTANT)
Q_PROPERTY(bool enableVirtualJoystick READ enableVirtualJoystick CONSTANT)
Q_PROPERTY(bool enableAutoConnectOptions READ enableAutoConnectOptions CONSTANT)
Q_PROPERTY(bool enableVideoSourceOptions READ enableVideoSourceOptions CONSTANT)
- Q_PROPERTY(int enabledSettings READ enabledSettings CONSTANT)
Q_PROPERTY(bool definesVideo READ definesVideo CONSTANT)
Q_PROPERTY(uint16_t videoUDPPort READ videoUDPPort CONSTANT)
Q_PROPERTY(QString videoRSTPUrl READ videoRSTPUrl CONSTANT)
@@ -49,11 +35,6 @@ public:
@return true if QGC should consolidate both menus into one.
*/
virtual bool combineSettingsAndSetup () { return false; }
- //! Should QGC use Maps as its default main view?
- /*!
- @return true if QGC should use Maps by default or false to show Video by default.
- */
- virtual bool mainViewIsMap () { return true; }
//! Should QGC use virtual Joysticks?
/*!
@return false to disable Virtual Joysticks.
@@ -69,11 +50,6 @@ public:
@return false to disable video source options.
*/
virtual bool enableVideoSourceOptions () { return true; }
- //! Which settings are enabled?
- /*!
- @return BaseSettings bitmap of enabled settings
- */
- virtual int enabledSettings () { return SETTINGS_GENERAL | SETTINGS_COMM_LINKS | SETTINGS_MAVLINK | SETTINGS_CONSOLE | SETTINGS_MOCKLINK | SETTINGS_DEBUG; }
//! Does your plugin defines its on video source?
/*!
@return true to define your own video source.