From b7e930eecf1f5495e50ddb779b92b507936aa3e1 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 20 Oct 2016 12:11:02 -0700
Subject: [PATCH] Add QGC version info to bottom of Settings/General

This makes it available on mobile builds
---
 src/QmlControls/QGroundControlQmlGlobal.h |  4 ++++
 src/ui/MainWindow.cc                      | 23 +----------------------
 src/ui/preferences/GeneralSettings.qml    |  5 +++++
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/QmlControls/QGroundControlQmlGlobal.h b/src/QmlControls/QGroundControlQmlGlobal.h
index 6918021..0065962 100644
--- a/src/QmlControls/QGroundControlQmlGlobal.h
+++ b/src/QmlControls/QGroundControlQmlGlobal.h
@@ -111,6 +111,8 @@ public:
     Q_PROPERTY(QString appSettingsDistanceUnitsString READ appSettingsDistanceUnitsString 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 QString loadGlobalSetting       (const QString& key, const QString& defaultValue);
     Q_INVOKABLE void    saveBoolGlobalSetting   (const QString& key, bool value);
@@ -209,6 +211,8 @@ public:
     QString missionFileExtension(void) const    { return QGCApplication::missionFileExtension; }
     QString telemetryFileExtension(void) const  { return QGCApplication::telemetryFileExtension; }
 
+    QString qgcVersion(void) const { return qgcApp()->applicationVersion(); }
+
     // Overrides from QGCTool
     virtual void setToolbox(QGCToolbox* toolbox);
 
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 4435fed..6cd378e 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -452,28 +452,7 @@ void MainWindow::storeSettings()
 
 void MainWindow::configureWindowName()
 {
-    QList<QHostAddress> hostAddresses = QNetworkInterface::allAddresses();
-    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);
+    setWindowTitle(qApp->applicationName() + " " + qApp->applicationVersion());
 }
 
 /**
diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml
index d3d8530..324c5af 100644
--- a/src/ui/preferences/GeneralSettings.qml
+++ b/src/ui/preferences/GeneralSettings.qml
@@ -575,6 +575,11 @@ QGCView {
                         }
                     }
                 }
+
+                QGCLabel {
+                    anchors.horizontalCenter:   parent.horizontalCenter
+                    text:                       qsTr("QGroundControl Version: " + QGroundControl.qgcVersion)
+                }
             } // settingsColumn
         } // QGCFlickable
     } // QGCViewPanel