Merge pull request #6757 from DonLakeFlyer/Help

Add new Help page under Settings

qgroundcontrol.qrc

@@ -39,6 +39,7 @@
         <file alias="GeneralSettings.qml">src/ui/preferences/GeneralSettings.qml</file>
         <file alias="GeoTagPage.qml">src/AnalyzeView/GeoTagPage.qml</file>
         <file alias="HealthPageWidget.qml">src/FlightMap/Widgets/HealthPageWidget.qml</file>
+        <file alias="HelpSettings.qml">src/ui/preferences/HelpSettings.qml</file>
         <file alias="JoystickConfig.qml">src/VehicleSetup/JoystickConfig.qml</file>
         <file alias="LinkSettings.qml">src/ui/preferences/LinkSettings.qml</file>
         <file alias="LogDownloadPage.qml">src/AnalyzeView/LogDownloadPage.qml</file>

src/api/QGCCorePlugin.cc

@@ -33,6 +33,7 @@ public:
         , pOfflineMaps              (NULL)
         , pMAVLink                  (NULL)
         , pConsole                  (NULL)
+        , pHelp                     (NULL)
     #if defined(QT_DEBUG)
         , pMockLink                 (NULL)
         , pDebug                    (NULL)
@@ -73,6 +74,7 @@ public:
     QmlComponentInfo* pOfflineMaps;
     QmlComponentInfo* pMAVLink;
     QmlComponentInfo* pConsole;
+    QmlComponentInfo* pHelp;
 #if defined(QT_DEBUG)
     QmlComponentInfo* pMockLink;
     QmlComponentInfo* pDebug;
@@ -135,6 +137,9 @@ QVariantList &QGCCorePlugin::settingsPages()
         _p->pConsole = new QmlComponentInfo(tr("Console"),
                                        QUrl::fromUserInput("qrc:/qml/QGroundControl/Controls/AppMessages.qml"));
         _p->settingsList.append(QVariant::fromValue((QmlComponentInfo*)_p->pConsole));
+        _p->pHelp = new QmlComponentInfo(tr("Help"),
+                                       QUrl::fromUserInput("qrc:/qml/HelpSettings.qml"));
+        _p->settingsList.append(QVariant::fromValue((QmlComponentInfo*)_p->pHelp));
 #if defined(QT_DEBUG)
         //-- These are always present on Debug builds
         _p->pMockLink = new QmlComponentInfo(tr("Mock Link"),

src/ui/preferences/HelpSettings.qml

+/****************************************************************************
+ *
+ *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick          2.3
+import QtQuick.Layouts  1.11
+
+import QGroundControl               1.0
+import QGroundControl.Controls      1.0
+import QGroundControl.Palette       1.0
+import QGroundControl.ScreenTools   1.0
+
+Rectangle {
+    color:          qgcPal.window
+    anchors.fill:   parent
+
+    readonly property real _margins: ScreenTools.defaultFontPixelHeight
+
+    QGCPalette { id: qgcPal; colorGroupEnabled: true }
+
+    QGCFlickable {
+        anchors.margins:    _margins
+        anchors.fill:       parent
+        contentWidth:       grid.width
+        contentHeight:      grid.height
+        clip:               true
+
+        GridLayout {
+            id:         grid
+            columns:    2
+
+            QGCLabel { text: qsTr("QGroundControl User Guide") }
+            QGCLabel {
+                linkColor:          qgcPal.text
+                text:               "<a href=\"https://docs.qgroundcontrol.com\">https://docs.qgroundcontrol.com</a>"
+                onLinkActivated:    Qt.openUrlExternally(link)
+            }
+
+            QGCLabel { text: qsTr("PX4 Users Discussion Forum") }
+            QGCLabel {
+                linkColor:          qgcPal.text
+                text:               "<a href=\"http://discuss.px4.io/c/qgroundcontrol\">http://discuss.px4.io/c/qgroundcontrol</a>"
+                onLinkActivated:    Qt.openUrlExternally(link)
+            }
+
+            QGCLabel { text: qsTr("ArduPilot Users Discussion Forum") }
+            QGCLabel {
+                linkColor:          qgcPal.text
+                text:               "<a href=\"https://discuss.ardupilot.org/c/ground-control-software/qgroundcontrol\">https://discuss.ardupilot.org/c/ground-control-software/qgroundcontrol</a>"
+                onLinkActivated:    Qt.openUrlExternally(link)
+            }
+        }
+    }
+}