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

Finish up retranslation in PreparePage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-11-13 16:51:23 +01:00
parent 280baf7326
commit 0f9496babe
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/prepare/PreparePage.cpp
View File

@ -60,7 +60,7 @@ PreparePage::init( const QList< PrepareEntry >& checkEntries )
for ( const PrepareEntry& entry : checkEntries ) for ( const PrepareEntry& entry : checkEntries )
{ {
PrepareCheckWidget* pcw = new PrepareCheckWidget( entry.checked ); PrepareCheckWidget* pcw = new PrepareCheckWidget( entry.checked );
pcw->setText( entry.text ); CALAMARES_RETRANSLATE( pcw->setText( entry.text() ); )
m_entriesLayout->addWidget( pcw ); m_entriesLayout->addWidget( pcw );
pcw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); pcw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );

12
src/modules/prepare/PrepareViewStep.cpp
View File

@ -87,30 +87,30 @@ PrepareViewStep::PrepareViewStep( QObject* parent )
if ( entry == "storage" ) if ( entry == "storage" )
checkEntries.append( { checkEntries.append( {
entry, entry,
tr( "has at least %1 GB available drive space" ) [this]{ return tr( "has at least %1 GB available drive space" )
.arg( m_requiredStorageGB ), .arg( m_requiredStorageGB ); },
enoughStorage, enoughStorage,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );
else if ( entry == "ram" ) else if ( entry == "ram" )
checkEntries.append( { checkEntries.append( {
entry, entry,
tr( "has at least %1 GB working memory" ) [this]{ return tr( "has at least %1 GB working memory" )
.arg( m_requiredRamGB ), .arg( m_requiredRamGB ); },
enoughRam, enoughRam,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );
else if ( entry == "power" ) else if ( entry == "power" )
checkEntries.append( { checkEntries.append( {
entry, entry,
tr( "is plugged in to a power source" ), [this]{ return tr( "is plugged in to a power source" ); },
hasPower, hasPower,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );
else if ( entry == "internet" ) else if ( entry == "internet" )
checkEntries.append( { checkEntries.append( {
entry, entry,
tr( "is connected to the Internet" ), [this]{ return tr( "is connected to the Internet" ); },
hasInternet, hasInternet,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );

8
src/modules/prepare/PrepareViewStep.h
View File

@ -19,18 +19,20 @@
#ifndef PREPAREPAGEPLUGIN_H #ifndef PREPAREPAGEPLUGIN_H
#define PREPAREPAGEPLUGIN_H #define PREPAREPAGEPLUGIN_H
#include "viewpages/ViewStep.h"
#include "PluginDllMacro.h"
#include <QObject> #include <QObject>
#include <QStringList> #include <QStringList>
#include "viewpages/ViewStep.h" #include <functional>
#include "PluginDllMacro.h"
class PreparePage; class PreparePage;
struct PrepareEntry struct PrepareEntry
{ {
QString name; QString name;
QString text; std::function< QString() > text;
bool checked; bool checked;
bool required; bool required;
}; };