From 1ede7003c0947201d328a57765b4e5d7e2f31a9b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 25 Mar 2020 11:41:39 +0100 Subject: [PATCH] [welcome] Apply coding style --- src/modules/welcome/Config.cpp | 147 ++++++++-------- src/modules/welcome/Config.h | 68 +++----- src/modules/welcome/WelcomePage.cpp | 15 +- src/modules/welcome/WelcomePage.h | 4 +- src/modules/welcome/WelcomeViewStep.cpp | 216 ++++++++++++------------ src/modules/welcome/WelcomeViewStep.h | 2 +- 6 files changed, 224 insertions(+), 228 deletions(-) diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp index fdc532d7f..9b7c84cbc 100644 --- a/src/modules/welcome/Config.cpp +++ b/src/modules/welcome/Config.cpp @@ -17,10 +17,10 @@ */ #include "Config.h" -#include "utils/Logger.h" -#include "utils/Retranslator.h" #include "Branding.h" #include "Settings.h" +#include "utils/Logger.h" +#include "utils/Retranslator.h" #include @@ -38,7 +38,7 @@ RequirementsModel::setRequirementsList( const Calamares::RequirementsList& requi m_satisfiedRequirements = std::none_of( m_requirements.begin(), m_requirements.end(), isUnSatisfied ); m_satisfiedMandatory = std::none_of( m_requirements.begin(), m_requirements.end(), isMandatoryAndUnSatisfied ); - emit satisfiedRequirementsChanged(m_satisfiedRequirements); + emit satisfiedRequirementsChanged( m_satisfiedRequirements ); emit satisfiedMandatoryChanged(); emit endResetModel(); } @@ -54,40 +54,41 @@ RequirementsModel::data( const QModelIndex& index, int role ) const { const auto requirement = m_requirements.at( index.row() ); - switch ( role ) - { - case Roles::Name: - return requirement.name; - case Roles::Details: - return requirement.enumerationText(); - case Roles::NegatedText: - return requirement.negatedText(); - case Roles::Satisfied: - return requirement.satisfied; - case Roles::Mandatory: - return requirement.mandatory; - default: - return QVariant(); - } + switch ( role ) + { + case Roles::Name: + return requirement.name; + case Roles::Details: + return requirement.enumerationText(); + case Roles::NegatedText: + return requirement.negatedText(); + case Roles::Satisfied: + return requirement.satisfied; + case Roles::Mandatory: + return requirement.mandatory; + default: + return QVariant(); + } } -QHash +QHash< int, QByteArray > RequirementsModel::roleNames() const { - static QHash roles; - roles[Roles::Name] = "name"; - roles[Roles::Details] = "details"; - roles[Roles::NegatedText] = "negatedText"; - roles[Roles::Satisfied] = "satisfied"; - roles[Roles::Mandatory] = "mandatory"; - return roles; + static QHash< int, QByteArray > roles; + roles[ Roles::Name ] = "name"; + roles[ Roles::Details ] = "details"; + roles[ Roles::NegatedText ] = "negatedText"; + roles[ Roles::Satisfied ] = "satisfied"; + roles[ Roles::Mandatory ] = "mandatory"; + return roles; } -Config::Config( QObject* parent ) : QObject( parent ) - , m_requirementsModel( new RequirementsModel( this )) +Config::Config( QObject* parent ) + : QObject( parent ) + , m_requirementsModel( new RequirementsModel( this ) ) , m_languages( CalamaresUtils::Locale::availableTranslations() ) { - connect(m_requirementsModel, &RequirementsModel::satisfiedRequirementsChanged, this, &Config::setIsNextEnabled); + connect( m_requirementsModel, &RequirementsModel::satisfiedRequirementsChanged, this, &Config::setIsNextEnabled ); initLanguages(); @@ -106,13 +107,13 @@ Config::retranslate() CalamaresUtils::Locale::LabelModel* Config::languagesModel() const { - return m_languages; + return m_languages; } QString Config::languageIcon() const { - return m_languageIcon; + return m_languageIcon; } void @@ -131,7 +132,7 @@ Config::initLanguages() cDebug() << Logger::SubEntry << "Matching approximate locale" << defaultLocale.language(); matchedLocaleIndex - = m_languages->find( [&]( const QLocale& x ) { return x.language() == defaultLocale.language(); } ); + = m_languages->find( [&]( const QLocale& x ) { return x.language() == defaultLocale.language(); } ); } if ( matchedLocaleIndex < 0 ) @@ -154,7 +155,7 @@ Config::initLanguages() cDebug() << Logger::SubEntry << "Matched with index" << matchedLocaleIndex << name; CalamaresUtils::installTranslator( name, Calamares::Branding::instance()->translationsDirectory(), qApp ); - setLocaleIndex( matchedLocaleIndex ); + setLocaleIndex( matchedLocaleIndex ); } else { @@ -165,23 +166,26 @@ Config::initLanguages() void Config::setCountryCode( const QString& countryCode ) { - m_countryCode = countryCode; - setLocaleIndex(CalamaresUtils::Locale::availableTranslations()->find( m_countryCode )); + m_countryCode = countryCode; + setLocaleIndex( CalamaresUtils::Locale::availableTranslations()->find( m_countryCode ) ); - emit countryCodeChanged( m_countryCode ); + emit countryCodeChanged( m_countryCode ); } void -Config::setLanguageIcon(const QString &languageIcon ) +Config::setLanguageIcon( const QString& languageIcon ) { - m_languageIcon = languageIcon; + m_languageIcon = languageIcon; } void -Config::setLocaleIndex(const int& index) +Config::setLocaleIndex( const int& index ) { - if(index == m_localeIndex || index > CalamaresUtils::Locale::availableTranslations()->rowCount(QModelIndex()) || index < 0) + if ( index == m_localeIndex || index > CalamaresUtils::Locale::availableTranslations()->rowCount( QModelIndex() ) + || index < 0 ) + { return; + } m_localeIndex = index; @@ -189,8 +193,7 @@ Config::setLocaleIndex(const int& index) cDebug() << "Selected locale" << selectedLocale; QLocale::setDefault( selectedLocale ); - CalamaresUtils::installTranslator( - selectedLocale, Calamares::Branding::instance()->translationsDirectory(), qApp ); + CalamaresUtils::installTranslator( selectedLocale, Calamares::Branding::instance()->translationsDirectory(), qApp ); emit localeIndexChanged( m_localeIndex ); } @@ -215,7 +218,7 @@ Config::donateUrl() const } void -Config::setDonateUrl(const QString& url) +Config::setDonateUrl( const QString& url ) { m_donateUrl = url; emit donateUrlChanged(); @@ -228,17 +231,17 @@ Config::knownIssuesUrl() const } void -Config::setKnownIssuesUrl(const QString& url) +Config::setKnownIssuesUrl( const QString& url ) { m_knownIssuesUrl = url; emit knownIssuesUrlChanged(); } void -Config::setReleaseNotesUrl(const QString& url) +Config::setReleaseNotesUrl( const QString& url ) { - m_releaseNotesUrl = url; - emit releaseNotesUrlChanged(); + m_releaseNotesUrl = url; + emit releaseNotesUrlChanged(); } QString @@ -254,7 +257,7 @@ Config::supportUrl() const } void -Config::setSupportUrl(const QString& url) +Config::setSupportUrl( const QString& url ) { m_supportUrl = url; emit supportUrlChanged(); @@ -271,32 +274,33 @@ RequirementsModel::retranslate() if ( !m_satisfiedMandatory ) { message = setup ? tr( "This computer does not satisfy the minimum " - "requirements for setting up %1.
" - "Setup cannot continue. " - "Details..." ) - : tr( "This computer does not satisfy the minimum " - "requirements for installing %1.
" - "Installation cannot continue. " - "Details..." ); - - }else + "requirements for setting up %1.
" + "Setup cannot continue. " + "Details..." ) + : tr( "This computer does not satisfy the minimum " + "requirements for installing %1.
" + "Installation cannot continue. " + "Details..." ); + } + else { message = setup ? tr( "This computer does not satisfy some of the " - "recommended requirements for setting up %1.
" - "Setup can continue, but some features " - "might be disabled." ) - : tr( "This computer does not satisfy some of the " - "recommended requirements for installing %1.
" - "Installation can continue, but some features " - "might be disabled." ); + "recommended requirements for setting up %1.
" + "Setup can continue, but some features " + "might be disabled." ) + : tr( "This computer does not satisfy some of the " + "recommended requirements for installing %1.
" + "Installation can continue, but some features " + "might be disabled." ); } m_warningMessage = message.arg( *Calamares::Branding::ShortVersionedName ); - }else + } + else { m_warningMessage = tr( "This program will ask you some questions and " - "set up %2 on your computer." ) - .arg( *Calamares::Branding::ProductName ); + "set up %2 on your computer." ) + .arg( *Calamares::Branding::ProductName ); } emit warningMessageChanged(); @@ -310,16 +314,15 @@ Config::genericWelcomeMessage() if ( Calamares::Settings::instance()->isSetupMode() ) { message = Calamares::Branding::instance()->welcomeStyleCalamares() - ? tr( "

