Skip to content

Q
qgroundcontrol
Commit eae5dc8f authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merge pull request #1502 from dogmaphobic/fixGPS 

Fix GPS icon when no GPS is present.
parents c3c6d326 ea38075b
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
src/ui/toolbar/MainToolBar.h
View file @ eae5dc8f
...@@ -88,7 +88,7 @@ public: ...@@ -88,7 +88,7 @@ public:
Q_PROPERTY(int newMessageCount MEMBER _currentMessageCount NOTIFY newMessageCountChanged) Q_PROPERTY(int newMessageCount MEMBER _currentMessageCount NOTIFY newMessageCountChanged)
Q_PROPERTY(int messageCount MEMBER _messageCount NOTIFY messageCountChanged) Q_PROPERTY(int messageCount MEMBER _messageCount NOTIFY messageCountChanged)
Q_PROPERTY(QString systemPixmap MEMBER _systemPixmap NOTIFY systemPixmapChanged) Q_PROPERTY(QString systemPixmap MEMBER _systemPixmap NOTIFY systemPixmapChanged)
Q_PROPERTY(int satelliteCount MEMBER _satelliteCount NOTIFY satelliteCountChanged) Q_PROPERTY(int satelliteCount READ satelliteCount NOTIFY satelliteCountChanged)
Q_PROPERTY(QStringList connectedList MEMBER _connectedList NOTIFY connectedListChanged) Q_PROPERTY(QStringList connectedList MEMBER _connectedList NOTIFY connectedListChanged)
Q_PROPERTY(bool mavPresent READ mavPresent NOTIFY mavPresentChanged) Q_PROPERTY(bool mavPresent READ mavPresent NOTIFY mavPresentChanged)
Q_PROPERTY(QString currentState MEMBER _currentState NOTIFY currentStateChanged) Q_PROPERTY(QString currentState MEMBER _currentState NOTIFY currentStateChanged)
...@@ -104,6 +104,7 @@ public: ...@@ -104,6 +104,7 @@ public:
Q_PROPERTY(int telemetryLRSSI READ telemetryLRSSI NOTIFY telemetryLRSSIChanged) Q_PROPERTY(int telemetryLRSSI READ telemetryLRSSI NOTIFY telemetryLRSSIChanged)
bool mavPresent () { return _mav != NULL; } bool mavPresent () { return _mav != NULL; }
int satelliteCount () { return _satelliteCount; }
int remoteRSSI () { return _remoteRSSI; } int remoteRSSI () { return _remoteRSSI; }
int telemetryRRSSI () { return _telemetryRRSSI; } int telemetryRRSSI () { return _telemetryRRSSI; }
int telemetryLRSSI () { return _telemetryLRSSI; } int telemetryLRSSI () { return _telemetryLRSSI; }
......
src/ui/toolbar/MainToolBar.qml
View file @ eae5dc8f
...@@ -315,7 +315,7 @@ Rectangle { ...@@ -315,7 +315,7 @@ Rectangle {
Rectangle { Rectangle {
id: satelitte id: satelitte
width: getProportionalDimmension(50) width: getProportionalDimmension(55)
height: cellHeight height: cellHeight
visible: showMavStatus() && (mainToolBar.showGPS) visible: showMavStatus() && (mainToolBar.showGPS)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
...@@ -336,8 +336,8 @@ Rectangle { ...@@ -336,8 +336,8 @@ Rectangle {
QGCLabel { QGCLabel {
id: satelitteText id: satelitteText
text: mainToolBar.satelliteCount text: mainToolBar.satelliteCount >= 0 ? mainToolBar.satelliteCount : 'NA'
font.pointSize: __screenTools.fontPointFactor * (14); font.pointSize: mainToolBar.satelliteCount >= 0 ? __screenTools.fontPointFactor * (14) : __screenTools.fontPointFactor * (10)
font.weight: Font.DemiBold font.weight: Font.DemiBold
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
......
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