X Tutup
Skip to content

CLOUD: Simplify Setup Wizard#6603

Merged
bluegr merged 4 commits intoscummvm:masterfrom
chkuendig:cloud-wizard
May 18, 2025
Merged

CLOUD: Simplify Setup Wizard#6603
bluegr merged 4 commits intoscummvm:masterfrom
chkuendig:cloud-wizard

Conversation

@chkuendig
Copy link
Member

@chkuendig chkuendig commented May 9, 2025

This simplifies the cloud wizard a bit:

  • Skip Mode Select in setup wizard if only manual mode is available (on platforms without SDL_NET / webserver).
  • CLOUD: Add new storage connection flow #4860 has removed the use of kOpenUrlStorageCmd but still left it in options.cpp.
  • CLOUD: Add new storage connection flow #4860 introduced kCloudConnectionWizardOpenUrlStorageCmd in gui/cloudconnectionwizard.cpp but doesn't consider the selected storage option anymore to construct the URL (despite selecting one still being required in options.cpp). This PR now passes the selected storage again to the opened URL as it was before.

UI Flow can also be observed at https://youtu.be/kYechxc5tvE as discussed at https://discord.com/channels/581224060529148060/581224061091446795/1370153256176713808

CloudConnectionWizard();
~CloudConnectionWizard() override;

int runModal(uint32 selectedStorageIndex);
Copy link
Member

@bluegr bluegr May 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same name as a member function in the base class, but it does not override it, which is why you added that using statement above.

It would be preferable to give this method a different name instead, e.g. runStorageModal(), to avoid unnecessary name clashes

@bluegr
Copy link
Member

bluegr commented May 18, 2025

Nice work, thanks!

@bluegr bluegr merged commit 9fb0538 into scummvm:master May 18, 2025
8 checks passed
@chkuendig chkuendig deleted the cloud-wizard branch May 18, 2025 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

X Tutup