applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 02:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[locale] Hook tz widget up to the Config's data

Browse source
This commit is contained in:
Adriaan de Groot 2020-07-20 16:54:44 +02:00
parent 4d5ff6d5c4
commit f0cac7d669
5 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/locale/Config.cpp
View file

@ -139,17 +139,29 @@ loadLocales( const QString& localeGenPath )
return localeGenLines;
}
static inline const CalamaresUtils::Locale::CStringPairList&
timezoneData()
{
return CalamaresUtils::Locale::TZRegion::fromZoneTab();
}
Config::Config( QObject* parent )
: QObject( parent )
, m_regionModel( std::make_unique< CalamaresUtils::Locale::CStringListModel >(
CalamaresUtils::Locale::TZRegion::fromZoneTab() ) )
, m_regionModel( std::make_unique< CalamaresUtils::Locale::CStringListModel >( ::timezoneData() ) )
, m_zonesModel( std::make_unique< CalamaresUtils::Locale::CStringListModel >() )
{
}
Config::~Config() {}
const CalamaresUtils::Locale::CStringPairList&
Config::timezoneData() const
{
return ::timezoneData();
}
void
Config::setConfigurationMap( const QVariantMap& configurationMap )
{