From 0705ba0b473b64ac0c676327927129e3ea4680d0 Mon Sep 17 00:00:00 2001 From: crueter Date: Fri, 8 Aug 2025 01:56:42 +0200 Subject: [PATCH] [frontend] add revolt links to about (#227) Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/227 Reviewed-by: Lizzie --- .../org/yuzu/yuzu_emu/fragments/AboutFragment.kt | 6 +++++- .../app/src/main/res/drawable/ic_revolt.xml | 15 +++++++++++++++ .../main/res/layout-w600dp/fragment_about.xml | 11 +++++++++++ .../app/src/main/res/layout/fragment_about.xml | 16 ++++++++++++++-- src/android/app/src/main/res/values/strings.xml | 7 ++++--- src/yuzu/main.cpp | 7 ++++++- src/yuzu/main.h | 2 ++ src/yuzu/main.ui | 16 ++++++++++++++++ 8 files changed, 73 insertions(+), 7 deletions(-) create mode 100644 src/android/app/src/main/res/drawable/ic_revolt.xml diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt index 0ec9984607..6f0493cbf8 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later @@ -91,7 +94,8 @@ class AboutFragment : Fragment() { } } - binding.buttonDiscord.setOnClickListener { openLink(getString(R.string.support_link)) } + binding.buttonDiscord.setOnClickListener { openLink(getString(R.string.discord_link)) } + binding.buttonRevolt.setOnClickListener { openLink(getString(R.string.revolt_link)) } binding.buttonWebsite.setOnClickListener { openLink(getString(R.string.website_link)) } binding.buttonGithub.setOnClickListener { openLink(getString(R.string.github_link)) } diff --git a/src/android/app/src/main/res/drawable/ic_revolt.xml b/src/android/app/src/main/res/drawable/ic_revolt.xml new file mode 100644 index 0000000000..cd0295b3d9 --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_revolt.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml index efa27f982e..f6de2f590e 100644 --- a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml +++ b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml @@ -219,6 +219,17 @@ app:iconSize="24dp" app:iconPadding="0dp" /> + + + + User data imported successfully Export cancelled Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again. - https://discord.gg/edenemu - https://eden-emulator.github.io - https://git.eden-emu.dev/eden-emu + https://discord.gg/kXAmGCXBGD + https://rvlt.gg/qKgFEAbH + https://eden-emu.dev + https://git.eden-emu.dev/eden-emu Limit speed diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index a9aeebb7b8..9cf2f9b76c 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1678,6 +1678,7 @@ void GMainWindow::ConnectMenuEvents() { connect_menu(ui->action_Log_Folder, &GMainWindow::OnOpenLogFolder); connect_menu(ui->action_Discord, &GMainWindow::OnOpenDiscord); + connect_menu(ui->action_Revolt, &GMainWindow::OnOpenRevolt); connect_menu(ui->action_Verify_installed_contents, &GMainWindow::OnVerifyInstalledContents); connect_menu(ui->action_Firmware_From_Folder, &GMainWindow::OnInstallFirmware); connect_menu(ui->action_Firmware_From_ZIP, &GMainWindow::OnInstallFirmwareFromZIP); @@ -2002,7 +2003,7 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa tr("Error while loading ROM! %1", "%1 signifies a numeric error code.") .arg(QString::fromStdString(error_code)); const auto description = - tr("%1
Please redump your files or ask on Discord for help.", + tr("%1
Please redump your files or ask on Discord/Revolt for help.", "%1 signifies an error string.") .arg(QString::fromStdString( GetResultStatusString(static_cast(error_id)))); @@ -3659,6 +3660,10 @@ void GMainWindow::OnOpenDiscord() { OpenURL(QUrl(QStringLiteral("https://discord.gg/kXAmGCXBGD"))); } +void GMainWindow::OnOpenRevolt() { + OpenURL(QUrl(QStringLiteral("https://rvlt.gg/qKgFEAbH"))); +} + void GMainWindow::ToggleFullscreen() { if (!emulation_running) { return; diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 9021c26005..e82a9ed335 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -346,6 +346,8 @@ private slots: void OnOpenQuickstartGuide(); void OnOpenFAQ(); void OnOpenDiscord(); + void OnOpenRevolt(); + /// Called whenever a user selects a game in the game list widget. void OnGameListLoadFile(QString game_path, u64 program_id); void OnGameListOpenFolder(u64 program_id, GameListOpenTarget target, diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui index c51aabd0e7..25aaf6ad1c 100644 --- a/src/yuzu/main.ui +++ b/src/yuzu/main.ui @@ -214,6 +214,8 @@ + + @@ -559,6 +561,20 @@ From ZIP + + + &Revolt + + + Revolt + + + + + + + +