From 8adcb0a111bd27746ed496143c9fce948baf09ac Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 14 Jun 2013 01:56:43 +0200 Subject: [PATCH] * Got rid of obsolete TomahawkStyle colors. --- src/libtomahawk/playlist/FlexibleTreeView.cpp | 2 +- src/libtomahawk/playlist/FlexibleView.cpp | 2 +- src/libtomahawk/widgets/BasicHeader.cpp | 4 ++-- src/libtomahawk/widgets/ToggleButton.cpp | 10 +++------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/libtomahawk/playlist/FlexibleTreeView.cpp b/src/libtomahawk/playlist/FlexibleTreeView.cpp index da0dc0c43..0204b8965 100644 --- a/src/libtomahawk/playlist/FlexibleTreeView.cpp +++ b/src/libtomahawk/playlist/FlexibleTreeView.cpp @@ -73,7 +73,7 @@ FlexibleTreeView::FlexibleTreeView( QWidget* parent, QWidget* extraHeader ) TomahawkUtils::unmarginLayout( layout() ); QFrame* lineBelow = new QFrame( this ); - lineBelow->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_UPPER.name() ) ); + lineBelow->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_BACKGROUND.name() ) ); lineBelow->setFrameShape( QFrame::HLine ); lineBelow->setMaximumHeight( 1 ); QFrame* lineBelow2 = new QFrame( this ); diff --git a/src/libtomahawk/playlist/FlexibleView.cpp b/src/libtomahawk/playlist/FlexibleView.cpp index 24c7f8fc2..50903e004 100644 --- a/src/libtomahawk/playlist/FlexibleView.cpp +++ b/src/libtomahawk/playlist/FlexibleView.cpp @@ -68,7 +68,7 @@ FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader ) TomahawkUtils::unmarginLayout( layout() ); QFrame* lineBelow = new QFrame( this ); - lineBelow->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_UPPER.name() ) ); + lineBelow->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_BACKGROUND.name() ) ); lineBelow->setFrameShape( QFrame::HLine ); lineBelow->setMaximumHeight( 1 ); QFrame* lineBelow2 = new QFrame( this ); diff --git a/src/libtomahawk/widgets/BasicHeader.cpp b/src/libtomahawk/widgets/BasicHeader.cpp index f4fb9bd68..be6c41a81 100644 --- a/src/libtomahawk/widgets/BasicHeader.cpp +++ b/src/libtomahawk/widgets/BasicHeader.cpp @@ -61,7 +61,7 @@ BasicHeader::BasicHeader( QWidget* parent ) QPalette pal = palette(); pal.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT ); - pal.setBrush( backgroundRole(), TomahawkStyle::HEADER_LOWER ); + pal.setBrush( backgroundRole(), TomahawkStyle::HEADER_BACKGROUND ); m_captionLabel->setPalette( pal ); m_descriptionLabel->setPalette( pal ); @@ -90,7 +90,7 @@ BasicHeader::BasicHeader( QWidget* parent ) // m_descriptionLabel->setGraphicsEffect( effect ); QFrame* lineAbove = new QFrame( this ); - lineAbove->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_UPPER.name() ) ); + lineAbove->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_BACKGROUND.name() ) ); lineAbove->setFrameShape( QFrame::HLine ); lineAbove->setMaximumHeight( 1 ); QFrame* lineBelow = new QFrame( this ); diff --git a/src/libtomahawk/widgets/ToggleButton.cpp b/src/libtomahawk/widgets/ToggleButton.cpp index b75e7c6a1..6f68285fe 100644 --- a/src/libtomahawk/widgets/ToggleButton.cpp +++ b/src/libtomahawk/widgets/ToggleButton.cpp @@ -89,15 +89,11 @@ ToggleButton::paintEvent( QPaintEvent* event ) if ( isChecked() ) { - p.setBrush( TomahawkStyle::HEADER_HIGHLIGHT ); - } - else if ( false ) - { - p.setBrush( TomahawkStyle::HEADER_LOWER ); + p.setBrush( TomahawkStyle::TOGGLEBUTTON_HIGHLIGHT ); } else { - p.setBrush( TomahawkStyle::HEADER_UPPER ); + p.setBrush( TomahawkStyle::TOGGLEBUTTON_BACKGROUND ); } p.drawRoundedRect( highlightRect, 4.0, 4.0 ); @@ -105,7 +101,7 @@ ToggleButton::paintEvent( QPaintEvent* event ) QTextOption to( Qt::AlignCenter ); r.adjust( 8, 0, -8, 0 ); - p.setBrush( TomahawkStyle::HEADER_TEXT ); + p.setBrush( TomahawkStyle::TOGGLEBUTTON_TEXT ); p.drawText( r, text(), to ); p.restore();