From 7ae2fe2952982d457ee394e086f7251cf83f7f3c Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 23 Nov 2014 09:07:11 +0100 Subject: [PATCH] Use PAGE_BACKGROUND color throughout Tomahawk. --- src/libtomahawk/playlist/ContextView.cpp | 4 ++-- src/libtomahawk/playlist/GridView.cpp | 3 ++- src/libtomahawk/playlist/TrackDetailView.cpp | 2 +- src/libtomahawk/utils/TomahawkStyle.h | 4 +++- src/libtomahawk/viewpages/AlbumViewPage.cpp | 11 ++--------- src/libtomahawk/viewpages/ArtistViewPage.cpp | 4 ++-- src/libtomahawk/viewpages/CollectionViewPage.cpp | 2 +- src/libtomahawk/viewpages/SearchViewPage.cpp | 10 +++++----- src/libtomahawk/viewpages/TrackViewPage.cpp | 2 +- src/viewpages/dashboard/Dashboard.cpp | 2 +- src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp | 2 +- 11 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/libtomahawk/playlist/ContextView.cpp b/src/libtomahawk/playlist/ContextView.cpp index c7af328ea..9a5705cca 100644 --- a/src/libtomahawk/playlist/ContextView.cpp +++ b/src/libtomahawk/playlist/ContextView.cpp @@ -53,13 +53,13 @@ ContextView::ContextView( QWidget* parent, const QString& caption ) setLayout( new QVBoxLayout() ); TomahawkUtils::unmarginLayout( layout() ); - m_trackView->setStyleSheet( QString( "QTreeView { background-color: white; }" ) ); + m_trackView->setStyleSheet( QString( "QTreeView { background-color: %1; }" ).arg( TomahawkStyle::PAGE_BACKGROUND.name() ) ); m_captionLabel = new CaptionLabel( this ); setCaption( caption ); QWidget* vbox = new QWidget; QPalette pal = vbox->palette(); - pal.setBrush( vbox->backgroundRole(), Qt::white ); + pal.setBrush( vbox->backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); vbox->setPalette( pal ); vbox->setAutoFillBackground( true ); diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp index edf02d243..edd1b281b 100644 --- a/src/libtomahawk/playlist/GridView.cpp +++ b/src/libtomahawk/playlist/GridView.cpp @@ -36,6 +36,7 @@ #include "utils/AnimatedSpinner.h" #include "utils/PixmapDelegateFader.h" #include "utils/TomahawkUtilsGui.h" +#include "utils/TomahawkStyle.h" #include #include @@ -77,7 +78,7 @@ GridView::GridView( QWidget* parent ) setVerticalScrollMode( QAbstractItemView::ScrollPerPixel ); setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); - setStyleSheet( "QListView { background-color: #ffffff; }" ); + setStyleSheet( QString( "QListView { background-color: %1; }" ).arg( TomahawkStyle::PAGE_BACKGROUND.name() ) ); setAutoFitItems( true ); setAutoResize( false ); diff --git a/src/libtomahawk/playlist/TrackDetailView.cpp b/src/libtomahawk/playlist/TrackDetailView.cpp index bca22c124..28ecb537f 100644 --- a/src/libtomahawk/playlist/TrackDetailView.cpp +++ b/src/libtomahawk/playlist/TrackDetailView.cpp @@ -47,7 +47,7 @@ TrackDetailView::TrackDetailView( QWidget* parent ) setContentsMargins( 0, 0, 0, 0 ); QPalette pal( palette() ); - pal.setColor( QPalette::Background, Qt::white ); + pal.setColor( QPalette::Background, TomahawkStyle::PAGE_BACKGROUND ); setPalette( pal ); setAutoFillBackground( true ); diff --git a/src/libtomahawk/utils/TomahawkStyle.h b/src/libtomahawk/utils/TomahawkStyle.h index e08705043..154a3d50d 100644 --- a/src/libtomahawk/utils/TomahawkStyle.h +++ b/src/libtomahawk/utils/TomahawkStyle.h @@ -50,6 +50,9 @@ namespace TomahawkStyle DLLEXPORT void stylePageWidget( QWidget* widget ); DLLEXPORT void styleScrollBar( QScrollBar* scrollBar ); + static const QColor PAGE_BACKGROUND = QColor( "#F9F9F9" ); + + // Potentially obsolete definitions static const QColor BORDER_LINE = QColor( "#8c8c8c" ); static const QColor POPUP_BACKGROUND = QColor( "#ffffff" ); static const QColor POPUP_OSX_BACKGROUND = QColor( "#D6E3F1" ); @@ -80,7 +83,6 @@ namespace TomahawkStyle static const QColor PAGE_CAPTION = QColor( "#292F34" ); static const QColor PAGE_TEXT = QColor( "#ABCCE8" ); static const QColor PAGE_FOREGROUND = QColor( "#292f34" ); - static const QColor PAGE_BACKGROUND = QColor( "#DBDBDB" ); static const QColor PAGE_TRACKLIST_TRACK_SOLVED = QColor( "#292F34" ); static const QColor PAGE_TRACKLIST_TRACK_UNRESOLVED = QColor( "#8597A6" ).lighter( 150 ); diff --git a/src/libtomahawk/viewpages/AlbumViewPage.cpp b/src/libtomahawk/viewpages/AlbumViewPage.cpp index a890569d6..f41f7a126 100644 --- a/src/libtomahawk/viewpages/AlbumViewPage.cpp +++ b/src/libtomahawk/viewpages/AlbumViewPage.cpp @@ -61,7 +61,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par ui->albumView->trackView()->setPlayableModel( m_tracksModel ); ui->albumView->setCaption( tr( "Album Details" ) ); - ui->topHits->setStyleSheet( QString( "QListView { background-color: #f9f9f9; }" ) ); + ui->topHits->setStyleSheet( QString( "QListView { background-color: %1; }" ).arg( TomahawkStyle::PAGE_BACKGROUND.name() ) ); TomahawkStyle::stylePageFrame( ui->trackFrame ); ui->topHits->setVisible( false ); ui->topHitsLabel->setVisible( false ); @@ -73,7 +73,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par area->setWidget( widget ); QPalette pal = palette(); - pal.setBrush( backgroundRole(), Qt::white ); + pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); area->setPalette( pal ); area->setAutoFillBackground( true ); area->setFrameShape( QFrame::NoFrame ); @@ -86,13 +86,6 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par TomahawkUtils::unmarginLayout( layout ); } -/* { - QPalette pal = palette(); - pal.setBrush( backgroundRole(), Qt::white ); - ui->widget->setPalette( pal ); - ui->widget->setAutoFillBackground( true ); - }*/ - MetaPlaylistInterface* mpl = new MetaPlaylistInterface(); mpl->addChildInterface( ui->topHits->playlistInterface() ); mpl->addChildInterface( ui->albumView->playlistInterface() ); diff --git a/src/libtomahawk/viewpages/ArtistViewPage.cpp b/src/libtomahawk/viewpages/ArtistViewPage.cpp index 6cb1af1fb..4fd0b7ec7 100644 --- a/src/libtomahawk/viewpages/ArtistViewPage.cpp +++ b/src/libtomahawk/viewpages/ArtistViewPage.cpp @@ -170,7 +170,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* m_area->setWidget( m_widget ); QPalette pal = palette(); - pal.setBrush( backgroundRole(), Qt::white ); + pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); m_area->setPalette( pal ); m_area->setAutoFillBackground( true ); m_area->setFrameShape( QFrame::NoFrame ); @@ -203,7 +203,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* QWidget* vbox = new QWidget; QPalette pal = vbox->palette(); - pal.setBrush( vbox->backgroundRole(), Qt::white ); + pal.setBrush( vbox->backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); vbox->setPalette( pal ); vbox->setAutoFillBackground( true ); diff --git a/src/libtomahawk/viewpages/CollectionViewPage.cpp b/src/libtomahawk/viewpages/CollectionViewPage.cpp index cf3474588..627a4b7c0 100644 --- a/src/libtomahawk/viewpages/CollectionViewPage.cpp +++ b/src/libtomahawk/viewpages/CollectionViewPage.cpp @@ -77,7 +77,7 @@ CollectionViewPage::CollectionViewPage( const Tomahawk::collection_ptr& collecti TomahawkStyle::stylePageFrame( m_albumView ); - m_albumView->setStyleSheet( QString( "QListView { background-color: white; }" ) ); + m_albumView->setStyleSheet( QString( "QListView { background-color: %1; }" ).arg( TomahawkStyle::PAGE_BACKGROUND.name() ) ); } m_stack = new QStackedWidget(); diff --git a/src/libtomahawk/viewpages/SearchViewPage.cpp b/src/libtomahawk/viewpages/SearchViewPage.cpp index 8ea828ac9..4b9401d62 100644 --- a/src/libtomahawk/viewpages/SearchViewPage.cpp +++ b/src/libtomahawk/viewpages/SearchViewPage.cpp @@ -85,7 +85,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) ui->albums->proxyModel()->sort( -1 ); ui->albums->setEmptyTip( tr( "Sorry, we could not find any albums!" ) ); - ui->albums->setStyleSheet( QString( "QListView { background-color: white; }" ) ); + ui->albums->setStyleSheet( QString( "QListView { background-color: %1; }" ).arg( TomahawkStyle::PAGE_BACKGROUND.name() ) ); TomahawkStyle::stylePageFrame( ui->albumFrame ); TomahawkStyle::styleScrollBar( ui->albums->verticalScrollBar() ); TomahawkStyle::styleScrollBar( ui->albums->horizontalScrollBar() ); @@ -107,7 +107,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) ui->tracks->proxyModel()->sort( -1 ); ui->tracks->setEmptyTip( tr( "Sorry, we could not find any songs!" ) ); - ui->tracks->setStyleSheet( QString( "QListView { background-color: white; }" ) ); + ui->tracks->setStyleSheet( QString( "QListView { background-color: %1; }" ).arg( TomahawkStyle::PAGE_BACKGROUND.name() ) ); TomahawkStyle::stylePageFrame( ui->trackFrame ); } @@ -133,7 +133,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) area->setWidget( widget ); QPalette pal = palette(); - pal.setBrush( backgroundRole(), Qt::white ); + pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); area->setPalette( pal ); area->setAutoFillBackground( true ); area->setFrameShape( QFrame::NoFrame ); @@ -160,7 +160,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) QWidget* vbox = new QWidget; QPalette pal = vbox->palette(); - pal.setBrush( vbox->backgroundRole(), Qt::white ); + pal.setBrush( vbox->backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); vbox->setPalette( pal ); vbox->setAutoFillBackground( true ); @@ -190,7 +190,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) QWidget* vbox = new QWidget; QPalette pal = vbox->palette(); - pal.setBrush( vbox->backgroundRole(), Qt::white ); + pal.setBrush( vbox->backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); vbox->setPalette( pal ); vbox->setAutoFillBackground( true ); diff --git a/src/libtomahawk/viewpages/TrackViewPage.cpp b/src/libtomahawk/viewpages/TrackViewPage.cpp index 173ca4119..c04a6c1fd 100644 --- a/src/libtomahawk/viewpages/TrackViewPage.cpp +++ b/src/libtomahawk/viewpages/TrackViewPage.cpp @@ -64,7 +64,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par area->setWidget( widget ); QPalette pal = palette(); - pal.setBrush( backgroundRole(), Qt::white ); + pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); area->setPalette( pal ); area->setAutoFillBackground( true ); area->setFrameShape( QFrame::NoFrame ); diff --git a/src/viewpages/dashboard/Dashboard.cpp b/src/viewpages/dashboard/Dashboard.cpp index 602f38af6..d60432b40 100644 --- a/src/viewpages/dashboard/Dashboard.cpp +++ b/src/viewpages/dashboard/Dashboard.cpp @@ -90,7 +90,7 @@ DashboardWidget::DashboardWidget( QWidget* parent ) area->setWidget( widget ); QPalette pal = palette(); - pal.setBrush( backgroundRole(), Qt::white ); + pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); area->setPalette( pal ); area->setAutoFillBackground( true ); area->setFrameShape( QFrame::NoFrame ); diff --git a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp index c634e737e..aa9e152cc 100644 --- a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp +++ b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp @@ -73,7 +73,7 @@ WhatsNewWidget_0_8::WhatsNewWidget_0_8( QWidget* parent ) m_area->setWidget( m_widget ); QPalette pal = palette(); - pal.setBrush( backgroundRole(), Qt::white ); + pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); m_area->setPalette( pal ); m_area->setAutoFillBackground( true ); m_area->setFrameShape( QFrame::NoFrame );