diff --git a/data/fonts/PathwayGothicOne-Regular.ttf b/data/fonts/PathwayGothicOne-Regular.ttf new file mode 100644 index 000000000..36ae84e6b Binary files /dev/null and b/data/fonts/PathwayGothicOne-Regular.ttf differ diff --git a/data/images/view-toggle-inactive-centre.svg b/data/images/view-toggle-inactive-centre.svg index 801f87e6c..a840d374b 100644 --- a/data/images/view-toggle-inactive-centre.svg +++ b/data/images/view-toggle-inactive-centre.svg @@ -1,14 +1,18 @@ - - view-toggle-inactive-centre + + Slice 1 Created with Sketch (http://www.bohemiancoding.com/sketch) - - - + + + - - + + + + + + \ No newline at end of file diff --git a/data/images/view-toggle-inactive-right.svg b/data/images/view-toggle-inactive-right.svg index 2000ece02..74e111daf 100644 --- a/data/images/view-toggle-inactive-right.svg +++ b/data/images/view-toggle-inactive-right.svg @@ -1,14 +1,18 @@ - - view-toggle-inactive-right + + Slice 1 Created with Sketch (http://www.bohemiancoding.com/sketch) - - - + + + - - + + + + + + \ No newline at end of file diff --git a/data/images/view-toggle-pressed-left.svg b/data/images/view-toggle-pressed-left.svg index 55734f01f..dc3cf8137 100644 --- a/data/images/view-toggle-pressed-left.svg +++ b/data/images/view-toggle-pressed-left.svg @@ -1,16 +1,18 @@ - - view-toggle-pressed-left + + Slice 1 Created with Sketch (http://www.bohemiancoding.com/sketch) - - - + + + - - - - + + + + + + \ No newline at end of file diff --git a/resources.qrc b/resources.qrc index 6bec00ecb..23d22bcd0 100644 --- a/resources.qrc +++ b/resources.qrc @@ -157,5 +157,6 @@ data/fonts/TitilliumWeb-Bold.ttf data/fonts/TitilliumWeb-Regular.ttf data/fonts/FaunaOne-Regular.ttf + data/fonts/PathwayGothicOne-Regular.ttf diff --git a/src/libtomahawk/widgets/BasicHeader.cpp b/src/libtomahawk/widgets/BasicHeader.cpp index be6c41a81..bdc206b5e 100644 --- a/src/libtomahawk/widgets/BasicHeader.cpp +++ b/src/libtomahawk/widgets/BasicHeader.cpp @@ -67,13 +67,16 @@ BasicHeader::BasicHeader( QWidget* parent ) m_descriptionLabel->setPalette( pal ); QFont font = m_captionLabel->font(); - font.setPointSize( TomahawkUtils::defaultFontSize() + 4 ); + + font.setPointSize( TomahawkUtils::defaultFontSize() + 10 ); font.setBold( true ); + font.setFamily( "Titillium Web" ); + m_captionLabel->setFont( font ); m_captionLabel->setElideMode( Qt::ElideRight ); m_captionLabel->setAlignment( Qt::AlignTop | Qt::AlignLeft ); - font.setPointSize( TomahawkUtils::defaultFontSize() + 1 ); + font.setPointSize( TomahawkUtils::defaultFontSize() + 2 ); font.setBold( false ); m_descriptionLabel->setFont( font ); m_descriptionLabel->setAlignment( Qt::AlignTop | Qt::AlignLeft ); diff --git a/src/libtomahawk/widgets/Dashboard.cpp b/src/libtomahawk/widgets/Dashboard.cpp index f6ab17bcf..5baecf1ed 100644 --- a/src/libtomahawk/widgets/Dashboard.cpp +++ b/src/libtomahawk/widgets/Dashboard.cpp @@ -122,7 +122,7 @@ Dashboard::Dashboard( QWidget* parent ) { QFont f = ui->label->font(); - f.setFamily( "Fauna One" ); + f.setFamily( "Pathway Gothic One" ); QPalette p = ui->label->palette(); p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION ); @@ -135,7 +135,7 @@ Dashboard::Dashboard( QWidget* parent ) { QFont f = ui->playlistLabel->font(); - f.setFamily( "Fauna One" ); + f.setFamily( "Pathway Gothic One" ); QPalette p = ui->playlistLabel->palette(); p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT ); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index d7021d84a..9ca56c6dc 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -171,7 +171,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* { QFont f = ui->label->font(); - f.setFamily( "Fauna One" ); + f.setFamily( "Pathway Gothic One" ); QPalette p = ui->label->palette(); p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION ); @@ -184,8 +184,8 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* { QFont f = ui->albumLabel->font(); - f.setFamily( "Fauna One" ); - + f.setFamily( "Pathway Gothic One" ); + QPalette p = ui->albumLabel->palette(); p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT ); diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp index 9eec9f44a..611578ebd 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp @@ -118,7 +118,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par { QFont f = ui->label->font(); - f.setFamily( "Fauna One" ); + f.setFamily( "Pathway Gothic One" ); QPalette p = ui->label->palette(); p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION );