From 45c5713814798b40bad2fea6e7bdf22ebb06a2b9 Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Mon, 17 Jun 2013 12:23:55 -0400 Subject: [PATCH] Try a different label font since Fauna One wasn't so great on Windows --- data/fonts/PathwayGothicOne-Regular.ttf | Bin 0 -> 26112 bytes data/images/view-toggle-inactive-centre.svg | 18 ++++++++++------ data/images/view-toggle-inactive-right.svg | 18 ++++++++++------ data/images/view-toggle-pressed-left.svg | 20 ++++++++++-------- resources.qrc | 1 + src/libtomahawk/widgets/BasicHeader.cpp | 7 ++++-- src/libtomahawk/widgets/Dashboard.cpp | 4 ++-- .../widgets/infowidgets/ArtistInfoWidget.cpp | 6 +++--- .../widgets/infowidgets/TrackInfoWidget.cpp | 2 +- 9 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 data/fonts/PathwayGothicOne-Regular.ttf diff --git a/data/fonts/PathwayGothicOne-Regular.ttf b/data/fonts/PathwayGothicOne-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..36ae84e6b40fd6f8946a8cfe3a5fc2cd643ee763 GIT binary patch literal 26112 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 - - 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 );