mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 09:04:33 +02:00
Code Issues Releases Wiki Activity

Use PAGE_BACKGROUND color throughout Tomahawk.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-11-23 09:07:11 +01:00
parent b399532251
commit 7ae2fe2952
11 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/playlist/ContextView.cpp
View File

@@ -53,13 +53,13 @@ ContextView::ContextView( QWidget* parent, const QString& caption )
setLayout( new QVBoxLayout() ); setLayout( new QVBoxLayout() );
TomahawkUtils::unmarginLayout( layout() ); 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 ); m_captionLabel = new CaptionLabel( this );
setCaption( caption ); setCaption( caption );
QWidget* vbox = new QWidget; QWidget* vbox = new QWidget;
QPalette pal = vbox->palette(); QPalette pal = vbox->palette();
pal.setBrush( vbox->backgroundRole(), Qt::white ); pal.setBrush( vbox->backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
vbox->setPalette( pal ); vbox->setPalette( pal );
vbox->setAutoFillBackground( true ); vbox->setAutoFillBackground( true );

3
src/libtomahawk/playlist/GridView.cpp
View File

@@ -36,6 +36,7 @@
#include "utils/AnimatedSpinner.h" #include "utils/AnimatedSpinner.h"
#include "utils/PixmapDelegateFader.h" #include "utils/PixmapDelegateFader.h"
#include "utils/TomahawkUtilsGui.h" #include "utils/TomahawkUtilsGui.h"
#include "utils/TomahawkStyle.h"
#include <QDrag> #include <QDrag>
#include <QHeaderView> #include <QHeaderView>
@@ -77,7 +78,7 @@ GridView::GridView( QWidget* parent )
setVerticalScrollMode( QAbstractItemView::ScrollPerPixel ); setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
setStyleSheet( "QListView { background-color: #ffffff; }" ); setStyleSheet( QString( "QListView { background-color: %1; }" ).arg( TomahawkStyle::PAGE_BACKGROUND.name() ) );
setAutoFitItems( true ); setAutoFitItems( true );
setAutoResize( false ); setAutoResize( false );

2
src/libtomahawk/playlist/TrackDetailView.cpp
View File

@@ -47,7 +47,7 @@ TrackDetailView::TrackDetailView( QWidget* parent )
setContentsMargins( 0, 0, 0, 0 ); setContentsMargins( 0, 0, 0, 0 );
QPalette pal( palette() ); QPalette pal( palette() );
pal.setColor( QPalette::Background, Qt::white ); pal.setColor( QPalette::Background, TomahawkStyle::PAGE_BACKGROUND );
setPalette( pal ); setPalette( pal );
setAutoFillBackground( true ); setAutoFillBackground( true );

4
src/libtomahawk/utils/TomahawkStyle.h
View File

@@ -50,6 +50,9 @@ namespace TomahawkStyle
DLLEXPORT void stylePageWidget( QWidget* widget ); DLLEXPORT void stylePageWidget( QWidget* widget );
DLLEXPORT void styleScrollBar( QScrollBar* scrollBar ); 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 BORDER_LINE = QColor( "#8c8c8c" );
static const QColor POPUP_BACKGROUND = QColor( "#ffffff" ); static const QColor POPUP_BACKGROUND = QColor( "#ffffff" );
static const QColor POPUP_OSX_BACKGROUND = QColor( "#D6E3F1" ); 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_CAPTION = QColor( "#292F34" );
static const QColor PAGE_TEXT = QColor( "#ABCCE8" ); static const QColor PAGE_TEXT = QColor( "#ABCCE8" );
static const QColor PAGE_FOREGROUND = QColor( "#292f34" ); 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_SOLVED = QColor( "#292F34" );
static const QColor PAGE_TRACKLIST_TRACK_UNRESOLVED = QColor( "#8597A6" ).lighter( 150 ); static const QColor PAGE_TRACKLIST_TRACK_UNRESOLVED = QColor( "#8597A6" ).lighter( 150 );

11
src/libtomahawk/viewpages/AlbumViewPage.cpp
View File

@@ -61,7 +61,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
ui->albumView->trackView()->setPlayableModel( m_tracksModel ); ui->albumView->trackView()->setPlayableModel( m_tracksModel );
ui->albumView->setCaption( tr( "Album Details" ) ); 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 ); TomahawkStyle::stylePageFrame( ui->trackFrame );
ui->topHits->setVisible( false ); ui->topHits->setVisible( false );
ui->topHitsLabel->setVisible( false ); ui->topHitsLabel->setVisible( false );
@@ -73,7 +73,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
area->setWidget( widget ); area->setWidget( widget );
QPalette pal = palette(); QPalette pal = palette();
pal.setBrush( backgroundRole(), Qt::white ); pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
area->setPalette( pal ); area->setPalette( pal );
area->setAutoFillBackground( true ); area->setAutoFillBackground( true );
area->setFrameShape( QFrame::NoFrame ); area->setFrameShape( QFrame::NoFrame );
@@ -86,13 +86,6 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
TomahawkUtils::unmarginLayout( layout ); TomahawkUtils::unmarginLayout( layout );
} }
/* {
QPalette pal = palette();
pal.setBrush( backgroundRole(), Qt::white );
ui->widget->setPalette( pal );
ui->widget->setAutoFillBackground( true );
}*/
MetaPlaylistInterface* mpl = new MetaPlaylistInterface(); MetaPlaylistInterface* mpl = new MetaPlaylistInterface();
mpl->addChildInterface( ui->topHits->playlistInterface() ); mpl->addChildInterface( ui->topHits->playlistInterface() );
mpl->addChildInterface( ui->albumView->playlistInterface() ); mpl->addChildInterface( ui->albumView->playlistInterface() );

