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

[libcalamares] Update button icons as we go along

Browse Source 
- Adapt the button icons (previous, next, do-install, all-done)
   to the state of the buttons and the corresponding text.
This commit is contained in:
Adriaan de Groot 2019-06-18 22:54:41 +02:00
parent b3d9af4cae
commit 79dc9e3463
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/libcalamaresui/ViewManager.cpp
View File

@ -54,6 +54,23 @@ ViewManager::instance( QObject* parent )
return s_instance; return s_instance;
} }
/** @brief Get a button-sized icon. */
static inline QPixmap
getButtonIcon( const QString& name )
{
return Calamares::Branding::instance()->image( name, QSize( 22, 22 ) );
}
static inline void
setButtonIcon( QPushButton* button, const QString& name )
{
auto icon = getButtonIcon( name );
if ( button && !icon.isNull() )
{
button->setIcon( icon );
}
}
/** @brief Creates a button with a given icon-name /** @brief Creates a button with a given icon-name
* *
* Creates a new button as child of @p parent. * Creates a new button as child of @p parent.
@ -68,11 +85,7 @@ static inline QPushButton*
makeButton( QWidget* parent, const QString& name ) makeButton( QWidget* parent, const QString& name )
{ {
QPushButton* button = new QPushButton( parent ); QPushButton* button = new QPushButton( parent );
auto icon = Calamares::Branding::instance()->image( name, QSize( 22, 22 ) ); setButtonIcon( button, name );
if ( button && !icon.isNull() )
{
button->setIcon( icon );
}
return button; return button;
} }
@ -350,9 +363,15 @@ ViewManager::updateButtonLabels()
// If we're going into the execution step / install phase, other message // If we're going into the execution step / install phase, other message
if ( stepIsExecute( m_steps, m_currentStep+1 ) ) if ( stepIsExecute( m_steps, m_currentStep+1 ) )
{
m_next->setText( nextIsInstallationStep ); m_next->setText( nextIsInstallationStep );
setButtonIcon( m_next, "run-install" );
}
else else
{
m_next->setText( tr( "&Next" ) ); m_next->setText( tr( "&Next" ) );
setButtonIcon( m_next, "go-next" );
}
// Going back is always simple // Going back is always simple
m_back->setText( tr( "&Back" ) ); m_back->setText( tr( "&Back" ) );
@ -363,6 +382,7 @@ ViewManager::updateButtonLabels()
m_quit->setText( tr( "&Done" ) ); m_quit->setText( tr( "&Done" ) );
m_quit->setToolTip( quitOnCompleteTooltip ); m_quit->setToolTip( quitOnCompleteTooltip );
m_quit->setVisible( true ); // At end, always visible and enabled. m_quit->setVisible( true ); // At end, always visible and enabled.
setButtonIcon( m_quit, "dialog-ok-apply" );
updateCancelEnabled( true ); updateCancelEnabled( true );
} }
else else
@ -373,6 +393,7 @@ ViewManager::updateButtonLabels()
m_quit->setText( tr( "&Cancel" ) ); m_quit->setText( tr( "&Cancel" ) );
m_quit->setToolTip( cancelBeforeInstallationTooltip ); m_quit->setToolTip( cancelBeforeInstallationTooltip );
setButtonIcon( m_quit, "dialog-cancel" );
} }
} }