diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp index 2aac1ed0c..7a9f1c673 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp @@ -48,57 +48,43 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par widget->setPalette( pal ); widget->setAutoFillBackground( true ); - ui->rightBar->setPalette( pal ); - ui->rightBar->setAutoFillBackground( true ); ui->statsLabel->setStyleSheet( "QLabel { background-image:url(); border: 2px solid #dddddd; background-color: #faf9f9; border-radius: 4px; padding: 12px; }" ); ui->lyricsView->setStyleSheet( "QTextBrowser#lyricsView { background-color: transparent; }" ); ui->lyricsView->setFrameShape( QFrame::NoFrame ); ui->lyricsView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); + ui->lyricsView->setVisible( false ); // FIXME eventually ui->similarTracksView->setAutoResize( true ); ui->similarTracksView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); // TomahawkUtils::styleScrollBar( ui->similarTracksView->verticalScrollBar() ); TomahawkUtils::styleScrollBar( ui->lyricsView->verticalScrollBar() ); - QFont f = font(); - f.setBold( true ); - f.setPointSize( TomahawkUtils::defaultFontSize() + 7 ); - ui->trackLabel->setFont( f ); -// ui->similarTracksLabel->setFont( f ); - - f.setPointSize( TomahawkUtils::defaultFontSize() + 4 ); - ui->artistLabel->setFont( f ); - ui->albumLabel->setFont( f ); - - f.setPointSize( TomahawkUtils::defaultFontSize() + 2 ); - ui->statsLabel->setFont( f ); - // ui->similarTracksView->setStyleSheet( "QListView { background-color: transparent; } QListView::item { background-color: transparent; }" ); - QPalette p = ui->trackLabel->palette(); + QFont f = ui->statsLabel->font(); + f.setPointSize( TomahawkUtils::defaultFontSize() + 2 ); + f.setBold( true ); + ui->statsLabel->setFont( f ); + + QPalette p = ui->lyricsView->palette(); p.setColor( QPalette::Foreground, Qt::white ); p.setColor( QPalette::Text, Qt::white ); - ui->trackLabel->setPalette( p ); - ui->artistLabel->setPalette( p ); - ui->albumLabel->setPalette( p ); ui->lyricsView->setPalette( p ); ui->label->setPalette( p ); // ui->similarTracksLabel->setPalette( p ); - ui->artistLabel->setType( QueryLabel::Artist ); - ui->albumLabel->setType( QueryLabel::Album ); - m_relatedTracksModel = new PlayableModel( ui->similarTracksView ); ui->similarTracksView->setPlayableModel( m_relatedTracksModel ); ui->similarTracksView->proxyModel()->sort( -1 ); ui->similarTracksView->setEmptyTip( tr( "Sorry, but we could not find similar tracks for this song!" ) ); - m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, QSize( 48, 48 ) ); - ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::ScaledCover, QSize( ui->cover->sizeHint() ) ) ); - + m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, QSize( 48, 48 ) ); + ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Grid ) ); + ui->cover->setShowText( true ); + m_scrollArea = new QScrollArea(); m_scrollArea->setWidgetResizable( true ); m_scrollArea->setWidget( widget ); @@ -120,9 +106,6 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); load( query ); - - connect( ui->artistLabel, SIGNAL( clickedArtist() ), SLOT( onArtistClicked() ) ); - connect( ui->albumLabel, SIGNAL( clickedAlbum() ), SLOT( onAlbumClicked() ) ); } @@ -198,10 +181,6 @@ TrackInfoWidget::load( const query_ptr& query ) // m_query->lyrics(); onCoverUpdated(); - ui->trackLabel->setText( query->track() ); - ui->artistLabel->setQuery( query ); - ui->albumLabel->setQuery( query ); - ui->albumLabel->setVisible( !query->album().isEmpty() ); ui->cover->setQuery( query ); m_relatedTracksModel->clear(); diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui index ea9da93d5..926ffe2f6 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui @@ -13,305 +13,160 @@ Form - + + + 16 + - 0 + 12 - - - 12 + + + 16 - - 0 - - - 0 - - + 0 - - - 0 + + + + 0 + 0 + - - 12 + + + 260 + 260 + - - 0 + + Cover - - 12 + + Qt::AlignCenter - - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 8 - - - 4 - - - 8 - - - 8 - - - - - - Arial - 18 - 75 - true - - - - Similar Tracks - - - 0 - - - - - - - - 0 - 0 - - - - - - - - + - - - 4 + + + Qt::Horizontal - - 0 + + + 40 + 20 + - - - - - 0 - 0 - - - - - 300 - 500 - - - - - 0 - - - 16 - - - 12 - - - 16 - - - 12 - - - - - - 0 - 0 - - - - - 220 - 220 - - - - Cover - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 8 - - - - - - - - 4 - - - 0 - - - - - Track - - - Qt::AlignCenter - - - - - - - 4 - - - 0 - - - - - Artist - - - Qt::AlignCenter - - - - - - - - - 4 - - - 0 - - - - - Album - - - Qt::AlignCenter - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 16 - - - - - - - - Statistics - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 12 - - - - - - - - - 0 - 0 - - - - - 300 - 0 - - - - false - - - - - - - + + + + + + + 0 + 0 + + + + + 16777215 + 260 + + + + Statistics + + + Qt::AlignCenter + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + false + + + + + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 8 + + + 4 + + + 8 + + + 8 + + + + + + Arial + 18 + 75 + true + + + + Similar Tracks + + + 0 + + + + + + + + 0 + 0 + + + + + + + @@ -320,11 +175,6 @@ QListView
playlist/GridView.h
- - QueryLabel - QLabel -
widgets/QueryLabel.h
- PlayableCover QLabel