From f8222da1da44cafbfb7993184ecbc385f2a90b08 Mon Sep 17 00:00:00 2001 From: Automatic Release Builder Date: Thu, 1 Oct 2020 16:20:21 +0100 Subject: [PATCH] Launcher: add help page Collect some standard information directly in the launcher. Text to be reviewed, this is just a first draft. --- src/GUI/assets/toolbox-help.png | Bin 0 -> 1315 bytes src/GUI/qml/HelpSupport.qml | 84 ++++++++++++++++++++++++++++++++ src/GUI/qml/Launcher.qml | 1 + src/GUI/resources.qrc | 2 + 4 files changed, 87 insertions(+) create mode 100644 src/GUI/assets/toolbox-help.png create mode 100644 src/GUI/qml/HelpSupport.qml diff --git a/src/GUI/assets/toolbox-help.png b/src/GUI/assets/toolbox-help.png new file mode 100644 index 0000000000000000000000000000000000000000..0f7e7a56e5b2297f14473f56358441b975d18493 GIT binary patch literal 1315 zcmV+;1>E|HP)%&?>Z0sPRFGTE$E4i-|^Qf-zbwF(w8R z@RE>VzzaeYV|+G7V$}x{j3z!AAAHg$Lu}-tEdAB$xtjCf(0l6j{sf3U*wlRfscTPftn(=1VsdxCFu!C&q}(?ZjVaZBWb6k zFC_IzIw|Rlwbw~%l60-47D-Db-6kn@U{KO)lHN#?{ zxdaTFa_-H}hLA7YfhTdf)T_W5uWb;h%Zb0t`ktU%Zf1l4`vaVq4V>}}eI-Mu8943f ztj)=hFt(DeDyP_GN^1ffxz{uB8=!g;z0IE9djULat?#zU6dG`8^;yCaz$Lhp{5znt zjNVGmkzD~i^}r}_F4Ionegof;7d)pSPkD}f5QwqM`rnt{o8h(JVb`5S44uM&8Im6L zZtV_)N+X%tJkF8Dc0C*jUWq&|=@$DwEa{ybU|~ zHyFmTtj3?Mab6*dvx%!2%Vfdr?!o67V7}q}l+`$DjWY{bolX3r=fn_jWkI|e!vV`fBp?7B1}VV|Ur?Qq5J4OQB6M^_$Z~4uA>de4fZdl)P-ci?|>`IbkRMPAA^JS)?z8fmI z6X#3zv(s!X+o8l*t#?B~@@NqOo-v%h^P^F&Q(CPU0a^->Ujy7_pVk66t-$YQQ@-jB z?)gOe4@6JxbJ)>{E6M?E2>~eK3di6I$rqxCT?gzl8}?N^q%wdSfnx^L3p7TywH$W? zu-mu?DEhz$_n;>YZ65)3+W^j1kF%eG2QeRbp*PG%a0TVe0$f3!YFnMsiMC}}|MWY;a}lSxzYi}F90 ZzX4dIrC6UxfB^si002ovPDHLkV1fZcWIg}@ literal 0 HcmV?d00001 diff --git a/src/GUI/qml/HelpSupport.qml b/src/GUI/qml/HelpSupport.qml new file mode 100644 index 000000000..b6c89fa6f --- /dev/null +++ b/src/GUI/qml/HelpSupport.qml @@ -0,0 +1,84 @@ +import QtQuick 2.4 +import FlightGear.Launcher 1.0 +import "." + +Item { + id: root + + readonly property string forumLink: "href=\"http://forum.flightgear.org\""; + readonly property string wikiLink: "href=\"http://wiki.flightgear.org\""; + + Flickable + { + id: flick + + contentHeight: contentColumn.childrenRect.height + flickableDirection: Flickable.VerticalFlick + height: parent.height + width: parent.width - (Style.strutSize * 4 + scrollbar.width) + x: Style.strutSize * 2 + y: Style.strutSize + + Column { + id: contentColumn + spacing: Style.strutSize + width: parent.width + + Text { + width: parent.width + font.pixelSize: Style.baseFontPixelSize * 1.5 + color: Style.baseTextColor + wrapMode: Text.WordWrap + + text: qsTr("

FlightGear is open-source software, developed entirely by volunteers. This means " + + "we can't offer the same kind of support as a commercial product, but we have " + + "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 our forums.

\n" + + "

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 " + + "getting the Cessna 172 airborne and flying a standard circuit.

\n" + + "

Another good source of information is the official wiki, which contains " + + "FAQs, tutorials and information on individual aircraft, scenery areas and more." + ).arg(root.forumLink).arg(root.wikiLink) + + onLinkActivated: { + Qt.openUrlExternally(link) + } + } + + Text { + width: parent.width + font.pixelSize: Style.baseFontPixelSize * 1.5 + color: Style.baseTextColor + wrapMode: Text.WordWrap + + readonly property string bugTrackerLink: "href=\"https://sourceforge.net/p/flightgear/codetickets/new/\""; + readonly property string sceneryDBLink: "href=\"https://scenery.flightgear.org\""; + + text: qsTr("

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 our forums are the best way to identify the author(s) and contact them. For bugs in the " + + "program, please check our bug tracker; first by searching for existing bugs, and " + + "then creating a new ticket if necessary.

\n" + + "

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 our scenery database." + + "

" + ).arg(root.forumLink).arg(bugTrackerLink).arg(sceneryDBLink) + + onLinkActivated: { + Qt.openUrlExternally(link) + } + } + } + + } // of flickable + + Scrollbar { + id: scrollbar + anchors.right: parent.right + height: flick.height + flickable: flick + visible: flick.contentHeight > flick.height + } +} diff --git a/src/GUI/qml/Launcher.qml b/src/GUI/qml/Launcher.qml index ce51b4078..748961837 100644 --- a/src/GUI/qml/Launcher.qml +++ b/src/GUI/qml/Launcher.qml @@ -25,6 +25,7 @@ Item { ListElement { title: qsTr("Settings"); pageSource: ""; iconPath: "qrc:///svg/toolbox-settings"; state:"settings" } ListElement { title: qsTr("Add-ons"); pageSource: "qrc:///qml/AddOns.qml"; iconPath: "qrc:///svg/toolbox-addons"; state:"loader" } + ListElement { title: qsTr("Help"); pageSource: "qrc:///qml/HelpSupport.qml"; iconPath: "qrc:///toolbox-help"; state:"loader" } } diff --git a/src/GUI/resources.qrc b/src/GUI/resources.qrc index d05560ad4..107fff5d4 100644 --- a/src/GUI/resources.qrc +++ b/src/GUI/resources.qrc @@ -28,6 +28,7 @@ assets/toolbox-settings.png assets/toolbox-summary.png assets/toolbox-addons.png + assets/toolbox-help.png qml/AircraftList.qml qml/AircraftRating.qml qml/ArrowButton.qml @@ -134,6 +135,7 @@ assets/icons8-christmas-star-filled.png assets/icons8-christmas-star-outline.png qml/FirstRun.qml + qml/HelpSupport.qml assets/preview-close.png