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

[libcalamaresui] Apply coding style

Browse Source 
- Some minor bits snuck in with the string-truncation code
- While here, make UPDATE_BUTTON_PROPERTY more statement-like
  so it doesn't confuse code-formatters.
This commit is contained in:
Adriaan de Groot 2021-01-28 13:52:48 +01:00
parent db5f3bc309
commit b85e5b52c2
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/libcalamaresui/ViewManager.cpp
View File

@ -31,10 +31,11 @@
#include <QMetaObject>
#define UPDATE_BUTTON_PROPERTY( name, value ) \
do \
{ \
m_##name = value; \
emit name##Changed( m_##name ); \
}
} while ( false )
namespace Calamares
{
@ -152,7 +153,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
QString text = "<p>" + message + "</p>";
if ( !details.isEmpty() )
{
text += "<p>" + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd{8, 0}) + "</p>";
text += "<p>" + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd { 8, 0 } ) + "</p>";
}
if ( shouldOfferWebPaste )
{
@ -365,8 +366,8 @@ ViewManager::next()
{
// Reached the end in a weird state (e.g. no finished step after an exec)
executing = false;
UPDATE_BUTTON_PROPERTY( nextEnabled, false )
UPDATE_BUTTON_PROPERTY( backEnabled, false )
UPDATE_BUTTON_PROPERTY( nextEnabled, false );
UPDATE_BUTTON_PROPERTY( backEnabled, false );
}
updateCancelEnabled( !settings->disableCancel() && !( executing && settings->disableCancelDuringExec() ) );
updateBackAndNextVisibility( !( executing && settings->hideBackAndNextDuringExec() ) );
@ -378,8 +379,8 @@ ViewManager::next()
if ( m_currentStep < m_steps.count() )
{
UPDATE_BUTTON_PROPERTY( nextEnabled, !executing && m_steps.at( m_currentStep )->isNextEnabled() )
UPDATE_BUTTON_PROPERTY( backEnabled, !executing && m_steps.at( m_currentStep )->isBackEnabled() )
UPDATE_BUTTON_PROPERTY( nextEnabled, !executing && m_steps.at( m_currentStep )->isNextEnabled() );
UPDATE_BUTTON_PROPERTY( backEnabled, !executing && m_steps.at( m_currentStep )->isBackEnabled() );
}
updateButtonLabels();
@ -401,26 +402,26 @@ ViewManager::updateButtonLabels()
// If we're going into the execution step / install phase, other message
if ( stepIsExecute( m_steps, m_currentStep + 1 ) )
{
UPDATE_BUTTON_PROPERTY( nextLabel, nextIsInstallationStep )
UPDATE_BUTTON_PROPERTY( nextIcon, "run-install" )
UPDATE_BUTTON_PROPERTY( nextLabel, nextIsInstallationStep );
UPDATE_BUTTON_PROPERTY( nextIcon, "run-install" );
}
else
{
UPDATE_BUTTON_PROPERTY( nextLabel, tr( "&Next" ) )
UPDATE_BUTTON_PROPERTY( nextIcon, "go-next" )
UPDATE_BUTTON_PROPERTY( nextLabel, tr( "&Next" ) );
UPDATE_BUTTON_PROPERTY( nextIcon, "go-next" );
}
// Going back is always simple
UPDATE_BUTTON_PROPERTY( backLabel, tr( "&Back" ) )
UPDATE_BUTTON_PROPERTY( backIcon, "go-previous" )
UPDATE_BUTTON_PROPERTY( backLabel, tr( "&Back" ) );
UPDATE_BUTTON_PROPERTY( backIcon, "go-previous" );
// Cancel button changes label at the end
if ( isAtVeryEnd( m_steps, m_currentStep ) )
{
UPDATE_BUTTON_PROPERTY( quitLabel, tr( "&Done" ) )
UPDATE_BUTTON_PROPERTY( quitTooltip, quitOnCompleteTooltip )
UPDATE_BUTTON_PROPERTY( quitVisible, true )
UPDATE_BUTTON_PROPERTY( quitIcon, "dialog-ok-apply" )
UPDATE_BUTTON_PROPERTY( quitLabel, tr( "&Done" ) );
UPDATE_BUTTON_PROPERTY( quitTooltip, quitOnCompleteTooltip );
UPDATE_BUTTON_PROPERTY( quitVisible, true );
UPDATE_BUTTON_PROPERTY( quitIcon, "dialog-ok-apply" );
updateCancelEnabled( true );
if ( settings->quitAtEnd() )
{
@ -431,14 +432,14 @@ ViewManager::updateButtonLabels()
{
if ( settings->disableCancel() )
{
UPDATE_BUTTON_PROPERTY( quitVisible, false )
UPDATE_BUTTON_PROPERTY( quitVisible, false );
}
updateCancelEnabled( !settings->disableCancel()
&& !( stepIsExecute( m_steps, m_currentStep ) && settings->disableCancelDuringExec() ) );
UPDATE_BUTTON_PROPERTY( quitLabel, tr( "&Cancel" ) )
UPDATE_BUTTON_PROPERTY( quitTooltip, cancelBeforeInstallationTooltip )
UPDATE_BUTTON_PROPERTY( quitIcon, "dialog-cancel" )
UPDATE_BUTTON_PROPERTY( quitLabel, tr( "&Cancel" ) );
UPDATE_BUTTON_PROPERTY( quitTooltip, cancelBeforeInstallationTooltip );
UPDATE_BUTTON_PROPERTY( quitIcon, "dialog-cancel" );
}
}
@ -468,11 +469,11 @@ ViewManager::back()
return;
}
UPDATE_BUTTON_PROPERTY( nextEnabled, m_steps.at( m_currentStep )->isNextEnabled() )
UPDATE_BUTTON_PROPERTY( nextEnabled, m_steps.at( m_currentStep )->isNextEnabled() );
UPDATE_BUTTON_PROPERTY( backEnabled,
( m_currentStep == 0 && m_steps.first()->isAtBeginning() )
? false
: m_steps.at( m_currentStep )->isBackEnabled() )
: m_steps.at( m_currentStep )->isBackEnabled() );
updateButtonLabels();
}
@ -525,14 +526,14 @@ ViewManager::confirmCancelInstallation()
void
ViewManager::updateCancelEnabled( bool enabled )
{
UPDATE_BUTTON_PROPERTY( quitEnabled, enabled )
UPDATE_BUTTON_PROPERTY( quitEnabled, enabled );
emit cancelEnabled( enabled );
}
void
ViewManager::updateBackAndNextVisibility( bool visible)
ViewManager::updateBackAndNextVisibility( bool visible )
{
UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible )
UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible );
}
QVariant