mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Removed Titillium Web and Pathway Gothic One fonts.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-10-12 13:02:46 +02:00
parent 0af3478a41
commit f2e3efcbd6
15 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/fonts/PathwayGothicOne-Regular.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-Black.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-Bold.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-BoldItalic.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-ExtraLight.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-ExtraLightItalic.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-Italic.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-Light.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-LightItalic.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-Regular.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-SemiBold.ttf
View File

Binary file not shown.

BIN
data/fonts/TitilliumWeb-SemiBoldItalic.ttf
View File

Binary file not shown.

3
resources.qrc
View File

@@ -114,9 +114,6 @@
<file>data/images/network-activity.svg</file> <file>data/images/network-activity.svg</file>
<file>data/images/play.svg</file> <file>data/images/play.svg</file>
<file>data/images/pause.svg</file> <file>data/images/pause.svg</file>
<file>data/fonts/TitilliumWeb-Bold.ttf</file>
<file>data/fonts/TitilliumWeb-Regular.ttf</file>
<file>data/fonts/PathwayGothicOne-Regular.ttf</file>
<file>data/fonts/Roboto-Bold.ttf</file> <file>data/fonts/Roboto-Bold.ttf</file>
<file>data/fonts/Roboto-Medium.ttf</file> <file>data/fonts/Roboto-Medium.ttf</file>
<file>data/fonts/Roboto-Regular.ttf</file> <file>data/fonts/Roboto-Regular.ttf</file>

2
src/tomahawk/widgets/SplashWidget.cpp
View File

@@ -55,7 +55,7 @@ SplashWidget::SplashWidget()
font.setPointSize( TomahawkUtils::defaultFontSize() - 1 ); font.setPointSize( TomahawkUtils::defaultFontSize() - 1 );
font.setBold( true ); font.setBold( true );
font.setFamily( "Titillium Web" ); font.setFamily( "Roboto" );
setFont( font ); setFont( font );
} }

6
src/viewpages/networkactivity/NetworkActivityWidget.cpp
View File

@@ -145,7 +145,7 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
} }
{ {
QFont f = d->ui->trendingTracksLabel->font(); QFont f = d->ui->trendingTracksLabel->font();
f.setFamily( "Pathway Gothic One" ); f.setFamily( "Roboto" );
QPalette p = d->ui->trendingTracksLabel->palette(); QPalette p = d->ui->trendingTracksLabel->palette();
p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION ); p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION );
@@ -159,7 +159,7 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
TomahawkStyle::stylePageFrame( d->ui->playlistsFrame ); TomahawkStyle::stylePageFrame( d->ui->playlistsFrame );
QFont f = d->ui->hotPlaylistsLabel->font(); QFont f = d->ui->hotPlaylistsLabel->font();
f.setFamily( "Pathway Gothic One" ); f.setFamily( "Roboto" );
QPalette p = d->ui->hotPlaylistsLabel->palette(); QPalette p = d->ui->hotPlaylistsLabel->palette();
p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION ); p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION );
@@ -205,7 +205,7 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
} }
{ {
QFont f = d->ui->trendingArtistsLabel->font(); QFont f = d->ui->trendingArtistsLabel->font();
f.setFamily( "Pathway Gothic One" ); f.setFamily( "Roboto" );
QPalette p = d->ui->trendingArtistsLabel->palette(); QPalette p = d->ui->trendingArtistsLabel->palette();
p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION ); p.setColor( QPalette::Foreground, TomahawkStyle::PAGE_CAPTION );