Launcher: first-run & help updates

Adjust the wording and links for these pages, after a review session
with Stuart and others. Include a link to the manual and short-ref
from the local installation.

src/GUI/LauncherController.cxx

@@ -880,3 +880,12 @@ QUrl LauncherController::flyIconUrl() const
 
     return QUrl{"qrc:///svg/toolbox-fly"};
 }
+
+QUrl LauncherController::urlToDataPath(QString relPath) const
+{
+    QString absFilePath = QString::fromStdString(globals->get_fg_root().utf8Str());
+    if (!relPath.startsWith("/")) {
+        relPath.prepend("/");
+    }
+    return QUrl::fromLocalFile(absFilePath + relPath);
+}

src/GUI/LauncherController.hxx

@@ -153,6 +153,13 @@ public:
     Q_INVOKABLE QVariant loadUISetting(QString name, QVariant defaultValue) const;
     Q_INVOKABLE void saveUISetting(QString name, QVariant value) const;
 
+    /**
+     * @brief urlToDataPath - convetr  a FGData path into a gloabl file:/// URL suitable for Qt.openExternally()
+     * @param relPath - the path rlative to FG_ROOT
+     * @return a file QUrl
+     */
+    Q_INVOKABLE QUrl urlToDataPath(QString relPath) const;
+
     LaunchConfig* config() const
     { return m_config; }
 

src/GUI/qml/FirstRun.qml

@@ -93,10 +93,10 @@ Item {
 
                 readonly property string forumLink: "href=\"http://forum.flightgear.org\"";
 
-                text: qsTr("Welcome to FlightGear, the open-source flight simulator. " +
+                text: qsTr("Welcome to FlightGear, the open source flight simulator. " +
-                           "Everything in this software is the work of volunteers; we hope " +
+                           "This software is the work of volunteers. we hope you enjoy it. " +
-                           "you enjoy it. If you find problems, or would like to contribute, " +
+                           "If you find problems, or would like to contribute, " +
-                           "please <a %1>visit our user forum</a>.").arg(forumLink)
+                           "please <a %1>visit our forum</a>.").arg(forumLink)
 
                 onLinkActivated: {
                     Qt.openUrlExternally(link)

src/GUI/qml/HelpSupport.qml

@@ -6,7 +6,9 @@ Item {
     id: root
 
     readonly property string forumLink: "href=\"http://forum.flightgear.org\"";
-    readonly property string wikiLink: "href=\"http://wiki.flightgear.org\"";
+    readonly property string forumHelpLink: "href=\"https://forum.flightgear.org/viewforum.php?f=17\"";
+
+    readonly property string wikiLink: "href=\"http://wiki.flightgear.org/Portal:User\"";
 
     Flickable
     {
@@ -30,16 +32,21 @@ Item {
                 color: Style.baseTextColor
                 wrapMode: Text.WordWrap
 
-                text: qsTr("<p>FlightGear is open-source software, developed entirely by volunteers. This means " +
+                readonly property var pdfManualLink: "href=\"" + _launcher.urlToDataPath("Docs/getstart.pdf") + "\""
-                           "we can't offer the same kind of support as a commercial product, but we have " +
+                readonly property var shortRefLink: "href=\"" +  _launcher.urlToDataPath("Docs/FGShortRef.html") +  "\""
-                           "an excellent user community, many of whom are willing to help out " +
+
-                           "other users. The easiest place to ask questions and get support is at <a %1>our forums</a>.</p>\n" +
+                text: qsTr("<p>FlightGear is open source software, developed entirely by volunteers. " +
+                           "Support is provided by our excellent user community. " +
+                           "The easiest place to ask questions and get support is on <a %1>our forums</a>.</p>\n" +
                            "<p>To get started with the simulator, please use our tutorial system: " +
-                           "this is available from the 'Help' menu in the simulator, and teaches the basics of " +
+                           "this is available from the 'Help' menu in the simulator. We recommend " +
-                           "getting the Cessna 172 airborne and flying a standard circuit.</p>\n" +
+                           "starting with the Cessna 172 to learn how to get airborne.</p>\n" +
-                           "<p>Another good source of information is <a %2>the official wiki</a>, which contains " +
+                           "<p>Other good resources:<ul>" +
-                           "FAQs, tutorials and information on individual aircraft, scenery areas and more."
+                           "<li><a %2>the official manual (PDF)</a></li>\n" +
-                           ).arg(root.forumLink).arg(root.wikiLink)
+                           "<li><a %3>key commands reference</a></li>\n" +
+                           "<li><a %4>our wiki</a> (which includes FAQs)</li>\n" +
+                           "</ul></p>"
+                           ).arg(root.forumLink).arg(pdfManualLink).arg(shortRefLink).arg(root.wikiLink)
 
                 onLinkActivated: {
                     Qt.openUrlExternally(link)
@@ -52,24 +59,27 @@ Item {
                 color: Style.baseTextColor
                 wrapMode: Text.WordWrap
 
-                readonly property string bugTrackerLink: "href=\"https://sourceforge.net/p/flightgear/codetickets/new/\"";
+                text: qsTr("<p>If you find an issue, please use <a %1>our help forum</a>.</p>\n").arg(root.forumHelpLink);
-                readonly property string sceneryDBLink: "href=\"https://scenery.flightgear.org\"";
-
-                text: qsTr("<p>If you've found a bug, please consider if it's in a particular aircraft, " +
-                           "the scenery, or in the main program. Aircraft are developed by many different people, " +
-                           "so <a %1>our forums</a> are the best way to identify the author(s) and contact them. For bugs in the " +
-                           "program, please check our <a %2>bug tracker</a>; first by searching for existing bugs, and " +
-                           "then creating a new ticket if necessary.</p>\n" +
-                           "<p>Due to the automated way we generate our world scenery, it's usually not possible " +
-                           "to fix individual data issues, such as missing roads or misplaced coastlines. For 3D models " +
-                           "placed in the scenery, you can submit improvements to <a %3>our scenery database.</a>" +
-                           "</p>"
-                            ).arg(root.forumLink).arg(bugTrackerLink).arg(sceneryDBLink)
 
                 onLinkActivated: {
                     Qt.openUrlExternally(link)
                 }
             }
+
+            Text {
+                width: parent.width
+                font.pixelSize: Style.baseFontPixelSize * 1.5
+                color: Style.baseTextColor
+                wrapMode: Text.WordWrap
+
+                text: qsTr("<p>FlightGear is the result of twenty-five years of work " +
+                           "by hundreds of contributors around the world. We'd be " +
+                           "delighted if you would join us.</p>\n")
+
+//                onLinkActivated: {
+//                    Qt.openUrlExternally(link)
+//                }
+            }
         }
 
     } // of flickable