diff options
Diffstat (limited to 'src/citron/applets')
-rw-r--r-- | src/citron/applets/qt_amiibo_settings.cpp | 6 | ||||
-rw-r--r-- | src/citron/applets/qt_amiibo_settings.h | 2 | ||||
-rw-r--r-- | src/citron/applets/qt_controller.cpp | 18 | ||||
-rw-r--r-- | src/citron/applets/qt_controller.h | 2 | ||||
-rw-r--r-- | src/citron/applets/qt_error.cpp | 6 | ||||
-rw-r--r-- | src/citron/applets/qt_error.h | 2 | ||||
-rw-r--r-- | src/citron/applets/qt_profile_select.cpp | 10 | ||||
-rw-r--r-- | src/citron/applets/qt_profile_select.h | 2 | ||||
-rw-r--r-- | src/citron/applets/qt_software_keyboard.cpp | 8 | ||||
-rw-r--r-- | src/citron/applets/qt_software_keyboard.h | 2 | ||||
-rw-r--r-- | src/citron/applets/qt_web_browser.cpp | 22 | ||||
-rw-r--r-- | src/citron/applets/qt_web_browser.h | 12 | ||||
-rw-r--r-- | src/citron/applets/qt_web_browser_scripts.h | 32 |
13 files changed, 62 insertions, 62 deletions
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; } } |