Welcome to the Calamares setup program for %1.

" ) - : tr( "

Welcome to %1 setup.

" ); + ? tr( "

Welcome to the Calamares setup program for %1.

" ) + : tr( "

Welcome to %1 setup.

" ); } else { message = Calamares::Branding::instance()->welcomeStyleCalamares() - ? tr( "

Welcome to the Calamares installer for %1.

" ) - : tr( "

Welcome to the %1 installer.

" ); + ? tr( "

Welcome to the Calamares installer for %1.

" ) + : tr( "

Welcome to the %1 installer.

" ); } return message; } - diff --git a/src/modules/welcome/Config.h b/src/modules/welcome/Config.h index a6de4c5dd..072bbfccf 100644 --- a/src/modules/welcome/Config.h +++ b/src/modules/welcome/Config.h @@ -19,9 +19,9 @@ #ifndef WELCOME_CONFIG_H #define WELCOME_CONFIG_H +#include "modulesystem/Requirement.h" #include #include -#include "modulesystem/Requirement.h" #include "locale/LabelModel.h" @@ -29,9 +29,9 @@ class RequirementsModel : public QAbstractListModel { Q_OBJECT using QAbstractListModel::QAbstractListModel; - Q_PROPERTY(bool satisfiedRequirements READ satisfiedRequirements NOTIFY satisfiedRequirementsChanged FINAL) + Q_PROPERTY( bool satisfiedRequirements READ satisfiedRequirements NOTIFY satisfiedRequirementsChanged FINAL ) - Q_PROPERTY(bool satisfiedMandatory READ satisfiedMandatory NOTIFY satisfiedMandatoryChanged FINAL) + Q_PROPERTY( bool satisfiedMandatory READ satisfiedMandatory NOTIFY satisfiedMandatoryChanged FINAL ) Q_PROPERTY( QString warningMessage READ warningMessage NOTIFY warningMessageChanged FINAL ) public: @@ -45,44 +45,33 @@ public: HasDetails }; - bool satisfiedRequirements() const - { - return m_satisfiedRequirements; - } + bool satisfiedRequirements() const { return m_satisfiedRequirements; } - bool satisfiedMandatory() const - { - return m_satisfiedMandatory; - } + bool satisfiedMandatory() const { return m_satisfiedMandatory; } - const Calamares::RequirementEntry& getEntry(const int& index) const + const Calamares::RequirementEntry& getEntry( const int& index ) const { - if(index > count() || index < 0) - return *(new Calamares::RequirementEntry()); - - return m_requirements.at(index); + if ( index > count() || index < 0 ) + { + return *( new Calamares::RequirementEntry() ); + } + return m_requirements.at( index ); } void setRequirementsList( const Calamares::RequirementsList& requirements ); - int rowCount(const QModelIndex&) const override; - int count() const - { - return m_requirements.count(); - } + int rowCount( const QModelIndex& ) const override; + int count() const { return m_requirements.count(); } - QString warningMessage() const - { - return m_warningMessage; - } + QString warningMessage() const { return m_warningMessage; } void retranslate(); - QVariant data(const QModelIndex& index, int role) const override; + QVariant data( const QModelIndex& index, int role ) const override; protected: - QHash roleNames() const override; + QHash< int, QByteArray > roleNames() const override; private: Calamares::RequirementsList m_requirements; @@ -92,7 +81,7 @@ private: QString m_warningMessage; signals: - void satisfiedRequirementsChanged(bool value); + void satisfiedRequirementsChanged( bool value ); void satisfiedMandatoryChanged(); void warningMessageChanged(); }; @@ -101,45 +90,45 @@ signals: class Config : public QObject { Q_OBJECT - Q_PROPERTY( CalamaresUtils::Locale::LabelModel* languagesModel READ languagesModel CONSTANT FINAL) + Q_PROPERTY( CalamaresUtils::Locale::LabelModel* languagesModel READ languagesModel CONSTANT FINAL ) Q_PROPERTY( RequirementsModel* requirementsModel MEMBER m_requirementsModel CONSTANT FINAL ) Q_PROPERTY( QString languageIcon READ languageIcon CONSTANT FINAL ) Q_PROPERTY( QString countryCode MEMBER m_countryCode NOTIFY countryCodeChanged FINAL ) - Q_PROPERTY (int localeIndex READ localeIndex WRITE setLocaleIndex NOTIFY localeIndexChanged) + Q_PROPERTY( int localeIndex READ localeIndex WRITE setLocaleIndex NOTIFY localeIndexChanged ) Q_PROPERTY( QString genericWelcomeMessage MEMBER m_genericWelcomeMessage NOTIFY genericWelcomeMessageChanged FINAL ) Q_PROPERTY( QString supportUrl MEMBER m_supportUrl NOTIFY supportUrlChanged FINAL ) Q_PROPERTY( QString knownIssuesUrl MEMBER m_knownIssuesUrl NOTIFY knownIssuesUrlChanged FINAL ) Q_PROPERTY( QString releaseNotesUrl MEMBER m_releaseNotesUrl NOTIFY releaseNotesUrlChanged FINAL ) - Q_PROPERTY (QString donateUrl MEMBER m_donateUrl NOTIFY donateUrlChanged FINAL ) + Q_PROPERTY( QString donateUrl MEMBER m_donateUrl NOTIFY donateUrlChanged FINAL ) Q_PROPERTY( bool isNextEnabled MEMBER m_isNextEnabled NOTIFY isNextEnabledChanged FINAL ) public: Config( QObject* parent = nullptr ); - void setCountryCode( const QString &countryCode ); - void setLanguageIcon( const QString &languageIcon ); - RequirementsModel& requirementsModel () const; + void setCountryCode( const QString& countryCode ); + void setLanguageIcon( const QString& languageIcon ); + RequirementsModel& requirementsModel() const; void setIsNextEnabled( const bool& isNextEnabled ); - void setLocaleIndex(const int &index); + void setLocaleIndex( const int& index ); int localeIndex() const { return m_localeIndex; } QString supportUrl() const; - void setSupportUrl(const QString &url); + void setSupportUrl( const QString& url ); QString knownIssuesUrl() const; - void setKnownIssuesUrl(const QString &url); + void setKnownIssuesUrl( const QString& url ); QString releaseNotesUrl() const; - void setReleaseNotesUrl(const QString &url); + void setReleaseNotesUrl( const QString& url ); QString donateUrl() const; - void setDonateUrl(const QString &url); + void setDonateUrl( const QString& url ); QString genericWelcomeMessage(); @@ -175,7 +164,6 @@ signals: void knownIssuesUrlChanged(); void releaseNotesUrlChanged(); void donateUrlChanged(); - }; #endif diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index 8ab1479f0..f55c70bdc 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -25,9 +25,9 @@ #include "Branding.h" #include "CalamaresVersion.h" +#include "Config.h" #include "Settings.h" #include "ViewManager.h" -#include "Config.h" #include "locale/LabelModel.h" #include "modulesystem/ModuleManager.h" @@ -44,7 +44,7 @@ #include #include -WelcomePage::WelcomePage( Config *conf, QWidget* parent ) +WelcomePage::WelcomePage( Config* conf, QWidget* parent ) : QWidget( parent ) , ui( new Ui::WelcomePage ) , m_checkingWidget( new CheckerContainer( conf->requirementsModel(), this ) ) @@ -84,13 +84,14 @@ WelcomePage::WelcomePage( Config *conf, QWidget* parent ) ui->verticalLayout->insertWidget( welcome_text_idx + 1, m_checkingWidget ); } -void WelcomePage::init() +void +WelcomePage::init() { //setup the url buttons - setupButton( WelcomePage::Button::Support, m_conf->supportUrl()); + setupButton( WelcomePage::Button::Support, m_conf->supportUrl() ); setupButton( WelcomePage::Button::KnownIssues, m_conf->knownIssuesUrl() ); setupButton( WelcomePage::Button::ReleaseNotes, m_conf->releaseNotesUrl() ); - setupButton( WelcomePage::Button::Donate, m_conf->donateUrl()); + setupButton( WelcomePage::Button::Donate, m_conf->donateUrl() ); //language icon auto icon = Calamares::Branding::instance()->image( m_conf->languageIcon(), QSize( 48, 48 ) ); @@ -113,7 +114,9 @@ WelcomePage::initLanguages() ui->languageWidget->setCurrentIndex( m_conf->localeIndex() ); connect( ui->languageWidget, - static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ), m_conf, &Config::setLocaleIndex ); + static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ), + m_conf, + &Config::setLocaleIndex ); } void diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h index 0fb899d8e..17fedc812 100644 --- a/src/modules/welcome/WelcomePage.h +++ b/src/modules/welcome/WelcomePage.h @@ -36,7 +36,7 @@ class WelcomePage : public QWidget { Q_OBJECT public: - explicit WelcomePage( Config *conf, QWidget* parent = nullptr ); + explicit WelcomePage( Config* conf, QWidget* parent = nullptr ); enum class Button { @@ -75,7 +75,7 @@ private: CheckerContainer* m_checkingWidget; CalamaresUtils::Locale::LabelModel* m_languages; - Config *m_conf; + Config* m_conf; }; /** @brief Delegate to display language information in two columns. diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp index fcf19ce19..c79d4771c 100644 --- a/src/modules/welcome/WelcomeViewStep.cpp +++ b/src/modules/welcome/WelcomeViewStep.cpp @@ -37,73 +37,73 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( WelcomeViewStepFactory, registerPlugin< WelcomeViewStep >(); ) WelcomeViewStep::WelcomeViewStep( QObject* parent ) - : Calamares::ViewStep( parent ) - , m_requirementsChecker( new GeneralRequirements( this ) ) - , m_conf( new Config(this) ) + : Calamares::ViewStep( parent ) + , m_requirementsChecker( new GeneralRequirements( this ) ) + , m_conf( new Config( this ) ) { - connect( Calamares::ModuleManager::instance(), - &Calamares::ModuleManager::requirementsComplete, - this, - &WelcomeViewStep::nextStatusChanged ); + connect( Calamares::ModuleManager::instance(), + &Calamares::ModuleManager::requirementsComplete, + this, + &WelcomeViewStep::nextStatusChanged ); // the instance of the qqc2 or qwidgets page - m_widget = new WelcomePage(m_conf); + m_widget = new WelcomePage( m_conf ); } WelcomeViewStep::~WelcomeViewStep() { - if ( m_widget && m_widget->parent() == nullptr ) - { - m_widget->deleteLater(); - } + if ( m_widget && m_widget->parent() == nullptr ) + { + m_widget->deleteLater(); + } } QString WelcomeViewStep::prettyName() const { - return tr( "Welcome" ); + return tr( "Welcome" ); } QWidget* WelcomeViewStep::widget() { - return m_widget; + return m_widget; } bool WelcomeViewStep::isNextEnabled() const { - return m_widget->verdict(); + return m_widget->verdict(); } bool WelcomeViewStep::isBackEnabled() const { - return false; + return false; } bool WelcomeViewStep::isAtBeginning() const { - return true; + return true; } bool WelcomeViewStep::isAtEnd() const { - return true; + return true; } Calamares::JobList WelcomeViewStep::jobs() const { - return Calamares::JobList(); + return Calamares::JobList(); } @@ -122,125 +122,127 @@ WelcomeViewStep::jobs() const static QString jobOrBrandingSetting( Calamares::Branding::StringEntry e, const QVariantMap& map, const QString& key ) { - if ( !map.contains( key ) ) - { - return QString(); - } - auto v = map.value( key ); - if ( v.type() == QVariant::Bool ) - { - return v.toBool() ? ( *e ) : QString(); - } - if ( v.type() == QVariant::String ) - { - return v.toString(); - } + if ( !map.contains( key ) ) + { + return QString(); + } + auto v = map.value( key ); + if ( v.type() == QVariant::Bool ) + { + return v.toBool() ? ( *e ) : QString(); + } + if ( v.type() == QVariant::String ) + { + return v.toString(); + } - return QString(); + return QString(); } void WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - using Calamares::Branding; + using Calamares::Branding; - m_conf->setSupportUrl( jobOrBrandingSetting( Branding::SupportUrl, configurationMap, "showSupportUrl" ) ); - m_conf->setKnownIssuesUrl( jobOrBrandingSetting( Branding::KnownIssuesUrl, configurationMap, "showKnownIssuesUrl" ) ); - m_conf->setReleaseNotesUrl( jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) ); - m_conf->setDonateUrl( CalamaresUtils::getString( configurationMap, "showDonateUrl" ) ); + m_conf->setSupportUrl( jobOrBrandingSetting( Branding::SupportUrl, configurationMap, "showSupportUrl" ) ); + m_conf->setKnownIssuesUrl( + jobOrBrandingSetting( Branding::KnownIssuesUrl, configurationMap, "showKnownIssuesUrl" ) ); + m_conf->setReleaseNotesUrl( + jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) ); + m_conf->setDonateUrl( CalamaresUtils::getString( configurationMap, "showDonateUrl" ) ); - if ( configurationMap.contains( "requirements" ) - && configurationMap.value( "requirements" ).type() == QVariant::Map ) - { - m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() ); + if ( configurationMap.contains( "requirements" ) + && configurationMap.value( "requirements" ).type() == QVariant::Map ) + { + m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() ); m_conf->requirementsModel().setRequirementsList( checkRequirements() ); - } - else - cWarning() << "no valid requirements map found in welcome " - "module configuration."; + } + else + cWarning() << "no valid requirements map found in welcome " + "module configuration."; - bool ok = false; - QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok ); - if ( ok ) - { - using FWString = QFutureWatcher< QString >; + bool ok = false; + QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok ); + if ( ok ) + { + using FWString = QFutureWatcher< QString >; - auto* handler = new CalamaresUtils::GeoIP::Handler( CalamaresUtils::getString( geoip, "style" ), - CalamaresUtils::getString( geoip, "url" ), - CalamaresUtils::getString( geoip, "selector" ) ); - if ( handler->type() != CalamaresUtils::GeoIP::Handler::Type::None ) - { - auto* future = new FWString(); - connect( future, &FWString::finished, [view = this, f = future, h = handler]() { - QString countryResult = f->future().result(); - cDebug() << "GeoIP result for welcome=" << countryResult; - view->setCountry( countryResult, h ); - f->deleteLater(); - delete h; - } ); - future->setFuture( handler->queryRaw() ); - } - else - { - // Would not produce useful country code anyway. - delete handler; - } - } + auto* handler = new CalamaresUtils::GeoIP::Handler( CalamaresUtils::getString( geoip, "style" ), + CalamaresUtils::getString( geoip, "url" ), + CalamaresUtils::getString( geoip, "selector" ) ); + if ( handler->type() != CalamaresUtils::GeoIP::Handler::Type::None ) + { + auto* future = new FWString(); + connect( future, &FWString::finished, [view = this, f = future, h = handler]() { + QString countryResult = f->future().result(); + cDebug() << "GeoIP result for welcome=" << countryResult; + view->setCountry( countryResult, h ); + f->deleteLater(); + delete h; + } ); + future->setFuture( handler->queryRaw() ); + } + else + { + // Would not produce useful country code anyway. + delete handler; + } + } - QString language = CalamaresUtils::getString( configurationMap, "languageIcon" ); - if ( !language.isEmpty() ) - { + QString language = CalamaresUtils::getString( configurationMap, "languageIcon" ); + if ( !language.isEmpty() ) + { m_conf->setLanguageIcon( language ); - } + } - //here init the qml or qwidgets needed bits - m_widget->init(); + //here init the qml or qwidgets needed bits + m_widget->init(); } Calamares::RequirementsList WelcomeViewStep::checkRequirements() { - return m_requirementsChecker->checkRequirements(); + return m_requirementsChecker->checkRequirements(); } static inline void logGeoIPHandler( CalamaresUtils::GeoIP::Handler* handler ) { - if ( handler ) - { - cDebug() << Logger::SubEntry << "Obtained from" << handler->url() << " (" - << static_cast< int >( handler->type() ) << handler->selector() << ')'; - } + if ( handler ) + { + cDebug() << Logger::SubEntry << "Obtained from" << handler->url() << " (" + << static_cast< int >( handler->type() ) << handler->selector() << ')'; + } } void WelcomeViewStep::setCountry( const QString& countryCode, CalamaresUtils::GeoIP::Handler* handler ) { - if ( countryCode.length() != 2 ) - { - cDebug() << "Unusable country code" << countryCode; - logGeoIPHandler( handler ); - return; - } + if ( countryCode.length() != 2 ) + { + cDebug() << "Unusable country code" << countryCode; + logGeoIPHandler( handler ); + return; + } - auto c_l = CalamaresUtils::Locale::countryData( countryCode ); - if ( c_l.first == QLocale::Country::AnyCountry ) - { - cDebug() << "Unusable country code" << countryCode; - logGeoIPHandler( handler ); - return; - } - else - { - int r = CalamaresUtils::Locale::availableTranslations()->find( countryCode ); - if ( r < 0 ) - { - cDebug() << "Unusable country code" << countryCode << "(no suitable translation)"; - } - if ( ( r >= 0 ) && m_conf ) - { + auto c_l = CalamaresUtils::Locale::countryData( countryCode ); + if ( c_l.first == QLocale::Country::AnyCountry ) + { + cDebug() << "Unusable country code" << countryCode; + logGeoIPHandler( handler ); + return; + } + else + { + int r = CalamaresUtils::Locale::availableTranslations()->find( countryCode ); + if ( r < 0 ) + { + cDebug() << "Unusable country code" << countryCode << "(no suitable translation)"; + } + if ( ( r >= 0 ) && m_conf ) + { m_conf->setCountryCode( countryCode ); } - } + } } diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h index 1d4baa759..d4b9b3019 100644 --- a/src/modules/welcome/WelcomeViewStep.h +++ b/src/modules/welcome/WelcomeViewStep.h @@ -75,7 +75,7 @@ public: private: WelcomePage* m_widget; GeneralRequirements* m_requirementsChecker; - Config *m_conf; + Config* m_conf; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( WelcomeViewStepFactory )