Browse Source

Fix problems with core plugin virtually

QGC4.4
DonLakeFlyer 8 years ago
parent
commit
f862388b69
  1. 7
      src/api/QGCCorePlugin.h
  2. 12
      src/api/QGCOptions.h

7
src/api/QGCCorePlugin.h

@ -37,8 +37,8 @@ public: @@ -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: @@ -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);

12
src/api/QGCOptions.h

@ -52,12 +52,12 @@ public: @@ -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);

Loading…
Cancel
Save