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

[libcalamaresui] WIP: refactor again

Browse Source 
- the string-manipulation can be done through a lambda. That makes
   handling *strings* and *styles* simple.
 - still doesn't compile.
This commit is contained in:
Adriaan de Groot 2019-05-20 16:20:31 +02:00
parent 5a126816f4
commit 544d905b2f
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/libcalamaresui/Branding.cpp
View File

@ -32,6 +32,8 @@
#include <QPixmap>
#include <QVariantMap>
#include <functional>
namespace Calamares
{
@ -87,19 +89,26 @@ Branding::WindowDimension::suffixes()
return names;
}
/** @brief Load the @p map with strings from @p config
*
* Each key-value pair from @p config is inserted into the @p map,
* but the value is first transformed by the @p transform function,
* which may change strings.
*/
static void
loadStrings( QMap<QString, QString>& map, const QVariantMap& config, const std::function< QString(const QString&) >& transform )
{
map.clear();
for ( auto it = config.constBegin(); it != config.constEnd(); ++it )
map.insert( it.key(), transform( it.value().toString() ) );
}
/** @brief Load the @p map with strings from @p config
*
* If os-release is supported (with KF5 CoreAddons >= 5.58) then
* special substitutions can be done as well. See the branding
* documentation for details.
*/
static void
loadStrings(QMap<QString, QString>& map, const QVariantMap& config)
{
map.clear();
for ( auto it = config.constBegin(); it != config.constEnd(); ++it )
map.insert( it.key(), it.value().toString() );
}
/** @brief Load the @p map of image-filepaths from @p config
*
@ -123,16 +132,6 @@ loadImages(QMap<QString, QString>& map, const QVariantMap& config)
}
}
/** @brief Load the @p map with stylesheet-strings from @p config.
*/
static void
loadStyles(QMap<QString, QString>& map, const QVariantMap& config)
{
map.clear();
for ( auto it = config.constBegin(); it != config.constEnd(); ++it )
map.insert( it.key(), it.value().toString() );
}
Branding::Branding( const QString& brandingFilePath,
QObject* parent )
: QObject( parent )
@ -166,7 +165,8 @@ Branding::Branding( const QString& brandingFilePath,
if ( !doc[ "strings" ].IsMap() )
bail( "Syntax error in strings map." );
loadStrings( m_strings, CalamaresUtils::yamlMapToVariant( doc[ "strings" ] ).toMap() );
loadStrings( m_strings, CalamaresUtils::yamlMapToVariant( doc[ "strings" ] ).toMap(),
[]( const QString& s ) -> QString { return s; } );
if ( !doc[ "images" ].IsMap() )
bail( "Syntax error in images map." );
@ -174,7 +174,8 @@ Branding::Branding( const QString& brandingFilePath,
if ( !doc[ "style" ].IsMap() )
bail( "Syntax error in style map." );
loadStyles( m_style, CalamaresUtils::yamlMapToVariant( doc[ "style" ] ).toMap() );
loadStrings( m_style, CalamaresUtils::yamlMapToVariant( doc[ "style" ] ).toMap(),
[]( const QString& s ) -> QString { return s; } );
if ( doc[ "slideshow" ].IsSequence() )
{