* Adapt Album page to new style.

src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp

@@ -51,18 +51,21 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
     QWidget* widget = new QWidget;
     ui->setupUi( widget );
 
-    QPalette pal = palette();
-    pal.setColor( QPalette::Window, TomahawkStyle::PAGE_BACKGROUND );
-
-    widget->setPalette( pal );
-    widget->setAutoFillBackground( true );
-
     m_albumsModel = new PlayableModel( ui->albums );
     ui->albums->setPlayableModel( m_albumsModel );
     ui->albums->setEmptyTip( tr( "Sorry, we could not find any other albums for this artist!" ) );
 
     m_tracksModel = new TreeModel( ui->tracks );
     m_tracksModel->setMode( Mixed );
+
+    QPalette trackViewPal = ui->tracks->palette();
+    trackViewPal.setColor( QPalette::Foreground, Qt::white );
+    trackViewPal.setColor( QPalette::Text, Qt::white );
+    trackViewPal.setColor( QPalette::Highlight, QColor( "#252020" ) );
+    trackViewPal.setColor( QPalette::HighlightedText, Qt::white );
+
+    ui->tracks->setPalette( trackViewPal );
+    ui->tracks->setAlternatingRowColors( false );
     ui->tracks->setRootIsDecorated( false );
     ui->tracks->setEmptyTip( tr( "Sorry, we could not find any tracks for this album!" ) );
     ui->tracks->proxyModel()->setStyle( PlayableProxyModel::Large );
@@ -72,14 +75,14 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
     AlbumItemDelegate* del = new AlbumItemDelegate( ui->tracks, ui->tracks->proxyModel() );
     ui->tracks->setPlaylistItemDelegate( del );
 
-    ui->albums->setAutoFitItems( false );
+/*    ui->albums->setAutoFitItems( false );
     ui->albums->setWrapping( false );
     ui->albums->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    ui->albums->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
+    ui->albums->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );*/
     ui->albums->delegate()->setItemSize( QSize( 170, 170 ) );
     ui->albums->proxyModel()->setHideDupeItems( true );
 
-    ui->tracks->setFrameShape( QFrame::StyledPanel );
+    ui->tracks->setFrameShape( QFrame::NoFrame );
     ui->tracks->setAttribute( Qt::WA_MacShowFocusRect, 0 );
 
     m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::Original, QSize( 48, 48 ) );
@@ -103,7 +106,10 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
     area->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
     area->setWidget( widget );
 
-    area->setStyleSheet( "QScrollArea { background-color: #454e59; }" );
+    QPalette pal = palette();
+    pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
+    area->setPalette( pal );
+    area->setAutoFillBackground( true );
     area->setFrameShape( QFrame::NoFrame );
     area->setAttribute( Qt::WA_MacShowFocusRect, 0 );
 
@@ -123,6 +129,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
                                "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->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;"

src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui

@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string notr="true" extracomment="not translatable because not shown to the user">Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
    <property name="spacing">
     <number>16</number>
    </property>
@@ -71,6 +71,11 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="margin">
+      <number>0</number>
+     </property>
      <item>
       <widget class="QFrame" name="trackFrame">
        <property name="frameShape">
@@ -173,7 +178,7 @@
         <item>
          <widget class="GridView" name="albums">
           <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -189,6 +194,8 @@
        </layout>
       </widget>
      </item>
+    </layout>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -210,16 +217,16 @@
    <extends>QListView</extends>
    <header location="global">playlist/GridView.h</header>
   </customwidget>
-  <customwidget>
-   <class>TrackView</class>
-   <extends>QTreeView</extends>
-   <header>playlist/TrackView.h</header>
-  </customwidget>
   <customwidget>
    <class>PlayableCover</class>
    <extends>QLabel</extends>
    <header>widgets/PlayableCover.h</header>
   </customwidget>
+  <customwidget>
+   <class>TrackView</class>
+   <extends>QTreeView</extends>
+   <header>playlist/TrackView.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>