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

[libcalamares] Rename dontCancel to disableCancelDuringExec

Browse source 
- This way the name actually refers to what it does, rather
   than being a somewhat ambiguous overload of disableCancel.
This commit is contained in:
Adriaan de Groot 2019-05-14 08:30:34 -04:00
parent 4de703430f
commit f3bfc81e52
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libcalamaresui/ViewManager.cpp
View file

@ -288,7 +288,7 @@ ViewManager::next()
m_steps.at( m_currentStep )->onActivate();
executing = qobject_cast< ExecutionViewStep* >( m_steps.at( m_currentStep ) ) != nullptr;
emit currentStepChanged();
updateCancelEnabled( !settings->disableCancel() && !(executing && settings->dontCancel() ) );
updateCancelEnabled( !settings->disableCancel() && !(executing && settings->disableCancelDuringExec() ) );
}
else
step->next();
@ -331,7 +331,7 @@ ViewManager::updateButtonLabels()
{
if ( settings->disableCancel() )
m_quit->setVisible( false ); // In case we went back from final
updateCancelEnabled( !settings->disableCancel() && !( stepIsExecute( m_steps, m_currentStep ) && settings->dontCancel() ) );
updateCancelEnabled( !settings->disableCancel() && !( stepIsExecute( m_steps, m_currentStep ) && settings->disableCancelDuringExec() ) );
m_quit->setText( tr( "&Cancel" ) );
m_quit->setToolTip( quit );
@ -369,7 +369,7 @@ bool ViewManager::confirmCancelInstallation()
if ( settings->disableCancel() )
return false;
if ( settings->dontCancel() && stepIsExecute( m_steps, m_currentStep ) )
if ( settings->disableCancelDuringExec() && stepIsExecute( m_steps, m_currentStep ) )
return false;
// If it's NOT the last page of the last step, we ask for confirmation