4
src/libtomahawk/viewpages/ArtistViewPage.cpp
View File

@@ -170,7 +170,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
m_area->setWidget( m_widget ); m_area->setWidget( m_widget );
QPalette pal = palette(); QPalette pal = palette();
pal.setBrush( backgroundRole(), Qt::white ); pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
m_area->setPalette( pal ); m_area->setPalette( pal );
m_area->setAutoFillBackground( true ); m_area->setAutoFillBackground( true );
m_area->setFrameShape( QFrame::NoFrame ); m_area->setFrameShape( QFrame::NoFrame );
@@ -203,7 +203,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
QWidget* vbox = new QWidget; QWidget* vbox = new QWidget;
QPalette pal = vbox->palette(); QPalette pal = vbox->palette();
pal.setBrush( vbox->backgroundRole(), Qt::white ); pal.setBrush( vbox->backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
vbox->setPalette( pal ); vbox->setPalette( pal );
vbox->setAutoFillBackground( true ); vbox->setAutoFillBackground( true );

2
src/libtomahawk/viewpages/CollectionViewPage.cpp
View File

@@ -77,7 +77,7 @@ CollectionViewPage::CollectionViewPage( const Tomahawk::collection_ptr& collecti
TomahawkStyle::stylePageFrame( m_albumView ); 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(); m_stack = new QStackedWidget();

10
src/libtomahawk/viewpages/SearchViewPage.cpp
View File

@@ -85,7 +85,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
ui->albums->proxyModel()->sort( -1 ); ui->albums->proxyModel()->sort( -1 );
ui->albums->setEmptyTip( tr( "Sorry, we could not find any albums!" ) ); 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::stylePageFrame( ui->albumFrame );
TomahawkStyle::styleScrollBar( ui->albums->verticalScrollBar() ); TomahawkStyle::styleScrollBar( ui->albums->verticalScrollBar() );
TomahawkStyle::styleScrollBar( ui->albums->horizontalScrollBar() ); TomahawkStyle::styleScrollBar( ui->albums->horizontalScrollBar() );
@@ -107,7 +107,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
ui->tracks->proxyModel()->sort( -1 ); ui->tracks->proxyModel()->sort( -1 );
ui->tracks->setEmptyTip( tr( "Sorry, we could not find any songs!" ) ); 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 ); TomahawkStyle::stylePageFrame( ui->trackFrame );
} }
@@ -133,7 +133,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
area->setWidget( widget ); area->setWidget( widget );
QPalette pal = palette(); QPalette pal = palette();
pal.setBrush( backgroundRole(), Qt::white ); pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
area->setPalette( pal ); area->setPalette( pal );
area->setAutoFillBackground( true ); area->setAutoFillBackground( true );
area->setFrameShape( QFrame::NoFrame ); area->setFrameShape( QFrame::NoFrame );
@@ -160,7 +160,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
QWidget* vbox = new QWidget; QWidget* vbox = new QWidget;
QPalette pal = vbox->palette(); QPalette pal = vbox->palette();
pal.setBrush( vbox->backgroundRole(), Qt::white ); pal.setBrush( vbox->backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
vbox->setPalette( pal ); vbox->setPalette( pal );
vbox->setAutoFillBackground( true ); vbox->setAutoFillBackground( true );
@@ -190,7 +190,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
QWidget* vbox = new QWidget; QWidget* vbox = new QWidget;
QPalette pal = vbox->palette(); QPalette pal = vbox->palette();
pal.setBrush( vbox->backgroundRole(), Qt::white ); pal.setBrush( vbox->backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
vbox->setPalette( pal ); vbox->setPalette( pal );
vbox->setAutoFillBackground( true ); vbox->setAutoFillBackground( true );

2
src/libtomahawk/viewpages/TrackViewPage.cpp
View File

@@ -64,7 +64,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
area->setWidget( widget ); area->setWidget( widget );
QPalette pal = palette(); QPalette pal = palette();
pal.setBrush( backgroundRole(), Qt::white ); pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
area->setPalette( pal ); area->setPalette( pal );
area->setAutoFillBackground( true ); area->setAutoFillBackground( true );
area->setFrameShape( QFrame::NoFrame ); area->setFrameShape( QFrame::NoFrame );

2
src/viewpages/dashboard/Dashboard.cpp
View File

@@ -90,7 +90,7 @@ DashboardWidget::DashboardWidget( QWidget* parent )
area->setWidget( widget ); area->setWidget( widget );
QPalette pal = palette(); QPalette pal = palette();
pal.setBrush( backgroundRole(), Qt::white ); pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
area->setPalette( pal ); area->setPalette( pal );
area->setAutoFillBackground( true ); area->setAutoFillBackground( true );
area->setFrameShape( QFrame::NoFrame ); area->setFrameShape( QFrame::NoFrame );

2
src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp
View File

@@ -73,7 +73,7 @@ WhatsNewWidget_0_8::WhatsNewWidget_0_8( QWidget* parent )
m_area->setWidget( m_widget ); m_area->setWidget( m_widget );
QPalette pal = palette(); QPalette pal = palette();
pal.setBrush( backgroundRole(), Qt::white ); pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
m_area->setPalette( pal ); m_area->setPalette( pal );
m_area->setAutoFillBackground( true ); m_area->setAutoFillBackground( true );
m_area->setFrameShape( QFrame::NoFrame ); m_area->setFrameShape( QFrame::NoFrame );