diff options
Diffstat (limited to 'src/citron')
158 files changed, 719 insertions, 719 deletions
diff --git a/src/citron/CMakeLists.txt b/src/citron/CMakeLists.txt index 0259a8c29..38f756ff1 100644 --- a/src/citron/CMakeLists.txt +++ b/src/citron/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2018 yuzu Emulator Project +# SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2025 citron Homebrew Project # SPDX-License-Identifier: GPL-2.0-or-later set(CMAKE_AUTOMOC ON) @@ -7,12 +7,12 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) # Set the RPATH for Qt Libraries -# This must be done before the `yuzu` target is created -if (YUZU_USE_BUNDLED_QT AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) +# This must be done before the `citron` target is created +if (CITRON_USE_BUNDLED_QT AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/bin/lib/") endif() -add_executable(yuzu +add_executable(citron Info.plist about_dialog.cpp about_dialog.h @@ -229,22 +229,22 @@ add_executable(yuzu vk_device_info.h compatdb.cpp compatdb.h - yuzu.qrc - yuzu.rc + citron.qrc + citron.rc ) -if (YUZU_CRASH_DUMPS) - target_sources(yuzu PRIVATE +if (CITRON_CRASH_DUMPS) + target_sources(citron PRIVATE breakpad.cpp breakpad.h ) - target_link_libraries(yuzu PRIVATE libbreakpad_client) - target_compile_definitions(yuzu PRIVATE YUZU_CRASH_DUMPS) + target_link_libraries(citron PRIVATE libbreakpad_client) + target_compile_definitions(citron PRIVATE CITRON_CRASH_DUMPS) endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - target_compile_definitions(yuzu PRIVATE + target_compile_definitions(citron PRIVATE $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE> ) endif() @@ -256,24 +256,24 @@ file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*) file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*) if (ENABLE_QT_TRANSLATION) - set(YUZU_QT_LANGUAGES "${PROJECT_SOURCE_DIR}/dist/languages" CACHE PATH "Path to the translation bundle for the Qt frontend") + set(CITRON_QT_LANGUAGES "${PROJECT_SOURCE_DIR}/dist/languages" CACHE PATH "Path to the translation bundle for the Qt frontend") option(GENERATE_QT_TRANSLATION "Generate en.ts as the translation source file" OFF) option(WORKAROUND_BROKEN_LUPDATE "Run lupdate directly through CMake if Qt's convenience wrappers don't work" OFF) # Update source TS file if enabled if (GENERATE_QT_TRANSLATION) - get_target_property(SRCS yuzu SOURCES) + get_target_property(SRCS citron SOURCES) # these calls to qt_create_translation also creates a rule to generate en.qm which conflicts with providing english plurals # so we have to set a OUTPUT_LOCATION so that we don't have multiple rules to generate en.qm - set_source_files_properties(${YUZU_QT_LANGUAGES}/en.ts PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/translations") + set_source_files_properties(${CITRON_QT_LANGUAGES}/en.ts PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/translations") if (WORKAROUND_BROKEN_LUPDATE) - add_custom_command(OUTPUT ${YUZU_QT_LANGUAGES}/en.ts + add_custom_command(OUTPUT ${CITRON_QT_LANGUAGES}/en.ts COMMAND lupdate -source-language en_US -target-language en_US ${SRCS} ${UIS} - -ts ${YUZU_QT_LANGUAGES}/en.ts + -ts ${CITRON_QT_LANGUAGES}/en.ts DEPENDS ${SRCS} ${UIS} @@ -284,7 +284,7 @@ if (ENABLE_QT_TRANSLATION) qt_create_translation(QM_FILES ${SRCS} ${UIS} - ${YUZU_QT_LANGUAGES}/en.ts + ${CITRON_QT_LANGUAGES}/en.ts OPTIONS -source-language en_US -target-language en_US @@ -312,12 +312,12 @@ if (ENABLE_QT_TRANSLATION) qt_create_translation(QM_FILES ${SRCS} ${UIS} ${GENERATED_PLURALS_FILE} OPTIONS -pluralonly -source-language en_US -target-language en_US) endif() - add_custom_target(translation ALL DEPENDS ${YUZU_QT_LANGUAGES}/en.ts ${GENERATED_PLURALS_FILE}) + add_custom_target(translation ALL DEPENDS ${CITRON_QT_LANGUAGES}/en.ts ${GENERATED_PLURALS_FILE}) endif() # Find all TS files except en.ts - file(GLOB_RECURSE LANGUAGES_TS ${YUZU_QT_LANGUAGES}/*.ts) - list(REMOVE_ITEM LANGUAGES_TS ${YUZU_QT_LANGUAGES}/en.ts) + file(GLOB_RECURSE LANGUAGES_TS ${CITRON_QT_LANGUAGES}/*.ts) + list(REMOVE_ITEM LANGUAGES_TS ${CITRON_QT_LANGUAGES}/en.ts) # Compile TS files to QM files qt_add_translation(LANGUAGES_QM ${LANGUAGES_TS}) @@ -340,7 +340,7 @@ else() set(LANGUAGES) endif() -target_sources(yuzu +target_sources(citron PRIVATE ${COMPAT_LIST} ${ICONS} @@ -349,11 +349,11 @@ target_sources(yuzu ) if (APPLE) - set(MACOSX_ICON "../../dist/yuzu.icns") + set(MACOSX_ICON "../../dist/citron.icns") set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - target_sources(yuzu PRIVATE ${MACOSX_ICON}) - set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE) - set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) + target_sources(citron PRIVATE ${MACOSX_ICON}) + set_target_properties(citron PROPERTIES MACOSX_BUNDLE TRUE) + set_target_properties(citron PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) if (NOT USE_SYSTEM_MOLTENVK) set(MOLTENVK_PLATFORM "macOS") @@ -364,36 +364,36 @@ if (APPLE) message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.") set_source_files_properties(${MOLTENVK_LIBRARY} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks XCODE_FILE_ATTRIBUTES "CodeSignOnCopy") - target_sources(yuzu PRIVATE ${MOLTENVK_LIBRARY}) + target_sources(citron PRIVATE ${MOLTENVK_LIBRARY}) elseif(WIN32) # compile as a win32 gui application instead of a console application if (QT_VERSION VERSION_GREATER_EQUAL 6) - target_link_libraries(yuzu PRIVATE Qt6::EntryPointPrivate) + target_link_libraries(citron PRIVATE Qt6::EntryPointPrivate) else() - target_link_libraries(yuzu PRIVATE Qt5::WinMain) + target_link_libraries(citron PRIVATE Qt5::WinMain) endif() if(MSVC) - target_link_libraries(yuzu PRIVATE version.lib) - set_target_properties(yuzu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS") + target_link_libraries(citron PRIVATE version.lib) + set_target_properties(citron PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS") elseif(MINGW) - set_target_properties(yuzu PROPERTIES LINK_FLAGS_RELEASE "-Wl,--subsystem,windows") + set_target_properties(citron PROPERTIES LINK_FLAGS_RELEASE "-Wl,--subsystem,windows") endif() endif() -target_link_libraries(yuzu PRIVATE common core input_common frontend_common network video_core) -target_link_libraries(yuzu PRIVATE Boost::headers glad Qt${QT_MAJOR_VERSION}::Widgets) -target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) +target_link_libraries(citron PRIVATE common core input_common frontend_common network video_core) +target_link_libraries(citron PRIVATE Boost::headers glad Qt${QT_MAJOR_VERSION}::Widgets) +target_link_libraries(citron PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) -target_link_libraries(yuzu PRIVATE Vulkan::Headers) +target_link_libraries(citron PRIVATE Vulkan::Headers) if (NOT WIN32) - target_include_directories(yuzu PRIVATE ${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS}) + target_include_directories(citron PRIVATE ${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS}) endif() if (UNIX AND NOT APPLE) - target_link_libraries(yuzu PRIVATE Qt${QT_MAJOR_VERSION}::DBus) + target_link_libraries(citron PRIVATE Qt${QT_MAJOR_VERSION}::DBus) endif() -target_compile_definitions(yuzu PRIVATE +target_compile_definitions(citron PRIVATE # Use QStringBuilder for string concatenation to reduce # the overall number of temporary strings created. -DQT_USE_QSTRINGBUILDER @@ -412,69 +412,69 @@ target_compile_definitions(yuzu PRIVATE -DQT_NO_URL_CAST_FROM_STRING ) -if (YUZU_ENABLE_COMPATIBILITY_REPORTING) - target_compile_definitions(yuzu PRIVATE -DYUZU_ENABLE_COMPATIBILITY_REPORTING) +if (CITRON_ENABLE_COMPATIBILITY_REPORTING) + target_compile_definitions(citron PRIVATE -DCITRON_ENABLE_COMPATIBILITY_REPORTING) endif() if (USE_DISCORD_PRESENCE) - target_sources(yuzu PUBLIC + target_sources(citron PUBLIC discord_impl.cpp discord_impl.h ) - target_link_libraries(yuzu PRIVATE DiscordRPC::discord-rpc httplib::httplib Qt${QT_MAJOR_VERSION}::Network) - target_compile_definitions(yuzu PRIVATE -DUSE_DISCORD_PRESENCE) + target_link_libraries(citron PRIVATE DiscordRPC::discord-rpc httplib::httplib Qt${QT_MAJOR_VERSION}::Network) + target_compile_definitions(citron PRIVATE -DUSE_DISCORD_PRESENCE) endif() if (ENABLE_WEB_SERVICE) - target_compile_definitions(yuzu PRIVATE -DENABLE_WEB_SERVICE) + target_compile_definitions(citron PRIVATE -DENABLE_WEB_SERVICE) endif() -if (YUZU_USE_QT_MULTIMEDIA) - target_link_libraries(yuzu PRIVATE Qt${QT_MAJOR_VERSION}::Multimedia) - target_compile_definitions(yuzu PRIVATE -DYUZU_USE_QT_MULTIMEDIA) +if (CITRON_USE_QT_MULTIMEDIA) + target_link_libraries(citron PRIVATE Qt${QT_MAJOR_VERSION}::Multimedia) + target_compile_definitions(citron PRIVATE -DCITRON_USE_QT_MULTIMEDIA) endif () -if (YUZU_USE_QT_WEB_ENGINE) - target_link_libraries(yuzu PRIVATE Qt${QT_MAJOR_VERSION}::WebEngineCore Qt${QT_MAJOR_VERSION}::WebEngineWidgets) - target_compile_definitions(yuzu PRIVATE -DYUZU_USE_QT_WEB_ENGINE) +if (CITRON_USE_QT_WEB_ENGINE) + target_link_libraries(citron PRIVATE Qt${QT_MAJOR_VERSION}::WebEngineCore Qt${QT_MAJOR_VERSION}::WebEngineWidgets) + target_compile_definitions(citron PRIVATE -DCITRON_USE_QT_WEB_ENGINE) endif () if(UNIX AND NOT APPLE) - install(TARGETS yuzu) + install(TARGETS citron) endif() if (WIN32 AND QT_VERSION VERSION_GREATER_EQUAL 6) - set(YUZU_EXE_DIR "$<TARGET_FILE_DIR:yuzu>") - add_custom_command(TARGET yuzu POST_BUILD COMMAND ${WINDEPLOYQT_EXECUTABLE} "${YUZU_EXE_DIR}/yuzu.exe" --dir "${YUZU_EXE_DIR}" --libdir "${YUZU_EXE_DIR}" --plugindir "${YUZU_EXE_DIR}/plugins" --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --no-translations --verbose 0) + set(CITRON_EXE_DIR "$<TARGET_FILE_DIR:citron>") + add_custom_command(TARGET citron POST_BUILD COMMAND ${WINDEPLOYQT_EXECUTABLE} "${CITRON_EXE_DIR}/citron.exe" --dir "${CITRON_EXE_DIR}" --libdir "${CITRON_EXE_DIR}" --plugindir "${CITRON_EXE_DIR}/plugins" --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --no-translations --verbose 0) endif() -if (YUZU_USE_BUNDLED_QT AND QT_VERSION VERSION_LESS 6) - include(CopyYuzuQt5Deps) - copy_yuzu_Qt5_deps(yuzu) +if (CITRON_USE_BUNDLED_QT AND QT_VERSION VERSION_LESS 6) + include(CopyCitronQt5Deps) + copy_citron_Qt5_deps(citron) endif() if (ENABLE_SDL2) - target_link_libraries(yuzu PRIVATE SDL2::SDL2) - target_compile_definitions(yuzu PRIVATE HAVE_SDL2) + target_link_libraries(citron PRIVATE SDL2::SDL2) + target_compile_definitions(citron PRIVATE HAVE_SDL2) endif() if (MSVC) - include(CopyYuzuSDLDeps) - include(CopyYuzuFFmpegDeps) - copy_yuzu_SDL_deps(yuzu) - copy_yuzu_FFmpeg_deps(yuzu) + include(CopyCitronSDLDeps) + include(CopyCitronFFmpegDeps) + copy_citron_SDL_deps(citron) + copy_citron_FFmpeg_deps(citron) endif() if (NOT APPLE AND ENABLE_OPENGL) - target_compile_definitions(yuzu PRIVATE HAS_OPENGL) + target_compile_definitions(citron PRIVATE HAS_OPENGL) endif() if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) - target_link_libraries(yuzu PRIVATE dynarmic::dynarmic) + target_link_libraries(citron PRIVATE dynarmic::dynarmic) endif() -if (YUZU_USE_PRECOMPILED_HEADERS) - target_precompile_headers(yuzu PRIVATE precompiled_headers.h) +if (CITRON_USE_PRECOMPILED_HEADERS) + target_precompile_headers(citron PRIVATE precompiled_headers.h) endif() -create_target_directory_groups(yuzu) +create_target_directory_groups(citron) diff --git a/src/citron/Info.plist b/src/citron/Info.plist index f05f3186c..87d1375a9 100644 --- a/src/citron/Info.plist +++ b/src/citron/Info.plist @@ -15,15 +15,15 @@ SPDX-License-Identifier: GPL-2.0-or-later <key>CFBundleGetInfoString</key> <string></string> <key>CFBundleIconFile</key> - <string>yuzu.icns</string> + <string>citron.icns</string> <key>CFBundleIdentifier</key> - <string>com.yuzu-emu.yuzu</string> + <string>com.citron-emu.citron</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleLongVersionString</key> <string></string> <key>CFBundleName</key> - <string>yuzu</string> + <string>citron</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> diff --git a/src/citron/about_dialog.cpp b/src/citron/about_dialog.cpp index eeff54359..dac8b40af 100644 --- a/src/citron/about_dialog.cpp +++ b/src/citron/about_dialog.cpp @@ -1,11 +1,11 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QIcon> #include <fmt/format.h> #include "common/scm_rev.h" #include "ui_aboutdialog.h" -#include "yuzu/about_dialog.h" +#include "citron/about_dialog.h" AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui{std::make_unique<Ui::AboutDialog>()} { @@ -13,19 +13,19 @@ AboutDialog::AboutDialog(QWidget* parent) const auto description = std::string(Common::g_scm_desc); const auto build_id = std::string(Common::g_build_id); - const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description); + const auto citron_build = fmt::format("citron Development Build | {}-{}", branch_name, description); const auto override_build = fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id); - const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build; + const auto citron_build_version = override_build.empty() ? citron_build : override_build; ui->setupUi(this); // Try and request the icon from Qt theme (Linux?) - const QIcon yuzu_logo = QIcon::fromTheme(QStringLiteral("org.yuzu_emu.yuzu")); - if (!yuzu_logo.isNull()) { - ui->labelLogo->setPixmap(yuzu_logo.pixmap(200)); + const QIcon citron_logo = QIcon::fromTheme(QStringLiteral("org.citron_emu.citron")); + if (!citron_logo.isNull()) { + ui->labelLogo->setPixmap(citron_logo.pixmap(200)); } ui->labelBuildInfo->setText( - ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version), + ui->labelBuildInfo->text().arg(QString::fromStdString(citron_build_version), QString::fromUtf8(Common::g_build_date).left(10))); } diff --git a/src/citron/about_dialog.h b/src/citron/about_dialog.h index 3c4e71ee6..124dbf857 100644 --- a/src/citron/about_dialog.h +++ b/src/citron/about_dialog.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/aboutdialog.ui b/src/citron/aboutdialog.ui index aea82809d..a278e5b6f 100644 --- a/src/citron/aboutdialog.ui +++ b/src/citron/aboutdialog.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>About yuzu</string> + <string>About citron</string> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> @@ -36,7 +36,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/yuzu.png</pixmap> + <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/citron.png</pixmap> </property> <property name="scaledContents"> <bool>true</bool> @@ -61,7 +61,7 @@ <item> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QLabel" name="labelYuzu"> + <widget class="QLabel" name="labelCitron"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> @@ -69,7 +69,7 @@ </sizepolicy> </property> <property name="text"> - <string><html><head/><body><p><span style=" font-size:28pt;">yuzu</span></p></body></html></string> + <string><html><head/><body><p><span style=" font-size:28pt;">citron</span></p></body></html></string> </property> </widget> </item> @@ -99,7 +99,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">citron is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html></string> </property> @@ -127,7 +127,7 @@ p, li { white-space: pre-wrap; } <item> <widget class="QLabel" name="labelLinks"> <property name="text"> - <string><html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html></string> + <string><html><head/><body><p><a href="https://citron-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://github.com/citron-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/citron-emu/citron/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/citron-emu/citron/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html></string> </property> <property name="openExternalLinks"> <bool>true</bool> @@ -143,7 +143,7 @@ p, li { white-space: pre-wrap; } </sizepolicy> </property> <property name="text"> - <string><html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; is a trademark of Nintendo. yuzu is not affiliated with Nintendo in any way.</span></p></body></html></string> + <string><html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; is a trademark of Nintendo. citron is not affiliated with Nintendo in any way.</span></p></body></html></string> </property> </widget> </item> diff --git a/src/citron/applets/qt_amiibo_settings.cpp b/src/citron/applets/qt_amiibo_settings.cpp index b91796dde..641e95095 100644 --- a/src/citron/applets/qt_amiibo_settings.cpp +++ b/src/citron/applets/qt_amiibo_settings.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <algorithm> @@ -16,8 +16,8 @@ #ifdef ENABLE_WEB_SERVICE #include "web_service/web_backend.h" #endif -#include "yuzu/applets/qt_amiibo_settings.h" -#include "yuzu/main.h" +#include "citron/applets/qt_amiibo_settings.h" +#include "citron/main.h" QtAmiiboSettingsDialog::QtAmiiboSettingsDialog(QWidget* parent, Core::Frontend::CabinetParameters parameters_, diff --git a/src/citron/applets/qt_amiibo_settings.h b/src/citron/applets/qt_amiibo_settings.h index 3833cf6f2..ca622885a 100644 --- a/src/citron/applets/qt_amiibo_settings.h +++ b/src/citron/applets/qt_amiibo_settings.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/applets/qt_controller.cpp b/src/citron/applets/qt_controller.cpp index 48ce860ad..a967e17c1 100644 --- a/src/citron/applets/qt_controller.cpp +++ b/src/citron/applets/qt_controller.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <algorithm> @@ -15,14 +15,14 @@ #include "hid_core/hid_types.h" #include "hid_core/resources/npad/npad.h" #include "ui_qt_controller.h" -#include "yuzu/applets/qt_controller.h" -#include "yuzu/configuration/configure_input.h" -#include "yuzu/configuration/configure_input_profile_dialog.h" -#include "yuzu/configuration/configure_motion_touch.h" -#include "yuzu/configuration/configure_vibration.h" -#include "yuzu/configuration/input_profiles.h" -#include "yuzu/main.h" -#include "yuzu/util/controller_navigation.h" +#include "citron/applets/qt_controller.h" +#include "citron/configuration/configure_input.h" +#include "citron/configuration/configure_input_profile_dialog.h" +#include "citron/configuration/configure_motion_touch.h" +#include "citron/configuration/configure_vibration.h" +#include "citron/configuration/input_profiles.h" +#include "citron/main.h" +#include "citron/util/controller_navigation.h" namespace { diff --git a/src/citron/applets/qt_controller.h b/src/citron/applets/qt_controller.h index e5372495d..e8f9eb484 100644 --- a/src/citron/applets/qt_controller.h +++ b/src/citron/applets/qt_controller.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/applets/qt_error.cpp b/src/citron/applets/qt_error.cpp index ad35f4126..324ac449a 100644 --- a/src/citron/applets/qt_error.cpp +++ b/src/citron/applets/qt_error.cpp @@ -1,9 +1,9 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QDateTime> -#include "yuzu/applets/qt_error.h" -#include "yuzu/main.h" +#include "citron/applets/qt_error.h" +#include "citron/main.h" QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) { connect(this, &QtErrorDisplay::MainWindowDisplayError, &parent, diff --git a/src/citron/applets/qt_error.h b/src/citron/applets/qt_error.h index 957f170ad..091884122 100644 --- a/src/citron/applets/qt_error.h +++ b/src/citron/applets/qt_error.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/applets/qt_profile_select.cpp b/src/citron/applets/qt_profile_select.cpp index 66edd6acd..5b43a4d14 100644 --- a/src/citron/applets/qt_profile_select.cpp +++ b/src/citron/applets/qt_profile_select.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <mutex> @@ -16,9 +16,9 @@ #include "core/constants.h" #include "core/core.h" #include "core/hle/service/acc/profile_manager.h" -#include "yuzu/applets/qt_profile_select.h" -#include "yuzu/main.h" -#include "yuzu/util/controller_navigation.h" +#include "citron/applets/qt_profile_select.h" +#include "citron/main.h" +#include "citron/util/controller_navigation.h" namespace { QString FormatUserEntryText(const QString& username, Common::UUID uuid) { @@ -30,7 +30,7 @@ QString FormatUserEntryText(const QString& username, Common::UUID uuid) { QString GetImagePath(Common::UUID uuid) { const auto path = - Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) / + Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir) / fmt::format("system/save/8000000000000010/su/avators/{}.jpg", uuid.FormattedString()); return QString::fromStdString(Common::FS::PathToUTF8String(path)); } diff --git a/src/citron/applets/qt_profile_select.h b/src/citron/applets/qt_profile_select.h index 607f1777c..4dde6ee8d 100644 --- a/src/citron/applets/qt_profile_select.h +++ b/src/citron/applets/qt_profile_select.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/applets/qt_software_keyboard.cpp b/src/citron/applets/qt_software_keyboard.cpp index 2749e6ed3..1725ecfd5 100644 --- a/src/citron/applets/qt_software_keyboard.cpp +++ b/src/citron/applets/qt_software_keyboard.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QCursor> @@ -14,9 +14,9 @@ #include "hid_core/hid_core.h" #include "hid_core/hid_types.h" #include "ui_qt_software_keyboard.h" -#include "yuzu/applets/qt_software_keyboard.h" -#include "yuzu/main.h" -#include "yuzu/util/overlay_dialog.h" +#include "citron/applets/qt_software_keyboard.h" +#include "citron/main.h" +#include "citron/util/overlay_dialog.h" namespace { diff --git a/src/citron/applets/qt_software_keyboard.h b/src/citron/applets/qt_software_keyboard.h index 7e2fdf09e..4f6fe5642 100644 --- a/src/citron/applets/qt_software_keyboard.h +++ b/src/citron/applets/qt_software_keyboard.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/applets/qt_web_browser.cpp b/src/citron/applets/qt_web_browser.cpp index cce9b2efb..6b9990189 100644 --- a/src/citron/applets/qt_web_browser.cpp +++ b/src/citron/applets/qt_web_browser.cpp @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE #include <bit> #include <QApplication> @@ -14,17 +14,17 @@ #include <QWebEngineUrlScheme> #include "hid_core/frontend/input_interpreter.h" -#include "yuzu/applets/qt_web_browser_scripts.h" +#include "citron/applets/qt_web_browser_scripts.h" #endif #include "common/fs/path_util.h" #include "core/core.h" #include "input_common/drivers/keyboard.h" -#include "yuzu/applets/qt_web_browser.h" -#include "yuzu/main.h" -#include "yuzu/util/url_request_interceptor.h" +#include "citron/applets/qt_web_browser.h" +#include "citron/main.h" +#include "citron/util/url_request_interceptor.h" -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE namespace { @@ -57,7 +57,7 @@ QtNXWebEngineView::QtNXWebEngineView(QWidget* parent, Core::System& system, default_profile{QWebEngineProfile::defaultProfile()}, global_settings{ default_profile->settings()} { default_profile->setPersistentStoragePath(QString::fromStdString(Common::FS::PathToUTF8String( - Common::FS::GetYuzuPath(Common::FS::YuzuPath::YuzuDir) / "qtwebengine"))); + Common::FS::GetCitronPath(Common::FS::CitronPath::CitronDir) / "qtwebengine"))); QWebEngineScript gamepad; QWebEngineScript window_nx; @@ -216,7 +216,7 @@ void QtNXWebEngineView::HandleWindowFooterButtonPressedOnce() { const auto button_index = std::countr_zero(static_cast<u64>(button)); page()->runJavaScript( - QStringLiteral("yuzu_key_callbacks[%1] == null;").arg(button_index), + QStringLiteral("citron_key_callbacks[%1] == null;").arg(button_index), [this, button](const QVariant& variant) { if (variant.toBool()) { switch (button) { @@ -239,7 +239,7 @@ void QtNXWebEngineView::HandleWindowFooterButtonPressedOnce() { }); page()->runJavaScript( - QStringLiteral("if (yuzu_key_callbacks[%1] != null) { yuzu_key_callbacks[%1](); }") + QStringLiteral("if (citron_key_callbacks[%1] != null) { citron_key_callbacks[%1](); }") .arg(button_index)); } }; @@ -336,7 +336,7 @@ void QtNXWebEngineView::LoadExtractedFonts() { QWebEngineScript load_nx_font; auto fonts_dir_str = Common::FS::PathToUTF8String( - Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / "fonts/"); + Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "fonts/"); std::replace(fonts_dir_str.begin(), fonts_dir_str.end(), '\\', '/'); diff --git a/src/citron/applets/qt_web_browser.h b/src/citron/applets/qt_web_browser.h index e8a0b6931..ecca7ec38 100644 --- a/src/citron/applets/qt_web_browser.h +++ b/src/citron/applets/qt_web_browser.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -8,7 +8,7 @@ #include <QObject> -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE #include <QWebEngineView> #endif @@ -30,7 +30,7 @@ namespace InputCommon { class InputSubsystem; } -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE enum class UserAgent { WebApplet, @@ -108,11 +108,11 @@ protected: private: /** - * Handles button presses to execute functions assigned in yuzu_key_callbacks. - * yuzu_key_callbacks contains specialized functions for the buttons in the window footer + * Handles button presses to execute functions assigned in citron_key_callbacks. + * citron_key_callbacks contains specialized functions for the buttons in the window footer * that can be overridden by games to achieve desired functionality. * - * @tparam HIDButton The list of buttons contained in yuzu_key_callbacks + * @tparam HIDButton The list of buttons contained in citron_key_callbacks */ template <Core::HID::NpadButton... T> void HandleWindowFooterButtonPressedOnce(); diff --git a/src/citron/applets/qt_web_browser_scripts.h b/src/citron/applets/qt_web_browser_scripts.h index f5530c38f..c226d7be3 100644 --- a/src/citron/applets/qt_web_browser_scripts.h +++ b/src/citron/applets/qt_web_browser_scripts.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -91,13 +91,13 @@ window.addEventListener("gamepaddisconnected", function(e) { constexpr char WINDOW_NX_SCRIPT[] = R"( var end_applet = false; -var yuzu_key_callbacks = []; +var citron_key_callbacks = []; (function() { class WindowNX { constructor() { - yuzu_key_callbacks[1] = function() { window.history.back(); }; - yuzu_key_callbacks[2] = function() { window.nx.endApplet(); }; + citron_key_callbacks[1] = function() { window.history.back(); }; + citron_key_callbacks[2] = function() { window.nx.endApplet(); }; } addEventListener(type, listener, options) { @@ -131,22 +131,22 @@ var yuzu_key_callbacks = []; switch (key) { case "A": - yuzu_key_callbacks[0] = func; + citron_key_callbacks[0] = func; break; case "B": - yuzu_key_callbacks[1] = func; + citron_key_callbacks[1] = func; break; case "X": - yuzu_key_callbacks[2] = func; + citron_key_callbacks[2] = func; break; case "Y": - yuzu_key_callbacks[3] = func; + citron_key_callbacks[3] = func; break; case "L": - yuzu_key_callbacks[6] = func; + citron_key_callbacks[6] = func; break; case "R": - yuzu_key_callbacks[7] = func; + citron_key_callbacks[7] = func; break; } } @@ -160,22 +160,22 @@ var yuzu_key_callbacks = []; switch (key) { case "A": - yuzu_key_callbacks[0] = function() {}; + citron_key_callbacks[0] = function() {}; break; case "B": - yuzu_key_callbacks[1] = function() {}; + citron_key_callbacks[1] = function() {}; break; case "X": - yuzu_key_callbacks[2] = function() {}; + citron_key_callbacks[2] = function() {}; break; case "Y": - yuzu_key_callbacks[3] = function() {}; + citron_key_callbacks[3] = function() {}; break; case "L": - yuzu_key_callbacks[6] = function() {}; + citron_key_callbacks[6] = function() {}; break; case "R": - yuzu_key_callbacks[7] = function() {}; + citron_key_callbacks[7] = function() {}; break; } } diff --git a/src/citron/bootmanager.cpp b/src/citron/bootmanager.cpp index ed5750155..b02b8f663 100644 --- a/src/citron/bootmanager.cpp +++ b/src/citron/bootmanager.cpp @@ -13,7 +13,7 @@ #include <QtCore/qglobal.h> #include "common/settings_enums.h" #include "uisettings.h" -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA #include <QCamera> #include <QCameraImageCapture> #include <QCameraInfo> @@ -57,9 +57,9 @@ #include "video_core/gpu.h" #include "video_core/rasterizer_interface.h" #include "video_core/renderer_base.h" -#include "yuzu/bootmanager.h" -#include "yuzu/main.h" -#include "yuzu/qt_common.h" +#include "citron/bootmanager.h" +#include "citron/main.h" +#include "citron/qt_common.h" class QObject; class QPaintEngine; @@ -286,7 +286,7 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_, Core::System& system_) : QWidget(parent), emu_thread(emu_thread_), input_subsystem{std::move(input_subsystem_)}, system{system_} { - setWindowTitle(QStringLiteral("yuzu %1 | %2-%3") + setWindowTitle(QStringLiteral("citron %1 | %2-%3") .arg(QString::fromUtf8(Common::g_build_name), QString::fromUtf8(Common::g_scm_branch), QString::fromUtf8(Common::g_scm_desc))); @@ -760,7 +760,7 @@ void GRenderWindow::TouchEndEvent() { } void GRenderWindow::InitializeCamera() { -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA constexpr auto camera_update_ms = std::chrono::milliseconds{50}; // (50ms, 20Hz) if (!Settings::values.enable_ir_sensor) { return; @@ -821,7 +821,7 @@ void GRenderWindow::InitializeCamera() { } void GRenderWindow::FinalizeCamera() { -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA if (camera_timer) { camera_timer->stop(); } @@ -832,7 +832,7 @@ void GRenderWindow::FinalizeCamera() { } void GRenderWindow::RequestCameraCapture() { -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA if (!Settings::values.enable_ir_sensor) { return; } @@ -853,7 +853,7 @@ void GRenderWindow::RequestCameraCapture() { } void GRenderWindow::OnCameraCapture(int requestId, const QImage& img) { -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA // TODO: Capture directly in the format and resolution needed const auto camera_width = input_subsystem->GetCamera()->getImageWidth(); const auto camera_height = input_subsystem->GetCamera()->getImageHeight(); @@ -1034,7 +1034,7 @@ bool GRenderWindow::InitializeOpenGL() { return true; #else QMessageBox::warning(this, tr("OpenGL not available!"), - tr("yuzu has not been compiled with OpenGL support.")); + tr("citron has not been compiled with OpenGL support.")); return false; #endif } diff --git a/src/citron/bootmanager.h b/src/citron/bootmanager.h index ae12b3481..e53dfaf78 100644 --- a/src/citron/bootmanager.h +++ b/src/citron/bootmanager.h @@ -261,7 +261,7 @@ private: bool first_frame = false; InputCommon::TasInput::TasState last_tas_state; -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA bool is_virtual_camera; int pending_camera_snapshots; std::vector<u32> camera_data; diff --git a/src/citron/breakpad.cpp b/src/citron/breakpad.cpp index 0f6a71ab0..f08a1950e 100644 --- a/src/citron/breakpad.cpp +++ b/src/citron/breakpad.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <algorithm> @@ -14,7 +14,7 @@ #include "common/fs/fs_paths.h" #include "common/fs/path_util.h" -#include "yuzu/breakpad.h" +#include "citron/breakpad.h" namespace Breakpad { @@ -60,7 +60,7 @@ static void PruneDumpDirectory(const std::filesystem::path& dump_path) { void InstallCrashHandler() { // Write crash dumps to profile directory. - const auto dump_path = GetYuzuPath(Common::FS::YuzuPath::CrashDumpsDir); + const auto dump_path = GetCitronPath(Common::FS::CitronPath::CrashDumpsDir); PruneDumpDirectory(dump_path); #if defined(_WIN32) diff --git a/src/citron/breakpad.h b/src/citron/breakpad.h index 0f911aa9c..1819cba28 100644 --- a/src/citron/breakpad.h +++ b/src/citron/breakpad.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/citron.qrc b/src/citron/citron.qrc index 855df05fd..c7555f1cb 100644 --- a/src/citron/citron.qrc +++ b/src/citron/citron.qrc @@ -1,10 +1,10 @@ <!-- -SPDX-FileCopyrightText: 2021 yuzu Emulator Project +SPDX-FileCopyrightText: 2021 yuzu Emulator Project & 2025 citron Homebrew Project SPDX-License-Identifier: GPL-2.0-or-later --> <RCC> <qresource prefix="/img"> - <file alias="yuzu.ico">../../dist/yuzu.ico</file> + <file alias="citron.ico">../../dist/citron.ico</file> </qresource> </RCC> diff --git a/src/citron/citron.rc b/src/citron/citron.rc index 1fc74d065..e39ef33ee 100644 --- a/src/citron/citron.rc +++ b/src/citron/citron.rc @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "winresrc.h" @@ -11,7 +11,7 @@ // remains consistent on all systems. // QT requires that the default application icon is named IDI_ICON1 -IDI_ICON1 ICON "../../dist/yuzu.ico" +IDI_ICON1 ICON "../../dist/citron.ico" ///////////////////////////////////////////////////////////////////////////// @@ -19,4 +19,4 @@ IDI_ICON1 ICON "../../dist/yuzu.ico" // RT_MANIFEST // -0 RT_MANIFEST "../../dist/yuzu.manifest" +0 RT_MANIFEST "../../dist/citron.manifest" diff --git a/src/citron/compatdb.cpp b/src/citron/compatdb.cpp index a57a96a38..395f559c1 100644 --- a/src/citron/compatdb.cpp +++ b/src/citron/compatdb.cpp @@ -9,7 +9,7 @@ #include "common/telemetry.h" #include "core/telemetry_session.h" #include "ui_compatdb.h" -#include "yuzu/compatdb.h" +#include "citron/compatdb.h" CompatDB::CompatDB(Core::TelemetrySession& telemetry_session_, QWidget* parent) : QWizard(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint), diff --git a/src/citron/compatdb.ui b/src/citron/compatdb.ui index d11669df2..7558e8658 100644 --- a/src/citron/compatdb.ui +++ b/src/citron/compatdb.ui @@ -33,7 +33,7 @@ <item> <widget class="QLabel" name="lbl_Spiel"> <property name="text"> - <string><html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://yuzu-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">yuzu Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of yuzu you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected yuzu account</li></ul></body></html></string> + <string><html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://citron-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">citron Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of citron you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected citron account</li></ul></body></html></string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/src/citron/compatibility_list.cpp b/src/citron/compatibility_list.cpp index dbbe76448..9629349a8 100644 --- a/src/citron/compatibility_list.cpp +++ b/src/citron/compatibility_list.cpp @@ -1,11 +1,11 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <algorithm> #include <fmt/format.h> -#include "yuzu/compatibility_list.h" +#include "citron/compatibility_list.h" CompatibilityList::const_iterator FindMatchingCompatibilityEntry( const CompatibilityList& compatibility_list, u64 program_id) { diff --git a/src/citron/compatibility_list.h b/src/citron/compatibility_list.h index c0675d793..ffd7c434b 100644 --- a/src/citron/compatibility_list.h +++ b/src/citron/compatibility_list.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configuration_shared.cpp b/src/citron/configuration/configuration_shared.cpp index 0ed6146a0..e7d5e90f7 100644 --- a/src/citron/configuration/configuration_shared.cpp +++ b/src/citron/configuration/configuration_shared.cpp @@ -4,7 +4,7 @@ #include <memory> #include <type_traits> #include <vector> -#include "yuzu/configuration/configuration_shared.h" +#include "citron/configuration/configuration_shared.h" namespace ConfigurationShared { diff --git a/src/citron/configuration/configure.ui b/src/citron/configuration/configure.ui index 573c40801..b42f7cf44 100644 --- a/src/citron/configuration/configure.ui +++ b/src/citron/configuration/configure.ui @@ -17,7 +17,7 @@ </size> </property> <property name="windowTitle"> - <string>yuzu Configuration</string> + <string>citron Configuration</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> diff --git a/src/citron/configuration/configure_applets.cpp b/src/citron/configuration/configure_applets.cpp index 139bfa9da..2158a3785 100644 --- a/src/citron/configuration/configure_applets.cpp +++ b/src/citron/configuration/configure_applets.cpp @@ -1,12 +1,12 @@ -// SPDX-FileCopyrightText: 2024 yuzu Emulator Project +// SPDX-FileCopyrightText: 2024 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/settings.h" #include "core/core.h" #include "ui_configure_applets.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_applets.h" -#include "yuzu/configuration/shared_widget.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_applets.h" +#include "citron/configuration/shared_widget.h" ConfigureApplets::ConfigureApplets(Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_, diff --git a/src/citron/configuration/configure_applets.h b/src/citron/configuration/configure_applets.h index 54f494d2f..e47fd830b 100644 --- a/src/citron/configuration/configure_applets.h +++ b/src/citron/configuration/configure_applets.h @@ -1,10 +1,10 @@ -// SPDX-FileCopyrightText: 2024 yuzu Emulator Project +// SPDX-FileCopyrightText: 2024 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include <QWidget> -#include "yuzu/configuration/configuration_shared.h" +#include "citron/configuration/configuration_shared.h" class QCheckBox; class QLineEdit; diff --git a/src/citron/configuration/configure_audio.cpp b/src/citron/configuration/configure_audio.cpp index c235b0fca..c14cfbf60 100644 --- a/src/citron/configuration/configure_audio.cpp +++ b/src/citron/configuration/configure_audio.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <map> @@ -14,11 +14,11 @@ #include "common/settings_common.h" #include "core/core.h" #include "ui_configure_audio.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_audio.h" -#include "yuzu/configuration/shared_translation.h" -#include "yuzu/configuration/shared_widget.h" -#include "yuzu/uisettings.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_audio.h" +#include "citron/configuration/shared_translation.h" +#include "citron/configuration/shared_widget.h" +#include "citron/uisettings.h" ConfigureAudio::ConfigureAudio(const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_, diff --git a/src/citron/configuration/configure_audio.h b/src/citron/configuration/configure_audio.h index 32a2fa5f0..592fadc74 100644 --- a/src/citron/configuration/configure_audio.h +++ b/src/citron/configuration/configure_audio.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -7,7 +7,7 @@ #include <memory> #include <vector> #include <QWidget> -#include "yuzu/configuration/configuration_shared.h" +#include "citron/configuration/configuration_shared.h" class QComboBox; diff --git a/src/citron/configuration/configure_camera.cpp b/src/citron/configuration/configure_camera.cpp index 3368f53f3..7994a5b97 100644 --- a/src/citron/configuration/configure_camera.cpp +++ b/src/citron/configuration/configure_camera.cpp @@ -1,9 +1,9 @@ -// Text : Copyright 2022 yuzu Emulator Project +// Text : Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-3.0-or-later #include <memory> #include <QtCore> -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA #include <QCameraImageCapture> #include <QCameraInfo> #endif @@ -14,7 +14,7 @@ #include "input_common/drivers/camera.h" #include "input_common/main.h" #include "ui_configure_camera.h" -#include "yuzu/configuration/configure_camera.h" +#include "citron/configuration/configure_camera.h" ConfigureCamera::ConfigureCamera(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_) : QDialog(parent), input_subsystem{input_subsystem_}, @@ -36,7 +36,7 @@ ConfigureCamera::ConfigureCamera(QWidget* parent, InputCommon::InputSubsystem* i ConfigureCamera::~ConfigureCamera() = default; void ConfigureCamera::PreviewCamera() { -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA const auto index = ui->ir_sensor_combo_box->currentIndex(); bool camera_found = false; const QList<QCameraInfo> cameras = QCameraInfo::availableCameras(); @@ -138,7 +138,7 @@ void ConfigureCamera::LoadConfiguration() { ui->ir_sensor_combo_box->clear(); input_devices.push_back("Auto"); ui->ir_sensor_combo_box->addItem(tr("Auto")); -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA const auto cameras = QCameraInfo::availableCameras(); for (const QCameraInfo& cameraInfo : cameras) { input_devices.push_back(cameraInfo.deviceName().toStdString()); diff --git a/src/citron/configuration/configure_camera.h b/src/citron/configuration/configure_camera.h index 3d822da7b..a4f8cc4bb 100644 --- a/src/citron/configuration/configure_camera.h +++ b/src/citron/configuration/configure_camera.h @@ -1,4 +1,4 @@ -// Text : Copyright 2022 yuzu Emulator Project +// Text : Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -46,7 +46,7 @@ private: bool is_virtual_camera; int pending_snapshots; -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && CITRON_USE_QT_MULTIMEDIA std::unique_ptr<QCamera> camera; std::unique_ptr<QCameraImageCapture> camera_capture; #endif diff --git a/src/citron/configuration/configure_cpu.cpp b/src/citron/configuration/configure_cpu.cpp index 7e16cf17d..8d4a7a7b5 100644 --- a/src/citron/configuration/configure_cpu.cpp +++ b/src/citron/configuration/configure_cpu.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <memory> @@ -11,8 +11,8 @@ #include "configuration/shared_widget.h" #include "core/core.h" #include "ui_configure_cpu.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_cpu.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_cpu.h" ConfigureCpu::ConfigureCpu(const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_, diff --git a/src/citron/configuration/configure_cpu.h b/src/citron/configuration/configure_cpu.h index 7bbeac496..7895100b4 100644 --- a/src/citron/configuration/configure_cpu.h +++ b/src/citron/configuration/configure_cpu.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -6,8 +6,8 @@ #include <memory> #include <vector> #include <QWidget> -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/shared_translation.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/shared_translation.h" class QComboBox; diff --git a/src/citron/configuration/configure_cpu_debug.cpp b/src/citron/configuration/configure_cpu_debug.cpp index 8cfef0cc1..af8debd17 100644 --- a/src/citron/configuration/configure_cpu_debug.cpp +++ b/src/citron/configuration/configure_cpu_debug.cpp @@ -1,10 +1,10 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/settings.h" #include "core/core.h" #include "ui_configure_cpu_debug.h" -#include "yuzu/configuration/configure_cpu_debug.h" +#include "citron/configuration/configure_cpu_debug.h" ConfigureCpuDebug::ConfigureCpuDebug(const Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique<Ui::ConfigureCpuDebug>()}, system{system_} { diff --git a/src/citron/configuration/configure_cpu_debug.h b/src/citron/configuration/configure_cpu_debug.h index 566ae7ecc..dae583e2a 100644 --- a/src/citron/configuration/configure_cpu_debug.h +++ b/src/citron/configuration/configure_cpu_debug.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_debug.cpp b/src/citron/configuration/configure_debug.cpp index 1010038b7..0a3ed298c 100644 --- a/src/citron/configuration/configure_debug.cpp +++ b/src/citron/configuration/configure_debug.cpp @@ -10,9 +10,9 @@ #include "common/settings.h" #include "core/core.h" #include "ui_configure_debug.h" -#include "yuzu/configuration/configure_debug.h" -#include "yuzu/debugger/console.h" -#include "yuzu/uisettings.h" +#include "citron/configuration/configure_debug.h" +#include "citron/debugger/console.h" +#include "citron/uisettings.h" ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent) : QScrollArea(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} { @@ -21,7 +21,7 @@ ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent) connect(ui->open_log_button, &QPushButton::clicked, []() { const auto path = - QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::LogDir)); + QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::LogDir)); QDesktopServices::openUrl(QUrl::fromLocalFile(path)); }); @@ -75,7 +75,7 @@ void ConfigureDebug::SetConfiguration() { ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue()); ui->perform_vulkan_check->setChecked(Settings::values.perform_vulkan_check.GetValue()); -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE ui->disable_web_applet->setChecked(UISettings::values.disable_web_applet.GetValue()); #else ui->disable_web_applet->setEnabled(false); diff --git a/src/citron/configuration/configure_debug.ui b/src/citron/configuration/configure_debug.ui index d842b0135..3788cda68 100644 --- a/src/citron/configuration/configure_debug.ui +++ b/src/citron/configuration/configure_debug.ui @@ -371,7 +371,7 @@ <item row="2" column="0"> <widget class="QCheckBox" name="enable_shader_feedback"> <property name="toolTip"> - <string>When checked, yuzu will log statistics about the compiled pipeline cache</string> + <string>When checked, citron will log statistics about the compiled pipeline cache</string> </property> <property name="text"> <string>Enable Shader Feedback</string> @@ -400,7 +400,7 @@ <item row="3" column="0"> <widget class="QCheckBox" name="perform_vulkan_check"> <property name="toolTip"> - <string>Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu.</string> + <string>Enables citron to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing citron.</string> </property> <property name="text"> <string>Perform Startup Vulkan Check</string> @@ -546,7 +546,7 @@ </font> </property> <property name="text"> - <string>**This will be reset automatically when yuzu closes.</string> + <string>**This will be reset automatically when citron closes.</string> </property> <property name="indent"> <number>20</number> diff --git a/src/citron/configuration/configure_debug_controller.cpp b/src/citron/configuration/configure_debug_controller.cpp index 74208d1cc..7c3683dde 100644 --- a/src/citron/configuration/configure_debug_controller.cpp +++ b/src/citron/configuration/configure_debug_controller.cpp @@ -1,10 +1,10 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "hid_core/hid_core.h" #include "ui_configure_debug_controller.h" -#include "yuzu/configuration/configure_debug_controller.h" -#include "yuzu/configuration/configure_input_player.h" +#include "citron/configuration/configure_debug_controller.h" +#include "citron/configuration/configure_input_player.h" ConfigureDebugController::ConfigureDebugController(QWidget* parent, InputCommon::InputSubsystem* input_subsystem, diff --git a/src/citron/configuration/configure_debug_controller.h b/src/citron/configuration/configure_debug_controller.h index aaed717e2..1856f822d 100644 --- a/src/citron/configuration/configure_debug_controller.h +++ b/src/citron/configuration/configure_debug_controller.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_debug_tab.cpp b/src/citron/configuration/configure_debug_tab.cpp index d1ca4752a..31c2432c6 100644 --- a/src/citron/configuration/configure_debug_tab.cpp +++ b/src/citron/configuration/configure_debug_tab.cpp @@ -1,11 +1,11 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <memory> #include "ui_configure_debug_tab.h" -#include "yuzu/configuration/configure_cpu_debug.h" -#include "yuzu/configuration/configure_debug.h" -#include "yuzu/configuration/configure_debug_tab.h" +#include "citron/configuration/configure_cpu_debug.h" +#include "citron/configuration/configure_debug.h" +#include "citron/configuration/configure_debug_tab.h" ConfigureDebugTab::ConfigureDebugTab(const Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique<Ui::ConfigureDebugTab>()}, diff --git a/src/citron/configuration/configure_debug_tab.h b/src/citron/configuration/configure_debug_tab.h index c0fd9f73f..e57ac9bfe 100644 --- a/src/citron/configuration/configure_debug_tab.h +++ b/src/citron/configuration/configure_debug_tab.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_dialog.cpp b/src/citron/configuration/configure_dialog.cpp index 37f23388e..f99512e3f 100644 --- a/src/citron/configuration/configure_dialog.cpp +++ b/src/citron/configuration/configure_dialog.cpp @@ -8,25 +8,25 @@ #include "core/core.h" #include "ui_configure.h" #include "vk_device_info.h" -#include "yuzu/configuration/configure_applets.h" -#include "yuzu/configuration/configure_audio.h" -#include "yuzu/configuration/configure_cpu.h" -#include "yuzu/configuration/configure_debug_tab.h" -#include "yuzu/configuration/configure_dialog.h" -#include "yuzu/configuration/configure_filesystem.h" -#include "yuzu/configuration/configure_general.h" -#include "yuzu/configuration/configure_graphics.h" -#include "yuzu/configuration/configure_graphics_advanced.h" -#include "yuzu/configuration/configure_hotkeys.h" -#include "yuzu/configuration/configure_input.h" -#include "yuzu/configuration/configure_input_player.h" -#include "yuzu/configuration/configure_network.h" -#include "yuzu/configuration/configure_profile_manager.h" -#include "yuzu/configuration/configure_system.h" -#include "yuzu/configuration/configure_ui.h" -#include "yuzu/configuration/configure_web.h" -#include "yuzu/hotkeys.h" -#include "yuzu/uisettings.h" +#include "citron/configuration/configure_applets.h" +#include "citron/configuration/configure_audio.h" +#include "citron/configuration/configure_cpu.h" +#include "citron/configuration/configure_debug_tab.h" +#include "citron/configuration/configure_dialog.h" +#include "citron/configuration/configure_filesystem.h" +#include "citron/configuration/configure_general.h" +#include "citron/configuration/configure_graphics.h" +#include "citron/configuration/configure_graphics_advanced.h" +#include "citron/configuration/configure_hotkeys.h" +#include "citron/configuration/configure_input.h" +#include "citron/configuration/configure_input_player.h" +#include "citron/configuration/configure_network.h" +#include "citron/configuration/configure_profile_manager.h" +#include "citron/configuration/configure_system.h" +#include "citron/configuration/configure_ui.h" +#include "citron/configuration/configure_web.h" +#include "citron/hotkeys.h" +#include "citron/uisettings.h" ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, InputCommon::InputSubsystem* input_subsystem, diff --git a/src/citron/configuration/configure_dialog.h b/src/citron/configuration/configure_dialog.h index d0a24a07b..6c5275748 100644 --- a/src/citron/configuration/configure_dialog.h +++ b/src/citron/configuration/configure_dialog.h @@ -7,9 +7,9 @@ #include <vector> #include <QDialog> #include "configuration/shared_widget.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/shared_translation.h" -#include "yuzu/vk_device_info.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/shared_translation.h" +#include "citron/vk_device_info.h" namespace Core { class System; diff --git a/src/citron/configuration/configure_filesystem.cpp b/src/citron/configuration/configure_filesystem.cpp index ad1951754..c8ca9e31a 100644 --- a/src/citron/configuration/configure_filesystem.cpp +++ b/src/citron/configuration/configure_filesystem.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QFileDialog> @@ -7,8 +7,8 @@ #include "common/fs/path_util.h" #include "common/settings.h" #include "ui_configure_filesystem.h" -#include "yuzu/configuration/configure_filesystem.h" -#include "yuzu/uisettings.h" +#include "citron/configuration/configure_filesystem.h" +#include "citron/uisettings.h" ConfigureFilesystem::ConfigureFilesystem(QWidget* parent) : QWidget(parent), ui(std::make_unique<Ui::ConfigureFilesystem>()) { @@ -47,15 +47,15 @@ void ConfigureFilesystem::changeEvent(QEvent* event) { void ConfigureFilesystem::SetConfiguration() { ui->nand_directory_edit->setText( - QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::NANDDir))); + QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::NANDDir))); ui->sdmc_directory_edit->setText( - QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::SDMCDir))); + QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::SDMCDir))); ui->gamecard_path_edit->setText( QString::fromStdString(Settings::values.gamecard_path.GetValue())); ui->dump_path_edit->setText( - QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::DumpDir))); + QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::DumpDir))); ui->load_path_edit->setText( - QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::LoadDir))); + QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::LoadDir))); ui->gamecard_inserted->setChecked(Settings::values.gamecard_inserted.GetValue()); ui->gamecard_current_game->setChecked(Settings::values.gamecard_current_game.GetValue()); @@ -68,13 +68,13 @@ void ConfigureFilesystem::SetConfiguration() { } void ConfigureFilesystem::ApplyConfiguration() { - Common::FS::SetYuzuPath(Common::FS::YuzuPath::NANDDir, + Common::FS::SetCitronPath(Common::FS::CitronPath::NANDDir, ui->nand_directory_edit->text().toStdString()); - Common::FS::SetYuzuPath(Common::FS::YuzuPath::SDMCDir, + Common::FS::SetCitronPath(Common::FS::CitronPath::SDMCDir, ui->sdmc_directory_edit->text().toStdString()); - Common::FS::SetYuzuPath(Common::FS::YuzuPath::DumpDir, + Common::FS::SetCitronPath(Common::FS::CitronPath::DumpDir, ui->dump_path_edit->text().toStdString()); - Common::FS::SetYuzuPath(Common::FS::YuzuPath::LoadDir, + Common::FS::SetCitronPath(Common::FS::CitronPath::LoadDir, ui->load_path_edit->text().toStdString()); Settings::values.gamecard_inserted = ui->gamecard_inserted->isChecked(); @@ -126,12 +126,12 @@ void ConfigureFilesystem::SetDirectory(DirectoryTarget target, QLineEdit* edit) } void ConfigureFilesystem::ResetMetadata() { - if (!Common::FS::Exists(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / + if (!Common::FS::Exists(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list/")) { QMessageBox::information(this, tr("Reset Metadata Cache"), tr("The metadata cache is already empty.")); } else if (Common::FS::RemoveDirRecursively( - Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / "game_list")) { + Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list")) { QMessageBox::information(this, tr("Reset Metadata Cache"), tr("The operation completed successfully.")); UISettings::values.is_game_list_reload_pending.exchange(true); diff --git a/src/citron/configuration/configure_filesystem.h b/src/citron/configuration/configure_filesystem.h index 31d2f1d56..0ea8486b5 100644 --- a/src/citron/configuration/configure_filesystem.h +++ b/src/citron/configuration/configure_filesystem.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_general.cpp b/src/citron/configuration/configure_general.cpp index 701b895e7..63e77b148 100644 --- a/src/citron/configuration/configure_general.cpp +++ b/src/citron/configuration/configure_general.cpp @@ -8,10 +8,10 @@ #include "common/settings.h" #include "core/core.h" #include "ui_configure_general.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_general.h" -#include "yuzu/configuration/shared_widget.h" -#include "yuzu/uisettings.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_general.h" +#include "citron/configuration/shared_widget.h" +#include "citron/uisettings.h" ConfigureGeneral::ConfigureGeneral(const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_, @@ -96,7 +96,7 @@ void ConfigureGeneral::SetResetCallback(std::function<void()> callback) { void ConfigureGeneral::ResetDefaults() { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("yuzu"), + this, tr("citron"), tr("This reset all settings and remove all per-game configurations. This will not delete " "game directories, profiles, or input profiles. Proceed?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); diff --git a/src/citron/configuration/configure_general.h b/src/citron/configuration/configure_general.h index ada6526a6..872b58b59 100644 --- a/src/citron/configuration/configure_general.h +++ b/src/citron/configuration/configure_general.h @@ -7,7 +7,7 @@ #include <memory> #include <vector> #include <QWidget> -#include "yuzu/configuration/configuration_shared.h" +#include "citron/configuration/configuration_shared.h" namespace Core { class System; diff --git a/src/citron/configuration/configure_graphics.cpp b/src/citron/configuration/configure_graphics.cpp index 54c931e56..0c814b043 100644 --- a/src/citron/configuration/configure_graphics.cpp +++ b/src/citron/configuration/configure_graphics.cpp @@ -37,12 +37,12 @@ #include "common/settings_enums.h" #include "core/core.h" #include "ui_configure_graphics.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_graphics.h" -#include "yuzu/configuration/shared_widget.h" -#include "yuzu/qt_common.h" -#include "yuzu/uisettings.h" -#include "yuzu/vk_device_info.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_graphics.h" +#include "citron/configuration/shared_widget.h" +#include "citron/qt_common.h" +#include "citron/uisettings.h" +#include "citron/vk_device_info.h" static const std::vector<VkPresentModeKHR> default_present_modes{VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_FIFO_KHR}; diff --git a/src/citron/configuration/configure_graphics.h b/src/citron/configuration/configure_graphics.h index b92b4496b..eae4a627a 100644 --- a/src/citron/configuration/configure_graphics.h +++ b/src/citron/configuration/configure_graphics.h @@ -17,7 +17,7 @@ #include "common/settings_enums.h" #include "configuration/shared_translation.h" #include "vk_device_info.h" -#include "yuzu/configuration/configuration_shared.h" +#include "citron/configuration/configuration_shared.h" class QPushButton; class QEvent; diff --git a/src/citron/configuration/configure_graphics_advanced.cpp b/src/citron/configuration/configure_graphics_advanced.cpp index 4db18673d..f3e544f6b 100644 --- a/src/citron/configuration/configure_graphics_advanced.cpp +++ b/src/citron/configuration/configure_graphics_advanced.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <vector> @@ -7,10 +7,10 @@ #include "common/settings.h" #include "core/core.h" #include "ui_configure_graphics_advanced.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_graphics_advanced.h" -#include "yuzu/configuration/shared_translation.h" -#include "yuzu/configuration/shared_widget.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_graphics_advanced.h" +#include "citron/configuration/shared_translation.h" +#include "citron/configuration/shared_widget.h" ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced( const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_, diff --git a/src/citron/configuration/configure_graphics_advanced.h b/src/citron/configuration/configure_graphics_advanced.h index 82431987e..5494970db 100644 --- a/src/citron/configuration/configure_graphics_advanced.h +++ b/src/citron/configuration/configure_graphics_advanced.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -6,7 +6,7 @@ #include <memory> #include <vector> #include <QWidget> -#include "yuzu/configuration/configuration_shared.h" +#include "citron/configuration/configuration_shared.h" namespace Core { class System; diff --git a/src/citron/configuration/configure_hotkeys.cpp b/src/citron/configuration/configure_hotkeys.cpp index 3f68de12d..60764b2af 100644 --- a/src/citron/configuration/configure_hotkeys.cpp +++ b/src/citron/configuration/configure_hotkeys.cpp @@ -11,10 +11,10 @@ #include "frontend_common/config.h" #include "ui_configure_hotkeys.h" -#include "yuzu/configuration/configure_hotkeys.h" -#include "yuzu/hotkeys.h" -#include "yuzu/uisettings.h" -#include "yuzu/util/sequence_dialog/sequence_dialog.h" +#include "citron/configuration/configure_hotkeys.h" +#include "citron/hotkeys.h" +#include "citron/uisettings.h" +#include "citron/util/sequence_dialog/sequence_dialog.h" constexpr int name_column = 0; constexpr int hotkey_column = 1; diff --git a/src/citron/configuration/configure_input.cpp b/src/citron/configuration/configure_input.cpp index 28c3baf08..8b8850245 100644 --- a/src/citron/configuration/configure_input.cpp +++ b/src/citron/configuration/configure_input.cpp @@ -15,16 +15,16 @@ #include "ui_configure_input.h" #include "ui_configure_input_advanced.h" #include "ui_configure_input_player.h" -#include "yuzu/configuration/configure_camera.h" -#include "yuzu/configuration/configure_debug_controller.h" -#include "yuzu/configuration/configure_input.h" -#include "yuzu/configuration/configure_input_advanced.h" -#include "yuzu/configuration/configure_input_player.h" -#include "yuzu/configuration/configure_motion_touch.h" -#include "yuzu/configuration/configure_ringcon.h" -#include "yuzu/configuration/configure_touchscreen_advanced.h" -#include "yuzu/configuration/configure_vibration.h" -#include "yuzu/configuration/input_profiles.h" +#include "citron/configuration/configure_camera.h" +#include "citron/configuration/configure_debug_controller.h" +#include "citron/configuration/configure_input.h" +#include "citron/configuration/configure_input_advanced.h" +#include "citron/configuration/configure_input_player.h" +#include "citron/configuration/configure_motion_touch.h" +#include "citron/configuration/configure_ringcon.h" +#include "citron/configuration/configure_touchscreen_advanced.h" +#include "citron/configuration/configure_vibration.h" +#include "citron/configuration/input_profiles.h" namespace { template <typename Dialog, typename... Args> diff --git a/src/citron/configuration/configure_input_advanced.cpp b/src/citron/configuration/configure_input_advanced.cpp index d6c4e09ec..7d3a514c1 100644 --- a/src/citron/configuration/configure_input_advanced.cpp +++ b/src/citron/configuration/configure_input_advanced.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QColorDialog> @@ -7,7 +7,7 @@ #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" #include "ui_configure_input_advanced.h" -#include "yuzu/configuration/configure_input_advanced.h" +#include "citron/configuration/configure_input_advanced.h" ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QWidget* parent) : QWidget(parent), ui(std::make_unique<Ui::ConfigureInputAdvanced>()), hid_core{hid_core_} { @@ -197,7 +197,7 @@ void ConfigureInputAdvanced::UpdateUIEnabled() { ui->debug_configure->setEnabled(ui->debug_enabled->isChecked()); ui->touchscreen_advanced->setEnabled(ui->touchscreen_enabled->isChecked()); ui->ring_controller_configure->setEnabled(ui->enable_ring_controller->isChecked()); -#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) || !defined(YUZU_USE_QT_MULTIMEDIA) +#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) || !defined(CITRON_USE_QT_MULTIMEDIA) ui->enable_ir_sensor->setEnabled(false); ui->camera_configure->setEnabled(false); #endif diff --git a/src/citron/configuration/configure_input_advanced.h b/src/citron/configuration/configure_input_advanced.h index 41f822c4a..9cb926b3e 100644 --- a/src/citron/configuration/configure_input_advanced.h +++ b/src/citron/configuration/configure_input_advanced.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_input_advanced.ui b/src/citron/configuration/configure_input_advanced.ui index 2994d0ab4..0c0143c47 100644 --- a/src/citron/configuration/configure_input_advanced.ui +++ b/src/citron/configuration/configure_input_advanced.ui @@ -2656,7 +2656,7 @@ <item row="2" column="0"> <widget class="QCheckBox" name="enable_raw_input"> <property name="toolTip"> - <string>Requires restarting yuzu</string> + <string>Requires restarting citron</string> </property> <property name="minimumSize"> <size> @@ -2698,7 +2698,7 @@ <item row="5" column="0"> <widget class="QCheckBox" name="enable_joycon_driver"> <property name="toolTip"> - <string>Requires restarting yuzu</string> + <string>Requires restarting citron</string> </property> <property name="minimumSize"> <size> @@ -2714,7 +2714,7 @@ <item row="6" column="0"> <widget class="QCheckBox" name="enable_procon_driver"> <property name="toolTip"> - <string>Requires restarting yuzu</string> + <string>Requires restarting citron</string> </property> <property name="minimumSize"> <size> diff --git a/src/citron/configuration/configure_input_per_game.cpp b/src/citron/configuration/configure_input_per_game.cpp index eea7ec369..d63a9eff3 100644 --- a/src/citron/configuration/configure_input_per_game.cpp +++ b/src/citron/configuration/configure_input_per_game.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/settings.h" @@ -7,8 +7,8 @@ #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" #include "ui_configure_input_per_game.h" -#include "yuzu/configuration/configure_input_per_game.h" -#include "yuzu/configuration/input_profiles.h" +#include "citron/configuration/configure_input_per_game.h" +#include "citron/configuration/input_profiles.h" ConfigureInputPerGame::ConfigureInputPerGame(Core::System& system_, QtConfig* config_, QWidget* parent) diff --git a/src/citron/configuration/configure_input_per_game.h b/src/citron/configuration/configure_input_per_game.h index 4420e856c..ae67946f7 100644 --- a/src/citron/configuration/configure_input_per_game.h +++ b/src/citron/configuration/configure_input_per_game.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -8,8 +8,8 @@ #include <QWidget> #include "ui_configure_input_per_game.h" -#include "yuzu/configuration/input_profiles.h" -#include "yuzu/configuration/qt_config.h" +#include "citron/configuration/input_profiles.h" +#include "citron/configuration/qt_config.h" class QComboBox; diff --git a/src/citron/configuration/configure_input_player.cpp b/src/citron/configuration/configure_input_player.cpp index 400917f9d..3a85fbef3 100644 --- a/src/citron/configuration/configure_input_player.cpp +++ b/src/citron/configuration/configure_input_player.cpp @@ -21,12 +21,12 @@ #include "input_common/drivers/mouse.h" #include "input_common/main.h" #include "ui_configure_input_player.h" -#include "yuzu/bootmanager.h" -#include "yuzu/configuration/configure_input_player.h" -#include "yuzu/configuration/configure_input_player_widget.h" -#include "yuzu/configuration/configure_mouse_panning.h" -#include "yuzu/configuration/input_profiles.h" -#include "yuzu/util/limitable_input_dialog.h" +#include "citron/bootmanager.h" +#include "citron/configuration/configure_input_player.h" +#include "citron/configuration/configure_input_player_widget.h" +#include "citron/configuration/configure_mouse_panning.h" +#include "citron/configuration/input_profiles.h" +#include "citron/util/limitable_input_dialog.h" const std::array<std::string, ConfigureInputPlayer::ANALOG_SUB_BUTTONS_NUM> ConfigureInputPlayer::analog_sub_buttons{{ diff --git a/src/citron/configuration/configure_input_player.ui b/src/citron/configuration/configure_input_player.ui index 5518cccd1..45d1794c8 100644 --- a/src/citron/configuration/configure_input_player.ui +++ b/src/citron/configuration/configure_input_player.ui @@ -3312,7 +3312,7 @@ <customwidget> <class>PlayerControlPreview</class> <extends>QFrame</extends> - <header>yuzu/configuration/configure_input_player_widget.h</header> + <header>citron/configuration/configure_input_player_widget.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/src/citron/configuration/configure_input_player_widget.cpp b/src/citron/configuration/configure_input_player_widget.cpp index b3d9d8006..9335177ec 100644 --- a/src/citron/configuration/configure_input_player_widget.cpp +++ b/src/citron/configuration/configure_input_player_widget.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <algorithm> @@ -7,7 +7,7 @@ #include <QTimer> #include "hid_core/frontend/emulated_controller.h" -#include "yuzu/configuration/configure_input_player_widget.h" +#include "citron/configuration/configure_input_player_widget.h" PlayerControlPreview::PlayerControlPreview(QWidget* parent) : QFrame(parent) { is_controller_set = false; diff --git a/src/citron/configuration/configure_input_player_widget.h b/src/citron/configuration/configure_input_player_widget.h index 76340912d..0640ed0d1 100644 --- a/src/citron/configuration/configure_input_player_widget.h +++ b/src/citron/configuration/configure_input_player_widget.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_input_profile_dialog.cpp b/src/citron/configuration/configure_input_profile_dialog.cpp index 58dffda51..db3f2d78f 100644 --- a/src/citron/configuration/configure_input_profile_dialog.cpp +++ b/src/citron/configuration/configure_input_profile_dialog.cpp @@ -1,10 +1,10 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" #include "ui_configure_input_profile_dialog.h" -#include "yuzu/configuration/configure_input_player.h" -#include "yuzu/configuration/configure_input_profile_dialog.h" +#include "citron/configuration/configure_input_player.h" +#include "citron/configuration/configure_input_profile_dialog.h" ConfigureInputProfileDialog::ConfigureInputProfileDialog( QWidget* parent, InputCommon::InputSubsystem* input_subsystem, InputProfiles* profiles, diff --git a/src/citron/configuration/configure_input_profile_dialog.h b/src/citron/configuration/configure_input_profile_dialog.h index 956cdf954..28d1449ac 100644 --- a/src/citron/configuration/configure_input_profile_dialog.h +++ b/src/citron/configuration/configure_input_profile_dialog.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_linux_tab.cpp b/src/citron/configuration/configure_linux_tab.cpp index ab3d18816..95f03c3b2 100644 --- a/src/citron/configuration/configure_linux_tab.cpp +++ b/src/citron/configuration/configure_linux_tab.cpp @@ -1,12 +1,12 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/settings.h" #include "core/core.h" #include "ui_configure_linux_tab.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_linux_tab.h" -#include "yuzu/configuration/shared_widget.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_linux_tab.h" +#include "citron/configuration/shared_widget.h" ConfigureLinuxTab::ConfigureLinuxTab(const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_, diff --git a/src/citron/configuration/configure_linux_tab.h b/src/citron/configuration/configure_linux_tab.h index 2f402079c..eb09d6a18 100644 --- a/src/citron/configuration/configure_linux_tab.h +++ b/src/citron/configuration/configure_linux_tab.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_motion_touch.cpp b/src/citron/configuration/configure_motion_touch.cpp index fb1292f07..7192c128f 100644 --- a/src/citron/configuration/configure_motion_touch.cpp +++ b/src/citron/configuration/configure_motion_touch.cpp @@ -13,8 +13,8 @@ #include "input_common/helpers/udp_protocol.h" #include "input_common/main.h" #include "ui_configure_motion_touch.h" -#include "yuzu/configuration/configure_motion_touch.h" -#include "yuzu/configuration/configure_touch_from_button.h" +#include "citron/configuration/configure_motion_touch.h" +#include "citron/configuration/configure_touch_from_button.h" CalibrationConfigurationDialog::CalibrationConfigurationDialog(QWidget* parent, const std::string& host, u16 port) @@ -85,7 +85,7 @@ ConfigureMotionTouch::ConfigureMotionTouch(QWidget* parent, ui->udp_learn_more->setOpenExternalLinks(true); ui->udp_learn_more->setText( tr("<a " - "href='https://yuzu-emu.org/wiki/" + "href='https://citron-emu.org/wiki/" "using-a-controller-or-android-phone-for-motion-or-touch-input'><span " "style=\"text-decoration: underline; color:#039be5;\">Learn More</span></a>")); @@ -170,27 +170,27 @@ void ConfigureMotionTouch::OnUDPAddServer() { const int row = udp_server_list_model->rowCount(); if (!ok) { - QMessageBox::warning(this, tr("yuzu"), tr("Port number has invalid characters")); + QMessageBox::warning(this, tr("citron"), tr("Port number has invalid characters")); return; } if (port_number < 0 || port_number > 65353) { - QMessageBox::warning(this, tr("yuzu"), tr("Port has to be in range 0 and 65353")); + QMessageBox::warning(this, tr("citron"), tr("Port has to be in range 0 and 65353")); return; } if (!re.match(server_text).hasMatch()) { - QMessageBox::warning(this, tr("yuzu"), tr("IP address is not valid")); + QMessageBox::warning(this, tr("citron"), tr("IP address is not valid")); return; } // Search for duplicates for (const auto& item : udp_server_list_model->stringList()) { if (item == server_string) { - QMessageBox::warning(this, tr("yuzu"), tr("This UDP server already exists")); + QMessageBox::warning(this, tr("citron"), tr("This UDP server already exists")); return; } } // Limit server count to 8 if (row == 8) { - QMessageBox::warning(this, tr("yuzu"), tr("Unable to add more than 8 servers")); + QMessageBox::warning(this, tr("citron"), tr("Unable to add more than 8 servers")); return; } @@ -284,7 +284,7 @@ void ConfigureMotionTouch::OnConfigureTouchFromButton() { bool ConfigureMotionTouch::CanCloseDialog() { if (udp_test_in_progress) { - QMessageBox::warning(this, tr("yuzu"), + QMessageBox::warning(this, tr("citron"), tr("UDP Test or calibration configuration is in progress.<br>Please " "wait for them to finish.")); return false; diff --git a/src/citron/configuration/configure_mouse_panning.cpp b/src/citron/configuration/configure_mouse_panning.cpp index e37c546b0..19a68682a 100644 --- a/src/citron/configuration/configure_mouse_panning.cpp +++ b/src/citron/configuration/configure_mouse_panning.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QCloseEvent> @@ -6,7 +6,7 @@ #include "common/settings.h" #include "ui_configure_mouse_panning.h" -#include "yuzu/configuration/configure_mouse_panning.h" +#include "citron/configuration/configure_mouse_panning.h" ConfigureMousePanning::ConfigureMousePanning(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_, diff --git a/src/citron/configuration/configure_mouse_panning.h b/src/citron/configuration/configure_mouse_panning.h index f5e62ee13..47e4fbf05 100644 --- a/src/citron/configuration/configure_mouse_panning.h +++ b/src/citron/configuration/configure_mouse_panning.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_network.cpp b/src/citron/configuration/configure_network.cpp index ba1986eb1..a39827fca 100644 --- a/src/citron/configuration/configure_network.cpp +++ b/src/citron/configuration/configure_network.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QtConcurrent/QtConcurrent> @@ -6,7 +6,7 @@ #include "core/core.h" #include "core/internal_network/network_interface.h" #include "ui_configure_network.h" -#include "yuzu/configuration/configure_network.h" +#include "citron/configuration/configure_network.h" ConfigureNetwork::ConfigureNetwork(const Core::System& system_, QWidget* parent) : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()), system{system_} { diff --git a/src/citron/configuration/configure_network.h b/src/citron/configuration/configure_network.h index f666edbd1..a3e60d0f9 100644 --- a/src/citron/configuration/configure_network.h +++ b/src/citron/configuration/configure_network.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_per_game.cpp b/src/citron/configuration/configure_per_game.cpp index 4dbe801a9..d496d0002 100644 --- a/src/citron/configuration/configure_per_game.cpp +++ b/src/citron/configuration/configure_per_game.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <algorithm> @@ -27,19 +27,19 @@ #include "core/loader/loader.h" #include "frontend_common/config.h" #include "ui_configure_per_game.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_audio.h" -#include "yuzu/configuration/configure_cpu.h" -#include "yuzu/configuration/configure_graphics.h" -#include "yuzu/configuration/configure_graphics_advanced.h" -#include "yuzu/configuration/configure_input_per_game.h" -#include "yuzu/configuration/configure_linux_tab.h" -#include "yuzu/configuration/configure_per_game.h" -#include "yuzu/configuration/configure_per_game_addons.h" -#include "yuzu/configuration/configure_system.h" -#include "yuzu/uisettings.h" -#include "yuzu/util/util.h" -#include "yuzu/vk_device_info.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_audio.h" +#include "citron/configuration/configure_cpu.h" +#include "citron/configuration/configure_graphics.h" +#include "citron/configuration/configure_graphics_advanced.h" +#include "citron/configuration/configure_input_per_game.h" +#include "citron/configuration/configure_linux_tab.h" +#include "citron/configuration/configure_per_game.h" +#include "citron/configuration/configure_per_game_addons.h" +#include "citron/configuration/configure_system.h" +#include "citron/uisettings.h" +#include "citron/util/util.h" +#include "citron/vk_device_info.h" ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name, std::vector<VkDeviceInfo::Record>& vk_device_records, diff --git a/src/citron/configuration/configure_per_game.h b/src/citron/configuration/configure_per_game.h index 196cb32e6..cd4b80e0b 100644 --- a/src/citron/configuration/configure_per_game.h +++ b/src/citron/configuration/configure_per_game.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -14,9 +14,9 @@ #include "core/file_sys/vfs/vfs_types.h" #include "frontend_common/config.h" #include "vk_device_info.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/qt_config.h" -#include "yuzu/configuration/shared_translation.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/qt_config.h" +#include "citron/configuration/shared_translation.h" namespace Core { class System; diff --git a/src/citron/configuration/configure_per_game_addons.cpp b/src/citron/configuration/configure_per_game_addons.cpp index 568775027..969d725f7 100644 --- a/src/citron/configuration/configure_per_game_addons.cpp +++ b/src/citron/configuration/configure_per_game_addons.cpp @@ -19,9 +19,9 @@ #include "core/file_sys/xts_archive.h" #include "core/loader/loader.h" #include "ui_configure_per_game_addons.h" -#include "yuzu/configuration/configure_input.h" -#include "yuzu/configuration/configure_per_game_addons.h" -#include "yuzu/uisettings.h" +#include "citron/configuration/configure_input.h" +#include "citron/configuration/configure_per_game_addons.h" +#include "citron/uisettings.h" ConfigurePerGameAddons::ConfigurePerGameAddons(Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique<Ui::ConfigurePerGameAddons>()}, system{system_} { @@ -80,7 +80,7 @@ void ConfigurePerGameAddons::ApplyConfiguration() { std::sort(disabled_addons.begin(), disabled_addons.end()); std::sort(current.begin(), current.end()); if (disabled_addons != current) { - Common::FS::RemoveFile(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / + Common::FS::RemoveFile(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list" / fmt::format("{:016X}.pv.txt", title_id)); } diff --git a/src/citron/configuration/configure_profile_manager.cpp b/src/citron/configuration/configure_profile_manager.cpp index 12a04b9a0..82d3b4c94 100644 --- a/src/citron/configuration/configure_profile_manager.cpp +++ b/src/citron/configuration/configure_profile_manager.cpp @@ -18,8 +18,8 @@ #include "core/core.h" #include "core/hle/service/acc/profile_manager.h" #include "ui_configure_profile_manager.h" -#include "yuzu/configuration/configure_profile_manager.h" -#include "yuzu/util/limitable_input_dialog.h" +#include "citron/configuration/configure_profile_manager.h" +#include "citron/util/limitable_input_dialog.h" namespace { // Same backup JPEG used by acc IProfile::GetImage if no jpeg found @@ -35,7 +35,7 @@ constexpr std::array<u8, 107> backup_jpeg{ QString GetImagePath(const Common::UUID& uuid) { const auto path = - Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) / + Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir) / fmt::format("system/save/8000000000000010/su/avators/{}.jpg", uuid.FormattedString()); return QString::fromStdString(Common::FS::PathToUTF8String(path)); } @@ -288,7 +288,7 @@ void ConfigureProfileManager::SetUserImage() { } const auto raw_path = QString::fromStdString(Common::FS::PathToUTF8String( - Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) / "system/save/8000000000000010")); + Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir) / "system/save/8000000000000010")); const QFileInfo raw_info{raw_path}; if (raw_info.exists() && !raw_info.isDir() && !QFile::remove(raw_path)) { QMessageBox::warning(this, tr("Error deleting file"), diff --git a/src/citron/configuration/configure_ringcon.cpp b/src/citron/configuration/configure_ringcon.cpp index 9fd094ab6..d72fdeb47 100644 --- a/src/citron/configuration/configure_ringcon.cpp +++ b/src/citron/configuration/configure_ringcon.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <memory> @@ -15,8 +15,8 @@ #include "input_common/drivers/mouse.h" #include "input_common/main.h" #include "ui_configure_ringcon.h" -#include "yuzu/bootmanager.h" -#include "yuzu/configuration/configure_ringcon.h" +#include "citron/bootmanager.h" +#include "citron/configuration/configure_ringcon.h" const std::array<std::string, ConfigureRingController::ANALOG_SUB_BUTTONS_NUM> ConfigureRingController::analog_sub_buttons{{ diff --git a/src/citron/configuration/configure_ringcon.h b/src/citron/configuration/configure_ringcon.h index 6fd95e2b8..4785a3e2e 100644 --- a/src/citron/configuration/configure_ringcon.h +++ b/src/citron/configuration/configure_ringcon.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_system.cpp b/src/citron/configuration/configure_system.cpp index e193b5f95..685772858 100644 --- a/src/citron/configuration/configure_system.cpp +++ b/src/citron/configuration/configure_system.cpp @@ -17,9 +17,9 @@ #include "common/settings.h" #include "core/core.h" #include "ui_configure_system.h" -#include "yuzu/configuration/configuration_shared.h" -#include "yuzu/configuration/configure_system.h" -#include "yuzu/configuration/shared_widget.h" +#include "citron/configuration/configuration_shared.h" +#include "citron/configuration/configure_system.h" +#include "citron/configuration/shared_widget.h" constexpr std::array<u32, 7> LOCALE_BLOCKLIST{ // pzzefezrpnkzeidfej diff --git a/src/citron/configuration/configure_system.h b/src/citron/configuration/configure_system.h index a01c29dcf..a1a3a799d 100644 --- a/src/citron/configuration/configure_system.h +++ b/src/citron/configuration/configure_system.h @@ -8,7 +8,7 @@ #include <vector> #include <QWidget> -#include "yuzu/configuration/configuration_shared.h" +#include "citron/configuration/configuration_shared.h" class QCheckBox; class QLineEdit; diff --git a/src/citron/configuration/configure_tas.cpp b/src/citron/configuration/configure_tas.cpp index 5a545aa70..e25d39143 100644 --- a/src/citron/configuration/configure_tas.cpp +++ b/src/citron/configuration/configure_tas.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QFileDialog> @@ -7,8 +7,8 @@ #include "common/fs/path_util.h" #include "common/settings.h" #include "ui_configure_tas.h" -#include "yuzu/configuration/configure_tas.h" -#include "yuzu/uisettings.h" +#include "citron/configuration/configure_tas.h" +#include "citron/uisettings.h" ConfigureTasDialog::ConfigureTasDialog(QWidget* parent) : QDialog(parent), ui(std::make_unique<Ui::ConfigureTas>()) { @@ -28,14 +28,14 @@ ConfigureTasDialog::~ConfigureTasDialog() = default; void ConfigureTasDialog::LoadConfiguration() { ui->tas_path_edit->setText( - QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::TASDir))); + QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::TASDir))); ui->tas_enable->setChecked(Settings::values.tas_enable.GetValue()); ui->tas_loop_script->setChecked(Settings::values.tas_loop.GetValue()); ui->tas_pause_on_load->setChecked(Settings::values.pause_tas_on_load.GetValue()); } void ConfigureTasDialog::ApplyConfiguration() { - Common::FS::SetYuzuPath(Common::FS::YuzuPath::TASDir, ui->tas_path_edit->text().toStdString()); + Common::FS::SetCitronPath(Common::FS::CitronPath::TASDir, ui->tas_path_edit->text().toStdString()); Settings::values.tas_enable.SetValue(ui->tas_enable->isChecked()); Settings::values.tas_loop.SetValue(ui->tas_loop_script->isChecked()); Settings::values.pause_tas_on_load.SetValue(ui->tas_pause_on_load->isChecked()); diff --git a/src/citron/configuration/configure_tas.h b/src/citron/configuration/configure_tas.h index a91891906..401454a9e 100644 --- a/src/citron/configuration/configure_tas.h +++ b/src/citron/configuration/configure_tas.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_tas.ui b/src/citron/configuration/configure_tas.ui index 625af0c89..5d0dc3549 100644 --- a/src/citron/configuration/configure_tas.ui +++ b/src/citron/configuration/configure_tas.ui @@ -14,7 +14,7 @@ <item row="0" column="0" colspan="4"> <widget class="QLabel" name="label_1"> <property name="text"> - <string><html><head/><body><p>Reads controller input from scripts in the same format as TAS-nx scripts.<br/>For a more detailed explanation, please consult the <a href="https://yuzu-emu.org/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">help page</span></a> on the yuzu website.</p></body></html></string> + <string><html><head/><body><p>Reads controller input from scripts in the same format as TAS-nx scripts.<br/>For a more detailed explanation, please consult the <a href="https://citron-emu.org/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">help page</span></a> on the citron website.</p></body></html></string> </property> <property name="openExternalLinks"> <bool>true</bool> diff --git a/src/citron/configuration/configure_touch_from_button.cpp b/src/citron/configuration/configure_touch_from_button.cpp index 18e2eba69..90cfdee08 100644 --- a/src/citron/configuration/configure_touch_from_button.cpp +++ b/src/citron/configuration/configure_touch_from_button.cpp @@ -12,8 +12,8 @@ #include "core/frontend/framebuffer_layout.h" #include "input_common/main.h" #include "ui_configure_touch_from_button.h" -#include "yuzu/configuration/configure_touch_from_button.h" -#include "yuzu/configuration/configure_touch_widget.h" +#include "citron/configuration/configure_touch_from_button.h" +#include "citron/configuration/configure_touch_widget.h" static QString GetKeyName(int key_code) { switch (key_code) { diff --git a/src/citron/configuration/configure_touch_from_button.ui b/src/citron/configuration/configure_touch_from_button.ui index 757219d54..6698932f4 100644 --- a/src/citron/configuration/configure_touch_from_button.ui +++ b/src/citron/configuration/configure_touch_from_button.ui @@ -205,7 +205,7 @@ Drag points to change position, or double-click table cells to edit values.</str <customwidget> <class>TouchScreenPreview</class> <extends>QFrame</extends> - <header>yuzu/configuration/configure_touch_widget.h</header> + <header>citron/configuration/configure_touch_widget.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/src/citron/configuration/configure_touchscreen_advanced.cpp b/src/citron/configuration/configure_touchscreen_advanced.cpp index 94df6d9d3..9110c6627 100644 --- a/src/citron/configuration/configure_touchscreen_advanced.cpp +++ b/src/citron/configuration/configure_touchscreen_advanced.cpp @@ -4,7 +4,7 @@ #include <memory> #include "common/settings.h" #include "ui_configure_touchscreen_advanced.h" -#include "yuzu/configuration/configure_touchscreen_advanced.h" +#include "citron/configuration/configure_touchscreen_advanced.h" ConfigureTouchscreenAdvanced::ConfigureTouchscreenAdvanced(QWidget* parent) : QDialog(parent), ui(std::make_unique<Ui::ConfigureTouchscreenAdvanced>()) { diff --git a/src/citron/configuration/configure_touchscreen_advanced.ui b/src/citron/configuration/configure_touchscreen_advanced.ui index 88e7cf050..e3ef2b9e8 100644 --- a/src/citron/configuration/configure_touchscreen_advanced.ui +++ b/src/citron/configuration/configure_touchscreen_advanced.ui @@ -23,7 +23,7 @@ </size> </property> <property name="text"> - <string>Warning: The settings in this page affect the inner workings of yuzu's emulated touchscreen. Changing them may result in undesirable behavior, such as the touchscreen partially or not working. You should only use this page if you know what you are doing.</string> + <string>Warning: The settings in this page affect the inner workings of citron's emulated touchscreen. Changing them may result in undesirable behavior, such as the touchscreen partially or not working. You should only use this page if you know what you are doing.</string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/src/citron/configuration/configure_ui.cpp b/src/citron/configuration/configure_ui.cpp index f3c91586c..f71532b67 100644 --- a/src/citron/configuration/configure_ui.cpp +++ b/src/citron/configuration/configure_ui.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2016 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "yuzu/configuration/configure_ui.h" +#include "citron/configuration/configure_ui.h" #include <array> #include <cstdlib> @@ -27,7 +27,7 @@ #include "core/core.h" #include "core/frontend/framebuffer_layout.h" #include "ui_configure_ui.h" -#include "yuzu/uisettings.h" +#include "citron/uisettings.h" namespace { constexpr std::array default_game_icon_sizes{ @@ -144,8 +144,8 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent) connect(ui->screenshot_path_button, &QToolButton::pressed, this, [this] { auto dir = QFileDialog::getExistingDirectory(this, tr("Select Screenshots Path..."), - QString::fromStdString(Common::FS::GetYuzuPathString( - Common::FS::YuzuPath::ScreenshotsDir))); + QString::fromStdString(Common::FS::GetCitronPathString( + Common::FS::CitronPath::ScreenshotsDir))); if (!dir.isEmpty()) { if (dir.back() != QChar::fromLatin1('/')) { dir.append(QChar::fromLatin1('/')); @@ -176,7 +176,7 @@ void ConfigureUi::ApplyConfiguration() { UISettings::values.row_2_text_id = ui->row_2_text_combobox->currentData().toUInt(); UISettings::values.enable_screenshot_save_as = ui->enable_screenshot_save_as->isChecked(); - Common::FS::SetYuzuPath(Common::FS::YuzuPath::ScreenshotsDir, + Common::FS::SetCitronPath(Common::FS::CitronPath::ScreenshotsDir, ui->screenshot_path_edit->text().toStdString()); const u32 height = ScreenshotDimensionToInt(ui->screenshot_height->currentText()); @@ -208,7 +208,7 @@ void ConfigureUi::SetConfiguration() { ui->enable_screenshot_save_as->setChecked( UISettings::values.enable_screenshot_save_as.GetValue()); ui->screenshot_path_edit->setText(QString::fromStdString( - Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir))); + Common::FS::GetCitronPathString(Common::FS::CitronPath::ScreenshotsDir))); const auto height = UISettings::values.screenshot_height.GetValue(); if (height == 0) { diff --git a/src/citron/configuration/configure_vibration.cpp b/src/citron/configuration/configure_vibration.cpp index 6b1f4527b..046410cce 100644 --- a/src/citron/configuration/configure_vibration.cpp +++ b/src/citron/configuration/configure_vibration.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/settings.h" @@ -6,7 +6,7 @@ #include "hid_core/hid_core.h" #include "hid_core/hid_types.h" #include "ui_configure_vibration.h" -#include "yuzu/configuration/configure_vibration.h" +#include "citron/configuration/configure_vibration.h" ConfigureVibration::ConfigureVibration(QWidget* parent, Core::HID::HIDCore& hid_core_) : QDialog(parent), ui(std::make_unique<Ui::ConfigureVibration>()), hid_core{hid_core_} { diff --git a/src/citron/configuration/configure_vibration.h b/src/citron/configuration/configure_vibration.h index e9d05df51..ceda09bd6 100644 --- a/src/citron/configuration/configure_vibration.h +++ b/src/citron/configuration/configure_vibration.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/configure_web.cpp b/src/citron/configuration/configure_web.cpp index ab526e4ca..d74b5cb7c 100644 --- a/src/citron/configuration/configure_web.cpp +++ b/src/citron/configuration/configure_web.cpp @@ -7,8 +7,8 @@ #include "common/settings.h" #include "core/telemetry_session.h" #include "ui_configure_web.h" -#include "yuzu/configuration/configure_web.h" -#include "yuzu/uisettings.h" +#include "citron/configuration/configure_web.h" +#include "citron/uisettings.h" static constexpr char token_delimiter{':'}; @@ -65,15 +65,15 @@ void ConfigureWeb::RetranslateUI() { ui->retranslateUi(this); ui->telemetry_learn_more->setText( - tr("<a href='https://yuzu-emu.org/help/feature/telemetry/'><span style=\"text-decoration: " + tr("<a href='https://citron-emu.org/help/feature/telemetry/'><span style=\"text-decoration: " "underline; color:#039be5;\">Learn more</span></a>")); ui->web_signup_link->setText( - tr("<a href='https://profile.yuzu-emu.org/'><span style=\"text-decoration: underline; " + tr("<a href='https://profile.citron-emu.org/'><span style=\"text-decoration: underline; " "color:#039be5;\">Sign up</span></a>")); ui->web_token_info_link->setText( - tr("<a href='https://yuzu-emu.org/wiki/yuzu-web-service/'><span style=\"text-decoration: " + tr("<a href='https://citron-emu.org/wiki/citron-web-service/'><span style=\"text-decoration: " "underline; color:#039be5;\">What is my token?</span></a>")); ui->label_telemetry_id->setText( @@ -87,15 +87,15 @@ void ConfigureWeb::SetConfiguration() { ui->web_signup_link->setOpenExternalLinks(true); ui->web_token_info_link->setOpenExternalLinks(true); - if (Settings::values.yuzu_username.GetValue().empty()) { + if (Settings::values.citron_username.GetValue().empty()) { ui->username->setText(tr("Unspecified")); } else { - ui->username->setText(QString::fromStdString(Settings::values.yuzu_username.GetValue())); + ui->username->setText(QString::fromStdString(Settings::values.citron_username.GetValue())); } ui->toggle_telemetry->setChecked(Settings::values.enable_telemetry.GetValue()); ui->edit_token->setText(QString::fromStdString(GenerateDisplayToken( - Settings::values.yuzu_username.GetValue(), Settings::values.yuzu_token.GetValue()))); + Settings::values.citron_username.GetValue(), Settings::values.citron_token.GetValue()))); // Connect after setting the values, to avoid calling OnLoginChanged now connect(ui->edit_token, &QLineEdit::textChanged, this, &ConfigureWeb::OnLoginChanged); @@ -109,9 +109,9 @@ void ConfigureWeb::ApplyConfiguration() { Settings::values.enable_telemetry = ui->toggle_telemetry->isChecked(); UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked(); if (user_verified) { - Settings::values.yuzu_username = + Settings::values.citron_username = UsernameFromDisplayToken(ui->edit_token->text().toStdString()); - Settings::values.yuzu_token = TokenFromDisplayToken(ui->edit_token->text().toStdString()); + Settings::values.citron_token = TokenFromDisplayToken(ui->edit_token->text().toStdString()); } else { QMessageBox::warning( this, tr("Token not verified"), diff --git a/src/citron/configuration/configure_web.ui b/src/citron/configuration/configure_web.ui index 3ac3864be..906fa77ad 100644 --- a/src/citron/configuration/configure_web.ui +++ b/src/citron/configuration/configure_web.ui @@ -22,18 +22,18 @@ <item> <widget class="QGroupBox" name="groupBoxWebConfig"> <property name="title"> - <string>yuzu Web Service</string> + <string>citron Web Service</string> </property> - <layout class="QVBoxLayout" name="verticalLayoutYuzuWebService"> + <layout class="QVBoxLayout" name="verticalLayoutCitronWebService"> <item> <widget class="QLabel" name="web_credentials_disclaimer"> <property name="text"> - <string>By providing your username and token, you agree to allow yuzu to collect additional usage data, which may include user identifying information.</string> + <string>By providing your username and token, you agree to allow citron to collect additional usage data, which may include user identifying information.</string> </property> </widget> </item> <item> - <layout class="QGridLayout" name="gridLayoutYuzuUsername"> + <layout class="QGridLayout" name="gridLayoutCitronUsername"> <item row="2" column="3"> <widget class="QPushButton" name="button_verify_login"> <property name="sizePolicy"> @@ -131,7 +131,7 @@ <item> <widget class="QCheckBox" name="toggle_telemetry"> <property name="text"> - <string>Share anonymous usage data with the yuzu team</string> + <string>Share anonymous usage data with the citron team</string> </property> </widget> </item> diff --git a/src/citron/configuration/input_profiles.cpp b/src/citron/configuration/input_profiles.cpp index ebebadc94..6b99b7a53 100644 --- a/src/citron/configuration/input_profiles.cpp +++ b/src/citron/configuration/input_profiles.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <fmt/format.h> @@ -7,14 +7,14 @@ #include "common/fs/path_util.h" #include "common/logging/log.h" #include "frontend_common/config.h" -#include "yuzu/configuration/input_profiles.h" +#include "citron/configuration/input_profiles.h" namespace FS = Common::FS; namespace { bool ProfileExistsInFilesystem(std::string_view profile_name) { - return FS::Exists(FS::GetYuzuPath(FS::YuzuPath::ConfigDir) / "input" / + return FS::Exists(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "input" / fmt::format("{}.ini", profile_name)); } @@ -29,7 +29,7 @@ std::filesystem::path GetNameWithoutExtension(std::filesystem::path filename) { } // namespace InputProfiles::InputProfiles() { - const auto input_profile_loc = FS::GetYuzuPath(FS::YuzuPath::ConfigDir) / "input"; + const auto input_profile_loc = FS::GetCitronPath(FS::CitronPath::ConfigDir) / "input"; if (!FS::IsDir(input_profile_loc)) { return; diff --git a/src/citron/configuration/input_profiles.h b/src/citron/configuration/input_profiles.h index 023ec74a6..1884004f3 100644 --- a/src/citron/configuration/input_profiles.h +++ b/src/citron/configuration/input_profiles.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/qt_config.cpp b/src/citron/configuration/qt_config.cpp index 37951b9c8..e9dc6a23e 100644 --- a/src/citron/configuration/qt_config.cpp +++ b/src/citron/configuration/qt_config.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" diff --git a/src/citron/configuration/qt_config.h b/src/citron/configuration/qt_config.h index dc2dceb4d..23fdb7180 100644 --- a/src/citron/configuration/qt_config.h +++ b/src/citron/configuration/qt_config.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/shared_translation.cpp b/src/citron/configuration/shared_translation.cpp index 0549e8ae4..18fd843c5 100644 --- a/src/citron/configuration/shared_translation.cpp +++ b/src/citron/configuration/shared_translation.cpp @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "yuzu/configuration/shared_translation.h" +#include "citron/configuration/shared_translation.h" #include <map> #include <memory> @@ -13,7 +13,7 @@ #include "common/settings_enums.h" #include "common/settings_setting.h" #include "common/time_zone.h" -#include "yuzu/uisettings.h" +#include "citron/uisettings.h" namespace ConfigurationShared { @@ -264,10 +264,10 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) { // Ui General INSERT(UISettings, select_user_on_boot, tr("Prompt for user on game boot"), - tr("Ask to select a user profile on each boot, useful if multiple people use yuzu on " + tr("Ask to select a user profile on each boot, useful if multiple people use citron on " "the same PC.")); INSERT(UISettings, pause_when_in_background, tr("Pause emulation when in background"), - tr("This setting pauses yuzu when focusing other windows.")); + tr("This setting pauses citron when focusing other windows.")); INSERT(UISettings, confirm_before_stopping, tr("Confirm before stopping emulation"), tr("This setting overrides game prompts asking to confirm stopping the game.\nEnabling " "it bypasses such prompts and directly exits the emulation.")); diff --git a/src/citron/configuration/shared_translation.h b/src/citron/configuration/shared_translation.h index d5fc3b8de..978d9cc10 100644 --- a/src/citron/configuration/shared_translation.h +++ b/src/citron/configuration/shared_translation.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/configuration/shared_widget.cpp b/src/citron/configuration/shared_widget.cpp index 85f4f7655..52c992efc 100644 --- a/src/citron/configuration/shared_widget.cpp +++ b/src/citron/configuration/shared_widget.cpp @@ -1,7 +1,7 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "yuzu/configuration/shared_widget.h" +#include "citron/configuration/shared_widget.h" #include <functional> #include <limits> @@ -42,7 +42,7 @@ #include "common/logging/log.h" #include "common/settings.h" #include "common/settings_common.h" -#include "yuzu/configuration/shared_translation.h" +#include "citron/configuration/shared_translation.h" namespace ConfigurationShared { diff --git a/src/citron/configuration/shared_widget.h b/src/citron/configuration/shared_widget.h index 226284cf3..5fef7cd84 100644 --- a/src/citron/configuration/shared_widget.h +++ b/src/citron/configuration/shared_widget.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -11,7 +11,7 @@ #include <QStringLiteral> #include <QWidget> #include <qobjectdefs.h> -#include "yuzu/configuration/shared_translation.h" +#include "citron/configuration/shared_translation.h" class QCheckBox; class QComboBox; diff --git a/src/citron/debugger/console.cpp b/src/citron/debugger/console.cpp index 1c1342ff1..0192aacc0 100644 --- a/src/citron/debugger/console.cpp +++ b/src/citron/debugger/console.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #ifdef _WIN32 @@ -8,8 +8,8 @@ #endif #include "common/logging/backend.h" -#include "yuzu/debugger/console.h" -#include "yuzu/uisettings.h" +#include "citron/debugger/console.h" +#include "citron/uisettings.h" namespace Debugger { void ToggleConsole() { diff --git a/src/citron/debugger/console.h b/src/citron/debugger/console.h index 2491d1ec1..c8d29a83f 100644 --- a/src/citron/debugger/console.h +++ b/src/citron/debugger/console.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/debugger/controller.cpp b/src/citron/debugger/controller.cpp index 216d2974d..51c9989e3 100644 --- a/src/citron/debugger/controller.cpp +++ b/src/citron/debugger/controller.cpp @@ -9,8 +9,8 @@ #include "hid_core/hid_core.h" #include "input_common/drivers/tas_input.h" #include "input_common/main.h" -#include "yuzu/configuration/configure_input_player_widget.h" -#include "yuzu/debugger/controller.h" +#include "citron/configuration/configure_input_player_widget.h" +#include "citron/debugger/controller.h" ControllerDialog::ControllerDialog(Core::HID::HIDCore& hid_core_, std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_, diff --git a/src/citron/debugger/profiler.cpp b/src/citron/debugger/profiler.cpp index 493ee0b17..c8555141e 100644 --- a/src/citron/debugger/profiler.cpp +++ b/src/citron/debugger/profiler.cpp @@ -9,8 +9,8 @@ #include <QTimer> #include "common/common_types.h" #include "common/microprofile.h" -#include "yuzu/debugger/profiler.h" -#include "yuzu/util/util.h" +#include "citron/debugger/profiler.h" +#include "citron/util/util.h" // Include the implementation of the UI in this file. This isn't in microprofile.cpp because the // non-Qt frontends don't need it (and don't implement the UI drawing hooks either). diff --git a/src/citron/debugger/wait_tree.cpp b/src/citron/debugger/wait_tree.cpp index c05a05057..fd26745f3 100644 --- a/src/citron/debugger/wait_tree.cpp +++ b/src/citron/debugger/wait_tree.cpp @@ -4,8 +4,8 @@ #include <array> #include <fmt/format.h> -#include "yuzu/debugger/wait_tree.h" -#include "yuzu/uisettings.h" +#include "citron/debugger/wait_tree.h" +#include "citron/uisettings.h" #include "core/arm/debug.h" #include "core/core.h" diff --git a/src/citron/discord_impl.cpp b/src/citron/discord_impl.cpp index 57b50abd0..9670ae4d6 100644 --- a/src/citron/discord_impl.cpp +++ b/src/citron/discord_impl.cpp @@ -15,14 +15,14 @@ #include "common/string_util.h" #include "core/core.h" #include "core/loader/loader.h" -#include "yuzu/discord_impl.h" -#include "yuzu/uisettings.h" +#include "citron/discord_impl.h" +#include "citron/uisettings.h" namespace DiscordRPC { DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} { DiscordEventHandlers handlers{}; - // The number is the client ID for yuzu, it's used for images and the + // The number is the client ID for citron, it's used for images and the // application name Discord_Initialize("712465656758665259", &handlers, 1, nullptr); } @@ -62,8 +62,8 @@ std::string DiscordImpl::GetGameString(const std::string& title) { } void DiscordImpl::UpdateGameStatus(bool use_default) { - const std::string default_text = "yuzu is an emulator for the Nintendo Switch"; - const std::string default_image = "yuzu_logo"; + const std::string default_text = "citron is an emulator for the Nintendo Switch"; + const std::string default_image = "citron_logo"; const std::string url = use_default ? default_image : game_url; s64 start_time = std::chrono::duration_cast<std::chrono::seconds>( std::chrono::system_clock::now().time_since_epoch()) @@ -81,15 +81,15 @@ void DiscordImpl::UpdateGameStatus(bool use_default) { } void DiscordImpl::Update() { - const std::string default_text = "yuzu is an emulator for the Nintendo Switch"; - const std::string default_image = "yuzu_logo"; + const std::string default_text = "citron is an emulator for the Nintendo Switch"; + const std::string default_image = "citron_logo"; if (system.IsPoweredOn()) { system.GetAppLoader().ReadTitle(game_title); - // Used to format Icon URL for yuzu website game compatibility page + // Used to format Icon URL for citron website game compatibility page std::string icon_name = GetGameString(game_title); - game_url = fmt::format("https://yuzu-emu.org/images/game/boxart/{}.png", icon_name); + game_url = fmt::format("https://citron-emu.org/images/game/boxart/{}.png", icon_name); QNetworkAccessManager manager; QNetworkRequest request; diff --git a/src/citron/discord_impl.h b/src/citron/discord_impl.h index eb6cf9ae0..a1dec6c48 100644 --- a/src/citron/discord_impl.h +++ b/src/citron/discord_impl.h @@ -3,7 +3,7 @@ #pragma once -#include "yuzu/discord.h" +#include "citron/discord.h" namespace Core { class System; diff --git a/src/citron/game_list.cpp b/src/citron/game_list.cpp index b40af957c..ef23c05c0 100644 --- a/src/citron/game_list.cpp +++ b/src/citron/game_list.cpp @@ -19,13 +19,13 @@ #include "core/core.h" #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" -#include "yuzu/compatibility_list.h" -#include "yuzu/game_list.h" -#include "yuzu/game_list_p.h" -#include "yuzu/game_list_worker.h" -#include "yuzu/main.h" -#include "yuzu/uisettings.h" -#include "yuzu/util/controller_navigation.h" +#include "citron/compatibility_list.h" +#include "citron/game_list.h" +#include "citron/game_list_p.h" +#include "citron/game_list_worker.h" +#include "citron/main.h" +#include "citron/uisettings.h" +#include "citron/util/controller_navigation.h" GameListSearchField::KeyReleaseEater::KeyReleaseEater(GameList* gamelist_, QObject* parent) : QObject(parent), gamelist{gamelist_} {} diff --git a/src/citron/game_list.h b/src/citron/game_list.h index 79f9c7ec0..36fb6972e 100644 --- a/src/citron/game_list.h +++ b/src/citron/game_list.h @@ -17,8 +17,8 @@ #include "common/common_types.h" #include "core/core.h" #include "uisettings.h" -#include "yuzu/compatibility_list.h" -#include "yuzu/play_time_manager.h" +#include "citron/compatibility_list.h" +#include "citron/play_time_manager.h" namespace Core { class System; diff --git a/src/citron/game_list_p.h b/src/citron/game_list_p.h index c330b574f..2f0bc9880 100644 --- a/src/citron/game_list_p.h +++ b/src/citron/game_list_p.h @@ -18,9 +18,9 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "common/string_util.h" -#include "yuzu/play_time_manager.h" -#include "yuzu/uisettings.h" -#include "yuzu/util/util.h" +#include "citron/play_time_manager.h" +#include "citron/uisettings.h" +#include "citron/util/util.h" enum class GameListItemType { Game = QStandardItem::UserType + 1, diff --git a/src/citron/game_list_worker.cpp b/src/citron/game_list_worker.cpp index 0cbf5f45e..9d6a47074 100644 --- a/src/citron/game_list_worker.cpp +++ b/src/citron/game_list_worker.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <memory> @@ -23,11 +23,11 @@ #include "core/file_sys/registered_cache.h" #include "core/file_sys/submission_package.h" #include "core/loader/loader.h" -#include "yuzu/compatibility_list.h" -#include "yuzu/game_list.h" -#include "yuzu/game_list_p.h" -#include "yuzu/game_list_worker.h" -#include "yuzu/uisettings.h" +#include "citron/compatibility_list.h" +#include "citron/game_list.h" +#include "citron/game_list_p.h" +#include "citron/game_list_worker.h" +#include "citron/uisettings.h" namespace { @@ -38,7 +38,7 @@ QString GetGameListCachedObject(const std::string& filename, const std::string& } const auto path = - Common::FS::PathToUTF8String(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / + Common::FS::PathToUTF8String(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list" / fmt::format("{}.{}", filename, ext)); void(Common::FS::CreateParentDirs(path)); @@ -70,7 +70,7 @@ std::pair<std::vector<u8>, std::string> GetGameListCachedObject( } const auto game_list_dir = - Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / "game_list"; + Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list"; const auto jpeg_name = fmt::format("{}.jpeg", filename); const auto app_name = fmt::format("{}.appname.txt", filename); diff --git a/src/citron/game_list_worker.h b/src/citron/game_list_worker.h index d5990fcde..80e6b384a 100644 --- a/src/citron/game_list_worker.h +++ b/src/citron/game_list_worker.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -14,8 +14,8 @@ #include <QString> #include "common/thread.h" -#include "yuzu/compatibility_list.h" -#include "yuzu/play_time_manager.h" +#include "citron/compatibility_list.h" +#include "citron/play_time_manager.h" namespace Core { class System; diff --git a/src/citron/hotkeys.cpp b/src/citron/hotkeys.cpp index 1931dcd1f..7346e8a53 100644 --- a/src/citron/hotkeys.cpp +++ b/src/citron/hotkeys.cpp @@ -7,8 +7,8 @@ #include <QtGlobal> #include "hid_core/frontend/emulated_controller.h" -#include "yuzu/hotkeys.h" -#include "yuzu/uisettings.h" +#include "citron/hotkeys.h" +#include "citron/uisettings.h" HotkeyRegistry::HotkeyRegistry() = default; HotkeyRegistry::~HotkeyRegistry() = default; diff --git a/src/citron/install_dialog.cpp b/src/citron/install_dialog.cpp index 673bbaa83..92609ad18 100644 --- a/src/citron/install_dialog.cpp +++ b/src/citron/install_dialog.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QCheckBox> @@ -7,8 +7,8 @@ #include <QLabel> #include <QListWidget> #include <QVBoxLayout> -#include "yuzu/install_dialog.h" -#include "yuzu/uisettings.h" +#include "citron/install_dialog.h" +#include "citron/uisettings.h" InstallDialog::InstallDialog(QWidget* parent, const QStringList& files) : QDialog(parent) { file_list = new QListWidget(this); diff --git a/src/citron/install_dialog.h b/src/citron/install_dialog.h index 4c7c3c158..4c1651133 100644 --- a/src/citron/install_dialog.h +++ b/src/citron/install_dialog.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/loading_screen.cpp b/src/citron/loading_screen.cpp index b081fff6b..82024a02b 100644 --- a/src/citron/loading_screen.cpp +++ b/src/citron/loading_screen.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <unordered_map> @@ -15,11 +15,11 @@ #include "core/loader/loader.h" #include "ui_loading_screen.h" #include "video_core/rasterizer_interface.h" -#include "yuzu/loading_screen.h" +#include "citron/loading_screen.h" // Mingw seems to not have QMovie at all. If QMovie is missing then use a single frame instead of an // showing the full animation -#if !YUZU_QT_MOVIE_MISSING +#if !CITRON_QT_MOVIE_MISSING #include <QMovie> #endif @@ -96,7 +96,7 @@ LoadingScreen::~LoadingScreen() = default; void LoadingScreen::Prepare(Loader::AppLoader& loader) { std::vector<u8> buffer; if (loader.ReadBanner(buffer) == Loader::ResultStatus::Success) { -#ifdef YUZU_QT_MOVIE_MISSING +#ifdef CITRON_QT_MOVIE_MISSING QPixmap map; map.loadFromData(buffer.data(), buffer.size()); ui->banner->setPixmap(map); @@ -194,7 +194,7 @@ void LoadingScreen::paintEvent(QPaintEvent* event) { } void LoadingScreen::Clear() { -#ifndef YUZU_QT_MOVIE_MISSING +#ifndef CITRON_QT_MOVIE_MISSING animation.reset(); backing_buf.reset(); backing_mem.reset(); diff --git a/src/citron/loading_screen.h b/src/citron/loading_screen.h index 17045595d..48248a37d 100644 --- a/src/citron/loading_screen.h +++ b/src/citron/loading_screen.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -10,7 +10,7 @@ #include <QtGlobal> #if !QT_CONFIG(movie) -#define YUZU_QT_MOVIE_MISSING 1 +#define CITRON_QT_MOVIE_MISSING 1 #endif namespace Loader { @@ -64,7 +64,7 @@ signals: void Hidden(); private: -#ifndef YUZU_QT_MOVIE_MISSING +#ifndef CITRON_QT_MOVIE_MISSING std::unique_ptr<QMovie> animation; std::unique_ptr<QBuffer> backing_buf; std::unique_ptr<QByteArray> backing_mem; diff --git a/src/citron/main.cpp b/src/citron/main.cpp index 19aaff7c6..e6d3c3eff 100644 --- a/src/citron/main.cpp +++ b/src/citron/main.cpp @@ -49,8 +49,8 @@ #include "frontend_common/content_manager.h" #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" -#include "yuzu/multiplayer/state.h" -#include "yuzu/util/controller_navigation.h" +#include "citron/multiplayer/state.h" +#include "citron/util/controller_navigation.h" // These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows // defines. @@ -139,38 +139,38 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include "video_core/gpu.h" #include "video_core/renderer_base.h" #include "video_core/shader_notify.h" -#include "yuzu/about_dialog.h" -#include "yuzu/bootmanager.h" -#include "yuzu/compatdb.h" -#include "yuzu/compatibility_list.h" -#include "yuzu/configuration/configure_dialog.h" -#include "yuzu/configuration/configure_input_per_game.h" -#include "yuzu/configuration/qt_config.h" -#include "yuzu/debugger/console.h" -#include "yuzu/debugger/controller.h" -#include "yuzu/debugger/profiler.h" -#include "yuzu/debugger/wait_tree.h" -#include "yuzu/discord.h" -#include "yuzu/game_list.h" -#include "yuzu/game_list_p.h" -#include "yuzu/hotkeys.h" -#include "yuzu/install_dialog.h" -#include "yuzu/loading_screen.h" -#include "yuzu/main.h" -#include "yuzu/play_time_manager.h" -#include "yuzu/startup_checks.h" -#include "yuzu/uisettings.h" -#include "yuzu/util/clickable_label.h" -#include "yuzu/vk_device_info.h" - -#ifdef YUZU_CRASH_DUMPS -#include "yuzu/breakpad.h" +#include "citron/about_dialog.h" +#include "citron/bootmanager.h" +#include "citron/compatdb.h" +#include "citron/compatibility_list.h" +#include "citron/configuration/configure_dialog.h" +#include "citron/configuration/configure_input_per_game.h" +#include "citron/configuration/qt_config.h" +#include "citron/debugger/console.h" +#include "citron/debugger/controller.h" +#include "citron/debugger/profiler.h" +#include "citron/debugger/wait_tree.h" +#include "citron/discord.h" +#include "citron/game_list.h" +#include "citron/game_list_p.h" +#include "citron/hotkeys.h" +#include "citron/install_dialog.h" +#include "citron/loading_screen.h" +#include "citron/main.h" +#include "citron/play_time_manager.h" +#include "citron/startup_checks.h" +#include "citron/uisettings.h" +#include "citron/util/clickable_label.h" +#include "citron/vk_device_info.h" + +#ifdef CITRON_CRASH_DUMPS +#include "citron/breakpad.h" #endif using namespace Common::Literals; #ifdef USE_DISCORD_PRESENCE -#include "yuzu/discord_impl.h" +#include "citron/discord_impl.h" #endif #ifdef QT_STATICPLUGIN @@ -211,8 +211,8 @@ void GMainWindow::ShowTelemetryCallout() { UISettings::values.callout_flags = UISettings::values.callout_flags.GetValue() | static_cast<uint32_t>(CalloutFlag::Telemetry); const QString telemetry_message = - tr("<a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous " - "data is collected</a> to help improve yuzu. " + tr("<a href='https://citron-emu.org/help/feature/telemetry/'>Anonymous " + "data is collected</a> to help improve citron. " "<br/><br/>Would you like to share your usage data with us?"); if (!question(this, tr("Telemetry"), telemetry_message)) { Settings::values.enable_telemetry = false; @@ -223,7 +223,7 @@ void GMainWindow::ShowTelemetryCallout() { const int GMainWindow::max_recent_files_item; static void RemoveCachedContents() { - const auto cache_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir); + const auto cache_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir); const auto offline_fonts = cache_dir / "fonts"; const auto offline_manual = cache_dir / "offline_web_applet_manual"; const auto offline_legal_information = cache_dir / "offline_web_applet_legal_information"; @@ -370,13 +370,13 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk const auto description = std::string(Common::g_scm_desc); const auto build_id = std::string(Common::g_build_id); - const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description); + const auto citron_build = fmt::format("citron Development Build | {}-{}", branch_name, description); const auto override_build = fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id); - const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build; + const auto citron_build_version = override_build.empty() ? citron_build : override_build; const auto processor_count = std::thread::hardware_concurrency(); - LOG_INFO(Frontend, "yuzu Version: {}", yuzu_build_version); + LOG_INFO(Frontend, "citron Version: {}", citron_build_version); LogRuntimes(); #ifdef ARCHITECTURE_x86_64 const auto& caps = Common::GetCPUCaps(); @@ -449,8 +449,8 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk QMessageBox::warning(this, tr("Broken Vulkan Installation Detected"), tr("Vulkan initialization failed during boot.<br><br>Click <a " - "href='https://yuzu-emu.org/wiki/faq/" - "#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>" + "href='https://citron-emu.org/wiki/faq/" + "#citron-starts-with-the-error-broken-vulkan-installation-detected'>" "here for instructions to fix the issue</a>.")); #ifdef HAS_OPENGL @@ -471,7 +471,7 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk // Set a screensaver inhibition reason string. Currently passed to DBus by SDL and visible to // the user through their desktop environment. - //: TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the + //: TRANSLATORS: This string is shown to the user to explain why citron needs to prevent the //: computer from sleeping QByteArray wakelock_reason = tr("Running a game").toUtf8(); SDL_SetHint(SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME, wakelock_reason.data()); @@ -848,7 +848,7 @@ void GMainWindow::SoftwareKeyboardExit() { void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, const std::string& additional_args, bool is_local) { -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE // Raw input breaks with the web applet, Disable web applets if enabled if (UISettings::values.disable_web_applet || Settings::values.enable_raw_input) { @@ -989,7 +989,7 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, } void GMainWindow::WebBrowserRequestExit() { -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE if (web_applet) { web_applet->SetExitReason(Service::AM::Frontend::WebExitReason::ExitRequested); web_applet->SetFinished(true); @@ -998,7 +998,7 @@ void GMainWindow::WebBrowserRequestExit() { } void GMainWindow::InitializeWidgets() { -#ifdef YUZU_ENABLE_COMPATIBILITY_REPORTING +#ifdef CITRON_ENABLE_COMPATIBILITY_REPORTING ui->action_Report_Compatibility->setVisible(true); #endif render_window = new GRenderWindow(this, emu_thread.get(), input_subsystem, *system); @@ -1339,7 +1339,7 @@ void GMainWindow::InitializeHotkeys() { LinkActionShortcut(ui->action_Load_File, QStringLiteral("Load File")); LinkActionShortcut(ui->action_Load_Amiibo, QStringLiteral("Load/Remove Amiibo")); - LinkActionShortcut(ui->action_Exit, QStringLiteral("Exit yuzu")); + LinkActionShortcut(ui->action_Exit, QStringLiteral("Exit citron")); LinkActionShortcut(ui->action_Restart, QStringLiteral("Restart Emulation")); LinkActionShortcut(ui->action_Pause, QStringLiteral("Continue/Pause Emulation")); LinkActionShortcut(ui->action_Stop, QStringLiteral("Stop Emulation")); @@ -1600,7 +1600,7 @@ void GMainWindow::ConnectMenuEvents() { connect_menu(ui->action_Configure_Tas, &GMainWindow::OnConfigureTas); // Help - connect_menu(ui->action_Open_yuzu_Folder, &GMainWindow::OnOpenYuzuFolder); + connect_menu(ui->action_Open_citron_Folder, &GMainWindow::OnOpenCitronFolder); connect_menu(ui->action_Verify_installed_contents, &GMainWindow::OnVerifyInstalledContents); connect_menu(ui->action_Install_Firmware, &GMainWindow::OnInstallFirmware); connect_menu(ui->action_Install_Keys, &GMainWindow::OnInstallDecryptionKeys); @@ -1816,8 +1816,8 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa tr("You are using the deconstructed ROM directory format for this game, which is an " "outdated format that has been superseded by others such as NCA, NAX, XCI, or " "NSP. Deconstructed ROM directories lack icons, metadata, and update " - "support.<br><br>For an explanation of the various Switch formats yuzu supports, <a " - "href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our " + "support.<br><br>For an explanation of the various Switch formats citron supports, <a " + "href='https://citron-emu.org/wiki/overview-of-switch-game-formats'>check out our " "wiki</a>. This message will not be shown again.")); } @@ -1831,11 +1831,11 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa case Core::SystemResultStatus::ErrorVideoCore: QMessageBox::critical( this, tr("An error occurred initializing the video core."), - tr("yuzu has encountered an error while running the video core. " + tr("citron has encountered an error while running the video core. " "This is usually caused by outdated GPU drivers, including integrated ones. " "Please see the log for more details. " "For more information on accessing the log, please see the following page: " - "<a href='https://yuzu-emu.org/help/reference/log-files/'>" + "<a href='https://citron-emu.org/help/reference/log-files/'>" "How to Upload the Log File</a>. ")); break; default: @@ -1849,9 +1849,9 @@ 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<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the " - "yuzu quickstart guide</a> to redump your files.<br>You can refer " - "to the yuzu wiki</a> or the yuzu Discord</a> for help.", + tr("%1<br>Please follow <a href='https://citron-emu.org/help/quickstart/'>the " + "citron quickstart guide</a> to redump your files.<br>You can refer " + "to the citron wiki</a> or the citron Discord</a> for help.", "%1 signifies an error string.") .arg(QString::fromStdString( GetResultStatusString(static_cast<Loader::ResultStatus>(error_id)))); @@ -1926,7 +1926,7 @@ void GMainWindow::ConfigureFilesystemProvider(const std::string& filepath) { void GMainWindow::BootGame(const QString& filename, Service::AM::FrontendAppletParameters params, StartGameType type) { - LOG_INFO(Frontend, "yuzu starting..."); + LOG_INFO(Frontend, "citron starting..."); if (params.program_id == 0 || params.program_id > static_cast<u64>(Service::AM::AppletProgramId::MaxProgramId)) { @@ -2288,7 +2288,7 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target switch (target) { case GameListOpenTarget::SaveData: { open_target = tr("Save Data"); - const auto nand_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir); + const auto nand_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir); auto vfs_nand_dir = vfs->OpenDirectory(Common::FS::PathToUTF8String(nand_dir), FileSys::OpenMode::Read); @@ -2344,7 +2344,7 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target } case GameListOpenTarget::ModData: { open_target = tr("Mod Data"); - path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::LoadDir) / + path = Common::FS::GetCitronPath(Common::FS::CitronPath::LoadDir) / fmt::format("{:016X}", program_id); break; } @@ -2366,7 +2366,7 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target } void GMainWindow::OnTransferableShaderCacheOpenFile(u64 program_id) { - const auto shader_cache_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir); + const auto shader_cache_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::ShaderDir); const auto shader_cache_folder_path{shader_cache_dir / fmt::format("{:016x}", program_id)}; if (!Common::FS::CreateDirs(shader_cache_folder_path)) { QMessageBox::warning(this, tr("Error Opening Transferable Shader Cache"), @@ -2485,7 +2485,7 @@ void GMainWindow::OnGameListRemoveInstalledEntry(u64 program_id, InstalledEntryT RemoveAddOnContent(program_id, type); break; } - Common::FS::RemoveDirRecursively(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / + Common::FS::RemoveDirRecursively(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list"); game_list->PopulateAsync(UISettings::values.game_dirs); } @@ -2591,7 +2591,7 @@ void GMainWindow::RemoveTransferableShaderCache(u64 program_id, GameListRemoveTa return ""; } }(); - const auto shader_cache_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir); + const auto shader_cache_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::ShaderDir); const auto shader_cache_folder_path = shader_cache_dir / fmt::format("{:016x}", program_id); const auto target_file = shader_cache_folder_path / target_file_name; @@ -2612,7 +2612,7 @@ void GMainWindow::RemoveTransferableShaderCache(u64 program_id, GameListRemoveTa void GMainWindow::RemoveVulkanDriverPipelineCache(u64 program_id) { static constexpr std::string_view target_file_name = "vulkan_pipelines.bin"; - const auto shader_cache_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir); + const auto shader_cache_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::ShaderDir); const auto shader_cache_folder_path = shader_cache_dir / fmt::format("{:016x}", program_id); const auto target_file = shader_cache_folder_path / target_file_name; @@ -2626,7 +2626,7 @@ void GMainWindow::RemoveVulkanDriverPipelineCache(u64 program_id) { } void GMainWindow::RemoveAllTransferableShaderCaches(u64 program_id) { - const auto shader_cache_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir); + const auto shader_cache_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::ShaderDir); const auto program_shader_cache_dir = shader_cache_dir / fmt::format("{:016x}", program_id); if (!Common::FS::Exists(program_shader_cache_dir)) { @@ -2649,7 +2649,7 @@ void GMainWindow::RemoveCustomConfiguration(u64 program_id, const std::string& g program_id == 0 ? Common::FS::PathToUTF8String(file_path.filename()).append(".ini") : fmt::format("{:016X}.ini", program_id); const auto custom_config_file_path = - Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "custom" / config_file_name; + Common::FS::GetCitronPath(Common::FS::CitronPath::ConfigDir) / "custom" / config_file_name; if (!Common::FS::Exists(custom_config_file_path)) { QMessageBox::warning(this, tr("Error Removing Custom Configuration"), @@ -2667,7 +2667,7 @@ void GMainWindow::RemoveCustomConfiguration(u64 program_id, const std::string& g } void GMainWindow::RemoveCacheStorage(u64 program_id) { - const auto nand_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir); + const auto nand_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir); auto vfs_nand_dir = vfs->OpenDirectory(Common::FS::PathToUTF8String(nand_dir), FileSys::OpenMode::Read); @@ -2725,8 +2725,8 @@ void GMainWindow::OnGameListDumpRomFS(u64 program_id, const std::string& game_pa const auto base_romfs = base_nca->GetRomFS(); const auto dump_dir = target == DumpRomFSTarget::Normal - ? Common::FS::GetYuzuPath(Common::FS::YuzuPath::DumpDir) - : Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir) / "atmosphere" / "contents"; + ? Common::FS::GetCitronPath(Common::FS::CitronPath::DumpDir) + : Common::FS::GetCitronPath(Common::FS::CitronPath::SDMCDir) / "atmosphere" / "contents"; const auto romfs_dir = fmt::format("{:016X}/romfs", title_id); const auto path = Common::FS::PathToUTF8String(dump_dir / romfs_dir); @@ -2843,7 +2843,7 @@ void GMainWindow::OnGameListNavigateToGamedbEntry(u64 program_id, directory = it->second.second; } - QDesktopServices::openUrl(QUrl(QStringLiteral("https://yuzu-emu.org/game/") + directory)); + QDesktopServices::openUrl(QUrl(QStringLiteral("https://citron-emu.org/game/") + directory)); } bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path, @@ -2981,10 +2981,10 @@ bool GMainWindow::CreateShortcutMessagesGUI(QWidget* parent, int imsg, const QSt bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name, std::filesystem::path& out_icon_path) { - // Get path to Yuzu icons directory & icon extension + // Get path to Citron icons directory & icon extension std::string ico_extension = "png"; #if defined(_WIN32) - out_icon_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::IconsDir); + out_icon_path = Common::FS::GetCitronPath(Common::FS::CitronPath::IconsDir); ico_extension = "ico"; #elif defined(__linux__) || defined(__FreeBSD__) out_icon_path = Common::FS::GetDataDirectory("XDG_DATA_HOME") / "icons/hicolor/256x256"; @@ -3001,19 +3001,19 @@ bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_vi } // Create icon file path - out_icon_path /= (program_id == 0 ? fmt::format("yuzu-{}.{}", game_file_name, ico_extension) - : fmt::format("yuzu-{:016X}.{}", program_id, ico_extension)); + out_icon_path /= (program_id == 0 ? fmt::format("citron-{}.{}", game_file_name, ico_extension) + : fmt::format("citron-{:016X}.{}", program_id, ico_extension)); return true; } void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path, GameListShortcutTarget target) { - // Get path to yuzu executable + // Get path to citron executable const QStringList args = QApplication::arguments(); - std::filesystem::path yuzu_command = args[0].toStdString(); + std::filesystem::path citron_command = args[0].toStdString(); // If relative path, make it an absolute path - if (yuzu_command.c_str()[0] == '.') { - yuzu_command = Common::FS::GetCurrentDir() / yuzu_command; + if (citron_command.c_str()[0] == '.') { + citron_command = Common::FS::GetCurrentDir() / citron_command; } // Shortcut path std::filesystem::path shortcut_path{}; @@ -3074,7 +3074,7 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga // Warn once if we are making a shortcut to a volatile AppImage const std::string appimage_ending = std::string(Common::g_scm_rev).substr(0, 9).append(".AppImage"); - if (yuzu_command.string().ends_with(appimage_ending) && + if (citron_command.string().ends_with(appimage_ending) && !UISettings::values.shortcut_already_warned) { if (GMainWindow::CreateShortcutMessagesGUI( this, GMainWindow::CREATE_SHORTCUT_MSGBOX_APPVOLATILE_WARNING, qt_game_title)) { @@ -3089,11 +3089,11 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga this, GMainWindow::CREATE_SHORTCUT_MSGBOX_FULLSCREEN_YES, qt_game_title)) { arguments = "-f " + arguments; } - const std::string comment = fmt::format("Start {:s} with the yuzu Emulator", game_title); + const std::string comment = fmt::format("Start {:s} with the citron Emulator", game_title); const std::string categories = "Game;Emulator;Qt;"; const std::string keywords = "Switch;Nintendo;"; - if (GMainWindow::CreateShortcutLink(shortcut_path, comment, out_icon_path, yuzu_command, + if (GMainWindow::CreateShortcutLink(shortcut_path, comment, out_icon_path, citron_command, arguments, categories, keywords, game_title)) { GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_SUCCESS, qt_game_title); @@ -3107,13 +3107,13 @@ void GMainWindow::OnGameListOpenDirectory(const QString& directory) { std::filesystem::path fs_path; if (directory == QStringLiteral("SDMC")) { fs_path = - Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir) / "Nintendo/Contents/registered"; + Common::FS::GetCitronPath(Common::FS::CitronPath::SDMCDir) / "Nintendo/Contents/registered"; } else if (directory == QStringLiteral("UserNAND")) { fs_path = - Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) / "user/Contents/registered"; + Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir) / "user/Contents/registered"; } else if (directory == QStringLiteral("SysNAND")) { fs_path = - Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) / "system/Contents/registered"; + Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir) / "system/Contents/registered"; } else { fs_path = directory.toStdString(); } @@ -3339,7 +3339,7 @@ void GMainWindow::OnMenuInstallToNAND() { : tr("%n file(s) failed to install\n", "", failed_files.size())); QMessageBox::information(this, tr("Install Results"), install_results); - Common::FS::RemoveDirRecursively(Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / + Common::FS::RemoveDirRecursively(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list"); game_list->PopulateAsync(UISettings::values.game_dirs); ui->action_Install_File_NAND->setEnabled(true); @@ -3552,15 +3552,15 @@ void GMainWindow::OnMenuReportCompatibility() { return; } - if (!Settings::values.yuzu_token.GetValue().empty() && - !Settings::values.yuzu_username.GetValue().empty()) { + if (!Settings::values.citron_token.GetValue().empty() && + !Settings::values.citron_username.GetValue().empty()) { CompatDB compatdb{system->TelemetrySession(), this}; compatdb.exec(); } else { QMessageBox::critical( - this, tr("Missing yuzu Account"), - tr("In order to submit a game compatibility test case, you must link your yuzu " - "account.<br><br/>To link your yuzu account, go to Emulation > Configuration " + this, tr("Missing citron Account"), + tr("In order to submit a game compatibility test case, you must link your citron " + "account.<br><br/>To link your citron account, go to Emulation > Configuration " "> " "Web.")); } @@ -3580,15 +3580,15 @@ void GMainWindow::OpenURL(const QUrl& url) { } void GMainWindow::OnOpenModsPage() { - OpenURL(QUrl(QStringLiteral("https://github.com/yuzu-emu/yuzu/wiki/Switch-Mods"))); + OpenURL(QUrl(QStringLiteral("https://github.com/citron-emu/citron/wiki/Switch-Mods"))); } void GMainWindow::OnOpenQuickstartGuide() { - OpenURL(QUrl(QStringLiteral("https://yuzu-emu.org/help/quickstart/"))); + OpenURL(QUrl(QStringLiteral("https://citron-emu.org/help/quickstart/"))); } void GMainWindow::OnOpenFAQ() { - OpenURL(QUrl(QStringLiteral("https://yuzu-emu.org/wiki/faq/"))); + OpenURL(QUrl(QStringLiteral("https://citron-emu.org/wiki/faq/"))); } void GMainWindow::ToggleFullscreen() { @@ -3759,11 +3759,11 @@ void GMainWindow::OnConfigure() { LOG_WARNING(Frontend, "Failed to remove configuration file"); } if (!Common::FS::RemoveDirContentsRecursively( - Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "custom")) { + Common::FS::GetCitronPath(Common::FS::CitronPath::ConfigDir) / "custom")) { LOG_WARNING(Frontend, "Failed to remove custom configuration files"); } if (!Common::FS::RemoveDirRecursively( - Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / "game_list")) { + Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list")) { LOG_WARNING(Frontend, "Failed to remove game metadata cache files"); } @@ -4119,9 +4119,9 @@ void GMainWindow::LoadAmiibo(const QString& filename) { } } -void GMainWindow::OnOpenYuzuFolder() { +void GMainWindow::OnOpenCitronFolder() { QDesktopServices::openUrl(QUrl::fromLocalFile( - QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::YuzuDir)))); + QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::CitronDir)))); } void GMainWindow::OnVerifyInstalledContents() { @@ -4164,7 +4164,7 @@ void GMainWindow::OnInstallFirmware() { if (!ContentManager::AreKeysPresent()) { QMessageBox::information( this, tr("Keys not installed"), - tr("Install decryption keys and restart yuzu before attempting to install firmware.")); + tr("Install decryption keys and restart citron before attempting to install firmware.")); return; } @@ -4254,7 +4254,7 @@ void GMainWindow::OnInstallFirmware() { QMessageBox::warning( this, tr("Firmware install failed"), tr("Firmware installation cancelled, firmware may be in bad state, " - "restart yuzu or re-install firmware.")); + "restart citron or re-install firmware.")); return; } } @@ -4336,9 +4336,9 @@ void GMainWindow::OnInstallDecryptionKeys() { return; } - const auto yuzu_keys_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::KeysDir); + const auto citron_keys_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::KeysDir); for (auto key_file : source_key_files) { - std::filesystem::path destination_key_file = yuzu_keys_dir / key_file.filename(); + std::filesystem::path destination_key_file = citron_keys_dir / key_file.filename(); if (!std::filesystem::copy_file(key_file, destination_key_file, std::filesystem::copy_options::overwrite_existing)) { LOG_ERROR(Frontend, "Failed to copy file {} to {}", key_file.string(), @@ -4489,7 +4489,7 @@ void GMainWindow::OnCaptureScreenshot() { const u64 title_id = system->GetApplicationProcessProgramID(); const auto screenshot_path = - QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir)); + QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::ScreenshotsDir)); const auto date = QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd_hh-mm-ss-zzz")); QString filename = QStringLiteral("%1/%2_%3.png") @@ -4517,7 +4517,7 @@ void GMainWindow::OnCaptureScreenshot() { // TODO: Written 2020-10-01: Remove per-game config migration code when it is irrelevant void GMainWindow::MigrateConfigFiles() { - const auto config_dir_fs_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir); + const auto config_dir_fs_path = Common::FS::GetCitronPath(Common::FS::CitronPath::ConfigDir); const QDir config_dir = QDir(QString::fromStdString(Common::FS::PathToUTF8String(config_dir_fs_path))); const QStringList config_dir_list = config_dir.entryList(QStringList(QStringLiteral("*.ini"))); @@ -4548,10 +4548,10 @@ void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_vie const auto description = std::string(Common::g_scm_desc); const auto build_id = std::string(Common::g_build_id); - const auto yuzu_title = fmt::format("yuzu | {}-{}", branch_name, description); + const auto citron_title = fmt::format("citron | {}-{}", branch_name, description); const auto override_title = fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id); - const auto window_title = override_title.empty() ? yuzu_title : override_title; + const auto window_title = override_title.empty() ? citron_title : override_title; if (title_name.empty()) { setWindowTitle(QString::fromStdString(window_title)); @@ -4790,7 +4790,7 @@ void GMainWindow::OnCheckFirmwareDecryption() { QMessageBox::warning( this, tr("Derivation Components Missing"), tr("Encryption keys are missing. " - "<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu " + "<br>Please follow <a href='https://citron-emu.org/help/quickstart/'>the citron " "quickstart guide</a> to get all your keys, firmware and " "games.")); } @@ -4905,8 +4905,8 @@ bool GMainWindow::ConfirmClose() { UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Based_On_Game) { return true; } - const auto text = tr("Are you sure you want to close yuzu?"); - return question(this, tr("yuzu"), text); + const auto text = tr("Are you sure you want to close citron?"); + return question(this, tr("citron"), text); } void GMainWindow::closeEvent(QCloseEvent* event) { @@ -4986,7 +4986,7 @@ bool GMainWindow::ConfirmChangeGame() { // Use custom question to link controller navigation return question( - this, tr("yuzu"), + this, tr("citron"), tr("Are you sure you want to stop the emulation? Any unsaved progress will be lost."), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); } @@ -4995,10 +4995,10 @@ bool GMainWindow::ConfirmForceLockedExit() { if (emu_thread == nullptr) { return true; } - const auto text = tr("The currently running application has requested yuzu to not exit.\n\n" + const auto text = tr("The currently running application has requested citron to not exit.\n\n" "Would you like to bypass this and exit anyway?"); - return question(this, tr("yuzu"), text); + return question(this, tr("citron"), text); } void GMainWindow::RequestGameExit() { @@ -5258,7 +5258,7 @@ int main(int argc, char* argv[]) { return 0; } -#ifdef YUZU_CRASH_DUMPS +#ifdef CITRON_CRASH_DUMPS Breakpad::InstallCrashHandler(); #endif @@ -5271,8 +5271,8 @@ int main(int argc, char* argv[]) { Common::ConfigureNvidiaEnvironmentFlags(); // Init settings params - QCoreApplication::setOrganizationName(QStringLiteral("yuzu team")); - QCoreApplication::setApplicationName(QStringLiteral("yuzu")); + QCoreApplication::setOrganizationName(QStringLiteral("citron team")); + QCoreApplication::setApplicationName(QStringLiteral("citron")); #ifdef _WIN32 // Increases the maximum open file limit to 8192 @@ -5296,7 +5296,7 @@ int main(int argc, char* argv[]) { // Fix the Wayland appId. This needs to match the name of the .desktop file without the .desktop // suffix. - QGuiApplication::setDesktopFileName(QStringLiteral("org.yuzu_emu.yuzu")); + QGuiApplication::setDesktopFileName(QStringLiteral("org.citron_emu.citron")); #endif SetHighDPIAttributes(); diff --git a/src/citron/main.h b/src/citron/main.h index cb68f5a75..4822a8981 100644 --- a/src/citron/main.h +++ b/src/citron/main.h @@ -18,9 +18,9 @@ #include "configuration/qt_config.h" #include "frontend_common/content_manager.h" #include "input_common/drivers/tas_input.h" -#include "yuzu/compatibility_list.h" -#include "yuzu/hotkeys.h" -#include "yuzu/util/controller_navigation.h" +#include "citron/compatibility_list.h" +#include "citron/hotkeys.h" +#include "citron/util/controller_navigation.h" #ifdef __unix__ #include <QVariant> @@ -377,7 +377,7 @@ private slots: void OnToggleAdaptingFilter(); void OnConfigurePerGame(); void OnLoadAmiibo(); - void OnOpenYuzuFolder(); + void OnOpenCitronFolder(); void OnVerifyInstalledContents(); void OnInstallFirmware(); void OnInstallDecryptionKeys(); @@ -510,7 +510,7 @@ private: std::unique_ptr<QtConfig> config; - // Whether emulation is currently running in yuzu. + // Whether emulation is currently running in citron. bool emulation_running = false; std::unique_ptr<EmuThread> emu_thread; // The path to the game currently running diff --git a/src/citron/main.ui b/src/citron/main.ui index 85dc1f2f6..f356c8bba 100644 --- a/src/citron/main.ui +++ b/src/citron/main.ui @@ -11,11 +11,11 @@ </rect> </property> <property name="windowTitle"> - <string>yuzu</string> + <string>citron</string> </property> <property name="windowIcon"> - <iconset resource="yuzu.qrc"> - <normaloff>:/img/yuzu.ico</normaloff>:/img/yuzu.ico</iconset> + <iconset resource="citron.qrc"> + <normaloff>:/img/citron.ico</normaloff>:/img/citron.ico</iconset> </property> <property name="tabShape"> <enum>QTabWidget::Rounded</enum> @@ -66,7 +66,7 @@ <addaction name="separator"/> <addaction name="action_Load_Amiibo"/> <addaction name="separator"/> - <addaction name="action_Open_yuzu_Folder"/> + <addaction name="action_Open_citron_Folder"/> <addaction name="separator"/> <addaction name="action_Exit"/> </widget> @@ -241,7 +241,7 @@ </action> <action name="action_About"> <property name="text"> - <string>&About yuzu</string> + <string>&About citron</string> </property> </action> <action name="action_Single_Window_Mode"> @@ -374,9 +374,9 @@ <string>&FAQ</string> </property> </action> - <action name="action_Open_yuzu_Folder"> + <action name="action_Open_citron_Folder"> <property name="text"> - <string>Open &yuzu Folder</string> + <string>Open &citron Folder</string> </property> </action> <action name="action_Capture_Screenshot"> @@ -477,7 +477,7 @@ </action> </widget> <resources> - <include location="yuzu.qrc"/> + <include location="citron.qrc"/> </resources> <connections/> </ui> diff --git a/src/citron/multiplayer/chat_room.cpp b/src/citron/multiplayer/chat_room.cpp index 4463616b4..75dfdf904 100644 --- a/src/citron/multiplayer/chat_room.cpp +++ b/src/citron/multiplayer/chat_room.cpp @@ -18,9 +18,9 @@ #include "common/logging/log.h" #include "network/announce_multiplayer_session.h" #include "ui_chat_room.h" -#include "yuzu/game_list_p.h" -#include "yuzu/multiplayer/chat_room.h" -#include "yuzu/multiplayer/message.h" +#include "citron/game_list_p.h" +#include "citron/multiplayer/chat_room.h" +#include "citron/multiplayer/message.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/web_backend.h" #endif diff --git a/src/citron/multiplayer/client_room.cpp b/src/citron/multiplayer/client_room.cpp index caf34a414..d6e55f8d4 100644 --- a/src/citron/multiplayer/client_room.cpp +++ b/src/citron/multiplayer/client_room.cpp @@ -12,11 +12,11 @@ #include "common/logging/log.h" #include "network/announce_multiplayer_session.h" #include "ui_client_room.h" -#include "yuzu/game_list_p.h" -#include "yuzu/multiplayer/client_room.h" -#include "yuzu/multiplayer/message.h" -#include "yuzu/multiplayer/moderation_dialog.h" -#include "yuzu/multiplayer/state.h" +#include "citron/game_list_p.h" +#include "citron/multiplayer/client_room.h" +#include "citron/multiplayer/message.h" +#include "citron/multiplayer/moderation_dialog.h" +#include "citron/multiplayer/state.h" ClientRoomWindow::ClientRoomWindow(QWidget* parent, Network::RoomNetwork& room_network_) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint), diff --git a/src/citron/multiplayer/client_room.h b/src/citron/multiplayer/client_room.h index f338e3c59..8fee509de 100644 --- a/src/citron/multiplayer/client_room.h +++ b/src/citron/multiplayer/client_room.h @@ -3,7 +3,7 @@ #pragma once -#include "yuzu/multiplayer/chat_room.h" +#include "citron/multiplayer/chat_room.h" namespace Ui { class ClientRoom; diff --git a/src/citron/multiplayer/direct_connect.cpp b/src/citron/multiplayer/direct_connect.cpp index 74da97e21..3255c7acc 100644 --- a/src/citron/multiplayer/direct_connect.cpp +++ b/src/citron/multiplayer/direct_connect.cpp @@ -12,13 +12,13 @@ #include "core/internal_network/network_interface.h" #include "network/network.h" #include "ui_direct_connect.h" -#include "yuzu/main.h" -#include "yuzu/multiplayer/client_room.h" -#include "yuzu/multiplayer/direct_connect.h" -#include "yuzu/multiplayer/message.h" -#include "yuzu/multiplayer/state.h" -#include "yuzu/multiplayer/validation.h" -#include "yuzu/uisettings.h" +#include "citron/main.h" +#include "citron/multiplayer/client_room.h" +#include "citron/multiplayer/direct_connect.h" +#include "citron/multiplayer/message.h" +#include "citron/multiplayer/state.h" +#include "citron/multiplayer/validation.h" +#include "citron/uisettings.h" enum class ConnectionType : u8 { TraversalServer, IP }; @@ -36,9 +36,9 @@ DirectConnectWindow::DirectConnectWindow(Core::System& system_, QWidget* parent) ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText( QString::fromStdString(UISettings::values.multiplayer_nickname.GetValue())); - if (ui->nickname->text().isEmpty() && !Settings::values.yuzu_username.GetValue().empty()) { - // Use yuzu Web Service user name as nickname by default - ui->nickname->setText(QString::fromStdString(Settings::values.yuzu_username.GetValue())); + if (ui->nickname->text().isEmpty() && !Settings::values.citron_username.GetValue().empty()) { + // Use citron Web Service user name as nickname by default + ui->nickname->setText(QString::fromStdString(Settings::values.citron_username.GetValue())); } ui->ip->setValidator(validation.GetIP()); ui->ip->setText(QString::fromStdString(UISettings::values.multiplayer_ip.GetValue())); diff --git a/src/citron/multiplayer/direct_connect.h b/src/citron/multiplayer/direct_connect.h index b8f66cfb2..50046ca9f 100644 --- a/src/citron/multiplayer/direct_connect.h +++ b/src/citron/multiplayer/direct_connect.h @@ -6,7 +6,7 @@ #include <memory> #include <QDialog> #include <QFutureWatcher> -#include "yuzu/multiplayer/validation.h" +#include "citron/multiplayer/validation.h" namespace Ui { class DirectConnect; diff --git a/src/citron/multiplayer/host_room.cpp b/src/citron/multiplayer/host_room.cpp index ef364ee43..596fb94f3 100644 --- a/src/citron/multiplayer/host_room.cpp +++ b/src/citron/multiplayer/host_room.cpp @@ -16,13 +16,13 @@ #include "core/internal_network/network_interface.h" #include "network/announce_multiplayer_session.h" #include "ui_host_room.h" -#include "yuzu/game_list_p.h" -#include "yuzu/main.h" -#include "yuzu/multiplayer/host_room.h" -#include "yuzu/multiplayer/message.h" -#include "yuzu/multiplayer/state.h" -#include "yuzu/multiplayer/validation.h" -#include "yuzu/uisettings.h" +#include "citron/game_list_p.h" +#include "citron/main.h" +#include "citron/multiplayer/host_room.h" +#include "citron/multiplayer/message.h" +#include "citron/multiplayer/state.h" +#include "citron/multiplayer/validation.h" +#include "citron/uisettings.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/verify_user_jwt.h" #endif @@ -57,9 +57,9 @@ HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list, // Restore the settings: ui->username->setText( QString::fromStdString(UISettings::values.multiplayer_room_nickname.GetValue())); - if (ui->username->text().isEmpty() && !Settings::values.yuzu_username.GetValue().empty()) { - // Use yuzu Web Service user name as nickname by default - ui->username->setText(QString::fromStdString(Settings::values.yuzu_username.GetValue())); + if (ui->username->text().isEmpty() && !Settings::values.citron_username.GetValue().empty()) { + // Use citron Web Service user name as nickname by default + ui->username->setText(QString::fromStdString(Settings::values.citron_username.GetValue())); } ui->room_name->setText( QString::fromStdString(UISettings::values.multiplayer_room_name.GetValue())); @@ -165,7 +165,7 @@ void HostRoomWindow::Host() { const bool created = room->Create(ui->room_name->text().toStdString(), ui->room_description->toPlainText().toStdString(), "", port, password, - ui->max_player->value(), Settings::values.yuzu_username.GetValue(), + ui->max_player->value(), Settings::values.citron_username.GetValue(), game, CreateVerifyBackend(is_public), ban_list); if (!created) { NetworkMessage::ErrorManager::ShowError( @@ -184,7 +184,7 @@ void HostRoomWindow::Host() { QMessageBox::warning( this, tr("Error"), tr("Failed to announce the room to the public lobby. In order to host a " - "room publicly, you must have a valid yuzu account configured in " + "room publicly, you must have a valid citron account configured in " "Emulation -> Configure -> Web. If you do not want to publish a room in " "the public lobby, then select Unlisted instead.\nDebug Message: ") + QString::fromStdString(result.result_string), @@ -204,8 +204,8 @@ void HostRoomWindow::Host() { #ifdef ENABLE_WEB_SERVICE if (is_public) { WebService::Client client(Settings::values.web_api_url.GetValue(), - Settings::values.yuzu_username.GetValue(), - Settings::values.yuzu_token.GetValue()); + Settings::values.citron_username.GetValue(), + Settings::values.citron_token.GetValue()); if (auto room = room_network.GetRoom().lock()) { token = client.GetExternalJWT(room->GetVerifyUID()).returned_data; } diff --git a/src/citron/multiplayer/host_room.h b/src/citron/multiplayer/host_room.h index ae816e2e0..49208ee3f 100644 --- a/src/citron/multiplayer/host_room.h +++ b/src/citron/multiplayer/host_room.h @@ -9,8 +9,8 @@ #include <QStandardItemModel> #include <QVariant> #include "network/network.h" -#include "yuzu/multiplayer/chat_room.h" -#include "yuzu/multiplayer/validation.h" +#include "citron/multiplayer/chat_room.h" +#include "citron/multiplayer/validation.h" namespace Ui { class HostRoom; diff --git a/src/citron/multiplayer/lobby.cpp b/src/citron/multiplayer/lobby.cpp index 77ac84295..918573d08 100644 --- a/src/citron/multiplayer/lobby.cpp +++ b/src/citron/multiplayer/lobby.cpp @@ -11,15 +11,15 @@ #include "core/internal_network/network_interface.h" #include "network/network.h" #include "ui_lobby.h" -#include "yuzu/game_list_p.h" -#include "yuzu/main.h" -#include "yuzu/multiplayer/client_room.h" -#include "yuzu/multiplayer/lobby.h" -#include "yuzu/multiplayer/lobby_p.h" -#include "yuzu/multiplayer/message.h" -#include "yuzu/multiplayer/state.h" -#include "yuzu/multiplayer/validation.h" -#include "yuzu/uisettings.h" +#include "citron/game_list_p.h" +#include "citron/main.h" +#include "citron/multiplayer/client_room.h" +#include "citron/multiplayer/lobby.h" +#include "citron/multiplayer/lobby_p.h" +#include "citron/multiplayer/message.h" +#include "citron/multiplayer/state.h" +#include "citron/multiplayer/validation.h" +#include "citron/uisettings.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/web_backend.h" #endif @@ -64,14 +64,14 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list, QString::fromStdString(UISettings::values.multiplayer_nickname.GetValue())); // Try find the best nickname by default - if (ui->nickname->text().isEmpty() || ui->nickname->text() == QStringLiteral("yuzu")) { - if (!Settings::values.yuzu_username.GetValue().empty()) { + if (ui->nickname->text().isEmpty() || ui->nickname->text() == QStringLiteral("citron")) { + if (!Settings::values.citron_username.GetValue().empty()) { ui->nickname->setText( - QString::fromStdString(Settings::values.yuzu_username.GetValue())); + QString::fromStdString(Settings::values.citron_username.GetValue())); } else if (!GetProfileUsername().empty()) { ui->nickname->setText(QString::fromStdString(GetProfileUsername())); } else { - ui->nickname->setText(QStringLiteral("yuzu")); + ui->nickname->setText(QStringLiteral("citron")); } } @@ -187,11 +187,11 @@ void Lobby::OnJoinRoom(const QModelIndex& source) { QFuture<void> f = QtConcurrent::run([nickname, ip, port, password, verify_uid, this] { std::string token; #ifdef ENABLE_WEB_SERVICE - if (!Settings::values.yuzu_username.GetValue().empty() && - !Settings::values.yuzu_token.GetValue().empty()) { + if (!Settings::values.citron_username.GetValue().empty() && + !Settings::values.citron_token.GetValue().empty()) { WebService::Client client(Settings::values.web_api_url.GetValue(), - Settings::values.yuzu_username.GetValue(), - Settings::values.yuzu_token.GetValue()); + Settings::values.citron_username.GetValue(), + Settings::values.citron_token.GetValue()); token = client.GetExternalJWT(verify_uid).returned_data; if (token.empty()) { LOG_ERROR(WebService, "Could not get external JWT, verification may fail"); diff --git a/src/citron/multiplayer/lobby.h b/src/citron/multiplayer/lobby.h index e78c9cae3..91f2a1444 100644 --- a/src/citron/multiplayer/lobby.h +++ b/src/citron/multiplayer/lobby.h @@ -11,7 +11,7 @@ #include "common/announce_multiplayer_room.h" #include "network/announce_multiplayer_session.h" #include "network/network.h" -#include "yuzu/multiplayer/validation.h" +#include "citron/multiplayer/validation.h" namespace Ui { class Lobby; diff --git a/src/citron/multiplayer/message.cpp b/src/citron/multiplayer/message.cpp index 6d8f18274..1d4dbb5ef 100644 --- a/src/citron/multiplayer/message.cpp +++ b/src/citron/multiplayer/message.cpp @@ -4,7 +4,7 @@ #include <QMessageBox> #include <QString> -#include "yuzu/multiplayer/message.h" +#include "citron/multiplayer/message.h" namespace NetworkMessage { const ConnectionError ErrorManager::USERNAME_NOT_VALID( @@ -29,12 +29,12 @@ const ConnectionError ErrorManager::UNABLE_TO_CONNECT( const ConnectionError ErrorManager::ROOM_IS_FULL( QT_TR_NOOP("Unable to connect to the room because it is already full.")); const ConnectionError ErrorManager::COULD_NOT_CREATE_ROOM( - QT_TR_NOOP("Creating a room failed. Please retry. Restarting yuzu might be necessary.")); + QT_TR_NOOP("Creating a room failed. Please retry. Restarting citron might be necessary.")); const ConnectionError ErrorManager::HOST_BANNED( QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you " "or try a different room.")); const ConnectionError ErrorManager::WRONG_VERSION( - QT_TR_NOOP("Version mismatch! Please update to the latest version of yuzu. If the problem " + QT_TR_NOOP("Version mismatch! Please update to the latest version of citron. If the problem " "persists, contact the room host and ask them to update the server.")); const ConnectionError ErrorManager::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password.")); const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP( diff --git a/src/citron/multiplayer/moderation_dialog.cpp b/src/citron/multiplayer/moderation_dialog.cpp index c9b8ed397..c3568b347 100644 --- a/src/citron/multiplayer/moderation_dialog.cpp +++ b/src/citron/multiplayer/moderation_dialog.cpp @@ -6,7 +6,7 @@ #include "network/network.h" #include "network/room_member.h" #include "ui_moderation_dialog.h" -#include "yuzu/multiplayer/moderation_dialog.h" +#include "citron/multiplayer/moderation_dialog.h" namespace Column { enum { diff --git a/src/citron/multiplayer/state.cpp b/src/citron/multiplayer/state.cpp index d82ca9aee..cd3494c55 100644 --- a/src/citron/multiplayer/state.cpp +++ b/src/citron/multiplayer/state.cpp @@ -9,15 +9,15 @@ #include "common/announce_multiplayer_room.h" #include "common/logging/log.h" #include "core/core.h" -#include "yuzu/game_list.h" -#include "yuzu/multiplayer/client_room.h" -#include "yuzu/multiplayer/direct_connect.h" -#include "yuzu/multiplayer/host_room.h" -#include "yuzu/multiplayer/lobby.h" -#include "yuzu/multiplayer/message.h" -#include "yuzu/multiplayer/state.h" -#include "yuzu/uisettings.h" -#include "yuzu/util/clickable_label.h" +#include "citron/game_list.h" +#include "citron/multiplayer/client_room.h" +#include "citron/multiplayer/direct_connect.h" +#include "citron/multiplayer/host_room.h" +#include "citron/multiplayer/lobby.h" +#include "citron/multiplayer/message.h" +#include "citron/multiplayer/state.h" +#include "citron/uisettings.h" +#include "citron/util/clickable_label.h" MultiplayerState::MultiplayerState(QWidget* parent, QStandardItemModel* game_list_model_, QAction* leave_room_, QAction* show_room_, Core::System& system_) diff --git a/src/citron/play_time_manager.cpp b/src/citron/play_time_manager.cpp index 94c99274d..40a1f7faa 100644 --- a/src/citron/play_time_manager.cpp +++ b/src/citron/play_time_manager.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/alignment.h" @@ -9,7 +9,7 @@ #include "common/settings.h" #include "common/thread.h" #include "core/hle/service/acc/profile_manager.h" -#include "yuzu/play_time_manager.h" +#include "citron/play_time_manager.h" namespace PlayTime { @@ -26,7 +26,7 @@ std::optional<std::filesystem::path> GetCurrentUserPlayTimePath( if (!uuid.has_value()) { return std::nullopt; } - return Common::FS::GetYuzuPath(Common::FS::YuzuPath::PlayTimeDir) / + return Common::FS::GetCitronPath(Common::FS::CitronPath::PlayTimeDir) / uuid->RawString().append(".bin"); } diff --git a/src/citron/play_time_manager.h b/src/citron/play_time_manager.h index 1714b9131..d15951185 100644 --- a/src/citron/play_time_manager.h +++ b/src/citron/play_time_manager.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -26,8 +26,8 @@ public: explicit PlayTimeManager(Service::Account::ProfileManager& profile_manager); ~PlayTimeManager(); - YUZU_NON_COPYABLE(PlayTimeManager); - YUZU_NON_MOVEABLE(PlayTimeManager); + CITRON_NON_COPYABLE(PlayTimeManager); + CITRON_NON_MOVEABLE(PlayTimeManager); u64 GetPlayTime(u64 program_id) const; void ResetProgramPlayTime(u64 program_id); diff --git a/src/citron/precompiled_headers.h b/src/citron/precompiled_headers.h index aabae730b..87b2e790e 100644 --- a/src/citron/precompiled_headers.h +++ b/src/citron/precompiled_headers.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/qt_common.cpp b/src/citron/qt_common.cpp index 413402165..014df8033 100644 --- a/src/citron/qt_common.cpp +++ b/src/citron/qt_common.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QGuiApplication> @@ -6,7 +6,7 @@ #include <QWindow> #include "common/logging/log.h" #include "core/frontend/emu_window.h" -#include "yuzu/qt_common.h" +#include "citron/qt_common.h" #if !defined(WIN32) && !defined(__APPLE__) #include <qpa/qplatformnativeinterface.h> diff --git a/src/citron/qt_common.h b/src/citron/qt_common.h index 9c63f08f3..10b8b3b59 100644 --- a/src/citron/qt_common.h +++ b/src/citron/qt_common.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/startup_checks.cpp b/src/citron/startup_checks.cpp index 6eefc94ed..d666f2d28 100644 --- a/src/citron/startup_checks.cpp +++ b/src/citron/startup_checks.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "video_core/vulkan_common/vulkan_wrapper.h" @@ -7,7 +7,7 @@ #include <cstring> #include <processthreadsapi.h> #include <windows.h> -#elif defined(YUZU_UNIX) +#elif defined(CITRON_UNIX) #include <cstring> #include <errno.h> #include <spawn.h> @@ -19,7 +19,7 @@ #include <fmt/core.h> #include "video_core/vulkan_common/vulkan_instance.h" #include "video_core/vulkan_common/vulkan_library.h" -#include "yuzu/startup_checks.h" +#include "citron/startup_checks.h" void CheckVulkan() { // Just start the Vulkan loader, this will crash if something is wrong @@ -56,7 +56,7 @@ bool CheckEnvVars(bool* is_child) { IS_CHILD_ENV_VAR, GetLastError()); return true; } -#elif defined(YUZU_UNIX) +#elif defined(CITRON_UNIX) const char* startup_check_var = getenv(STARTUP_CHECK_ENV_VAR); if (startup_check_var != nullptr && std::strncmp(startup_check_var, ENV_VAR_ENABLED_TEXT, 8) == 0) { @@ -110,7 +110,7 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan, bool perform_vulka STARTUP_CHECK_ENV_VAR, GetLastError()); } -#elif defined(YUZU_UNIX) +#elif defined(CITRON_UNIX) const int env_var_set = setenv(STARTUP_CHECK_ENV_VAR, ENV_VAR_ENABLED_TEXT, 1); if (env_var_set == -1) { const int err = errno; @@ -175,7 +175,7 @@ bool SpawnChild(const char* arg0, PROCESS_INFORMATION* pi, int flags) { return true; } -#elif defined(YUZU_UNIX) +#elif defined(CITRON_UNIX) pid_t SpawnChild(const char* arg0) { const pid_t pid = fork(); diff --git a/src/citron/startup_checks.h b/src/citron/startup_checks.h index 2f86fb843..796578aae 100644 --- a/src/citron/startup_checks.h +++ b/src/citron/startup_checks.h @@ -1,16 +1,16 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #ifdef _WIN32 #include <windows.h> -#elif defined(YUZU_UNIX) +#elif defined(CITRON_UNIX) #include <sys/types.h> #endif -constexpr char IS_CHILD_ENV_VAR[] = "YUZU_IS_CHILD"; -constexpr char STARTUP_CHECK_ENV_VAR[] = "YUZU_DO_STARTUP_CHECKS"; +constexpr char IS_CHILD_ENV_VAR[] = "CITRON_IS_CHILD"; +constexpr char STARTUP_CHECK_ENV_VAR[] = "CITRON_DO_STARTUP_CHECKS"; constexpr char ENV_VAR_ENABLED_TEXT[] = "ON"; void CheckVulkan(); @@ -19,6 +19,6 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan, bool perform_vulka #ifdef _WIN32 bool SpawnChild(const char* arg0, PROCESS_INFORMATION* pi, int flags); -#elif defined(YUZU_UNIX) +#elif defined(CITRON_UNIX) pid_t SpawnChild(const char* arg0); #endif diff --git a/src/citron/uisettings.cpp b/src/citron/uisettings.cpp index 7bb7e95af..8168d8b12 100644 --- a/src/citron/uisettings.cpp +++ b/src/citron/uisettings.cpp @@ -4,7 +4,7 @@ #include <QSettings> #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "yuzu/uisettings.h" +#include "citron/uisettings.h" #ifndef CANNOT_EXPLICITLY_INSTANTIATE namespace Settings { @@ -57,7 +57,7 @@ u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) { void SaveWindowState() { const auto window_state_config_loc = - FS::PathToUTF8String(FS::GetYuzuPath(FS::YuzuPath::ConfigDir) / "window_state.ini"); + FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "window_state.ini"); void(FS::CreateParentDir(window_state_config_loc)); QSettings config(QString::fromStdString(window_state_config_loc), QSettings::IniFormat); @@ -73,12 +73,12 @@ void SaveWindowState() { void RestoreWindowState(std::unique_ptr<QtConfig>& qtConfig) { const auto window_state_config_loc = - FS::PathToUTF8String(FS::GetYuzuPath(FS::YuzuPath::ConfigDir) / "window_state.ini"); + FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "window_state.ini"); // Migrate window state from old location if (!FS::Exists(window_state_config_loc) && qtConfig->Exists("UI", "UILayout\\geometry")) { const auto config_loc = - FS::PathToUTF8String(FS::GetYuzuPath(FS::YuzuPath::ConfigDir) / "qt-config.ini"); + FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "qt-config.ini"); QSettings config(QString::fromStdString(config_loc), QSettings::IniFormat); config.beginGroup(QStringLiteral("UI")); diff --git a/src/citron/uisettings.h b/src/citron/uisettings.h index 03e42b930..f74785668 100644 --- a/src/citron/uisettings.h +++ b/src/citron/uisettings.h @@ -239,7 +239,7 @@ const std::array<Shortcut, 28> default_hotkeys{{ {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Change GPU Accuracy")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F9"), std::string("Home+R"), Qt::ApplicationShortcut, false}}, {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Continue/Pause Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F4"), std::string("Home+Plus"), Qt::WindowShortcut, false}}, {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Exit Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Esc"), std::string(""), Qt::WindowShortcut, false}}, - {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Exit yuzu")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+Q"), std::string("Home+Minus"), Qt::WindowShortcut, false}}, + {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Exit citron")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+Q"), std::string("Home+Minus"), Qt::WindowShortcut, false}}, {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F11"), std::string("Home+B"), Qt::WindowShortcut, false}}, {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load File")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+O"), std::string(""), Qt::WidgetWithChildrenShortcut, false}}, {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load/Remove Amiibo")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F2"), std::string("Home+A"), Qt::WidgetWithChildrenShortcut, false}}, diff --git a/src/citron/util/clickable_label.cpp b/src/citron/util/clickable_label.cpp index 89d14190a..1c7895c2f 100644 --- a/src/citron/util/clickable_label.cpp +++ b/src/citron/util/clickable_label.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "yuzu/util/clickable_label.h" +#include "citron/util/clickable_label.h" ClickableLabel::ClickableLabel(QWidget* parent, [[maybe_unused]] Qt::WindowFlags f) : QLabel(parent) {} diff --git a/src/citron/util/controller_navigation.cpp b/src/citron/util/controller_navigation.cpp index 0dbfca243..e8003881d 100644 --- a/src/citron/util/controller_navigation.cpp +++ b/src/citron/util/controller_navigation.cpp @@ -1,10 +1,10 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/settings_input.h" #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" -#include "yuzu/util/controller_navigation.h" +#include "citron/util/controller_navigation.h" ControllerNavigation::ControllerNavigation(Core::HID::HIDCore& hid_core, QWidget* parent) { player1_controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); diff --git a/src/citron/util/controller_navigation.h b/src/citron/util/controller_navigation.h index 86e210368..1eee171d0 100644 --- a/src/citron/util/controller_navigation.h +++ b/src/citron/util/controller_navigation.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/util/limitable_input_dialog.cpp b/src/citron/util/limitable_input_dialog.cpp index 5f6a9c193..8653ccebf 100644 --- a/src/citron/util/limitable_input_dialog.cpp +++ b/src/citron/util/limitable_input_dialog.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QDialogButtonBox> @@ -6,7 +6,7 @@ #include <QLineEdit> #include <QPushButton> #include <QVBoxLayout> -#include "yuzu/util/limitable_input_dialog.h" +#include "citron/util/limitable_input_dialog.h" LimitableInputDialog::LimitableInputDialog(QWidget* parent) : QDialog{parent} { CreateUI(); diff --git a/src/citron/util/limitable_input_dialog.h b/src/citron/util/limitable_input_dialog.h index f261f1a0f..cb839a80c 100644 --- a/src/citron/util/limitable_input_dialog.h +++ b/src/citron/util/limitable_input_dialog.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/util/overlay_dialog.cpp b/src/citron/util/overlay_dialog.cpp index 466bbe7b2..1b21c2df0 100644 --- a/src/citron/util/overlay_dialog.cpp +++ b/src/citron/util/overlay_dialog.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <QKeyEvent> @@ -9,7 +9,7 @@ #include "hid_core/frontend/input_interpreter.h" #include "hid_core/hid_types.h" #include "ui_overlay_dialog.h" -#include "yuzu/util/overlay_dialog.h" +#include "citron/util/overlay_dialog.h" namespace { diff --git a/src/citron/util/overlay_dialog.h b/src/citron/util/overlay_dialog.h index 62f9da311..819f74bf9 100644 --- a/src/citron/util/overlay_dialog.h +++ b/src/citron/util/overlay_dialog.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/citron/util/sequence_dialog/sequence_dialog.cpp b/src/citron/util/sequence_dialog/sequence_dialog.cpp index 1670aa596..9202a1ccc 100644 --- a/src/citron/util/sequence_dialog/sequence_dialog.cpp +++ b/src/citron/util/sequence_dialog/sequence_dialog.cpp @@ -4,7 +4,7 @@ #include <QDialogButtonBox> #include <QKeySequenceEdit> #include <QVBoxLayout> -#include "yuzu/util/sequence_dialog/sequence_dialog.h" +#include "citron/util/sequence_dialog/sequence_dialog.h" SequenceDialog::SequenceDialog(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Enter a hotkey")); diff --git a/src/citron/util/url_request_interceptor.cpp b/src/citron/util/url_request_interceptor.cpp index 996097e35..55ac151d5 100644 --- a/src/citron/util/url_request_interceptor.cpp +++ b/src/citron/util/url_request_interceptor.cpp @@ -1,9 +1,9 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE -#include "yuzu/util/url_request_interceptor.h" +#include "citron/util/url_request_interceptor.h" UrlRequestInterceptor::UrlRequestInterceptor(QObject* p) : QWebEngineUrlRequestInterceptor(p) {} diff --git a/src/citron/util/url_request_interceptor.h b/src/citron/util/url_request_interceptor.h index 9831e1523..9403bd1bf 100644 --- a/src/citron/util/url_request_interceptor.h +++ b/src/citron/util/url_request_interceptor.h @@ -1,9 +1,9 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#ifdef YUZU_USE_QT_WEB_ENGINE +#ifdef CITRON_USE_QT_WEB_ENGINE #include <QObject> #include <QWebEngineUrlRequestInterceptor> diff --git a/src/citron/util/util.cpp b/src/citron/util/util.cpp index e22cf84bf..52e95d38d 100644 --- a/src/citron/util/util.cpp +++ b/src/citron/util/util.cpp @@ -6,7 +6,7 @@ #include <QPainter> #include "common/logging/log.h" -#include "yuzu/util/util.h" +#include "citron/util/util.h" #ifdef _WIN32 #include <windows.h> diff --git a/src/citron/vk_device_info.cpp b/src/citron/vk_device_info.cpp index ab0d39c25..b1213be4c 100644 --- a/src/citron/vk_device_info.cpp +++ b/src/citron/vk_device_info.cpp @@ -1,10 +1,10 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <utility> #include <vector> -#include "yuzu/qt_common.h" +#include "citron/qt_common.h" #include "common/dynamic_library.h" #include "common/logging/log.h" @@ -14,7 +14,7 @@ #include "video_core/vulkan_common/vulkan_surface.h" #include "video_core/vulkan_common/vulkan_wrapper.h" #include "vulkan/vulkan_core.h" -#include "yuzu/vk_device_info.h" +#include "citron/vk_device_info.h" class QWindow; diff --git a/src/citron/vk_device_info.h b/src/citron/vk_device_info.h index bda8262f4..f572f5ad1 100644 --- a/src/citron/vk_device_info.h +++ b/src/citron/vk_device_info.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once |