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

Try removing the centered icon from CheckerWidget

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-05-18 12:46:51 +02:00
parent dd36825559
commit 994db0973f
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/welcome/checker/CheckerWidget.cpp
View File

@ -80,26 +80,15 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries )
if ( !allChecked ) if ( !allChecked )
{ {
QLabel* iconLabel = new QLabel;
QLabel* textLabel = new QLabel; QLabel* textLabel = new QLabel;
int iconSize = qBound( 32, CalamaresUtils::defaultFontHeight() * 6, 128 );
QHBoxLayout* iconLayout = new QHBoxLayout;
iconLayout->addStretch();
iconLayout->addWidget( iconLabel );
iconLayout->addStretch();
iconLabel->setFixedSize( iconSize, iconSize );
CalamaresUtils::unmarginLayout( iconLayout );
textLabel->setWordWrap( true ); textLabel->setWordWrap( true );
m_entriesLayout->insertLayout( 0, iconLayout ); m_entriesLayout->insertWidget( 0, textLabel );
m_entriesLayout->insertWidget( 1, textLabel ); m_entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
m_entriesLayout->insertSpacing( 2, CalamaresUtils::defaultFontHeight() / 2 );
textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
if ( !requirementsSatisfied ) if ( !requirementsSatisfied )
{ {
iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Fail,
CalamaresUtils::Original,
iconLabel->size() ) );
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
textLabel->setText( tr( "This computer does not satisfy the minimum " textLabel->setText( tr( "This computer does not satisfy the minimum "
"requirements for installing %1.<br/>" "requirements for installing %1.<br/>"
@ -118,9 +107,6 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries )
} }
else else
{ {
iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,
CalamaresUtils::Original,
iconLabel->size() ) );
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
textLabel->setText( tr( "This computer does not satisfy some of the " textLabel->setText( tr( "This computer does not satisfy some of the "
"recommended requirements for installing %1.<br/>" "recommended requirements for installing %1.<br/>"