diff options
| author | 2019-06-05 12:13:15 -0400 | |
|---|---|---|
| committer | 2019-06-24 20:05:11 -0400 | |
| commit | 6ff90082306c3bb5341c0ac2bc3beeb4177dc8a4 (patch) | |
| tree | ddb058ec522b6aae1947a3ceb47ad84517fb084b /src | |
| parent | frontend: Add base class and default impl of parent controls applet frontend (diff) | |
| download | yuzu-6ff90082306c3bb5341c0ac2bc3beeb4177dc8a4.tar.gz yuzu-6ff90082306c3bb5341c0ac2bc3beeb4177dc8a4.tar.xz yuzu-6ff90082306c3bb5341c0ac2bc3beeb4177dc8a4.zip | |
web_browser: Rename OpenPage to OpenPageLocal
This is more representative of what actually occurs, as web does support remote URLs which wouldn't need a romfs callback. This paves for easy future support of this with a call like 'OpenPageRemote' or similar.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/frontend/applets/web_browser.cpp | 6 | ||||
| -rw-r--r-- | src/core/frontend/applets/web_browser.h | 8 | ||||
| -rw-r--r-- | src/yuzu/applets/web_browser.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/applets/web_browser.h | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/core/frontend/applets/web_browser.cpp b/src/core/frontend/applets/web_browser.cpp index 3a3d3d0bf..528295ffc 100644 --- a/src/core/frontend/applets/web_browser.cpp +++ b/src/core/frontend/applets/web_browser.cpp | |||
| @@ -11,9 +11,9 @@ WebBrowserApplet::~WebBrowserApplet() = default; | |||
| 11 | 11 | ||
| 12 | DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default; | 12 | DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default; |
| 13 | 13 | ||
| 14 | void DefaultWebBrowserApplet::OpenPage(std::string_view filename, | 14 | void DefaultWebBrowserApplet::OpenPageLocal(std::string_view filename, |
| 15 | std::function<void()> unpack_romfs_callback, | 15 | std::function<void()> unpack_romfs_callback, |
| 16 | std::function<void()> finished_callback) { | 16 | std::function<void()> finished_callback) { |
| 17 | LOG_INFO(Service_AM, | 17 | LOG_INFO(Service_AM, |
| 18 | "(STUBBED) called - No suitable web browser implementation found to open website page " | 18 | "(STUBBED) called - No suitable web browser implementation found to open website page " |
| 19 | "at '{}'!", | 19 | "at '{}'!", |
diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h index f952856af..110e33bc4 100644 --- a/src/core/frontend/applets/web_browser.h +++ b/src/core/frontend/applets/web_browser.h | |||
| @@ -13,16 +13,16 @@ class WebBrowserApplet { | |||
| 13 | public: | 13 | public: |
| 14 | virtual ~WebBrowserApplet(); | 14 | virtual ~WebBrowserApplet(); |
| 15 | 15 | ||
| 16 | virtual void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback, | 16 | virtual void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback, |
| 17 | std::function<void()> finished_callback) = 0; | 17 | std::function<void()> finished_callback) = 0; |
| 18 | }; | 18 | }; |
| 19 | 19 | ||
| 20 | class DefaultWebBrowserApplet final : public WebBrowserApplet { | 20 | class DefaultWebBrowserApplet final : public WebBrowserApplet { |
| 21 | public: | 21 | public: |
| 22 | ~DefaultWebBrowserApplet() override; | 22 | ~DefaultWebBrowserApplet() override; |
| 23 | 23 | ||
| 24 | void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback, | 24 | void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback, |
| 25 | std::function<void()> finished_callback) override; | 25 | std::function<void()> finished_callback) override; |
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| 28 | } // namespace Core::Frontend | 28 | } // namespace Core::Frontend |
diff --git a/src/yuzu/applets/web_browser.cpp b/src/yuzu/applets/web_browser.cpp index ac80b2fa2..33f1c385d 100644 --- a/src/yuzu/applets/web_browser.cpp +++ b/src/yuzu/applets/web_browser.cpp | |||
| @@ -87,8 +87,8 @@ QtWebBrowser::QtWebBrowser(GMainWindow& main_window) { | |||
| 87 | 87 | ||
| 88 | QtWebBrowser::~QtWebBrowser() = default; | 88 | QtWebBrowser::~QtWebBrowser() = default; |
| 89 | 89 | ||
| 90 | void QtWebBrowser::OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback, | 90 | void QtWebBrowser::OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback, |
| 91 | std::function<void()> finished_callback) { | 91 | std::function<void()> finished_callback) { |
| 92 | this->unpack_romfs_callback = std::move(unpack_romfs_callback); | 92 | this->unpack_romfs_callback = std::move(unpack_romfs_callback); |
| 93 | this->finished_callback = std::move(finished_callback); | 93 | this->finished_callback = std::move(finished_callback); |
| 94 | 94 | ||
diff --git a/src/yuzu/applets/web_browser.h b/src/yuzu/applets/web_browser.h index 1a3d67353..b38437e46 100644 --- a/src/yuzu/applets/web_browser.h +++ b/src/yuzu/applets/web_browser.h | |||
| @@ -37,8 +37,8 @@ public: | |||
| 37 | explicit QtWebBrowser(GMainWindow& main_window); | 37 | explicit QtWebBrowser(GMainWindow& main_window); |
| 38 | ~QtWebBrowser() override; | 38 | ~QtWebBrowser() override; |
| 39 | 39 | ||
| 40 | void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback, | 40 | void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback, |
| 41 | std::function<void()> finished_callback) override; | 41 | std::function<void()> finished_callback) override; |
| 42 | 42 | ||
| 43 | signals: | 43 | signals: |
| 44 | void MainWindowOpenPage(std::string_view filename, std::string_view additional_args) const; | 44 | void MainWindowOpenPage(std::string_view filename, std::string_view additional_args) const; |