1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-27 05:12:34 +01:00

* Fixed deprecated InfoBar to look like the new header.

This commit is contained in:
Christian Muehlhaeuser 2013-07-23 17:01:15 +02:00
parent 46572cc5d1
commit e556bbe178

View File

@ -47,20 +47,30 @@ InfoBar::InfoBar( QWidget* parent )
{ {
ui->setupUi( this ); ui->setupUi( this );
QFont boldFont = ui->captionLabel->font(); QFont font = ui->captionLabel->font();
boldFont.setPointSize( TomahawkUtils::defaultFontSize() + 4 );
ui->captionLabel->setFont( boldFont ); // TODO: This should be in stylesheet?
int captionFontSize = TomahawkUtils::defaultFontSize() + 10;
font.setPointSize( captionFontSize );
font.setBold( true );
font.setFamily( "Titillium Web" );
ui->captionLabel->setFont( font );
ui->captionLabel->setElideMode( Qt::ElideRight ); ui->captionLabel->setElideMode( Qt::ElideRight );
ui->captionLabel->setAlignment( Qt::AlignTop | Qt::AlignLeft );
QFontMetrics boldFontMetrics( boldFont ); // TODO: This should be in stylesheet?
boldFont.setPointSize( TomahawkUtils::defaultFontSize() + 1 ); int descriptionFontSize = TomahawkUtils::defaultFontSize() + 2;
boldFont.setBold( false ); font.setPointSize( descriptionFontSize );
ui->descriptionLabel->setFont( boldFont ); font.setBold( false );
boldFontMetrics = QFontMetrics( boldFont ); ui->descriptionLabel->setFont( font );
QFont regFont = ui->longDescriptionLabel->font(); ui->descriptionLabel->setAlignment( Qt::AlignTop | Qt::AlignLeft );
regFont.setPointSize( TomahawkUtils::defaultFontSize() );
ui->longDescriptionLabel->setFont( regFont ); ui->longDescriptionLabel->setFont( font );
ui->captionLabel->setMargin( 2 );
ui->descriptionLabel->setMargin( 2 );
m_whitePal = ui->captionLabel->palette(); m_whitePal = ui->captionLabel->palette();
m_whitePal.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT ); m_whitePal.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT );
@ -87,7 +97,7 @@ InfoBar::InfoBar( QWidget* parent )
m_queryLabel = new QueryLabel( this ); m_queryLabel = new QueryLabel( this );
m_queryLabel->setType( QueryLabel::Artist ); m_queryLabel->setType( QueryLabel::Artist );
m_queryLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); m_queryLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
m_queryLabel->setFont( boldFont ); m_queryLabel->setFont( font );
m_queryLabel->hide(); m_queryLabel->hide();
connect( m_queryLabel, SIGNAL( clickedArtist() ), this, SLOT( artistClicked() ) ); connect( m_queryLabel, SIGNAL( clickedArtist() ), this, SLOT( artistClicked() ) );
@ -102,10 +112,12 @@ InfoBar::InfoBar( QWidget* parent )
pal.setBrush( backgroundRole(), TomahawkStyle::HEADER_BACKGROUND ); pal.setBrush( backgroundRole(), TomahawkStyle::HEADER_BACKGROUND );
setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
setFixedHeight( 58 );
setAutoFillBackground( true ); setAutoFillBackground( true );
setPalette( pal ); setPalette( pal );
// top-margin + header + bottom-margin + top-margin + subheader + bottom-margin
setFixedHeight( 2 + 2 * captionFontSize + 2 + 2 + 2 * descriptionFontSize + 2 );
connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ), SLOT( setFilterAvailable( bool ) ) ); connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ), SLOT( setFilterAvailable( bool ) ) );
} }