Browse Source

Add QGC version info to bottom of Settings/General

This makes it available on mobile builds
QGC4.4
Don Gagne 8 years ago
parent
commit
b7e930eecf
  1. 4
      src/QmlControls/QGroundControlQmlGlobal.h
  2. 23
      src/ui/MainWindow.cc
  3. 5
      src/ui/preferences/GeneralSettings.qml

4
src/QmlControls/QGroundControlQmlGlobal.h

@ -111,6 +111,8 @@ public:
Q_PROPERTY(QString appSettingsDistanceUnitsString READ appSettingsDistanceUnitsString CONSTANT) Q_PROPERTY(QString appSettingsDistanceUnitsString READ appSettingsDistanceUnitsString CONSTANT)
Q_PROPERTY(QString appSettingsAreaUnitsString READ appSettingsAreaUnitsString CONSTANT) Q_PROPERTY(QString appSettingsAreaUnitsString READ appSettingsAreaUnitsString CONSTANT)
Q_PROPERTY(QString qgcVersion READ qgcVersion CONSTANT)
Q_INVOKABLE void saveGlobalSetting (const QString& key, const QString& value); Q_INVOKABLE void saveGlobalSetting (const QString& key, const QString& value);
Q_INVOKABLE QString loadGlobalSetting (const QString& key, const QString& defaultValue); Q_INVOKABLE QString loadGlobalSetting (const QString& key, const QString& defaultValue);
Q_INVOKABLE void saveBoolGlobalSetting (const QString& key, bool value); Q_INVOKABLE void saveBoolGlobalSetting (const QString& key, bool value);
@ -209,6 +211,8 @@ public:
QString missionFileExtension(void) const { return QGCApplication::missionFileExtension; } QString missionFileExtension(void) const { return QGCApplication::missionFileExtension; }
QString telemetryFileExtension(void) const { return QGCApplication::telemetryFileExtension; } QString telemetryFileExtension(void) const { return QGCApplication::telemetryFileExtension; }
QString qgcVersion(void) const { return qgcApp()->applicationVersion(); }
// Overrides from QGCTool // Overrides from QGCTool
virtual void setToolbox(QGCToolbox* toolbox); virtual void setToolbox(QGCToolbox* toolbox);

23
src/ui/MainWindow.cc

@ -452,28 +452,7 @@ void MainWindow::storeSettings()
void MainWindow::configureWindowName() void MainWindow::configureWindowName()
{ {
QList<QHostAddress> hostAddresses = QNetworkInterface::allAddresses(); setWindowTitle(qApp->applicationName() + " " + qApp->applicationVersion());
QString windowname = qApp->applicationName() + " " + qApp->applicationVersion();
// XXX we do have UDP MAVLink heartbeat broadcast now in SITL and will have it on the
// WIFI radio, so people should not be in need any more of knowing their IP.
// this can go once we are certain its not needed any more.
#if 0
bool prevAddr = false;
windowname.append(" (" + QHostInfo::localHostName() + ": ");
for (int i = 0; i < hostAddresses.size(); i++)
{
// Exclude loopback IPv4 and all IPv6 addresses
if (hostAddresses.at(i) != QHostAddress("127.0.0.1") && !hostAddresses.at(i).toString().contains(":"))
{
if(prevAddr) windowname.append("/");
windowname.append(hostAddresses.at(i).toString());
prevAddr = true;
}
}
windowname.append(")");
#endif
setWindowTitle(windowname);
} }
/** /**

5
src/ui/preferences/GeneralSettings.qml

@ -575,6 +575,11 @@ QGCView {
} }
} }
} }
QGCLabel {
anchors.horizontalCenter: parent.horizontalCenter
text: qsTr("QGroundControl Version: " + QGroundControl.qgcVersion)
}
} // settingsColumn } // settingsColumn
} // QGCFlickable } // QGCFlickable
} // QGCViewPanel } // QGCViewPanel

Loading…
Cancel
Save