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

[libcalamaresui] Refactor button-creation

Browse Source 
- The "convenience" method was no longer convenient, since
   we now place strings on the buttons by default.
 - While here, **name** the buttons so they can be themed.
This commit is contained in:
Adriaan de Groot 2019-10-22 15:03:37 +02:00
parent ee4cd06c23
commit c030cc41cd
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/libcalamaresui/ViewManager.cpp
View File

@ -75,26 +75,6 @@ setButtonIcon( QPushButton* button, const QString& name )
} }
} }
/** @brief Creates a button with a given icon-name
*
* Creates a new button as child of @p parent.
* Sets the named icon, if it exists, onto the button.
* Returns the new button.
*
* There is a QPushButton constructor that takes an icon,
* but it also needs a text and we've got translations
* to worry about as well as state.
*/
static inline QPushButton*
makeButton( QWidget* parent, const QString& name, const QString& label )
{
QPushButton* button = new QPushButton( parent );
button->setObjectName( name );
button->setText( label );
setButtonIcon( button, name );
return button;
}
ViewManager::ViewManager( QObject* parent ) ViewManager::ViewManager( QObject* parent )
: QObject( parent ) : QObject( parent )
, m_currentStep( 0 ) , m_currentStep( 0 )
@ -110,9 +90,12 @@ ViewManager::ViewManager( QObject* parent )
mainLayout->addWidget( m_stack ); mainLayout->addWidget( m_stack );
// Create buttons and sets an initial icon; the icons may change // Create buttons and sets an initial icon; the icons may change
m_back = makeButton( m_widget, QStringLiteral( "go-previous" ), tr( "&Back" ) ); m_back = new QPushButton( getButtonIcon( QStringLiteral( "go-previous" ) ), tr( "&Back" ), m_widget );
m_next = makeButton( m_widget, QStringLiteral( "go-next" ), tr( "&Next" ) ); m_back->setObjectName( "view-button-back" );
m_quit = makeButton( m_widget, QStringLiteral( "dialog-cancel" ), tr( "&Cancel" ) ); m_next = new QPushButton( getButtonIcon( QStringLiteral( "go-next" ) ), tr( "&Next" ), m_widget );
m_next->setObjectName( "view-button-next" );
m_quit = new QPushButton( getButtonIcon( QStringLiteral( "dialog-cancel" ) ), tr( "&Cancel" ), m_widget );
m_quit->setObjectName( "view-button-cancel" );
CALAMARES_RETRANSLATE_SLOT( &ViewManager::updateButtonLabels ) CALAMARES_RETRANSLATE_SLOT( &ViewManager::updateButtonLabels )