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

[libcalamaresui] Fix disable-cancel behavior

Browse Source 
- d78bc0c5 added an early `return false` when cancel is disabled,
   before checking if we were at the last step; so last-step
   didn't get any special handling.
 - refactor so that last-step now gets special handling first,
   **then** disable-cancel handling, and then the usual case.
This commit is contained in:
Adriaan de Groot 2019-05-28 13:38:28 +02:00
parent 0c24a01eb9
commit 95009a5222
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/libcalamaresui/ViewManager.cpp
View File

@ -228,16 +228,16 @@ ViewManager::currentStepIndex() const
} }
/** @brief Is the given step at @p index an execution step? /** @brief Is the given step at @p index an execution step?
* *
* Returns true if the step is an execution step, false otherwise. * Returns true if the step is an execution step, false otherwise.
* Also returns false if the @p index is out of range. * Also returns false if the @p index is out of range.
*/ */
static inline bool static inline bool
stepIsExecute( const ViewStepList& steps, int index ) stepIsExecute( const ViewStepList& steps, int index )
{ {
return return
( 0 <= index ) && ( 0 <= index ) &&
( index < steps.count() ) && ( index < steps.count() ) &&
( qobject_cast< ExecutionViewStep* >( steps.at( index ) ) != nullptr ); ( qobject_cast< ExecutionViewStep* >( steps.at( index ) ) != nullptr );
} }
@ -249,7 +249,7 @@ ViewManager::next()
if ( step->isAtEnd() ) if ( step->isAtEnd() )
{ {
const auto* const settings = Calamares::Settings::instance(); const auto* const settings = Calamares::Settings::instance();
// Special case when the user clicks next on the very last page in a view phase // Special case when the user clicks next on the very last page in a view phase
// and right before switching to an execution phase. // and right before switching to an execution phase.
// Depending on Calamares::Settings, we show an "are you sure" prompt or not. // Depending on Calamares::Settings, we show an "are you sure" prompt or not.
@ -303,7 +303,7 @@ void
ViewManager::updateButtonLabels() ViewManager::updateButtonLabels()
{ {
const auto* const settings = Calamares::Settings::instance(); const auto* const settings = Calamares::Settings::instance();
QString next = settings->isSetupMode() QString next = settings->isSetupMode()
? tr( "&Set up" ) ? tr( "&Set up" )
: tr( "&Install" ); : tr( "&Install" );
@ -332,7 +332,7 @@ ViewManager::updateButtonLabels()
if ( settings->disableCancel() ) if ( settings->disableCancel() )
m_quit->setVisible( false ); // In case we went back from final m_quit->setVisible( false ); // In case we went back from final
updateCancelEnabled( !settings->disableCancel() && !( stepIsExecute( m_steps, m_currentStep ) && settings->disableCancelDuringExec() ) ); updateCancelEnabled( !settings->disableCancel() && !( stepIsExecute( m_steps, m_currentStep ) && settings->disableCancelDuringExec() ) );
m_quit->setText( tr( "&Cancel" ) ); m_quit->setText( tr( "&Cancel" ) );
m_quit->setToolTip( quit ); m_quit->setToolTip( quit );
} }
@ -366,37 +366,36 @@ ViewManager::back()
bool ViewManager::confirmCancelInstallation() bool ViewManager::confirmCancelInstallation()
{ {
const auto* const settings = Calamares::Settings::instance(); const auto* const settings = Calamares::Settings::instance();
// When we're at the very end, then it's always OK to exit.
if ( m_currentStep == m_steps.count() -1 && m_steps.last()->isAtEnd() )
return true;
// Not at the very end, cancel/quit might be disabled
if ( settings->disableCancel() ) if ( settings->disableCancel() )
return false; return false;
if ( settings->disableCancelDuringExec() && stepIsExecute( m_steps, m_currentStep ) ) if ( settings->disableCancelDuringExec() && stepIsExecute( m_steps, m_currentStep ) )
return false; return false;
// If it's NOT the last page of the last step, we ask for confirmation // Otherwise, confirm cancel/quit.
if ( !( m_currentStep == m_steps.count() -1 && QString title = settings->isSetupMode()
m_steps.last()->isAtEnd() ) ) ? tr( "Cancel setup?" )
{ : tr( "Cancel installation?" );
QString title = settings->isSetupMode() QString question = settings->isSetupMode()
? tr( "Cancel setup?" ) ? tr( "Do you really want to cancel the current setup process?\n"
: tr( "Cancel installation?" ); "The setup program will quit and all changes will be lost." )
QString question = settings->isSetupMode() : tr( "Do you really want to cancel the current install process?\n"
? tr( "Do you really want to cancel the current setup process?\n" "The installer will quit and all changes will be lost." );
"The setup program will quit and all changes will be lost." ) QMessageBox mb( QMessageBox::Question,
: tr( "Do you really want to cancel the current install process?\n" title,
"The installer will quit and all changes will be lost." ); question,
QMessageBox mb( QMessageBox::Question, QMessageBox::Yes | QMessageBox::No,
title, m_widget );
question, mb.setDefaultButton( QMessageBox::No );
QMessageBox::Yes | QMessageBox::No, mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) );
m_widget ); mb.button( QMessageBox::No )->setText( tr( "&No" ) );
mb.setDefaultButton( QMessageBox::No ); int response = mb.exec();
mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) ); return response == QMessageBox::Yes;
mb.button( QMessageBox::No )->setText( tr( "&No" ) );
int response = mb.exec();
return response == QMessageBox::Yes;
}
else // Means we're at the end, no need to confirm.
return true;
} }
void void