From 623f764ee4b9125c94dda1c877ae24c633701c33 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 13 Jun 2013 09:06:43 +0200 Subject: [PATCH] * Use TomahawkStyle's methods to apply stylesheets. --- src/libtomahawk/widgets/Dashboard.cpp | 30 +++++++------------ .../widgets/infowidgets/AlbumInfoWidget.cpp | 24 ++++++--------- .../widgets/infowidgets/ArtistInfoWidget.cpp | 29 +++++++----------- .../widgets/infowidgets/TrackInfoWidget.cpp | 11 +++---- 4 files changed, 34 insertions(+), 60 deletions(-) diff --git a/src/libtomahawk/widgets/Dashboard.cpp b/src/libtomahawk/widgets/Dashboard.cpp index e74b37e2a..b024965c1 100644 --- a/src/libtomahawk/widgets/Dashboard.cpp +++ b/src/libtomahawk/widgets/Dashboard.cpp @@ -64,8 +64,8 @@ Dashboard::Dashboard( QWidget* parent ) RecentPlaylistsModel* model = new RecentPlaylistsModel( HISTORY_PLAYLIST_ITEMS, this ); QPalette trackViewPal = ui->tracksView->palette(); - trackViewPal.setColor( QPalette::Foreground, Qt::white ); - trackViewPal.setColor( QPalette::Text, Qt::white ); + trackViewPal.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); + trackViewPal.setColor( QPalette::Text, TomahawkStyle::PAGE_FOREGROUND ); trackViewPal.setColor( QPalette::Highlight, QColor( "#252020" ) ); trackViewPal.setColor( QPalette::HighlightedText, Qt::white ); @@ -101,6 +101,7 @@ Dashboard::Dashboard( QWidget* parent ) area->setWidget( widget ); QPalette pal = palette(); + // background: qradialgradient(cx: 0.5, cy: -1.8, fx: 0.5, fy: 0, radius: 2, stop: 0 %1, stop: 1 %2); pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); area->setPalette( pal ); area->setAutoFillBackground( true ); @@ -113,8 +114,8 @@ Dashboard::Dashboard( QWidget* parent ) setLayout( layout ); TomahawkUtils::unmarginLayout( layout ); - TomahawkUtils::styleScrollBar( ui->playlistWidget->verticalScrollBar() ); - TomahawkUtils::styleScrollBar( ui->additionsView->verticalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->playlistWidget->verticalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->additionsView->verticalScrollBar() ); QFont f; f.setBold( true ); @@ -122,30 +123,21 @@ Dashboard::Dashboard( QWidget* parent ) ui->tracksView->setMinimumWidth( fm.width( tr( "Recently played tracks" ) ) * 2 ); QPalette p = ui->label->palette(); - p.setColor( QPalette::Foreground, Qt::white ); - p.setColor( QPalette::Text, Qt::gray ); + p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); + p.setColor( QPalette::Text, TomahawkStyle::PAGE_TEXT ); ui->label->setPalette( p ); ui->label_2->setPalette( p ); ui->label_3->setPalette( p ); ui->playlistWidget->setStyleSheet( "QListView { background-color: transparent; }" ); - ui->playlistFrame->setStyleSheet( "QFrame#playlistFrame { background-color: transparent; }" - "QFrame#playlistFrame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + TomahawkStyle::stylePageFrame( ui->playlistFrame ); ui->additionsView->setStyleSheet( "QListView { background-color: transparent; }" ); - ui->additionsFrame->setStyleSheet( "QFrame#additionsFrame { background-color: transparent; }" - "QFrame#additionsFrame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + TomahawkStyle::stylePageFrame( ui->additionsFrame ); - ui->tracksView->setStyleSheet( "QTreeView#tracksView { background-color: transparent; }" ); - ui->trackFrame->setStyleSheet( "QFrame#trackFrame { background-color: transparent; }" - "QFrame#trackFrame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + ui->tracksView->setStyleSheet( "QTreeView { background-color: transparent; }" ); + TomahawkStyle::stylePageFrame( ui->trackFrame ); MetaPlaylistInterface* mpl = new MetaPlaylistInterface(); mpl->addChildInterface( ui->tracksView->playlistInterface() ); diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index ccd971a32..36d969932 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -59,8 +59,8 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par m_tracksModel->setMode( Mixed ); QPalette trackViewPal = ui->tracks->palette(); - trackViewPal.setColor( QPalette::Foreground, Qt::white ); - trackViewPal.setColor( QPalette::Text, Qt::white ); + trackViewPal.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); + trackViewPal.setColor( QPalette::Text, TomahawkStyle::PAGE_FOREGROUND ); trackViewPal.setColor( QPalette::Highlight, QColor( "#252020" ) ); trackViewPal.setColor( QPalette::HighlightedText, Qt::white ); @@ -91,11 +91,11 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par ui->biography->setFrameShape( QFrame::NoFrame ); ui->biography->setAttribute( Qt::WA_MacShowFocusRect, 0 ); - TomahawkUtils::styleScrollBar( ui->biography->verticalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->biography->verticalScrollBar() ); QPalette p = ui->biography->palette(); - p.setColor( QPalette::Foreground, Qt::white ); - p.setColor( QPalette::Text, Qt::white ); + p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); + p.setColor( QPalette::Text, TomahawkStyle::PAGE_TEXT ); ui->biography->setPalette( p ); ui->label->setPalette( p ); @@ -118,22 +118,16 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par setLayout( layout ); TomahawkUtils::unmarginLayout( layout ); - TomahawkUtils::styleScrollBar( ui->tracks->horizontalScrollBar() ); - TomahawkUtils::styleScrollBar( ui->albums->verticalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->tracks->horizontalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->albums->verticalScrollBar() ); ui->biography->setStyleSheet( "QTextBrowser#biography { background-color: transparent; }" ); ui->albums->setStyleSheet( "QListView { background-color: transparent; }" ); - ui->albumFrame->setStyleSheet( "QFrame#albumFrame { background-color: transparent; }" - "QFrame#albumFrame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + TomahawkStyle::stylePageFrame( ui->albumFrame ); ui->tracks->setStyleSheet( "QTreeView#tracks { background-color: transparent; }" ); - ui->trackFrame->setStyleSheet( "QFrame#trackFrame { background-color: transparent; }" - "QFrame#trackFrame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + TomahawkStyle::stylePageFrame( ui->trackFrame ); MetaPlaylistInterface* mpl = new MetaPlaylistInterface(); mpl->addChildInterface( ui->tracks->playlistInterface() ); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 95f405969..71e5b3aea 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -90,8 +90,8 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* ui->albums->proxyModel()->setHideDupeItems( true ); QPalette trackViewPal = ui->topHits->palette(); - trackViewPal.setColor( QPalette::Foreground, Qt::white ); - trackViewPal.setColor( QPalette::Text, Qt::white ); + trackViewPal.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); + trackViewPal.setColor( QPalette::Text, TomahawkStyle::PAGE_FOREGROUND ); trackViewPal.setColor( QPalette::Highlight, QColor( "#252020" ) ); trackViewPal.setColor( QPalette::HighlightedText, Qt::white ); ui->topHits->setPalette( trackViewPal ); @@ -121,11 +121,11 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* ui->biography->setFrameShape( QFrame::NoFrame ); ui->biography->setAttribute( Qt::WA_MacShowFocusRect, 0 ); ui->biography->setFont( f ); - TomahawkUtils::styleScrollBar( ui->biography->verticalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->biography->verticalScrollBar() ); QPalette p = ui->biography->palette(); - p.setColor( QPalette::Foreground, Qt::white ); - p.setColor( QPalette::Text, Qt::gray ); + p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); + p.setColor( QPalette::Text, TomahawkStyle::PAGE_TEXT ); ui->biography->setPalette( p ); ui->artistLabel->setPalette( p ); @@ -150,29 +150,20 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* setLayout( layout ); TomahawkUtils::unmarginLayout( layout ); - TomahawkUtils::styleScrollBar( ui->albums->horizontalScrollBar() ); - TomahawkUtils::styleScrollBar( ui->relatedArtists->verticalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->albums->horizontalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->relatedArtists->verticalScrollBar() ); ui->biography->setStyleSheet( "QTextBrowser#biography { background-color: transparent; }" ); ui->biography->document()->setDefaultStyleSheet( "a { text-decoration: none; font-weight: bold; color: #ffffff; }" ); ui->albums->setStyleSheet( "QListView { background-color: transparent; }" ); - ui->albumFrame->setStyleSheet( "QFrame#albumFrame { background-color: transparent; }" - "QFrame#albumFrame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + TomahawkStyle::stylePageFrame( ui->albumFrame ); ui->relatedArtists->setStyleSheet( "QListView { background-color: transparent; }" ); - ui->artistFrame->setStyleSheet( "QFrame#artistFrame { background-color: transparent; }" - "QFrame#artistFrame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + TomahawkStyle::stylePageFrame( ui->artistFrame ); ui->topHits->setStyleSheet( "QTreeView#topHits { background-color: transparent; }" ); - ui->trackFrame->setStyleSheet( "QFrame#trackFrame { background-color: transparent; }" - "QFrame#trackFrame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + TomahawkStyle::stylePageFrame( ui->trackFrame ); connect( ui->biography, SIGNAL( anchorClicked( QUrl ) ), SLOT( onBiographyLinkClicked( QUrl ) ) ); diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp index 8b2a81f3d..c3170958e 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp @@ -59,7 +59,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par ui->similarTracksView->setAutoResize( true ); ui->similarTracksView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); // TomahawkUtils::styleScrollBar( ui->similarTracksView->verticalScrollBar() ); - TomahawkUtils::styleScrollBar( ui->lyricsView->verticalScrollBar() ); + TomahawkStyle::styleScrollBar( ui->lyricsView->verticalScrollBar() ); // ui->similarTracksView->setStyleSheet( "QListView { background-color: transparent; } QListView::item { background-color: transparent; }" ); @@ -69,8 +69,8 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par ui->statsLabel->setFont( f ); QPalette p = ui->lyricsView->palette(); - p.setColor( QPalette::Foreground, Qt::white ); - p.setColor( QPalette::Text, Qt::white ); + p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND ); + p.setColor( QPalette::Text, TomahawkStyle::PAGE_FOREGROUND ); ui->lyricsView->setPalette( p ); ui->label->setPalette( p ); @@ -120,10 +120,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par TomahawkUtils::unmarginLayout( layout ); ui->similarTracksView->setStyleSheet( "QListView { background-color: transparent; }" ); - ui->frame->setStyleSheet( "QFrame#frame { background-color: transparent; }" - "QFrame#frame { " - "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" - "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); + TomahawkStyle::stylePageFrame( ui->frame ); load( query ); }