From 994db0973fbb7858af445385a2d45d105ba8ad02 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Mon, 18 May 2015 12:46:51 +0200 Subject: [PATCH] Try removing the centered icon from CheckerWidget --- src/modules/welcome/checker/CheckerWidget.cpp | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/modules/welcome/checker/CheckerWidget.cpp b/src/modules/welcome/checker/CheckerWidget.cpp index 077249b35..9f39982a6 100644 --- a/src/modules/welcome/checker/CheckerWidget.cpp +++ b/src/modules/welcome/checker/CheckerWidget.cpp @@ -80,26 +80,15 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries ) if ( !allChecked ) { - QLabel* iconLabel = 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 ); - m_entriesLayout->insertLayout( 0, iconLayout ); - m_entriesLayout->insertWidget( 1, textLabel ); - m_entriesLayout->insertSpacing( 2, CalamaresUtils::defaultFontHeight() / 2 ); + m_entriesLayout->insertWidget( 0, textLabel ); + m_entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 ); textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); if ( !requirementsSatisfied ) { - iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Fail, - CalamaresUtils::Original, - iconLabel->size() ) ); CALAMARES_RETRANSLATE( textLabel->setText( tr( "This computer does not satisfy the minimum " "requirements for installing %1.
" @@ -118,9 +107,6 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries ) } else { - iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Information, - CalamaresUtils::Original, - iconLabel->size() ) ); CALAMARES_RETRANSLATE( textLabel->setText( tr( "This computer does not satisfy some of the " "recommended requirements for installing %1.
"