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

[summary] No need for widget-creation to be a method of the Page

Browse Source
This commit is contained in:
Adriaan de Groot 2021-07-20 16:21:59 +02:00
parent 5de99d53d2
commit d6fe30dfdb
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/modules/summary/SummaryPage.cpp
View File

@ -61,6 +61,29 @@ SummaryPage::SummaryPage( Config* config, const SummaryViewStep* thisViewStep, Q
} }
static QLabel*
createTitleLabel( const QString& text, const QFont& titleFont )
{
QLabel* label = new QLabel( text );
label->setObjectName( "summaryItemTitle" );
label->setFont( titleFont );
label->setContentsMargins( 0, 0, 0, 0 );
return label;
}
static QLabel*
createBodyLabel( const QString& text, const QPalette& bodyPalette )
{
QLabel* label = new QLabel;
label->setObjectName( "summaryItemBody" );
label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
label->setAutoFillBackground( true );
label->setPalette( bodyPalette );
label->setText( text );
return label;
}
// Adds a widget for those ViewSteps that want a summary; // Adds a widget for those ViewSteps that want a summary;
// see SummaryPage documentation and also ViewStep docs. // see SummaryPage documentation and also ViewStep docs.
void void
@ -68,6 +91,13 @@ SummaryPage::onActivate()
{ {
createContentWidget(); createContentWidget();
QFont titleFont = font();
titleFont.setWeight( QFont::Light );
titleFont.setPointSize( CalamaresUtils::defaultFontSize() * 2 );
QPalette bodyPalette( palette() );
bodyPalette.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
bool first = true; bool first = true;
const Calamares::ViewStepList steps = stepsForSummary( Calamares::ViewManager::instance()->viewSteps() ); const Calamares::ViewStepList steps = stepsForSummary( Calamares::ViewManager::instance()->viewSteps() );
@ -90,7 +120,7 @@ SummaryPage::onActivate()
m_layout->addSpacing( SECTION_SPACING ); m_layout->addSpacing( SECTION_SPACING );
} }
m_layout->addWidget( createTitleLabel( step->prettyName() ) ); m_layout->addWidget( createTitleLabel( step->prettyName(), titleFont ) );
QHBoxLayout* itemBodyLayout = new QHBoxLayout; QHBoxLayout* itemBodyLayout = new QHBoxLayout;
m_layout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 ); m_layout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 );
m_layout->addLayout( itemBodyLayout ); m_layout->addLayout( itemBodyLayout );
@ -100,7 +130,7 @@ SummaryPage::onActivate()
CalamaresUtils::unmarginLayout( itemBodyLayout ); CalamaresUtils::unmarginLayout( itemBodyLayout );
if ( !text.isEmpty() ) if ( !text.isEmpty() )
{ {
itemBodyCoreLayout->addWidget( createBodyLabel( text ) ); itemBodyCoreLayout->addWidget( createBodyLabel( text, bodyPalette ) );
} }
if ( widget ) if ( widget )
{ {
@ -170,31 +200,3 @@ SummaryPage::onLeave()
delete m_contentWidget; delete m_contentWidget;
m_contentWidget = nullptr; m_contentWidget = nullptr;
} }
QLabel*
SummaryPage::createTitleLabel( const QString& text ) const
{
QLabel* label = new QLabel( text );
label->setObjectName( "summaryItemTitle" );
QFont fnt = font();
fnt.setWeight( QFont::Light );
fnt.setPointSize( CalamaresUtils::defaultFontSize() * 2 );
label->setFont( fnt );
label->setContentsMargins( 0, 0, 0, 0 );
return label;
}
QLabel*
SummaryPage::createBodyLabel( const QString& text ) const
{
QLabel* label = new QLabel;
label->setObjectName( "summaryItemBody" );
label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
QPalette pal( palette() );
pal.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
label->setAutoFillBackground( true );
label->setPalette( pal );
label->setText( text );
return label;
}

3
src/modules/summary/SummaryPage.h
View File

@ -61,9 +61,6 @@ private:
QVBoxLayout* m_layout = nullptr; QVBoxLayout* m_layout = nullptr;
QWidget* m_contentWidget = nullptr; QWidget* m_contentWidget = nullptr;
QLabel* createTitleLabel( const QString& text ) const;
QLabel* createBodyLabel( const QString& text ) const;
QScrollArea* m_scrollArea; QScrollArea* m_scrollArea;
}; };