diff --git a/src/api/QGCCorePlugin.h b/src/api/QGCCorePlugin.h index 2786978e3a6ba46b58eb21a9b9ed7fdcfa93a11e..d932e04b62d439ffb79777b6c4a3e2b473b599cf 100644 --- a/src/api/QGCCorePlugin.h +++ b/src/api/QGCCorePlugin.h @@ -37,8 +37,8 @@ public: Q_PROPERTY(int defaultSettings READ defaultSettings CONSTANT) Q_PROPERTY(QGCOptions* options READ options CONSTANT) - Q_PROPERTY(bool showTouchAreas MEMBER _showTouchAreas NOTIFY showTouchAreasChanged) - Q_PROPERTY(bool showAdvancedUI MEMBER _showAdvancedUI NOTIFY showAdvancedUIChanged) + Q_PROPERTY(bool showTouchAreas READ showTouchAreas NOTIFY showTouchAreasChanged) + Q_PROPERTY(bool showAdvancedUI READ showAdvancedUI NOTIFY showAdvancedUIChanged) Q_PROPERTY(QString brandImageIndoor READ brandImageIndoor CONSTANT) Q_PROPERTY(QString brandImageOutdoor READ brandImageIndoor CONSTANT) @@ -71,6 +71,9 @@ public: /// Return the resource file which contains the brand image for for Outdoor theme. virtual QString brandImageOutdoor(void) const { return QString(); } + bool showTouchAreas(void) { return _showTouchAreas; } + bool showAdvancedUI(void) { return _showAdvancedUI; } + // Override from QGCTool void setToolbox (QGCToolbox *toolbox); diff --git a/src/api/QGCOptions.h b/src/api/QGCOptions.h index 9c5b54600bdbb604e553de3a2265d40f22320321..1a41a0ee59a7c01a5373d18ea0d2728db6194f5f 100644 --- a/src/api/QGCOptions.h +++ b/src/api/QGCOptions.h @@ -52,12 +52,12 @@ public: virtual CustomInstrumentWidget* instrumentWidget(); /// By returning false you can hide the following sensor calibration pages - bool showSensorCalibrationCompass () const { return true; } - bool showSensorCalibrationGyro () const { return true; } - bool showSensorCalibrationAccel () const { return true; } - bool showSensorCalibrationLevel () const { return true; } - bool showSensorCalibrationAirspeed () const { return true; } - bool showSensorCalibrationOrient () const { return true; } + virtual bool showSensorCalibrationCompass () const { return true; } + virtual bool showSensorCalibrationGyro () const { return true; } + virtual bool showSensorCalibrationAccel () const { return true; } + virtual bool showSensorCalibrationLevel () const { return true; } + virtual bool showSensorCalibrationAirspeed () const { return true; } + virtual bool showSensorCalibrationOrient () const { return true; } signals: void showSensorCalibrationCompassChanged (bool show);