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

* New Track page layout.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-12-20 08:21:10 +01:00
parent 60879b5d53
commit 0d4162c9ee
2 changed files with 147 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,56 +48,42 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
widget->setPalette( pal ); widget->setPalette( pal );
widget->setAutoFillBackground( true ); widget->setAutoFillBackground( true );
ui->rightBar->setPalette( pal );
ui->rightBar->setAutoFillBackground( true );
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; }" );
ui->lyricsView->setFrameShape( QFrame::NoFrame ); ui->lyricsView->setFrameShape( QFrame::NoFrame );
ui->lyricsView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); ui->lyricsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->lyricsView->setVisible( false ); // FIXME eventually
ui->similarTracksView->setAutoResize( true ); ui->similarTracksView->setAutoResize( true );
ui->similarTracksView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); ui->similarTracksView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
// TomahawkUtils::styleScrollBar( ui->similarTracksView->verticalScrollBar() ); // TomahawkUtils::styleScrollBar( ui->similarTracksView->verticalScrollBar() );
TomahawkUtils::styleScrollBar( ui->lyricsView->verticalScrollBar() ); TomahawkUtils::styleScrollBar( ui->lyricsView->verticalScrollBar() );
QFont f = font();
f.setBold( true );
f.setPointSize( TomahawkUtils::defaultFontSize() + 7 );
ui->trackLabel->setFont( f );
// ui->similarTracksLabel->setFont( f );
f.setPointSize( TomahawkUtils::defaultFontSize() + 4 );
ui->artistLabel->setFont( f );
ui->albumLabel->setFont( f );
f.setPointSize( TomahawkUtils::defaultFontSize() + 2 );
ui->statsLabel->setFont( f );
// ui->similarTracksView->setStyleSheet( "QListView { background-color: transparent; } QListView::item { background-color: transparent; }" ); // ui->similarTracksView->setStyleSheet( "QListView { background-color: transparent; } QListView::item { background-color: transparent; }" );
QPalette p = ui->trackLabel->palette(); QFont f = ui->statsLabel->font();
f.setPointSize( TomahawkUtils::defaultFontSize() + 2 );
f.setBold( true );
ui->statsLabel->setFont( f );
QPalette p = ui->lyricsView->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->trackLabel->setPalette( p );
ui->artistLabel->setPalette( p );
ui->albumLabel->setPalette( p );
ui->lyricsView->setPalette( p ); ui->lyricsView->setPalette( p );
ui->label->setPalette( p ); ui->label->setPalette( p );
// ui->similarTracksLabel->setPalette( p ); // ui->similarTracksLabel->setPalette( p );
ui->artistLabel->setType( QueryLabel::Artist );
ui->albumLabel->setType( QueryLabel::Album );
m_relatedTracksModel = new PlayableModel( ui->similarTracksView ); m_relatedTracksModel = new PlayableModel( ui->similarTracksView );
ui->similarTracksView->setPlayableModel( m_relatedTracksModel ); ui->similarTracksView->setPlayableModel( m_relatedTracksModel );
ui->similarTracksView->proxyModel()->sort( -1 ); ui->similarTracksView->proxyModel()->sort( -1 );
ui->similarTracksView->setEmptyTip( tr( "Sorry, but we could not find similar tracks for this song!" ) ); 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 ) ); m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, QSize( 48, 48 ) );
ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::ScaledCover, QSize( ui->cover->sizeHint() ) ) ); ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Grid ) );
ui->cover->setShowText( true );
m_scrollArea = new QScrollArea(); m_scrollArea = new QScrollArea();
m_scrollArea->setWidgetResizable( true ); m_scrollArea->setWidgetResizable( true );
@@ -120,9 +106,6 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
"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; }" );
load( query ); load( query );
connect( ui->artistLabel, SIGNAL( clickedArtist() ), SLOT( onArtistClicked() ) );
connect( ui->albumLabel, SIGNAL( clickedAlbum() ), SLOT( onAlbumClicked() ) );
} }
@@ -198,10 +181,6 @@ TrackInfoWidget::load( const query_ptr& query )
// m_query->lyrics(); // m_query->lyrics();
onCoverUpdated(); onCoverUpdated();
ui->trackLabel->setText( query->track() );
ui->artistLabel->setQuery( query );
ui->albumLabel->setQuery( query );
ui->albumLabel->setVisible( !query->album().isEmpty() );
ui->cover->setQuery( query ); ui->cover->setQuery( query );
m_relatedTracksModel->clear(); m_relatedTracksModel->clear();

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

@@ -13,38 +13,99 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>16</number>
</property>
<property name="margin">
<number>12</number>
</property>
<item>
<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> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="PlayableCover" name="cover">
<property name="leftMargin"> <property name="sizePolicy">
<number>12</number> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="topMargin"> <property name="minimumSize">
<number>0</number> <size>
<width>260</width>
<height>260</height>
</size>
</property> </property>
<property name="rightMargin"> <property name="text">
<number>0</number> <string>Cover</string>
</property> </property>
<property name="bottomMargin"> <property name="alignment">
<number>0</number> <set>Qt::AlignCenter</set>
</property> </property>
</widget>
</item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_3"> <spacer name="horizontalSpacer">
<property name="leftMargin"> <property name="orientation">
<number>0</number> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="topMargin"> <property name="sizeHint" stdset="0">
<number>12</number> <size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
<property name="rightMargin"> </spacer>
<number>0</number> </item>
<item>
<widget class="QLabel" name="statsLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="bottomMargin"> <property name="maximumSize">
<number>12</number> <size>
<width>16777215</width>
<height>260</height>
</size>
</property> </property>
<property name="text">
<string>Statistics</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</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>
<item> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="minimumSize"> <property name="minimumSize">
@@ -107,212 +168,6 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>4</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="rightBar" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>500</height>
</size>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>16</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>16</number>
</property>
<property name="bottomMargin">
<number>12</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>8</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>4</number>
</property>
<property name="margin">
<number>0</number>
</property>
<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">
<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>
<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="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>16</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>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
@@ -320,11 +175,6 @@
<extends>QListView</extends> <extends>QListView</extends>
<header location="global">playlist/GridView.h</header> <header location="global">playlist/GridView.h</header>
</customwidget> </customwidget>
<customwidget>
<class>QueryLabel</class>
<extends>QLabel</extends>
<header>widgets/QueryLabel.h</header>
</customwidget>
<customwidget> <customwidget>
<class>PlayableCover</class> <class>PlayableCover</class>
<extends>QLabel</extends> <extends>QLabel</extends>