From b4922a5919ad4ab57aba9642545163356446d599 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 23 Aug 2014 22:30:16 +0200 Subject: [PATCH] * Calc font sizes based on default font. --- src/libtomahawk/playlist/TrackDetailView.cpp | 8 ++++---- src/libtomahawk/widgets/SearchWidget.cpp | 4 ++-- src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp | 2 +- src/tomahawk/sourcetree/SourceDelegate.cpp | 4 ++-- src/tomahawk/widgets/SplashWidget.cpp | 2 +- src/viewpages/dashboard/Dashboard.cpp | 2 +- src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libtomahawk/playlist/TrackDetailView.cpp b/src/libtomahawk/playlist/TrackDetailView.cpp index 62d5a4b19..0243619b0 100644 --- a/src/libtomahawk/playlist/TrackDetailView.cpp +++ b/src/libtomahawk/playlist/TrackDetailView.cpp @@ -57,19 +57,19 @@ TrackDetailView::TrackDetailView( QWidget* parent ) QFont f = font(); m_nameLabel = new QueryLabel( this ); - f.setPointSize( 13 ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 3 ); m_nameLabel->setFont( f ); m_dateLabel = new QLabel( this ); - f.setPointSize( 11 ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 1 ); m_dateLabel->setFont( f ); m_dateLabel->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 70% ) }" ); m_lovedIcon = new QLabel( this ); - m_lovedIcon->setFixedWidth( 12 ); + m_lovedIcon->setFixedWidth( TomahawkUtils::defaultFontSize() + 2 ); m_lovedLabel = new QLabel( this ); f.setWeight( QFont::DemiBold ); - f.setPointSize( 11 ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 1 ); m_lovedLabel->setFont( f ); m_lovedLabel->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 50% ) }" ); m_lovedIcon->setPixmap( ImageRegistry::instance()->pixmap( RESPATH "images/love.svg", QSize( m_lovedIcon->width(), m_lovedIcon->width() ) ) ); diff --git a/src/libtomahawk/widgets/SearchWidget.cpp b/src/libtomahawk/widgets/SearchWidget.cpp index de884ff39..9ca071012 100644 --- a/src/libtomahawk/widgets/SearchWidget.cpp +++ b/src/libtomahawk/widgets/SearchWidget.cpp @@ -113,7 +113,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) { QFont f = ui->topHitsMoreLabel->font(); f.setWeight( QFont::Light ); - f.setPointSize( 11 ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 1 ); ui->topHitsMoreLabel->setFont( f ); ui->artistsMoreLabel->setFont( f ); ui->albumsMoreLabel->setFont( f ); @@ -126,7 +126,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent ) { QFont f = uiHeader->artistLabel->font(); f.setBold( true ); - f.setPointSize( 16 ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 6 ); QPalette p = uiHeader->artistLabel->palette(); p.setColor( QPalette::Foreground, Qt::white ); diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 157091eca..c3ca19a24 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -67,7 +67,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par { QFont f = uiHeader->artistLabel->font(); f.setBold( true ); - f.setPointSize( 16 ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 6 ); QPalette p = uiHeader->artistLabel->palette(); p.setColor( QPalette::Foreground, Qt::white ); diff --git a/src/tomahawk/sourcetree/SourceDelegate.cpp b/src/tomahawk/sourcetree/SourceDelegate.cpp index 99e5deec5..38e9df0d7 100644 --- a/src/tomahawk/sourcetree/SourceDelegate.cpp +++ b/src/tomahawk/sourcetree/SourceDelegate.cpp @@ -416,7 +416,7 @@ SourceDelegate::paintCategory( QPainter* painter, const QStyleOptionViewItem& op painter->save(); QFont font = painter->font(); - font.setPointSize( 9 ); + font.setPointSize( TomahawkUtils::defaultFontSize() - 1 ); painter->setFont( font ); QTextOption to( Qt::AlignVCenter ); @@ -450,7 +450,7 @@ SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& optio painter->save(); QFont font = painter->font(); - font.setPointSize( 9 ); + font.setPointSize( TomahawkUtils::defaultFontSize() - 1 ); painter->setFont( font ); QTextOption to( Qt::AlignBottom ); diff --git a/src/tomahawk/widgets/SplashWidget.cpp b/src/tomahawk/widgets/SplashWidget.cpp index 4481c8d11..f75420f05 100644 --- a/src/tomahawk/widgets/SplashWidget.cpp +++ b/src/tomahawk/widgets/SplashWidget.cpp @@ -53,7 +53,7 @@ SplashWidget::SplashWidget() QFont font = this->font(); - font.setPointSize( 9 ); + font.setPointSize( TomahawkUtils::defaultFontSize() - 1 ); font.setBold( true ); font.setFamily( "Titillium Web" ); setFont( font ); diff --git a/src/viewpages/dashboard/Dashboard.cpp b/src/viewpages/dashboard/Dashboard.cpp index 89f5d1cbf..036d69654 100644 --- a/src/viewpages/dashboard/Dashboard.cpp +++ b/src/viewpages/dashboard/Dashboard.cpp @@ -89,7 +89,7 @@ DashboardWidget::DashboardWidget( QWidget* parent ) { QFont f = uiHeader->artistLabel->font(); f.setBold( true ); - f.setPointSize( 16 ); + f.setPointSize( TomahawkUtils::defaultFontSize() + 6 ); QPalette p = uiHeader->artistLabel->palette(); p.setColor( QPalette::Foreground, Qt::white ); diff --git a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp index 61c2d2253..9ef0ae2f3 100644 --- a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp +++ b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp @@ -142,16 +142,16 @@ WhatsNewWidget_0_8::WhatsNewWidget_0_8( QWidget* parent ) { QFont font = ui->label->font(); font.setWeight( QFont::Light ); - font.setPointSize( 48 ); + font.setPointSize( TomahawkUtils::defaultFontSize() + 38 ); ui->label->setFont( font ); ui->label->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 60% ) }" ); font.setWeight( QFont::Normal ); - font.setPointSize( 11 ); + font.setPointSize( TomahawkUtils::defaultFontSize() + 1 ); ui->label_2->setFont( font ); ui->label_2->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 30% ) }" ); - font.setPointSize( 12 ); + font.setPointSize( TomahawkUtils::defaultFontSize() + 2 ); ui->label_3->setFont( font ); ui->label_3->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 65% ) }" ); ui->label_5->setFont( font );