diff options
| -rw-r--r-- | gui/storagewizarddialog.cpp | 40 | ||||
| -rw-r--r-- | gui/storagewizarddialog.h | 3 | ||||
| -rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 3 | ||||
| -rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 3 |
4 files changed, 35 insertions, 14 deletions
diff --git a/gui/storagewizarddialog.cpp b/gui/storagewizarddialog.cpp index 8e3f17746b..86513e2980 100644 --- a/gui/storagewizarddialog.cpp +++ b/gui/storagewizarddialog.cpp @@ -28,6 +28,7 @@ #ifdef USE_SDL_NET #include "backends/networking/sdl_net/localwebserver.h" #endif +#include "backends/networking/browser/openurl.h" #include "common/translation.h" #include "widgets/edittext.h" @@ -35,7 +36,8 @@ namespace GUI { enum { kConnectCmd = 'Cnnt', - kCodeBoxCmd = 'CdBx' + kCodeBoxCmd = 'CdBx', + kOpenUrlCmd = 'OpUr' }; StorageWizardDialog::StorageWizardDialog(uint32 storageId): @@ -46,19 +48,7 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId): new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.Headline", headline); new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.NavigateLine", _s("Navigate to the following URL:")); - - Common::String url = "https://www.scummvm.org/c/"; - switch (storageId) { - case Cloud::kStorageDropboxId: url += "db"; break; - case Cloud::kStorageOneDriveId: url += "od"; break; - case Cloud::kStorageGoogleDriveId: url += "gd"; break; - case Cloud::kStorageBoxId: url += "bx"; break; - } -#ifdef USE_SDL_NET - url += "s"; -#endif - - new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.URLLine", url); + new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.URLLine", getUrl()); StaticTextWidget *returnLine1 = new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.ReturnLine1", _s("Obtain the code from the storage, enter it")); StaticTextWidget *returnLine2 = new StaticTextWidget(this, "GlobalOptions_Cloud_ConnectionWizard.ReturnLine2", _s("in the following field and press 'Connect':")); @@ -68,6 +58,7 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId): // Buttons new ButtonWidget(this, "GlobalOptions_Cloud_ConnectionWizard.CancelButton", _("Cancel"), 0, kCloseCmd); + new ButtonWidget(this, "GlobalOptions_Cloud_ConnectionWizard.OpenUrlButton", _("Open URL"), 0, kOpenUrlCmd); _connectWidget = new ButtonWidget(this, "GlobalOptions_Cloud_ConnectionWizard.ConnectButton", _("Connect"), 0, kConnectCmd); #ifdef USE_SDL_NET @@ -147,6 +138,12 @@ void StorageWizardDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 _messageWidget->setLabel(message); break; } + case kOpenUrlCmd: { + if (!Networking::Browser::openUrl(getUrl())) { + _messageWidget->setLabel(_("Failed to open URL!")); + } + break; + } case kConnectCmd: { Common::String code; for (uint32 i = 0; i < CODE_FIELDS; ++i) { @@ -181,6 +178,21 @@ void StorageWizardDialog::handleTickle() { Dialog::handleTickle(); } +Common::String StorageWizardDialog::getUrl() const { + Common::String url = "https://www.scummvm.org/c/"; + switch (_storageId) { + case Cloud::kStorageDropboxId: url += "db"; break; + case Cloud::kStorageOneDriveId: url += "od"; break; + case Cloud::kStorageGoogleDriveId: url += "gd"; break; + case Cloud::kStorageBoxId: url += "bx"; break; + } +#ifdef USE_SDL_NET + url += "s"; +#endif + return url; +} + + int StorageWizardDialog::decodeHashchar(char c) { const char HASHCHARS[65] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ?!"; for (uint32 i = 0; i < 64; ++i) diff --git a/gui/storagewizarddialog.h b/gui/storagewizarddialog.h index ade3c57b47..6b00d60915 100644 --- a/gui/storagewizarddialog.h +++ b/gui/storagewizarddialog.h @@ -48,6 +48,9 @@ class StorageWizardDialog : public Dialog { bool _close; bool _stopServerOnClose; + /** Return short scummvm.org URL for user to navigate to. */ + Common::String getUrl() const; + /** * Return the value corresponding to the given character. * diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index 753d061ae1..6edfebc0d4 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -699,6 +699,9 @@ <widget name = 'CancelButton' type = 'Button' /> + <widget name = 'OpenUrlButton' + type = 'Button' + /> <widget name = 'ConnectButton' type = 'Button' /> diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index f27c8b6564..e183ceea2d 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -691,6 +691,9 @@ <widget name = 'CancelButton' type = 'Button' /> + <widget name = 'OpenUrlButton' + type = 'Button' + /> <widget name = 'ConnectButton' type = 'Button' /> |