Skip to content

Q
qgroundcontrol
Commit 48a18758 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #4939 from jaxxzer/sub-updates 

Sub updates
parents 1edf5b83 d81d1c50
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
View file @ 48a18758
......@@ -113,8 +113,6 @@ const QVariantList& ArduSubFirmwarePlugin::toolBarIndicators(const Vehicle* vehi
//-- Sub specific list of indicators (Enter your modified list here)
if(_toolBarIndicators.size() == 0) {
_toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")));
_toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/TelemetryRSSIIndicator.qml")));
_toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RCRSSIIndicator.qml")));
_toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/BatteryIndicator.qml")));
_toolBarIndicators.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/ModeIndicator.qml")));
}
......
src/FlightDisplay/FlightDisplayView.qml
View file @ 48a18758
......@@ -342,6 +342,7 @@ QGCView {
}
ToolStrip {
visible: _activeVehicle ? _activeVehicle.guidedModeSupported : false
id: toolStrip
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.left: _panel.left
......
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