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

Merge branch 'no-rcc'

Browse source
This commit is contained in:
Adriaan de Groot 2017-07-03 05:48:50 -04:00
commit 43e7ea6265
4 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libcalamares/utils/CalamaresUtils.cpp
View file

@ -47,7 +47,6 @@ static bool s_isAppDataDirOverridden = false;
static QTranslator* s_brandingTranslator = nullptr;
static QTranslator* s_translator = nullptr;
static QTranslator* s_qtTranslator = nullptr;
static QString s_translatorLocaleName;
@ -207,25 +206,6 @@ installTranslator( const QLocale& locale,
QCoreApplication::installTranslator( translator );
s_translator = translator;
// Qt translations
translator = new QTranslator( parent );
if ( translator->load( QString( ":/lang/qt_" ) + localeName ) )
{
qDebug() << "Translation: Qt: Using system locale:" << localeName;
}
else
{
qDebug() << "Translation: Qt: Using default locale, system locale one not found:" << localeName;
}
if ( s_qtTranslator )
{
QCoreApplication::removeTranslator( s_qtTranslator );
delete s_qtTranslator;
}
QCoreApplication::installTranslator( translator );
s_qtTranslator = translator;
s_translatorLocaleName = localeName;
}

8
src/libcalamaresui/ViewManager.cpp
View file

@ -94,12 +94,16 @@ ViewManager::ViewManager( QObject* parent )
if ( !( m_currentStep == m_steps.count() -1 &&
m_steps.last()->isAtEnd() ) )
{
int response = QMessageBox::question( m_widget,
QMessageBox mb( QMessageBox::Question,
tr( "Cancel installation?" ),
tr( "Do you really want to cancel the current install process?\n"
"The installer will quit and all changes will be lost." ),
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No );
m_widget );
mb.setDefaultButton( QMessageBox::No );
mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) );
mb.button( QMessageBox::No )->setText( tr( "&No" ) );
int response = mb.exec();
if ( response == QMessageBox::Yes )
qApp->quit();
}