From 45da3be40edd71195b7aac633187fc81956e3150 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 24 Dec 2018 16:23:31 -0500 Subject: main: Add main window integrations for QtWebBrowserApplet --- src/yuzu/main.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/yuzu/main.h') diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 4e37f6a2d..3af5fa1f3 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -26,6 +26,7 @@ class GraphicsSurfaceWidget; class GRenderWindow; class MicroProfileDialog; class ProfilerWidget; +class QLabel; class WaitTreeWidget; enum class GameListOpenTarget; @@ -38,6 +39,10 @@ class RegisteredCacheUnion; class VfsFilesystem; } // namespace FileSys +namespace Service::Account { +struct UUID; +} // namespace Service::Account + namespace Tegra { class DebugContext; } @@ -103,11 +108,16 @@ signals: void SoftwareKeyboardFinishedText(std::optional text); void SoftwareKeyboardFinishedCheckDialog(); + void WebBrowserUnpackRomFS(); + void WebBrowserFinishedBrowsing(); + public slots: void ProfileSelectorSelectProfile(); void SoftwareKeyboardGetText(const Core::Frontend::SoftwareKeyboardParameters& parameters); void SoftwareKeyboardInvokeCheckDialog(std::u16string error_message); + void WebBrowserOpenPage(std::string_view filename, std::string_view arguments); + private: void InitializeWidgets(); void InitializeDebugWidgets(); -- cgit v1.2.3 From cb930c4b5a3f8f3931ba93ef35d4000558ffa79e Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Fri, 28 Dec 2018 18:20:29 -0500 Subject: web_browser: Add bounds checking to applet interface --- src/yuzu/main.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/yuzu/main.h') diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 3af5fa1f3..8a0485de9 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -13,6 +13,7 @@ #include "common/common_types.h" #include "core/core.h" +#include "core/hle/service/acc/profile_manager.h" #include "ui_main.h" #include "yuzu/compatibility_list.h" #include "yuzu/hotkeys.h" @@ -39,10 +40,6 @@ class RegisteredCacheUnion; class VfsFilesystem; } // namespace FileSys -namespace Service::Account { -struct UUID; -} // namespace Service::Account - namespace Tegra { class DebugContext; } -- cgit v1.2.3