summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-07-01 01:03:47 +0200
committerGitHub <noreply@github.com>2020-07-01 01:03:47 +0200
commitf1b1238e2df7b4b845f19d83262e89f10f0dcb38 (patch)
treee6c13f2ce1512571857868a9265bc62b57f7be56
parentMerge pull request #4176 from ReinUsesLisp/compatible-formats (diff)
parentUpdate FAQ function name (2/2) (diff)
downloadyuzu-f1b1238e2df7b4b845f19d83262e89f10f0dcb38.tar
yuzu-f1b1238e2df7b4b845f19d83262e89f10f0dcb38.tar.gz
yuzu-f1b1238e2df7b4b845f19d83262e89f10f0dcb38.tar.bz2
yuzu-f1b1238e2df7b4b845f19d83262e89f10f0dcb38.tar.lz
yuzu-f1b1238e2df7b4b845f19d83262e89f10f0dcb38.tar.xz
yuzu-f1b1238e2df7b4b845f19d83262e89f10f0dcb38.tar.zst
yuzu-f1b1238e2df7b4b845f19d83262e89f10f0dcb38.zip
-rw-r--r--src/yuzu/main.cpp23
-rw-r--r--src/yuzu/main.h3
-rw-r--r--src/yuzu/main.ui12
3 files changed, 33 insertions, 5 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 880a6a06e..f65cc20b4 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -868,6 +868,9 @@ void GMainWindow::ConnectMenuEvents() {
connect(ui.action_Report_Compatibility, &QAction::triggered, this,
&GMainWindow::OnMenuReportCompatibility);
connect(ui.action_Open_Mods_Page, &QAction::triggered, this, &GMainWindow::OnOpenModsPage);
+ connect(ui.action_Open_Quickstart_Guide, &QAction::triggered, this,
+ &GMainWindow::OnOpenQuickstartGuide);
+ connect(ui.action_Open_FAQ, &QAction::triggered, this, &GMainWindow::OnOpenFAQ);
connect(ui.action_Restart, &QAction::triggered, this, [this] { BootGame(QString(game_path)); });
connect(ui.action_Configure, &QAction::triggered, this, &GMainWindow::OnConfigure);
@@ -1839,16 +1842,26 @@ void GMainWindow::OnMenuReportCompatibility() {
}
}
-void GMainWindow::OnOpenModsPage() {
- const auto mods_page_url = QStringLiteral("https://github.com/yuzu-emu/yuzu/wiki/Switch-Mods");
- const QUrl mods_page(mods_page_url);
- const bool open = QDesktopServices::openUrl(mods_page);
+void GMainWindow::OpenURL(const QUrl& url) {
+ const bool open = QDesktopServices::openUrl(url);
if (!open) {
QMessageBox::warning(this, tr("Error opening URL"),
- tr("Unable to open the URL \"%1\".").arg(mods_page_url));
+ tr("Unable to open the URL \"%1\".").arg(url.toString()));
}
}
+void GMainWindow::OnOpenModsPage() {
+ OpenURL(QUrl(QStringLiteral("https://github.com/yuzu-emu/yuzu/wiki/Switch-Mods")));
+}
+
+void GMainWindow::OnOpenQuickstartGuide() {
+ OpenURL(QUrl(QStringLiteral("https://yuzu-emu.org/help/quickstart/")));
+}
+
+void GMainWindow::OnOpenFAQ() {
+ OpenURL(QUrl(QStringLiteral("https://yuzu-emu.org/wiki/faq/")));
+}
+
void GMainWindow::ToggleFullscreen() {
if (!emulation_running) {
return;
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 5581874ed..a48d6436b 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -182,6 +182,8 @@ private slots:
void OnStopGame();
void OnMenuReportCompatibility();
void OnOpenModsPage();
+ void OnOpenQuickstartGuide();
+ void OnOpenFAQ();
/// Called whenever a user selects a game in the game list widget.
void OnGameListLoadFile(QString game_path);
void OnGameListOpenFolder(GameListOpenTarget target, const std::string& game_path);
@@ -220,6 +222,7 @@ private:
void UpdateStatusBar();
void HideMouseCursor();
void ShowMouseCursor();
+ void OpenURL(const QUrl& url);
Ui::MainWindow ui;
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index b5745dfd5..bee6e107e 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -114,6 +114,8 @@
</property>
<addaction name="action_Report_Compatibility"/>
<addaction name="action_Open_Mods_Page"/>
+ <addaction name="action_Open_Quickstart_Guide"/>
+ <addaction name="action_Open_FAQ"/>
<addaction name="separator"/>
<addaction name="action_About"/>
</widget>
@@ -262,6 +264,16 @@
<string>Open Mods Page</string>
</property>
</action>
+ <action name="action_Open_Quickstart_Guide">
+ <property name="text">
+ <string>Open Quickstart Guide</string>
+ </property>
+ </action>
+ <action name="action_Open_FAQ">
+ <property name="text">
+ <string>FAQ</string>
+ </property>
+ </action>
<action name="action_Open_yuzu_Folder">
<property name="text">
<string>Open yuzu Folder</string>