From e27396be63f41de82f5f9c084f3c813982ab766a Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 13 Jun 2013 11:41:19 +0200 Subject: [PATCH] * Further tweaks to artist-page layout. --- .../widgets/infowidgets/ArtistInfoWidget.cpp | 28 +- .../widgets/infowidgets/ArtistInfoWidget.ui | 453 +++++++++++------- 2 files changed, 292 insertions(+), 189 deletions(-) diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 71e5b3aea..4b5e04812 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -57,10 +57,6 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* artist->loadStats(); connect( artist.data(), SIGNAL( statsLoaded() ), SLOT( onArtistStatsLoaded() ) ); - m_albumsModel = new PlayableModel( ui->albums ); - ui->albums->setPlayableModel( m_albumsModel ); - ui->albums->setEmptyTip( tr( "Sorry, we could not find any albums for this artist!" ) ); - m_relatedModel = new PlayableModel( ui->relatedArtists ); ui->relatedArtists->setPlayableModel( m_relatedModel ); ui->relatedArtists->proxyModel()->sort( -1 ); @@ -82,13 +78,23 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* ui->relatedArtists->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );*/ ui->relatedArtists->delegate()->setItemSize( QSize( 170, 170 ) ); - ui->albums->setAutoFitItems( false ); - ui->albums->setWrapping( false ); + ui->albums->setAutoResize( true ); ui->albums->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); - ui->albums->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded ); +/* ui->albums->setWrapping( false ); + ui->albums->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );*/ ui->albums->delegate()->setItemSize( QSize( 170, 170 ) ); ui->albums->proxyModel()->setHideDupeItems( true ); + m_albumsModel = new PlayableModel( ui->albums ); + ui->albums->setPlayableModel( m_albumsModel ); + ui->albums->proxyModel()->sort( -1 ); + ui->albums->setEmptyTip( tr( "Sorry, we could not find any albums for this artist!" ) ); + + ui->lineAbove->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_UPPER.name() ) ); + ui->lineBelow->setStyleSheet( QString( "QFrame { border: 1px solid black; }" ) ); + ui->lineAbove2->setStyleSheet( QString( "QFrame { border: 1px solid black; }" ) ); + ui->lineBelow2->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_UPPER.name() ) ); + QPalette trackViewPal = ui->topHits->palette(); trackViewPal.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); trackViewPal.setColor( QPalette::Text, TomahawkStyle::PAGE_FOREGROUND ); @@ -139,18 +145,22 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* area->setWidget( widget ); QPalette pal = palette(); - pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); + pal.setBrush( backgroundRole(), TomahawkStyle::HEADER_LOWER ); area->setPalette( pal ); area->setAutoFillBackground( true ); area->setFrameShape( QFrame::NoFrame ); area->setAttribute( Qt::WA_MacShowFocusRect, 0 ); + pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); + ui->widget->setPalette( pal ); + ui->widget->setAutoFillBackground( true ); + QVBoxLayout* layout = new QVBoxLayout(); layout->addWidget( area ); setLayout( layout ); TomahawkUtils::unmarginLayout( layout ); - TomahawkStyle::styleScrollBar( ui->albums->horizontalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->albums->verticalScrollBar() ); TomahawkStyle::styleScrollBar( ui->relatedArtists->verticalScrollBar() ); ui->biography->setStyleSheet( "QTextBrowser#biography { background-color: transparent; }" ); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui index 829ca723e..2e2ca533c 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui @@ -7,18 +7,18 @@ 0 0 965 - 1179 + 822 Form - + - 16 + 0 - 12 + 0 @@ -26,7 +26,7 @@ 16 - 0 + 12 @@ -130,207 +130,305 @@ - - - 0 - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 8 - - - 4 - - - 8 - - - 8 - - - - - - 18 - 75 - true - - - - Top Hits - - - 0 - - - - - - - - 0 - 0 - - - - true - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 8 - - - 4 - - - 8 - - - 4 - - - - - - Arial - 18 - 75 - true - - - - Related Artists - - - 0 - - - - - - - - 0 - 0 - - - - - 0 - 190 - - - - - - - - - - - - - QFrame::StyledPanel + + + + 16777215 + 1 + - QFrame::Raised + QFrame::Sunken - + + Qt::Horizontal + + + + + + + + 16777215 + 1 + + + + Qt::Horizontal + + + + + + - 4 + 0 - 8 + 0 - 4 + 16 - 8 + 0 - 4 + 16 - - - - Arial - 18 - 75 - true - + + + 12 - - Albums - - + 0 - - - - - - - 0 - 0 - + + 12 - - - 0 - 190 - + + 0 - + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 8 + + + 4 + + + 8 + + + 8 + + + + + + 18 + 75 + true + + + + Top Hits + + + 0 + + + + + + + + 0 + 0 + + + + true + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 8 + + + 4 + + + 8 + + + 4 + + + + + + Arial + 18 + 75 + true + + + + Related Artists + + + 0 + + + + + + + + 0 + 0 + + + + + 0 + 190 + + + + + + + + - - - Qt::Vertical - - + + - 20 - 0 + 16777215 + 1 - + + Qt::Horizontal + + + + + + + + 16777215 + 1 + + + + Qt::Horizontal + + + + + + + + 0 + + + 0 + + + 16 + + + 0 + + + 16 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 28 + + + 4 + + + 8 + + + 4 + + + + + + Arial + 18 + 75 + true + + + + Albums + + + 0 + + + + + + + + 0 + 0 + + + + + 0 + 190 + + + + + + + + + + + PlaylistView + QTreeView +
playlist/PlaylistView.h
+ GridView QListView @@ -341,11 +439,6 @@ QLabel
widgets/PlayableCover.h
 - - PlaylistView - QTreeView -
playlist/PlaylistView.h
-