From 6b4ac0a3c9310533b9ce6a7207e6b301b1724988 Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Fri, 14 Jun 2013 14:46:57 -0400 Subject: [PATCH 1/3] More artist & track design plus some updated placeholder icons --- data/images/album-placeholder-grid.svg | 28 ++++--------------- data/images/info.svg | 10 +++++-- data/images/track-placeholder-grid.svg | 14 +++++++--- src/libtomahawk/utils/TomahawkStyle.h | 5 ++-- .../widgets/infowidgets/ArtistInfoWidget.cpp | 6 ++-- .../widgets/infowidgets/TrackInfoWidget.cpp | 7 +++-- 6 files changed, 34 insertions(+), 36 deletions(-) diff --git a/data/images/album-placeholder-grid.svg b/data/images/album-placeholder-grid.svg index d1120cd2b..bb69070ee 100644 --- a/data/images/album-placeholder-grid.svg +++ b/data/images/album-placeholder-grid.svg @@ -3,24 +3,8 @@ album-placeholder-grid Created with Sketch (http://www.bohemiancoding.com/sketch) - - - - - + - - - - - - - - - - - - @@ -33,12 +17,10 @@ - - - - - - + + + + \ No newline at end of file diff --git a/data/images/info.svg b/data/images/info.svg index b369d3c0a..569c93122 100644 --- a/data/images/info.svg +++ b/data/images/info.svg @@ -1,9 +1,13 @@ - + info Created with Sketch (http://www.bohemiancoding.com/sketch) - - + + + + + + \ No newline at end of file diff --git a/data/images/track-placeholder-grid.svg b/data/images/track-placeholder-grid.svg index d938fe3ac..6669b63b1 100644 --- a/data/images/track-placeholder-grid.svg +++ b/data/images/track-placeholder-grid.svg @@ -1,9 +1,15 @@ - + track-placeholder-grid Created with Sketch (http://www.bohemiancoding.com/sketch) - - - + + + + + + + + + \ No newline at end of file diff --git a/src/libtomahawk/utils/TomahawkStyle.h b/src/libtomahawk/utils/TomahawkStyle.h index 0598d3321..915b92464 100644 --- a/src/libtomahawk/utils/TomahawkStyle.h +++ b/src/libtomahawk/utils/TomahawkStyle.h @@ -67,7 +67,8 @@ namespace TomahawkStyle static const QColor HEADER_GAUGE_LABEL_BACKGROUND = QColor( "#DBDBDB" ); static const QColor HEADER_BACKGROUND = QColor( "#292f34" ); - static const QColor HEADER_TEXT = QColor( "#ffffff" ); + static const QColor HEADER_LABEL = QColor( "#FFFFFF" ); + static const QColor HEADER_TEXT = QColor( "#DBDBDB" ); static const QColor HEADER_LINK = QColor( "#7DC4FF" ); static const QColor HEADER_HIGHLIGHT = QColor( "#333" ); @@ -81,7 +82,7 @@ namespace TomahawkStyle static const QColor PAGE_BACKGROUND = QColor( "#DBDBDB" ); static const QColor PAGE_TRACKLIST_TRACK_SOLVED = QColor( "#292F34" ); - static const QColor PAGE_TRACKLIST_TRACK_UNRESOLVED = QColor( "#8597A6" ).lighter( 200 ); + static const QColor PAGE_TRACKLIST_TRACK_UNRESOLVED = QColor( "#8597A6" ).lighter( 150 ); static const QColor PAGE_TRACKLIST_NUMBER = QColor( "#8DBF2D" ).darker( 400 ); static const QColor PAGE_TRACKLIST_HIGHLIGHT = QColor( "#292f34" ); static const QColor PAGE_TRACKLIST_HIGHLIGHT_TEXT = QColor( "#ffffff" ); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 2cac579fa..eafb25b29 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -111,7 +111,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* QHBoxLayout* l = new QHBoxLayout( ui->statsWidget ); m_playStatsGauge = new StatsGauge( ui->statsWidget ); - m_playStatsGauge->setText( tr( "# IN YOUR CHARTS" ) ); + m_playStatsGauge->setText( tr( "YOUR CHART RANK" ) ); m_playStatsGauge->setInvertedAppearance( true ); l->addSpacerItem( new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) ); @@ -149,9 +149,11 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* { QFont f = ui->artistLabel->font(); f.setFamily( "Titillium Web" ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 20 ); + f.setBold( true ); QPalette p = ui->artistLabel->palette(); - p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT ); + p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_LABEL ); ui->artistLabel->setFont( f ); ui->artistLabel->setPalette( p ); diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp index 24db980ef..76b0bf880 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp @@ -71,9 +71,11 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par { QFont f = ui->trackLabel->font(); f.setFamily( "Titillium Web" ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 20 ); + f.setBold( true ); QPalette p = ui->trackLabel->palette(); - p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT ); + p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_LABEL ); ui->trackLabel->setFont( f ); ui->trackLabel->setPalette( p ); @@ -82,6 +84,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par { QFont f = ui->artistLabel->font(); f.setFamily( "Titillium Web" ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 10 ); QPalette p = ui->artistLabel->palette(); p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT ); @@ -145,7 +148,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par m_playStatsGauge = new StatsGauge( ui->statsWidget ); m_playStatsGauge->setText( tr( "# PLAYS / ARTIST" ) ); m_playStatsTotalGauge = new StatsGauge( ui->statsWidget ); - m_playStatsTotalGauge->setText( tr( "# IN YOUR CHARTS" ) ); + m_playStatsTotalGauge->setText( tr( "YOUR CHART RANK" ) ); m_playStatsTotalGauge->setInvertedAppearance( true ); l->addSpacerItem( new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) ); From 6d806e2fb18d3deea8796b87150a5fe5d9fa407a Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Fri, 14 Jun 2013 14:54:52 -0400 Subject: [PATCH 2/3] Pretty up the gauge a bit more --- src/libtomahawk/utils/TomahawkStyle.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/utils/TomahawkStyle.h b/src/libtomahawk/utils/TomahawkStyle.h index 915b92464..6488e64f8 100644 --- a/src/libtomahawk/utils/TomahawkStyle.h +++ b/src/libtomahawk/utils/TomahawkStyle.h @@ -62,9 +62,9 @@ namespace TomahawkStyle static const QColor SELECTION_FOREGROUND = QColor( "#ffffff" ); static const QColor HEADER_GAUGE_HIGHLIGHT = QColor( "#7DC4FF" ); - static const QColor HEADER_GAUGE_BACKGROUND = QColor( "#DBDBDB" ); - static const QColor HEADER_GAUGE_TEXT = QColor( "#292f34" ); - static const QColor HEADER_GAUGE_LABEL_BACKGROUND = QColor( "#DBDBDB" ); + static const QColor HEADER_GAUGE_BACKGROUND = QColor( "#0B0A0A" ); + static const QColor HEADER_GAUGE_TEXT = QColor( "#FFFFFF" ); + static const QColor HEADER_GAUGE_LABEL_BACKGROUND = QColor( "#0B0A0A" ); static const QColor HEADER_BACKGROUND = QColor( "#292f34" ); static const QColor HEADER_LABEL = QColor( "#FFFFFF" ); From cdd75599e80d928677a58e332d4e61975eabd1f1 Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Fri, 14 Jun 2013 16:38:51 -0400 Subject: [PATCH 3/3] Bump up bio font a couple of point sizes --- data/images/track-placeholder-grid.svg | 2 +- src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp | 1 + src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp | 4 ++-- src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data/images/track-placeholder-grid.svg b/data/images/track-placeholder-grid.svg index 6669b63b1..225329490 100644 --- a/data/images/track-placeholder-grid.svg +++ b/data/images/track-placeholder-grid.svg @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 36d969932..6f22bbb87 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -54,6 +54,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par 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 ); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index eafb25b29..9981aad83 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -111,7 +111,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* QHBoxLayout* l = new QHBoxLayout( ui->statsWidget ); m_playStatsGauge = new StatsGauge( ui->statsWidget ); - m_playStatsGauge->setText( tr( "YOUR CHART RANK" ) ); + m_playStatsGauge->setText( tr( "YOUR ARTIST RANK" ) ); m_playStatsGauge->setInvertedAppearance( true ); l->addSpacerItem( new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) ); @@ -126,7 +126,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* { QFont f = ui->biography->font(); - f.setPointSize( f.pointSize() + 2 ); + f.setPointSize( f.pointSize() + 4 ); f.setFamily( "Titillium Web" ); QPalette p = ui->biography->palette(); diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp index 76b0bf880..6bf243fd5 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp @@ -148,7 +148,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par m_playStatsGauge = new StatsGauge( ui->statsWidget ); m_playStatsGauge->setText( tr( "# PLAYS / ARTIST" ) ); m_playStatsTotalGauge = new StatsGauge( ui->statsWidget ); - m_playStatsTotalGauge->setText( tr( "YOUR CHART RANK" ) ); + m_playStatsTotalGauge->setText( tr( "YOUR SONG RANK" ) ); m_playStatsTotalGauge->setInvertedAppearance( true ); l->addSpacerItem( new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) );