From 3e056dfbddb51baffcc4153422d717ea266a192d Mon Sep 17 00:00:00 2001 From: RedBlackAka <140876408+RedBlackAka@users.noreply.github.com> Date: Fri, 13 Mar 2026 12:31:46 +0100 Subject: [PATCH] UI: Replace all archive links with Azahar wiki pages --- .../app/src/main/res/values/strings.xml | 12 +++--- src/citra_qt/citra_qt.cpp | 40 ++++++------------- .../configuration/configure_motion_touch.cpp | 3 +- src/citra_qt/multiplayer/chat_room.cpp | 7 ---- 4 files changed, 19 insertions(+), 43 deletions(-) diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 750677fd5..70966639a 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ Azahar - This software will run applications for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you can begin with emulating, please select a folder to store Azahar\'s user data in.\n\nWhat\'s this:\nWiki - Citra Android user data and storage + This software will run applications for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you can begin with emulating, please select a folder to store Azahar\'s user data in. Azahar Azahar Azahar 3DS emulator notifications @@ -86,7 +86,7 @@ Permission denied Skip selecting applications folder? Software won\'t be displayed in the Applications list if a folder isn\'t selected. - https://web.archive.org/web/20240304210021/https://citra-emu.org/wiki/dumping-game-cartridges/ + https://github.com/azahar-emu/azahar/wiki/Dumping-Games Permissions Data Folders (User folder is required)]]> @@ -95,18 +95,18 @@ Skip Cancel Select User Folder - user data directory with the button below.]]> + You appear to have user directories set for both Lime3DS and Azahar. This is likely because you upgraded to Azahar, and when prompted chose a different user directory than what was being used for Lime3DS.\n\nThis may have resulted in you thinking you lost saves or other settings - we apologize if that happened.\n\nWould you like to go back to using your original Lime3DS user directory, restoring settings and save games from Lime3DS, or keep your current Azahar user directory?\n\nNeither directory will be deleted, regardless of your choice, and you may freely switch between them using the Select User Folder option. Keep Current Azahar Directory Use Prior Lime3DS Directory Select You can\'t skip setting up the user folder This step is required to allow Azahar to work. Please select a directory and then you can continue. - You have lost write permissions on your user data directory, where saves and other information are stored. This can happen after some app or Android updates. Please re-select the directory to regain permissions so you can continue. + You have lost write permissions on your user data directory, where saves and other information are stored. This can happen after some app or Android updates. Please re-select the directory to regain permissions so you can continue. Invalid Selection The user directory selection was invalid.\nPlease re-select the user directory, ensuring that you navigate to it from the root of your device\'s storage. Azahar has lost permission to manage files on this device. This can happen after some app or Android updates. Please re-grant this permission on the next screen to continue using the app. - https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage + https://github.com/azahar-emu/azahar/wiki/Android-User-Data-and-Storage Theme Settings Configure your theme preferences for Azahar. Set Theme @@ -391,7 +391,7 @@ Learn More Close Reset to Default - game cartridges or installed titles.]]> + game titles.]]> Default None Auto diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index f0aba2c31..f9329dd31 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -1293,14 +1293,10 @@ bool GMainWindow::LoadROM(const QString& filename) { LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filename.toStdString()); QMessageBox::critical( this, tr("Invalid App Format"), - tr("Your app format is not supported.
Please follow the guides to redump your " + tr("Your app format is not supported.
Please check the wiki and redump your " "game " - "cartridges or " - "installed " + "href='https://github.com/azahar-emu/azahar/wiki/Dumping-Games" + "dumping-installed-titles/'>game " "titles.")); break; @@ -1308,14 +1304,10 @@ bool GMainWindow::LoadROM(const QString& filename) { LOG_CRITICAL(Frontend, "Failed to load App!"); QMessageBox::critical( this, tr("App Corrupted"), - tr("Your app is corrupted.
Please follow the guides to redump your " + tr("Your app is corrupted.
Please check the wiki and redump your " "game " - "cartridges or " - "installed " + "href='https://github.com/azahar-emu/azahar/wiki/Dumping-Games" + "dumping-installed-titles/'>game " "titles.")); break; @@ -1330,14 +1322,10 @@ bool GMainWindow::LoadROM(const QString& filename) { case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat: QMessageBox::critical( this, tr("Invalid App Format"), - tr("Your app format is not supported.
Please follow the guides to redump your " + tr("Your app format is not supported.
Please check the wiki and redump your " "game " - "cartridges or " - "installed " + "href='https://github.com/azahar-emu/azahar/wiki/Dumping-Games" + "dumping-installed-titles/'>game " "titles.")); break; @@ -3116,8 +3104,7 @@ void GMainWindow::ShowFFmpegErrorMessage() { auto result = message_box.exec(); if (result == QMessageBox::Help) { QDesktopServices::openUrl( - QUrl(QStringLiteral("https://web.archive.org/web/20240301121456/https://" - "citra-emu.org/wiki/installing-ffmpeg-for-the-video-dumper/"))); + QUrl(QStringLiteral("https://github.com/azahar-emu/azahar/wiki/Installing-FFmpeg"))); #ifdef _WIN32 } else if (result == QMessageBox::Open) { OnOpenFFmpeg(); @@ -3776,8 +3763,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det if (result == Core::System::ResultStatus::ErrorSystemFiles) { const QString common_message = tr("%1 is missing. Please dump your " + "href='https://github.com/azahar-emu/azahar/wiki/Dumping-System-Files'>dump your " "system archives.
Continuing emulation may result in crashes and bugs."); if (!details.empty()) { @@ -3803,9 +3789,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det } else { title = tr("Fatal Error"); message = tr("A fatal error occurred. " - "Check " - "the log for details." + "Check the log for details." "
Continuing emulation may result in crashes and bugs."); status_message = tr("Fatal Error encountered"); error_severity_icon = QMessageBox::Icon::Critical; diff --git a/src/citra_qt/configuration/configure_motion_touch.cpp b/src/citra_qt/configuration/configure_motion_touch.cpp index 5b9b79bd7..f400f0f44 100644 --- a/src/citra_qt/configuration/configure_motion_touch.cpp +++ b/src/citra_qt/configuration/configure_motion_touch.cpp @@ -100,8 +100,7 @@ ConfigureMotionTouch::ConfigureMotionTouch(QWidget* parent) ui->udp_learn_more->setOpenExternalLinks(true); ui->udp_learn_more->setText( tr("Learn More")); timeout_timer->setSingleShot(true); diff --git a/src/citra_qt/multiplayer/chat_room.cpp b/src/citra_qt/multiplayer/chat_room.cpp index 5fbdf7281..cb3abc0b5 100644 --- a/src/citra_qt/multiplayer/chat_room.cpp +++ b/src/citra_qt/multiplayer/chat_room.cpp @@ -424,13 +424,6 @@ void ChatRoom::PopupContextMenu(const QPoint& menu_location) { QMenu context_menu; QString username = player_list->item(item.row())->data(PlayerListItem::UsernameRole).toString(); - if (!username.isEmpty()) { - QAction* view_profile_action = context_menu.addAction(tr("View Profile")); - connect(view_profile_action, &QAction::triggered, [username] { - QDesktopServices::openUrl( - QUrl(QStringLiteral("https://community.citra-emu.org/u/%1").arg(username))); - }); - } std::string cur_nickname; if (auto room = Network::GetRoomMember().lock()) {