From 52dcf924a40c26c38225a35a1da59be4a87530a4 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Wed, 13 Jun 2012 09:17:20 +0200
Subject: [PATCH] * New track page. Again, still a bit WIP.

---
 .../widgets/infowidgets/TrackInfoWidget.cpp   |  29 +-
 .../widgets/infowidgets/TrackInfoWidget.ui    | 389 ++++++++----------
 2 files changed, 200 insertions(+), 218 deletions(-)

diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
index 20837b978..74cdab9ad 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
@@ -21,6 +21,8 @@
 #include "TrackInfoWidget.h"
 #include "ui_TrackInfoWidget.h"
 
+#include <QScrollArea>
+
 #include "ViewManager.h"
 #include "SourceList.h"
 #include "playlist/PlayableModel.h"
@@ -36,7 +38,8 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
     : QWidget( parent )
     , ui( new Ui::TrackInfoWidget )
 {
-    ui->setupUi( this );
+    QWidget* widget = new QWidget;
+    ui->setupUi( widget );
 
     QPalette pal = palette();
     pal.setColor( QPalette::Window, QColor( "#323435" ) );
@@ -44,8 +47,8 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
     setPalette( pal );
     setAutoFillBackground( true );
 
-    layout()->setSpacing( 0 );
-    ui->tracksWidget->setStyleSheet( "QWidget#tracksWidget { background-color: #323435; }" );
+//    layout()->setSpacing( 0 );
+//    ui->tracksWidget->setStyleSheet( "QWidget#tracksWidget { background-color: #323435; }" );
 //    ui->headerWidget->setStyleSheet( "QWidget#headerWidget { background-image: url(" RESPATH "images/playlist-header-tiled.png); }" );
 //    ui->headerWidget->setStyleSheet( "background-color: #323435;" );
 //    ui->tracksWidget->setStyleSheet( "background-color: #323435;" );
@@ -64,8 +67,6 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
     f.setPixelSize( 14 );
     ui->artistLabel->setFont( f );
     ui->albumLabel->setFont( f );
-    ui->byLabel->setFont( f );
-    ui->fromLabel->setFont( f );
 
     f.setPixelSize( 12 );
     ui->statsLabel->setFont( f );
@@ -79,9 +80,8 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
     ui->trackLabel->setPalette( p );
     ui->artistLabel->setPalette( p );
     ui->albumLabel->setPalette( p );
-    ui->byLabel->setPalette( p );
-    ui->fromLabel->setPalette( p );
     ui->lyricsView->setPalette( p );
+    ui->label->setPalette( p );
 //    ui->similarTracksLabel->setPalette( p );
 
     ui->artistLabel->setType( QueryLabel::Artist );
@@ -93,6 +93,20 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
     ui->similarTracksView->setEmptyTip( tr( "Sorry, but we could not find similar tracks for this song!" ) );
 
     m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, QSize( 48, 48 ) );
+    ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::ScaledCover, QSize( ui->cover->sizeHint() ) ) );
+
+    QScrollArea* area = new QScrollArea();
+    area->setWidgetResizable( true );
+    area->setWidget( widget );
+
+    area->setStyleSheet( "QScrollArea { background-color: #323435; }" );
+    area->setFrameShape( QFrame::NoFrame );
+    area->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+    QVBoxLayout* layout = new QVBoxLayout();
+    layout->addWidget( area );
+    setLayout( layout );
+    TomahawkUtils::unmarginLayout( layout );
 
     load( query );
     
@@ -159,7 +173,6 @@ TrackInfoWidget::load( const query_ptr& query )
     ui->trackLabel->setText( query->track() );
     ui->artistLabel->setQuery( query );
     ui->albumLabel->setQuery( query );
-    ui->fromLabel->setVisible( !query->album().isEmpty() );
 
     m_relatedTracksModel->clear();
     
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
index 088f5b234..1004806b6 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
@@ -6,219 +6,193 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>852</width>
-    <height>571</height>
+    <width>951</width>
+    <height>771</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,0,1">
-   <property name="margin">
-    <number>0</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
-    <widget class="QWidget" name="headerWidget" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <property name="margin">
-       <number>12</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="cover">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>128</width>
-          <height>128</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Cover</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>16</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QLabel" name="trackLabel">
-          <property name="text">
-           <string>Track</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QLabel" name="byLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>by </string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QueryLabel" name="artistLabel">
-            <property name="text">
-             <string>Artist</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QLabel" name="fromLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>from </string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QueryLabel" name="albumLabel">
-            <property name="text">
-             <string>Album</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>16</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="statsLabel">
-        <property name="text">
-         <string>Statistics</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="HeaderLabel" name="label">
-     <property name="text">
-      <string>Lyrics</string>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <property name="leftMargin">
+      <number>16</number>
      </property>
-     <property name="indent">
-      <number>8</number>
+     <property name="topMargin">
+      <number>12</number>
      </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTextBrowser" name="lyricsView">
-     <property name="openLinks">
-      <bool>false</bool>
+     <property name="rightMargin">
+      <number>16</number>
      </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="tracksWidget" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>4</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="HeaderLabel" name="similarTracksLabel">
-        <property name="text">
-         <string>Similar Tracks</string>
-        </property>
-        <property name="indent">
-         <number>8</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="GridView" name="similarTracksView">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
+     <property name="bottomMargin">
+      <number>12</number>
+     </property>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+           <pointsize>20</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Similar Tracks</string>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="GridView" name="similarTracksView">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="leftMargin">
+        <number>16</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="cover">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>220</width>
+           <height>220</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Cover</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <widget class="QLabel" name="trackLabel">
+           <property name="text">
+            <string>Track</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QueryLabel" name="artistLabel">
+             <property name="text">
+              <string>Artist</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="QueryLabel" name="albumLabel">
+             <property name="text">
+              <string>Album</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>12</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="statsLabel">
+         <property name="text">
+          <string>Statistics</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>12</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QTextBrowser" name="lyricsView">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>300</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="openLinks">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
@@ -226,12 +200,7 @@
   <customwidget>
    <class>GridView</class>
    <extends>QListView</extends>
-   <header>playlist/GridView.h</header>
-  </customwidget>
-  <customwidget>
-   <class>HeaderLabel</class>
-   <extends>QLabel</extends>
-   <header>widgets/HeaderLabel.h</header>
+   <header location="global">GridView.h</header>
   </customwidget>
   <customwidget>
    <class>QueryLabel</class>