From 880b9f96c72793be7f8a4d3d18dcc44552c907be Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 4 Dec 2012 03:49:48 +0100
Subject: [PATCH] * Remove tiled background image from header. I'm kinda fed up
 with it.

---
 src/libtomahawk/infobar/InfoBar.cpp         | 23 ++++---------------
 src/libtomahawk/infobar/InfoBar.h           |  2 --
 src/libtomahawk/playlist/FlexibleHeader.cpp |  2 +-
 src/libtomahawk/widgets/BasicHeader.cpp     | 25 ---------------------
 src/libtomahawk/widgets/BasicHeader.h       |  2 --
 5 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/src/libtomahawk/infobar/InfoBar.cpp b/src/libtomahawk/infobar/InfoBar.cpp
index 7b4a916cb..6c3fda957 100644
--- a/src/libtomahawk/infobar/InfoBar.cpp
+++ b/src/libtomahawk/infobar/InfoBar.cpp
@@ -95,10 +95,12 @@ InfoBar::InfoBar( QWidget* parent )
 
     ui->horizontalLayout->addWidget( m_searchWidget );
 
-    setAutoFillBackground( true );
+    QPalette pal = palette();
+    pal.setColor( QPalette::Window, QColor( "#454e59" ) );
 
+    setPalette( pal );
+    setAutoFillBackground( true );
     setFixedHeight( 80 );
-    m_bgTile = TomahawkUtils::createTiledPixmap( 2000, height(), QImage( RESPATH "images/playlist-header-tiled.png" ) );
 
     connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ), SLOT( setFilterAvailable( bool ) ) );
 }
@@ -282,23 +284,6 @@ InfoBar::onFilterEdited()
     emit filterTextChanged( m_searchWidget->text() );
 }
 
-void
-InfoBar::paintEvent( QPaintEvent* e )
-{
-    Q_UNUSED( e );
-
-    if ( m_bgTile.isNull() || width() > m_bgTile.width() )
-        m_bgTile = TomahawkUtils::createTiledPixmap( width(), height(), QImage( RESPATH "images/playlist-header-tiled.png" ) );
-
-    if ( m_bgTile.isNull() )
-        return;
-
-    QPainter p( this );
-
-    // Truncate bg pixmap and paint into bg
-    p.drawPixmap( rect(), m_bgTile, rect() );
-}
-
 
 void
 InfoBar::changeEvent( QEvent* e )
diff --git a/src/libtomahawk/infobar/InfoBar.h b/src/libtomahawk/infobar/InfoBar.h
index 80ef6dbfa..12c611145 100644
--- a/src/libtomahawk/infobar/InfoBar.h
+++ b/src/libtomahawk/infobar/InfoBar.h
@@ -69,7 +69,6 @@ signals:
 
 protected:
     void changeEvent( QEvent* e );
-    void paintEvent( QPaintEvent* e );
 
 private slots:
     void onFilterEdited();
@@ -78,7 +77,6 @@ private slots:
 private:
     Ui::InfoBar* ui;
 
-    QPixmap m_bgTile;
     QPalette m_whitePal;
 
     QList<Tomahawk::PlaylistUpdaterInterface*> m_updaters;;
diff --git a/src/libtomahawk/playlist/FlexibleHeader.cpp b/src/libtomahawk/playlist/FlexibleHeader.cpp
index 36681066e..7c574fa08 100644
--- a/src/libtomahawk/playlist/FlexibleHeader.cpp
+++ b/src/libtomahawk/playlist/FlexibleHeader.cpp
@@ -62,7 +62,7 @@ FlexibleHeader::FlexibleHeader( FlexibleView* parent )
     m_radioDetailed = new QRadioButton( modeWidget );
     m_radioCloud = new QRadioButton( modeWidget );
     //for the CSS:
-    m_radioNormal->setObjectName( "radioNormal");
+    m_radioNormal->setObjectName( "radioNormal" );
     m_radioCloud->setObjectName( "radioCloud" );
 
     m_radioNormal->setFocusPolicy( Qt::NoFocus );
diff --git a/src/libtomahawk/widgets/BasicHeader.cpp b/src/libtomahawk/widgets/BasicHeader.cpp
index a6c06bed3..a1255d2f6 100644
--- a/src/libtomahawk/widgets/BasicHeader.cpp
+++ b/src/libtomahawk/widgets/BasicHeader.cpp
@@ -86,16 +86,11 @@ BasicHeader::BasicHeader( QWidget* parent )
 
     setPalette( pal );
     setAutoFillBackground( true );
-
-    if ( !s_tiledHeader )
-        s_tiledHeader = new QPixmap( TomahawkUtils::createTiledPixmap( 2000, height(), QImage( RESPATH "images/playlist-header-tiled.png" ) ) );
 }
 
 
 BasicHeader::~BasicHeader()
 {
-    delete s_tiledHeader;
-    s_tiledHeader = 0;
 }
 
 
@@ -118,23 +113,3 @@ BasicHeader::setPixmap( const QPixmap& p )
 {
     m_imageLabel->setPixmap( p.scaledToHeight( m_imageLabel->height(), Qt::SmoothTransformation ) );
 }
-
-
-void
-BasicHeader::paintEvent( QPaintEvent* )
-{
-    if ( !s_tiledHeader || s_tiledHeader->isNull() || width() > s_tiledHeader->width() )
-    {
-        delete s_tiledHeader;
-        s_tiledHeader = new QPixmap( TomahawkUtils::createTiledPixmap( width(), height(), QImage( RESPATH "images/playlist-header-tiled.png" ) ) );
-    }
-
-    if ( !s_tiledHeader || s_tiledHeader->isNull() )
-        return;
-
-    QPainter p( this );
-
-    // Truncate bg pixmap and paint into bg
-    p.drawPixmap( rect(), *s_tiledHeader, rect() );
-}
-
diff --git a/src/libtomahawk/widgets/BasicHeader.h b/src/libtomahawk/widgets/BasicHeader.h
index aaed9bee9..4c0c5f181 100644
--- a/src/libtomahawk/widgets/BasicHeader.h
+++ b/src/libtomahawk/widgets/BasicHeader.h
@@ -42,8 +42,6 @@ public slots:
     virtual void setPixmap( const QPixmap& p );
 
 protected:
-    void paintEvent( QPaintEvent* );
-
     QLabel* m_imageLabel;
     ElidedLabel* m_captionLabel;
     ElidedLabel* m_descriptionLabel;