summaryrefslogtreecommitdiff
path: root/src/yuzu/applets
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu/applets')
-rw-r--r--src/yuzu/applets/qt_profile_select.cpp4
-rw-r--r--src/yuzu/applets/qt_software_keyboard.cpp10
-rw-r--r--src/yuzu/applets/qt_software_keyboard.h17
-rw-r--r--src/yuzu/applets/qt_web_browser.cpp12
-rw-r--r--src/yuzu/applets/qt_web_browser.h10
5 files changed, 27 insertions, 26 deletions
diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp
index 79162a491..66edd6acd 100644
--- a/src/yuzu/applets/qt_profile_select.cpp
+++ b/src/yuzu/applets/qt_profile_select.cpp
@@ -162,7 +162,7 @@ void QtProfileSelectionDialog::SelectUser(const QModelIndex& index) {
void QtProfileSelectionDialog::SetWindowTitle(
const Core::Frontend::ProfileSelectParameters& parameters) {
- using Service::AM::Applets::UiMode;
+ using Service::AM::Frontend::UiMode;
switch (parameters.mode) {
case UiMode::UserCreator:
case UiMode::UserCreatorForStarter:
@@ -193,7 +193,7 @@ void QtProfileSelectionDialog::SetWindowTitle(
void QtProfileSelectionDialog::SetDialogPurpose(
const Core::Frontend::ProfileSelectParameters& parameters) {
- using Service::AM::Applets::UserSelectionPurpose;
+ using Service::AM::Frontend::UserSelectionPurpose;
switch (parameters.purpose) {
case UserSelectionPurpose::GameCardRegistration:
diff --git a/src/yuzu/applets/qt_software_keyboard.cpp b/src/yuzu/applets/qt_software_keyboard.cpp
index ac81ace9e..2749e6ed3 100644
--- a/src/yuzu/applets/qt_software_keyboard.cpp
+++ b/src/yuzu/applets/qt_software_keyboard.cpp
@@ -20,7 +20,7 @@
namespace {
-using namespace Service::AM::Applets;
+using namespace Service::AM::Frontend;
constexpr float BASE_HEADER_FONT_SIZE = 23.0f;
constexpr float BASE_SUB_FONT_SIZE = 17.0f;
@@ -389,7 +389,7 @@ void QtSoftwareKeyboardDialog::ShowNormalKeyboard(QPoint pos, QSize size) {
}
void QtSoftwareKeyboardDialog::ShowTextCheckDialog(
- Service::AM::Applets::SwkbdTextCheckResult text_check_result,
+ Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
std::u16string text_check_message) {
switch (text_check_result) {
case SwkbdTextCheckResult::Success:
@@ -1612,7 +1612,7 @@ void QtSoftwareKeyboard::ShowNormalKeyboard() const {
}
void QtSoftwareKeyboard::ShowTextCheckDialog(
- Service::AM::Applets::SwkbdTextCheckResult text_check_result,
+ Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
std::u16string text_check_message) const {
emit MainWindowShowTextCheckDialog(text_check_result, std::move(text_check_message));
}
@@ -1662,12 +1662,12 @@ void QtSoftwareKeyboard::ExitKeyboard() const {
emit MainWindowExitKeyboard();
}
-void QtSoftwareKeyboard::SubmitNormalText(Service::AM::Applets::SwkbdResult result,
+void QtSoftwareKeyboard::SubmitNormalText(Service::AM::Frontend::SwkbdResult result,
std::u16string submitted_text, bool confirmed) const {
submit_normal_callback(result, submitted_text, confirmed);
}
-void QtSoftwareKeyboard::SubmitInlineText(Service::AM::Applets::SwkbdReplyType reply_type,
+void QtSoftwareKeyboard::SubmitInlineText(Service::AM::Frontend::SwkbdReplyType reply_type,
std::u16string submitted_text,
s32 cursor_position) const {
submit_inline_callback(reply_type, submitted_text, cursor_position);
diff --git a/src/yuzu/applets/qt_software_keyboard.h b/src/yuzu/applets/qt_software_keyboard.h
index ac23ce047..7e2fdf09e 100644
--- a/src/yuzu/applets/qt_software_keyboard.h
+++ b/src/yuzu/applets/qt_software_keyboard.h
@@ -39,7 +39,7 @@ public:
void ShowNormalKeyboard(QPoint pos, QSize size);
- void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
+ void ShowTextCheckDialog(Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
std::u16string text_check_message);
void ShowInlineKeyboard(Core::Frontend::InlineAppearParameters appear_parameters, QPoint pos,
@@ -52,10 +52,10 @@ public:
void ExitKeyboard();
signals:
- void SubmitNormalText(Service::AM::Applets::SwkbdResult result, std::u16string submitted_text,
+ void SubmitNormalText(Service::AM::Frontend::SwkbdResult result, std::u16string submitted_text,
bool confirmed = false) const;
- void SubmitInlineText(Service::AM::Applets::SwkbdReplyType reply_type,
+ void SubmitInlineText(Service::AM::Frontend::SwkbdReplyType reply_type,
std::u16string submitted_text, s32 cursor_position) const;
public slots:
@@ -244,7 +244,7 @@ public:
void ShowNormalKeyboard() const override;
- void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
+ void ShowTextCheckDialog(Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
std::u16string text_check_message) const override;
void ShowInlineKeyboard(
@@ -262,8 +262,9 @@ signals:
void MainWindowShowNormalKeyboard() const;
- void MainWindowShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
- std::u16string text_check_message) const;
+ void MainWindowShowTextCheckDialog(
+ Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
+ std::u16string text_check_message) const;
void MainWindowShowInlineKeyboard(
Core::Frontend::InlineAppearParameters appear_parameters) const;
@@ -275,10 +276,10 @@ signals:
void MainWindowExitKeyboard() const;
private:
- void SubmitNormalText(Service::AM::Applets::SwkbdResult result, std::u16string submitted_text,
+ void SubmitNormalText(Service::AM::Frontend::SwkbdResult result, std::u16string submitted_text,
bool confirmed) const;
- void SubmitInlineText(Service::AM::Applets::SwkbdReplyType reply_type,
+ void SubmitInlineText(Service::AM::Frontend::SwkbdReplyType reply_type,
std::u16string submitted_text, s32 cursor_position) const;
mutable SubmitNormalCallback submit_normal_callback;
diff --git a/src/yuzu/applets/qt_web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp
index 34c5fd3be..cce9b2efb 100644
--- a/src/yuzu/applets/qt_web_browser.cpp
+++ b/src/yuzu/applets/qt_web_browser.cpp
@@ -96,7 +96,7 @@ QtNXWebEngineView::QtNXWebEngineView(QWidget* parent, Core::System& system,
[this] {
if (page()->url() == url_interceptor->GetRequestedURL()) {
SetFinished(true);
- SetExitReason(Service::AM::Applets::WebExitReason::WindowClosed);
+ SetExitReason(Service::AM::Frontend::WebExitReason::WindowClosed);
}
},
Qt::QueuedConnection);
@@ -115,7 +115,7 @@ void QtNXWebEngineView::LoadLocalWebPage(const std::string& main_url,
FocusFirstLinkElement();
SetUserAgent(UserAgent::WebApplet);
SetFinished(false);
- SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed);
+ SetExitReason(Service::AM::Frontend::WebExitReason::EndButtonPressed);
SetLastURL("http://localhost/");
StartInputThread();
@@ -130,7 +130,7 @@ void QtNXWebEngineView::LoadExternalWebPage(const std::string& main_url,
FocusFirstLinkElement();
SetUserAgent(UserAgent::WebApplet);
SetFinished(false);
- SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed);
+ SetExitReason(Service::AM::Frontend::WebExitReason::EndButtonPressed);
SetLastURL("http://localhost/");
StartInputThread();
@@ -170,11 +170,11 @@ void QtNXWebEngineView::SetFinished(bool finished_) {
finished = finished_;
}
-Service::AM::Applets::WebExitReason QtNXWebEngineView::GetExitReason() const {
+Service::AM::Frontend::WebExitReason QtNXWebEngineView::GetExitReason() const {
return exit_reason;
}
-void QtNXWebEngineView::SetExitReason(Service::AM::Applets::WebExitReason exit_reason_) {
+void QtNXWebEngineView::SetExitReason(Service::AM::Frontend::WebExitReason exit_reason_) {
exit_reason = exit_reason_;
}
@@ -441,7 +441,7 @@ void QtWebBrowser::MainWindowExtractOfflineRomFS() {
extract_romfs_callback();
}
-void QtWebBrowser::MainWindowWebBrowserClosed(Service::AM::Applets::WebExitReason exit_reason,
+void QtWebBrowser::MainWindowWebBrowserClosed(Service::AM::Frontend::WebExitReason exit_reason,
std::string last_url) {
if (callback) {
callback(exit_reason, last_url);
diff --git a/src/yuzu/applets/qt_web_browser.h b/src/yuzu/applets/qt_web_browser.h
index 1234108ae..e8a0b6931 100644
--- a/src/yuzu/applets/qt_web_browser.h
+++ b/src/yuzu/applets/qt_web_browser.h
@@ -85,8 +85,8 @@ public:
[[nodiscard]] bool IsFinished() const;
void SetFinished(bool finished_);
- [[nodiscard]] Service::AM::Applets::WebExitReason GetExitReason() const;
- void SetExitReason(Service::AM::Applets::WebExitReason exit_reason_);
+ [[nodiscard]] Service::AM::Frontend::WebExitReason GetExitReason() const;
+ void SetExitReason(Service::AM::Frontend::WebExitReason exit_reason_);
[[nodiscard]] const std::string& GetLastURL() const;
void SetLastURL(std::string last_url_);
@@ -176,8 +176,8 @@ private:
std::atomic<bool> finished{};
- Service::AM::Applets::WebExitReason exit_reason{
- Service::AM::Applets::WebExitReason::EndButtonPressed};
+ Service::AM::Frontend::WebExitReason exit_reason{
+ Service::AM::Frontend::WebExitReason::EndButtonPressed};
std::string last_url{"http://localhost/"};
@@ -212,7 +212,7 @@ signals:
private:
void MainWindowExtractOfflineRomFS();
- void MainWindowWebBrowserClosed(Service::AM::Applets::WebExitReason exit_reason,
+ void MainWindowWebBrowserClosed(Service::AM::Frontend::WebExitReason exit_reason,
std::string last_url);
mutable ExtractROMFSCallback extract_romfs_callback;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 14:49:42 +0000