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

[libcalamaresui] Chase Branding API change

Browse Source
This commit is contained in:
Adriaan de Groot 2020-05-04 12:43:53 +02:00
parent 794939b6a8
commit dc1a4fab8e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcalamaresui/ViewManager.cpp
View File

@ -226,7 +226,9 @@ ViewManager::onInitFailed( const QStringList& modules )
detailString = details.join( QString() ); detailString = details.join( QString() );
} }
insertViewStep( 0, new BlankViewStep( title, description.arg( *Calamares::Branding::ProductName ), detailString ) ); insertViewStep(
0,
new BlankViewStep( title, description.arg( Calamares::Branding::instance()->productName() ), detailString ) );
} }
void void
@ -335,10 +337,11 @@ ViewManager::next()
"to undo these changes.</strong>" ); "to undo these changes.</strong>" );
QString confirm = settings->isSetupMode() ? tr( "&Set up now" ) : tr( "&Install now" ); QString confirm = settings->isSetupMode() ? tr( "&Set up now" ) : tr( "&Install now" );
int reply = QMessageBox::question( const auto* branding = Calamares::Branding::instance();
m_widget, int reply
= QMessageBox::question( m_widget,
title, title,
question.arg( *Calamares::Branding::ShortProductName, *Calamares::Branding::ShortVersionedName ), question.arg( branding->shortProductName(), branding->shortVersionedName() ),
confirm, confirm,
tr( "Go &back" ), tr( "Go &back" ),
QString(), QString(),