From 99c2418d1a270c4496b21d6d6c8035b6ef73e8a1 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Thu, 18 Jul 2019 23:10:49 +0700
Subject: GUI: Rewrite Cloud tab
- StorageWizardDialog is removed, along with bmps it was using;
- EditTextWidget now accepts custom font in constructor;
- ScrollContainer scrollbar now jumps to top when content height changes
so it's "overscrolled";
- IndexPageHandler now does not awaits for `code` GET-parameter, as
local webserver is no longer used to connect Storages;
- CloudManager and all corresponding Storages are updated to support
disconnecting and to notify about successful connection.
---
.../sdl_net/handlers/indexpagehandler.cpp | 32 +++++++---------------
.../networking/sdl_net/handlers/indexpagehandler.h | 2 --
2 files changed, 10 insertions(+), 24 deletions(-)
(limited to 'backends/networking/sdl_net')
diff --git a/backends/networking/sdl_net/handlers/indexpagehandler.cpp b/backends/networking/sdl_net/handlers/indexpagehandler.cpp
index 17e5159768..876bdde9ce 100644
--- a/backends/networking/sdl_net/handlers/indexpagehandler.cpp
+++ b/backends/networking/sdl_net/handlers/indexpagehandler.cpp
@@ -24,7 +24,6 @@
#include "backends/networking/sdl_net/handlerutils.h"
#include "backends/networking/sdl_net/localwebserver.h"
#include "common/translation.h"
-#include "gui/storagewizarddialog.h"
namespace Networking {
@@ -34,28 +33,17 @@ IndexPageHandler::~IndexPageHandler() {}
/// public
-Common::String IndexPageHandler::code() const { return _code; }
-
void IndexPageHandler::handle(Client &client) {
- Common::String queryCode = client.queryParameter("code");
-
- if (queryCode == "") {
- // redirect to "/filesAJAX"
- HandlerUtils::setMessageHandler(
- client,
- Common::String::format(
- "%s
%s",
- _("This is a local webserver index page."),
- _("Open Files manager")
- ),
- "/filesAJAX"
- );
- return;
- }
-
- _code = queryCode;
- sendCommand(GUI::kStorageCodePassedCmd, 0);
- HandlerUtils::setMessageHandler(client, _("ScummVM got the code and already connects to your cloud storage!"));
+ // redirect to "/filesAJAX"
+ HandlerUtils::setMessageHandler(
+ client,
+ Common::String::format(
+ "%s
%s",
+ _("This is a local webserver index page."),
+ _("Open Files manager")
+ ),
+ "/filesAJAX"
+ );
}
bool IndexPageHandler::minimalModeSupported() {
diff --git a/backends/networking/sdl_net/handlers/indexpagehandler.h b/backends/networking/sdl_net/handlers/indexpagehandler.h
index 0d8e616395..b4841bcdca 100644
--- a/backends/networking/sdl_net/handlers/indexpagehandler.h
+++ b/backends/networking/sdl_net/handlers/indexpagehandler.h
@@ -30,12 +30,10 @@ namespace Networking {
class LocalWebserver;
class IndexPageHandler: public BaseHandler, public GUI::CommandSender {
- Common::String _code;
public:
IndexPageHandler();
virtual ~IndexPageHandler();
- Common::String code() const;
virtual void handle(Client &client);
virtual bool minimalModeSupported();
};
--
cgit v1.2.3