[locale] Move job-creation to Config
- since Config knows what settings there are, it should create the jobs to run later -- not the Page. - this doesn't work yet, because the Config does **not** know what the selected timezone is yet.
This commit is contained in:
parent
8c21b59853
commit
5a6a9a0d45
@ -20,6 +20,8 @@
|
||||
|
||||
#include "Config.h"
|
||||
|
||||
#include "SetTimezoneJob.h"
|
||||
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/Variant.h"
|
||||
|
||||
@ -172,3 +174,18 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
|
||||
}
|
||||
m_localeGenLines = loadLocales( localeGenPath );
|
||||
}
|
||||
|
||||
Calamares::JobList
|
||||
Config::createJobs()
|
||||
{
|
||||
Calamares::JobList list;
|
||||
const CalamaresUtils::Locale::TZZone* location = nullptr; // TODO: m_tzWidget->currentLocation();
|
||||
|
||||
if ( location )
|
||||
{
|
||||
Calamares::Job* j = new SetTimezoneJob( location->region(), location->zone() );
|
||||
list.append( Calamares::job_ptr( j ) );
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
@ -21,6 +21,7 @@
|
||||
#ifndef LOCALE_CONFIG_H
|
||||
#define LOCALE_CONFIG_H
|
||||
|
||||
#include "Job.h"
|
||||
#include "locale/TimeZone.h"
|
||||
|
||||
#include <QObject>
|
||||
@ -40,6 +41,7 @@ public:
|
||||
~Config();
|
||||
|
||||
void setConfigurationMap( const QVariantMap& );
|
||||
Calamares::JobList createJobs();
|
||||
|
||||
public Q_SLOTS:
|
||||
const QStringList& supportedLocales() const { return m_localeGenLines; }
|
||||
|
@ -114,9 +114,7 @@ LocalePage::LocalePage( Config* config, QWidget* parent )
|
||||
}
|
||||
|
||||
|
||||
LocalePage::~LocalePage()
|
||||
{
|
||||
}
|
||||
LocalePage::~LocalePage() {}
|
||||
|
||||
|
||||
void
|
||||
@ -185,19 +183,6 @@ LocalePage::prettyStatus() const
|
||||
}
|
||||
|
||||
|
||||
Calamares::JobList
|
||||
LocalePage::createJobs()
|
||||
{
|
||||
QList< Calamares::job_ptr > list;
|
||||
const CalamaresUtils::Locale::TZZone* location = m_tzWidget->currentLocation();
|
||||
|
||||
Calamares::Job* j = new SetTimezoneJob( location->region(), location->zone() );
|
||||
list.append( Calamares::job_ptr( j ) );
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
QMap< QString, QString >
|
||||
LocalePage::localesMap()
|
||||
{
|
||||
|
@ -47,8 +47,6 @@ public:
|
||||
|
||||
QString prettyStatus() const;
|
||||
|
||||
Calamares::JobList createJobs();
|
||||
|
||||
QMap< QString, QString > localesMap();
|
||||
|
||||
void onActivate();
|
||||
|
@ -166,7 +166,7 @@ LocaleViewStep::onLeave()
|
||||
{
|
||||
if ( m_actualWidget )
|
||||
{
|
||||
m_jobs = m_actualWidget->createJobs();
|
||||
m_jobs = m_config->createJobs();
|
||||
m_prettyStatus = m_actualWidget->prettyStatus();
|
||||
|
||||
auto map = m_actualWidget->localesMap();
|
||||
|
Loading…
Reference in New Issue
Block a user