napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct typo

Browse Source
This commit is contained in:
Camilo Higuita 2020-03-24 10:39:29 -05:00
parent 1c0e69e1c2
commit b6b9f888fc
2 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/modules/welcome/Config.cpp
View File

@ -30,13 +30,13 @@ RequirementsModel::setRequirementsList( const Calamares::RequirementsList& requi
CALAMARES_RETRANSLATE_SLOT( &RequirementsModel::retranslate )
emit beginResetModel();
m_requierements = requirements;
m_requirements = requirements;
auto isUnSatisfied = []( const Calamares::RequirementEntry& e ) { return !e.satisfied; };
auto isMandatoryAndUnSatisfied = []( const Calamares::RequirementEntry& e ) { return e.mandatory && !e.satisfied; };
m_satisfiedRequirements = std::none_of( m_requierements.begin(), m_requierements.end(), isUnSatisfied );
m_satisfiedMandatory = std::none_of( m_requierements.begin(), m_requierements.end(), isMandatoryAndUnSatisfied );
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 satisfiedMandatoryChanged();
@ -46,13 +46,13 @@ RequirementsModel::setRequirementsList( const Calamares::RequirementsList& requi
int
RequirementsModel::rowCount( const QModelIndex& ) const
{
return m_requierements.count();
return m_requirements.count();
}
QVariant
RequirementsModel::data( const QModelIndex& index, int role ) const
{
const auto requirement = m_requierements.at( index.row() );
const auto requirement = m_requirements.at( index.row() );
switch ( role )
{
@ -92,28 +92,12 @@ Config::Config( QObject* parent ) : QObject( parent )
initLanguages();
CALAMARES_RETRANSLATE_SLOT( &Config::retranslate )
}
void
Config::retranslate()
{
QString message;
if ( Calamares::Settings::instance()->isSetupMode() )
{
message = Calamares::Branding::instance()->welcomeStyleCalamares()
? tr( "<h1>Welcome to the Calamares setup program for %1.</h1>" )
: tr( "<h1>Welcome to %1 setup.</h1>" );
}
else
{
message = Calamares::Branding::instance()->welcomeStyleCalamares()
? tr( "<h1>Welcome to the Calamares installer for %1.</h1>" )
: tr( "<h1>Welcome to the %1 installer.</h1>" );
}
m_genericWelcomeMessage = message.arg( *Calamares::Branding::VersionedName );
m_genericWelcomeMessage = genericWelcomeMessage().arg( *Calamares::Branding::VersionedName );
emit genericWelcomeMessageChanged();
m_requirementsModel->retranslate();
@ -224,51 +208,60 @@ Config::setIsNextEnabled( const bool& isNextEnabled )
emit isNextEnabledChanged( m_isNextEnabled );
}
QString Config::donateUrl() const
QString
Config::donateUrl() const
{
return m_donateUrl;
}
void Config::setDonateUrl(const QString& url)
void
Config::setDonateUrl(const QString& url)
{
m_donateUrl = url;
emit donateUrlChanged();
}
QString Config::knownIssuesUrl() const
QString
Config::knownIssuesUrl() const
{
return m_knownIssuesUrl;
}
void Config::setKnownIssuesUrl(const QString& url)
void
Config::setKnownIssuesUrl(const QString& url)
{
m_knownIssuesUrl = url;
emit knownIssuesUrlChanged();
}
void Config::setReleaseNotesUrl(const QString& url)
void
Config::setReleaseNotesUrl(const QString& url)
{
m_releaseNotesUrl = url;
emit releaseNotesUrlChanged();
}
QString Config::releaseNotesUrl() const
QString
Config::releaseNotesUrl() const
{
return m_releaseNotesUrl;
}
QString Config::supportUrl() const
QString
Config::supportUrl() const
{
return m_supportUrl;
}
void Config::setSupportUrl(const QString& url)
void
Config::setSupportUrl(const QString& url)
{
m_supportUrl = url;
emit supportUrlChanged();
}
void RequirementsModel::retranslate()
void
RequirementsModel::retranslate()
{
if ( !m_satisfiedRequirements )
{
@ -308,3 +301,25 @@ void RequirementsModel::retranslate()
emit warningMessageChanged();
}
QString
Config::genericWelcomeMessage()
{
QString message;
if ( Calamares::Settings::instance()->isSetupMode() )
{
message = Calamares::Branding::instance()->welcomeStyleCalamares()
? tr( "<h1>Welcome to the Calamares setup program for %1.</h1>" )
: tr( "<h1>Welcome to %1 setup.</h1>" );
}
else
{
message = Calamares::Branding::instance()->welcomeStyleCalamares()
? tr( "<h1>Welcome to the Calamares installer for %1.</h1>" )
: tr( "<h1>Welcome to the %1 installer.</h1>" );
}
return message;
}

9
src/modules/welcome/Config.h
View File

@ -61,7 +61,7 @@ public:
if(index > count() || index < 0)
return *(new Calamares::RequirementEntry());
return m_requierements.at(index);
return m_requirements.at(index);
}
@ -69,7 +69,7 @@ public:
int rowCount(const QModelIndex&) const override;
int count() const
{
return m_requierements.count();
return m_requirements.count();
}
QString warningMessage() const
@ -85,7 +85,7 @@ protected:
QHash<int, QByteArray> roleNames() const override;
private:
Calamares::RequirementsList m_requierements;
Calamares::RequirementsList m_requirements;
bool m_satisfiedRequirements = false;
bool m_satisfiedMandatory = false;
@ -141,6 +141,9 @@ public:
QString donateUrl() const;
void setDonateUrl(const QString &url);
QString genericWelcomeMessage();
public slots:
CalamaresUtils::Locale::LabelModel* languagesModel() const;
void retranslate();