blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 03:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update setup wizard for missing media codecs

Browse source
This commit is contained in:
Dan Paulat 2023-12-08 09:56:01 -06:00
parent d760641770
commit f143186ea5
7 changed files with 268 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

46
scwx-qt/source/scwx/qt/ui/setup/setup_wizard.cpp
View file

@ -1,9 +1,9 @@
#include <scwx/qt/ui/setup/setup_wizard.hpp>
#include <scwx/qt/ui/setup/audio_codec_page.hpp>
#include <scwx/qt/ui/setup/finish_page.hpp>
#include <scwx/qt/ui/setup/map_layout_page.hpp>
#include <scwx/qt/ui/setup/map_provider_page.hpp>
#include <scwx/qt/ui/setup/welcome_page.hpp>
#include <scwx/qt/settings/general_settings.hpp>
#include <QDesktopServices>
#include <QUrl>
@ -38,6 +38,7 @@ SetupWizard::SetupWizard(QWidget* parent) :
setPage(static_cast<int>(Page::Welcome), new WelcomePage(this));
setPage(static_cast<int>(Page::MapProvider), new MapProviderPage(this));
setPage(static_cast<int>(Page::MapLayout), new MapLayoutPage(this));
setPage(static_cast<int>(Page::AudioCodec), new AudioCodecPage(this));
setPage(static_cast<int>(Page::Finish), new FinishPage(this));
#if !defined(Q_OS_MAC)
@ -55,16 +56,43 @@ SetupWizard::SetupWizard(QWidget* parent) :
SetupWizard::~SetupWizard() = default;
int SetupWizard::nextId() const
{
int nextId = currentId();
while (true)
{
switch (++nextId)
{
case static_cast<int>(Page::MapProvider):
case static_cast<int>(Page::MapLayout):
if (MapProviderPage::IsRequired())
{
return nextId;
}
break;
case static_cast<int>(Page::AudioCodec):
if (AudioCodecPage::IsRequired())
{
return nextId;
}
break;
case static_cast<int>(Page::Finish):
return nextId;
default:
return -1;
}
}
return -1;
}
bool SetupWizard::IsSetupRequired()
{
auto& generalSettings = settings::GeneralSettings::Instance();
std::string mapboxApiKey = generalSettings.mapbox_api_key().GetValue();
std::string maptilerApiKey = generalSettings.maptiler_api_key().GetValue();
// Setup is required if either API key is empty, or contains a single
// character ("?")
return (mapboxApiKey.size() <= 1 && maptilerApiKey.size() <= 1);
return (MapProviderPage::IsRequired() || AudioCodecPage::IsRequired());
}
} // namespace setup