Merge pull request #75 from MarcusLlewellyn/fixes/help-menu

Redo the interface's help menu for Project Athena.
This commit is contained in:
kasenvr 2020-01-13 09:28:04 -05:00 committed by GitHub
commit a3415750a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 22 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View file

@ -25,7 +25,7 @@ Rectangle {
Image {
sourceSize.width: 295
sourceSize.height: 75
source: "../../../images/about-highfidelity.png"
source: "../../../images/about-projectathena.png"
}
Item { height: 30; width: 1 }
Column {
@ -45,7 +45,7 @@ Rectangle {
}
Item { height: 10; width: 1 }
RalewayRegular {
text: "An open-source virtual reality platform."
text: "An open source virtual reality platform."
size: 20
color: "white"
}
@ -56,9 +56,9 @@ Rectangle {
text: "<a href=\"https:/github.com/kasenvr/hifi-community\">Project Athena Github</a>."
size: 20
onLinkActivated: {
HiFiAbout.openUrl("https:/github.com/kasenvr/hifi-community");
HiFiAbout.openUrl("https:/github.com/kasenvr/project-athena");
}
}
Item { height: 40; width: 1 }
Row {
@ -93,21 +93,35 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
}
Row {
spacing: 5
Image {
sourceSize.width: 34
sourceSize.height: 25
source: "../../../images/about-opus.png"
MouseArea {
anchors.fill: parent
onClicked: {
HiFiAbout.openUrl("http://opus-codec.org/");
}
}
}
RalewayRegular {
color: "white"
text: "Built using the Opus codec."
size: 12
anchors.verticalCenter: parent.verticalCenter
}
}
Item { height: 20; width: 1 }
RalewayRegular {
textFormat: Text.StyledText
linkColor: "#00B4EF"
color: "white"
property string link: "https://eos.io/"
text: "Blockchain technology from <a href=\"" + link + "\">EOS</a>."
text: "© 2019 - 2020 Project Athena Contributors."
size: 14
onLinkActivated: {
HiFiAbout.openUrl(link);
}
}
RalewayRegular {
color: "white"
text: "© 2012 - 2019 High Fidelity, Inc.. All rights reserved."
text: "© 2012 - 2019 High Fidelity, Inc. All rights reserved."
size: 14
}
RalewayRegular {

View file

@ -768,30 +768,30 @@ Menu::Menu() {
// Help/Application menu ----------------------------------
MenuWrapper * helpMenu = addMenu("Help");
// Help > About High Fidelity
action = addActionToQMenuAndActionHash(helpMenu, "About High Fidelity");
// Help > About Project Athena
action = addActionToQMenuAndActionHash(helpMenu, "About Project Athena");
connect(action, &QAction::triggered, [] {
qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"),
QString("hifi/dialogs/TabletAboutDialog.qml"), "AboutDialog");
});
helpMenu->addSeparator();
// Help > HiFi Docs
// Help > Athena Docs
action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://docs.highfidelity.com/"));
QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/"));
});
// Help > HiFi Forum
action = addActionToQMenuAndActionHash(helpMenu, "Online Forums");
// Help > Athena Forum
/* action = addActionToQMenuAndActionHash(helpMenu, "Online Forums");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://forums.highfidelity.com/"));
});
}); */
// Help > Scripting Reference
action = addActionToQMenuAndActionHash(helpMenu, "Online Script Reference");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://docs.highfidelity.com/api-reference"));
QDesktopServices::openUrl(QUrl("https://apidocs.projectathena.dev/"));
});
addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp()));
@ -801,13 +801,13 @@ Menu::Menu() {
// Help > Release Notes
action = addActionToQMenuAndActionHash(helpMenu, "Release Notes");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://docs.highfidelity.com/release-notes.html"));
QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/release-notes.html"));
});
// Help > Report a Bug!
action = addActionToQMenuAndActionHash(helpMenu, "Report a Bug!");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://github.com/kasenvr/hifi-community/issues"));
QDesktopServices::openUrl(QUrl("https://github.com/kasenvr/project-athena/issues"));
});
}