mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

* Updated album page to new style.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-12-20 11:28:35 +01:00
parent 0befad91e7
commit aabd84a9ab
2 changed files with 192 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
View File

@@ -26,6 +26,7 @@
#include "database/Database.h" #include "database/Database.h"
#include "playlist/TreeModel.h" #include "playlist/TreeModel.h"
#include "playlist/PlayableModel.h" #include "playlist/PlayableModel.h"
#include "playlist/AlbumItemDelegate.h"
#include "playlist/GridItemDelegate.h" #include "playlist/GridItemDelegate.h"
#include "Source.h" #include "Source.h"
#include "MetaPlaylistInterface.h" #include "MetaPlaylistInterface.h"
@@ -61,10 +62,14 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
m_tracksModel = new TreeModel( ui->tracks ); m_tracksModel = new TreeModel( ui->tracks );
m_tracksModel->setMode( Mixed ); m_tracksModel->setMode( Mixed );
ui->tracks->setTreeModel( m_tracksModel );
ui->tracks->setRootIsDecorated( false ); ui->tracks->setRootIsDecorated( false );
ui->tracks->setEmptyTip( tr( "Sorry, we could not find any tracks for this album!" ) ); ui->tracks->setEmptyTip( tr( "Sorry, we could not find any tracks for this album!" ) );
ui->tracks->proxyModel()->setStyle( PlayableProxyModel::Collection ); ui->tracks->proxyModel()->setStyle( PlayableProxyModel::Large );
ui->tracks->setAutoResize( true );
ui->tracks->setPlayableModel( m_tracksModel );
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->setWrapping( false );
@@ -77,33 +82,21 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
ui->tracks->setAttribute( Qt::WA_MacShowFocusRect, 0 ); ui->tracks->setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::Original, QSize( 48, 48 ) ); m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::Original, QSize( 48, 48 ) );
ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::Original, QSize( ui->cover->sizeHint() ) ) ); ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::Grid ) );
ui->cover->setShowText( true );
ui->biography->setFrameShape( QFrame::NoFrame ); ui->biography->setFrameShape( QFrame::NoFrame );
ui->biography->setAttribute( Qt::WA_MacShowFocusRect, 0 ); ui->biography->setAttribute( Qt::WA_MacShowFocusRect, 0 );
TomahawkUtils::styleScrollBar( ui->biography->verticalScrollBar() ); TomahawkUtils::styleScrollBar( ui->biography->verticalScrollBar() );
QFont f = font();
f.setBold( true );
f.setPointSize( TomahawkUtils::defaultFontSize() + 7 );
ui->albumLabel->setFont( f );
// ui->similarTracksLabel->setFont( f );
f.setPointSize( TomahawkUtils::defaultFontSize() + 4 );
ui->artistLabel->setFont( f );
QPalette p = ui->biography->palette(); QPalette p = ui->biography->palette();
p.setColor( QPalette::Foreground, Qt::white ); p.setColor( QPalette::Foreground, Qt::white );
p.setColor( QPalette::Text, Qt::white ); p.setColor( QPalette::Text, Qt::white );
ui->albumLabel->setPalette( p );
ui->artistLabel->setPalette( p );
ui->biography->setPalette( p ); ui->biography->setPalette( p );
ui->label->setPalette( p ); ui->label->setPalette( p );
ui->label_2->setPalette( p ); ui->label_2->setPalette( p );
ui->artistLabel->setType( QueryLabel::Artist );
QScrollArea* area = new QScrollArea(); QScrollArea* area = new QScrollArea();
area->setWidgetResizable( true ); area->setWidgetResizable( true );
area->setWidget( widget ); area->setWidget( widget );
@@ -128,7 +121,6 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
"border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;" "border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;"
"border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" );
// ui->topHits->setStyleSheet( "QTreeView#topHits { background-color: transparent; }" );
ui->trackFrame->setStyleSheet( "QFrame#trackFrame { background-color: transparent; }" ui->trackFrame->setStyleSheet( "QFrame#trackFrame { background-color: transparent; }"
"QFrame#trackFrame { " "QFrame#trackFrame { "
"border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;" "border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;"
@@ -140,8 +132,6 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
m_playlistInterface = playlistinterface_ptr( mpl ); m_playlistInterface = playlistinterface_ptr( mpl );
load( album ); load( album );
connect( ui->artistLabel, SIGNAL( clickedArtist() ), SLOT( onArtistClicked() ) );
} }
@@ -197,10 +187,8 @@ AlbumInfoWidget::load( const album_ptr& album )
m_album = album; m_album = album;
m_title = album->name(); m_title = album->name();
connect( m_album.data(), SIGNAL( updated() ), SLOT( onArtistImageUpdated() ) ); connect( m_album.data(), SIGNAL( updated() ), SLOT( onAlbumImageUpdated() ) );
ui->artistLabel->setArtist( album->artist() );
ui->albumLabel->setText( album->name() );
ui->label_2->setText( tr( "Other Albums by %1" ).arg( album->artist()->name() ) ); ui->label_2->setText( tr( "Other Albums by %1" ).arg( album->artist()->name() ) );
ui->cover->setAlbum( album ); ui->cover->setAlbum( album );

241
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
View File

@@ -13,26 +13,64 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <property name="spacing">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>16</number> <number>16</number>
</property> </property>
<property name="bottomMargin"> <property name="margin">
<number>12</number> <number>12</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>16</number>
</property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="PlayableCover" name="cover">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>260</width>
<height>260</height>
</size>
</property>
<property name="text">
<string>Cover</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="biography">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>240</height>
</size>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<widget class="QFrame" name="trackFrame"> <widget class="QFrame" name="trackFrame">
<property name="minimumSize"> <property name="minimumSize">
@@ -81,7 +119,13 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="TreeView" name="tracks"> <widget class="TrackView" name="tracks">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@@ -96,22 +140,6 @@
</layout> </layout>
</widget> </widget>
</item> </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>16</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QFrame" name="albumFrame"> <widget class="QFrame" name="albumFrame">
<property name="minimumSize"> <property name="minimumSize">
@@ -180,152 +208,6 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="spacing">
<number>-1</number>
</property>
<property name="leftMargin">
<number>16</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="PlayableCover" 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>
<spacer name="verticalSpacer_4">
<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>13</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing">
<number>4</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>4</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="albumLabel">
<property name="text">
<string>Album</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>4</number>
</property>
<property name="margin">
<number>0</number>
</property>
<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>
</layout>
</item>
<item>
<spacer name="verticalSpacer_3">
<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>13</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QTextBrowser" name="biography">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>240</height>
</size>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
@@ -334,14 +216,9 @@
<header location="global">playlist/GridView.h</header> <header location="global">playlist/GridView.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>TreeView</class> <class>TrackView</class>
<extends>QTreeView</extends> <extends>QTreeView</extends>
<header>playlist/TreeView.h</header> <header>playlist/TrackView.h</header>
</customwidget>
<customwidget>
<class>QueryLabel</class>
<extends>QLabel</extends>
<header>widgets/QueryLabel.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>PlayableCover</class> <class>PlayableCover</class>