From c2be5c8bfb81b9b37a1481c733ea3a01ccb21ca1 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 5 Sep 2014 07:04:36 +0200 Subject: [PATCH] * Wordwrap caption in header when needed. Fixed balance spaer. --- src/libtomahawk/widgets/BasicHeader.cpp | 10 ++++++++++ src/libtomahawk/widgets/BasicHeader.h | 3 +++ src/libtomahawk/widgets/SearchWidget.cpp | 2 +- .../widgets/infowidgets/AlbumInfoWidget.cpp | 2 +- .../widgets/infowidgets/ArtistInfoWidget.cpp | 3 +-- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/widgets/BasicHeader.cpp b/src/libtomahawk/widgets/BasicHeader.cpp index c3074733e..61dafc75b 100644 --- a/src/libtomahawk/widgets/BasicHeader.cpp +++ b/src/libtomahawk/widgets/BasicHeader.cpp @@ -50,6 +50,7 @@ BasicHeader::BasicHeader( QWidget* parent ) ui->captionLabel->setFont( f ); ui->captionLabel->setPalette( p ); + ui->captionLabel->setWordWrap( true ); ui->iconLabel->hide(); @@ -87,6 +88,7 @@ void BasicHeader::setCaption( const QString& s ) { ui->captionLabel->setText( s.toUpper() ); + resizeEvent( 0 ); } @@ -112,3 +114,11 @@ BasicHeader::setPixmap( const QPixmap& pixmap, bool tinted ) if ( !p.isNull() ) ui->iconLabel->show(); } + + +void +BasicHeader::resizeEvent( QResizeEvent* /* event */) +{ + ui->captionLabel->setFixedWidth( width() * 0.33 ); + ui->balanceSpacer->changeSize( ui->captionLabel->width(), 1, QSizePolicy::Expanding, QSizePolicy::Fixed ); +} diff --git a/src/libtomahawk/widgets/BasicHeader.h b/src/libtomahawk/widgets/BasicHeader.h index 71ec9fcde..78f660326 100644 --- a/src/libtomahawk/widgets/BasicHeader.h +++ b/src/libtomahawk/widgets/BasicHeader.h @@ -43,6 +43,9 @@ public slots: virtual void setCaption( const QString& s ); virtual void setDescription( const QString& s ); virtual void setPixmap( const QPixmap& p, bool tinted = true ); + +protected: + virtual void resizeEvent( QResizeEvent* event ); }; #endif // BASICHEADER_H diff --git a/src/libtomahawk/widgets/SearchWidget.cpp b/src/libtomahawk/widgets/SearchWidget.cpp index 9bc06aea7..20c116c36 100644 --- a/src/libtomahawk/widgets/SearchWidget.cpp +++ b/src/libtomahawk/widgets/SearchWidget.cpp @@ -234,7 +234,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) m_resultsModel->startLoading(); m_queries << Tomahawk::Query::get( search, uuid() ); - headerWidget->ui->captionLabel->setText( title().toUpper() ); + headerWidget->setCaption( title() ); foreach ( const Tomahawk::query_ptr& query, m_queries ) { diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index f8f37314c..33740d5af 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -149,7 +149,7 @@ AlbumInfoWidget::load( const album_ptr& album ) connect( m_album.data(), SIGNAL( updated() ), SLOT( onAlbumImageUpdated() ) ); - m_headerWidget->ui->captionLabel->setText( album->artist()->name().toUpper() ); + m_headerWidget->setCaption( album->artist()->name() ); m_tracksModel->startLoading(); m_tracksModel->addTracks( album, QModelIndex(), true ); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index e5d397112..8634cb6c0 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -309,8 +309,7 @@ ArtistInfoWidget::load( const artist_ptr& artist ) m_artist = artist; m_title = artist->name(); - m_headerWidget->ui->captionLabel->setText( artist->name().toUpper() ); - m_headerWidget->ui->balanceSpacer->changeSize( m_headerWidget->ui->captionLabel->sizeHint().width(), 1, QSizePolicy::Fixed, QSizePolicy::Fixed ); + m_headerWidget->setCaption( artist->name() ); connect( m_artist.data(), SIGNAL( biographyLoaded() ), SLOT( onBiographyLoaded() ) ); connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) );