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

Use branding in Prepare viewmodule.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-10-16 16:59:29 +02:00
parent 8e38a03cca
commit 4c51d320f6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@
#include "PrepareCheckWidget.h" #include "PrepareCheckWidget.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "Branding.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QLabel> #include <QLabel>
@ -89,7 +90,9 @@ PreparePage::init( const QList< PrepareEntry >& checkEntries )
iconLabel->size() ) ); iconLabel->size() ) );
textLabel->setText( tr( "This computer does not satisfy the minimum " textLabel->setText( tr( "This computer does not satisfy the minimum "
"requirements for installing %1.\n" "requirements for installing %1.\n"
"Installation cannot continue." ).arg( "$RELEASE_NAME" ) ); //TODO: fill this with text from branding system "Installation cannot continue." )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) );
} }
else else
{ {
@ -99,7 +102,9 @@ PreparePage::init( const QList< PrepareEntry >& checkEntries )
textLabel->setText( tr( "This computer does not satisfy some of the " textLabel->setText( tr( "This computer does not satisfy some of the "
"recommended requirements for installing %1.\n" "recommended requirements for installing %1.\n"
"Installation can continue, but some features " "Installation can continue, but some features "
"might be disabled." ).arg( "$RELEASE_NAME" ) ); //TODO: fill this with text from branding system "might be disabled." )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) );
} }