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

[interactiveterminal] Refactor error message

Browse Source 
- refactor error message
 - ifx capitalisation problem
 - remove editorializing in comments

FIXES #866
This commit is contained in:
Adriaan de Groot 2017-11-28 05:05:28 -05:00
parent 49fda9da28
commit 3cb6fd839b
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/interactiveterminal/InteractiveTerminalPage.cpp
View File

@ -46,6 +46,14 @@ InteractiveTerminalPage::InteractiveTerminalPage( QWidget* parent )
m_layout->addWidget( m_headerLabel );
}
static void
errorKonsoleNotInstalled( QWidget* parent)
{
QMessageBox::critical( parent,
parent->tr( "Konsole not installed"),
parent->tr( "Please install KDE Konsole and try again!" ),
QMessageBox::Ok );
}
void
InteractiveTerminalPage::onActivate()
@ -60,15 +68,7 @@ InteractiveTerminalPage::onActivate()
{
// And all of this hoping the Konsole application is installed. If not,
// tough cookies.
// Maybe linking against a library seemed too simple and elegant so
// someone decided to have a terminal widget depend on over 9000 other
// KDElibs things that have nothing to do with a terminal widget, and
// have the loading happen at runtime so it's more likely to fail at
// an inconvenient time.
QMessageBox::critical( this,
tr( "Konsole not installed"),
tr( "Please install the kde konsole and try again!" ),
QMessageBox::Ok);
errorKonsoleNotInstalled( this );
return ;
}
@ -80,10 +80,7 @@ InteractiveTerminalPage::onActivate()
if ( !p )
{
// One more opportunity for the loading operation to fail.
QMessageBox::critical( this,
tr( "Konsole not installed"),
tr( "Please install the kde konsole and try again!" ),
QMessageBox::Ok);
errorKonsoleNotInstalled( this );
return;
}
@ -92,10 +89,7 @@ InteractiveTerminalPage::onActivate()
if ( !t )
{
// This is why we can't have nice things.
QMessageBox::critical( this,
tr( "Konsole not installed"),
tr( "Please install the kde konsole and try again!" ),
QMessageBox::Ok);
errorKonsoleNotInstalled( this );
return;
}