mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

* Moved artist / track labels out of the PlayableCover.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-06-08 14:24:37 +02:00
parent 4c46425cbb
commit a31f4c770a
4 changed files with 146 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
View File

@@ -111,7 +111,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
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::DefaultArtistImage, TomahawkUtils::Grid, ui->cover->size() ) ); ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::Grid, ui->cover->size() ) );
ui->cover->setShowText( true ); ui->cover->setShowText( false );
QFont f = font(); QFont f = font();
f.setPointSize( f.pointSize() + 3 ); f.setPointSize( f.pointSize() + 3 );
@@ -127,6 +127,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
p.setColor( QPalette::Text, Qt::gray ); p.setColor( QPalette::Text, Qt::gray );
ui->biography->setPalette( p ); ui->biography->setPalette( p );
ui->artistLabel->setPalette( p );
ui->label->setPalette( p ); ui->label->setPalette( p );
ui->label_2->setPalette( p ); ui->label_2->setPalette( p );
ui->label_3->setPalette( p ); ui->label_3->setPalette( p );
@@ -245,7 +246,7 @@ ArtistInfoWidget::jumpToCurrentTrack()
void void
ArtistInfoWidget::load( const artist_ptr& artist ) ArtistInfoWidget::load( const artist_ptr& artist )
{ {
if ( !m_artist.isNull() ) if ( m_artist )
{ {
disconnect( m_artist.data(), SIGNAL( updated() ), this, SLOT( onArtistImageUpdated() ) ); disconnect( m_artist.data(), SIGNAL( updated() ), this, SLOT( onArtistImageUpdated() ) );
disconnect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), this, SLOT( onSimilarArtistsLoaded() ) ); disconnect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), this, SLOT( onSimilarArtistsLoaded() ) );
@@ -258,6 +259,7 @@ ArtistInfoWidget::load( const artist_ptr& artist )
m_artist = artist; m_artist = artist;
m_title = artist->name(); m_title = artist->name();
ui->artistLabel->setText( artist->name() );
connect( m_artist.data(), SIGNAL( biographyLoaded() ), SLOT( onBiographyLoaded() ) ); connect( m_artist.data(), SIGNAL( biographyLoaded() ), SLOT( onBiographyLoaded() ) );
connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) ); connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) );

44
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
View File

@@ -50,6 +50,46 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>8</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="artistLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true" extracomment="not translatable because not shown to the user">ArtistName</string>
</property>
<property name="indent">
<number>2</number>
</property>
</widget>
</item>
<item> <item>
<widget class="QTextBrowser" name="biography"> <widget class="QTextBrowser" name="biography">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -61,7 +101,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>240</height> <height>220</height>
</size> </size>
</property> </property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
@@ -69,6 +109,8 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item> <item>
<widget class="QWidget" name="statsWidget" native="true"> <widget class="QWidget" name="statsWidget" native="true">
<property name="minimumSize"> <property name="minimumSize">

12
src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
View File

@@ -44,6 +44,11 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
QWidget* widget = new QWidget; QWidget* widget = new QWidget;
ui->setupUi( widget ); ui->setupUi( widget );
ui->artistLabel->setContentsMargins( 6, 2, 6, 2 );
ui->artistLabel->setElideMode( Qt::ElideMiddle );
ui->artistLabel->setType( QueryLabel::Artist );
connect( ui->artistLabel, SIGNAL( clickedArtist() ), SLOT( onArtistClicked() ) );
ui->statsLabel->setStyleSheet( "QLabel { background-image:url(); border: 2px solid #dddddd; background-color: #faf9f9; border-radius: 4px; padding: 12px; }" ); ui->statsLabel->setStyleSheet( "QLabel { background-image:url(); border: 2px solid #dddddd; background-color: #faf9f9; border-radius: 4px; padding: 12px; }" );
ui->lyricsView->setStyleSheet( "QTextBrowser#lyricsView { background-color: transparent; }" ); ui->lyricsView->setStyleSheet( "QTextBrowser#lyricsView { background-color: transparent; }" );
@@ -69,7 +74,8 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
ui->lyricsView->setPalette( p ); ui->lyricsView->setPalette( p );
ui->label->setPalette( p ); ui->label->setPalette( p );
// ui->similarTracksLabel->setPalette( p ); ui->artistLabel->setPalette( p );
ui->trackLabel->setPalette( p );
m_relatedTracksModel = new PlayableModel( ui->similarTracksView ); m_relatedTracksModel = new PlayableModel( ui->similarTracksView );
ui->similarTracksView->setPlayableModel( m_relatedTracksModel ); ui->similarTracksView->setPlayableModel( m_relatedTracksModel );
@@ -78,7 +84,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, QSize( 48, 48 ) ); m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, QSize( 48, 48 ) );
ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Grid, ui->cover->size() ) ); ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Grid, ui->cover->size() ) );
ui->cover->setShowText( true ); ui->cover->setShowText( false );
m_scrollArea = new QScrollArea(); m_scrollArea = new QScrollArea();
m_scrollArea->setWidgetResizable( true ); m_scrollArea->setWidgetResizable( true );
@@ -171,6 +177,8 @@ TrackInfoWidget::load( const query_ptr& query )
m_query = query; m_query = query;
m_artist = Artist::get( m_query->track()->artist() ); m_artist = Artist::get( m_query->track()->artist() );
m_title = QString( "%1 - %2" ).arg( query->track()->artist() ).arg( query->track()->track() ); m_title = QString( "%1 - %2" ).arg( query->track()->artist() ).arg( query->track()->track() );
ui->trackLabel->setText( m_query->track()->track() );
ui->artistLabel->setArtist( m_query->track()->artistPtr() );
if ( !m_query.isNull() ) if ( !m_query.isNull() )
{ {

77
src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>951</width> <width>965</width>
<height>771</height> <height>771</height>
</rect> </rect>
</property> </property>
@@ -21,7 +21,7 @@
<number>12</number> <number>12</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0">
<property name="spacing"> <property name="spacing">
<number>16</number> <number>16</number>
</property> </property>
@@ -51,18 +51,78 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>8</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="trackLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true" extracomment="not translatable because not shown to the user">TrackName</string>
</property>
<property name="indent">
<number>4</number>
</property>
</widget>
</item>
<item>
<widget class="QueryLabel" name="artistLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string notr="true" extracomment="not translatable because not shown to the user">ArtistName</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>20</width>
<height>20</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout>
</item>
<item> <item>
<widget class="QLabel" name="statsLabel"> <widget class="QLabel" name="statsLabel">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -196,6 +256,11 @@
<extends>QLabel</extends> <extends>QLabel</extends>
<header>widgets/PlayableCover.h</header> <header>widgets/PlayableCover.h</header>
</customwidget> </customwidget>
<customwidget>
<class>QueryLabel</class>
<extends>QLabel</extends>
<header>widgets/QueryLabel.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>