diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 1d4ec4ff3c15e24720c1acd9eb06a2a2528b4212..786860205bddaa69740aa13509d1b2de6b178114 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -39,6 +39,7 @@ src/ui/preferences/GeneralSettings.qml src/AnalyzeView/GeoTagPage.qml src/FlightMap/Widgets/HealthPageWidget.qml + src/ui/preferences/HelpSettings.qml src/VehicleSetup/JoystickConfig.qml src/ui/preferences/LinkSettings.qml src/AnalyzeView/LogDownloadPage.qml diff --git a/src/api/QGCCorePlugin.cc b/src/api/QGCCorePlugin.cc index 9031c90560b174205d3c0d6ff52f9a529a3fef20..690a457d33382947fcfeb35aa2d1f72e1e3a222d 100644 --- a/src/api/QGCCorePlugin.cc +++ b/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"), diff --git a/src/ui/preferences/HelpSettings.qml b/src/ui/preferences/HelpSettings.qml new file mode 100644 index 0000000000000000000000000000000000000000..8cd7297437221874b29b4c9b98207e16f5bcdeba --- /dev/null +++ b/src/ui/preferences/HelpSettings.qml @@ -0,0 +1,59 @@ +/**************************************************************************** + * + * (c) 2009-2016 QGROUNDCONTROL PROJECT + * + * 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: "https://docs.qgroundcontrol.com" + onLinkActivated: Qt.openUrlExternally(link) + } + + QGCLabel { text: qsTr("PX4 Users Discussion Forum") } + QGCLabel { + linkColor: qgcPal.text + text: "http://discuss.px4.io/c/qgroundcontrol" + onLinkActivated: Qt.openUrlExternally(link) + } + + QGCLabel { text: qsTr("ArduPilot Users Discussion Forum") } + QGCLabel { + linkColor: qgcPal.text + text: "https://discuss.ardupilot.org/c/ground-control-software/qgroundcontrol" + onLinkActivated: Qt.openUrlExternally(link) + } + } + } +}