From 76ccd71c51feeb49232021b260c76278bec468ff Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 3 Aug 2012 19:10:06 +0200 Subject: [PATCH] decrease font sizes by 1 point --- src/libtomahawk/playlist/FlexibleHeader.cpp | 4 ++-- .../playlist/PlaylistChartItemDelegate.cpp | 18 +++++++++--------- .../playlist/PlaylistLargeItemDelegate.cpp | 6 +++--- src/libtomahawk/playlist/QueueView.cpp | 4 ++-- src/libtomahawk/widgets/HeaderLabel.cpp | 2 +- src/libtomahawk/widgets/WelcomeWidget.cpp | 12 ++++++------ .../widgets/infowidgets/ArtistInfoWidget.cpp | 2 +- src/sourcetree/SourceDelegate.cpp | 10 +++++----- src/sourcetree/SourceTreeView.cpp | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/libtomahawk/playlist/FlexibleHeader.cpp b/src/libtomahawk/playlist/FlexibleHeader.cpp index 7b9ab749a..c24c75d2c 100644 --- a/src/libtomahawk/playlist/FlexibleHeader.cpp +++ b/src/libtomahawk/playlist/FlexibleHeader.cpp @@ -51,11 +51,11 @@ FlexibleHeader::FlexibleHeader( FlexibleView* parent ) ui->descLabel->setPalette( pal ); QFont font = ui->captionLabel->font(); - font.setPointSize( 14 ); + font.setPointSize( 13 ); font.setBold( true ); ui->captionLabel->setFont( font ); - font.setPointSize( 9 ); + font.setPointSize( 8 ); ui->descLabel->setFont( font ); ui->radioNormal->setFocusPolicy( Qt::NoFocus ); diff --git a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp index b0300e2e0..d97ff6fb4 100644 --- a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp @@ -157,19 +157,19 @@ PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& } QFont figureFont = opt.font; - figureFont.setPointSize( 16 ); + figureFont.setPointSize( 17 ); figureFont.setWeight( 99 ); QFont boldFont = opt.font; - boldFont.setPointSize( 13 ); + boldFont.setPointSize( 12 ); boldFont.setWeight( 99 ); QFont smallBoldFont = opt.font; - smallBoldFont.setPointSize( 10 ); + smallBoldFont.setPointSize( 9 ); smallBoldFont.setWeight( 60 ); QFont durationFont = opt.font; - durationFont.setPointSize( 10 ); + durationFont.setPointSize( 9 ); durationFont.setWeight( 80 ); QFontMetrics durationFontMetrics( durationFont ); @@ -183,18 +183,18 @@ PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& { figureFont.setPointSize( 28 ); boldFont.setPointSize( 20 ); - smallBoldFont.setPointSize( 16 ); + smallBoldFont.setPointSize( 15 ); } else if ( index.row() == 2 ) { figureFont.setPointSize( 20 ); - boldFont.setPointSize( 16 ); - smallBoldFont.setPointSize( 12 ); + boldFont.setPointSize( 15 ); + smallBoldFont.setPointSize( 11 ); } else if ( index.row() >= 10 ) { - boldFont.setPointSize( 10 ); - smallBoldFont.setPointSize( 9 ); + boldFont.setPointSize( 9 ); + smallBoldFont.setPointSize( 8 ); } QRect figureRect = r.adjusted( 0, 0, -option.rect.width() + 60 - 6 + r.left(), 0 ); diff --git a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp index fd5620954..921091b2a 100644 --- a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp @@ -205,18 +205,18 @@ PlaylistLargeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& painter->drawPixmap( avatarRect, avatar ); QFont boldFont = opt.font; - boldFont.setPointSize( 12 ); + boldFont.setPointSize( 11 ); boldFont.setWeight( 99 ); QFontMetrics boldFontMetrics( boldFont ); QFont smallBoldFont = opt.font; - smallBoldFont.setPointSize( 9 ); + smallBoldFont.setPointSize( 8 ); smallBoldFont.setBold( true ); smallBoldFont.setWeight( 60 ); QFontMetrics smallBoldFontMetrics( smallBoldFont ); QFont smallFont = opt.font; - smallFont.setPointSize( 8 ); + smallFont.setPointSize( 7 ); r.adjust( pixmapRect.width() + 12, 1, -28 - avatar.width(), 0 ); QRect leftRect = r.adjusted( 0, 0, -48, 0 ); diff --git a/src/libtomahawk/playlist/QueueView.cpp b/src/libtomahawk/playlist/QueueView.cpp index 534950f9d..88038e745 100644 --- a/src/libtomahawk/playlist/QueueView.cpp +++ b/src/libtomahawk/playlist/QueueView.cpp @@ -42,9 +42,9 @@ QueueView::QueueView( AnimatedSplitter* parent ) setContentsMargins( 0, 0, 0, 0 ); QFont f; - f.setPointSize( 10 ); + f.setPointSize( 9 ); QFontMetrics fm( f ); - setHiddenSize( QSize( 0, fm.height() * 1.1 ) ); + setHiddenSize( QSize( 0, fm.height() * 1.2 ) ); ui->queue->setProxyModel( new QueueProxyModel( ui->queue ) ); ui->queue->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored ); diff --git a/src/libtomahawk/widgets/HeaderLabel.cpp b/src/libtomahawk/widgets/HeaderLabel.cpp index 4f9ef3ca2..355ece9d8 100644 --- a/src/libtomahawk/widgets/HeaderLabel.cpp +++ b/src/libtomahawk/widgets/HeaderLabel.cpp @@ -26,7 +26,7 @@ #include "utils/StyleHelper.h" #include "utils/TomahawkUtilsGui.h" -static const int s_defaultFontSize = 10; +static const int s_defaultFontSize = 9; HeaderLabel::HeaderLabel( QWidget* parent ) diff --git a/src/libtomahawk/widgets/WelcomeWidget.cpp b/src/libtomahawk/widgets/WelcomeWidget.cpp index 896cc3523..4b4c5679c 100644 --- a/src/libtomahawk/widgets/WelcomeWidget.cpp +++ b/src/libtomahawk/widgets/WelcomeWidget.cpp @@ -123,7 +123,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent ) m_tracksModel->setSource( source_ptr() ); QFont f; - f.setPointSize( 10 ); + f.setPointSize( 9 ); f.setBold( true ); QFontMetrics fm( f ); ui->tracksView->setMinimumWidth( fm.width( tr("Recently played tracks") ) * 2 ); @@ -257,9 +257,9 @@ PlaylistDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelInde int height = 2 * 6; // margins QFont font = option.font; QFontMetrics fm1( font ); - font.setPointSize( 9 ); + font.setPointSize( 8 ); height += fm1.height() * 3; - font.setPointSize( 12 ); + font.setPointSize( 9 ); QFontMetrics fm2( font ); height += fm2.height(); @@ -286,15 +286,15 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, QTextOption to; to.setAlignment( Qt::AlignCenter ); QFont font = opt.font; - font.setPointSize( 9 ); + font.setPointSize( 8 ); QFont boldFont = font; boldFont.setBold( true ); - boldFont.setPointSize( 10 ); + boldFont.setPointSize( 9 ); QFontMetrics boldFontMetrics( boldFont ); QFont figFont = boldFont; - figFont.setPointSize( 9 ); + figFont.setPointSize( 8 ); QPixmap icon; RecentlyPlayedPlaylistsModel::PlaylistTypes type = (RecentlyPlayedPlaylistsModel::PlaylistTypes)index.data( RecentlyPlayedPlaylistsModel::PlaylistTypeRole ).toInt(); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 0265b2c5a..b3096eff6 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -104,7 +104,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* QFont f = font(); f.setBold( true ); - f.setPointSize( 15 ); + f.setPointSize( 14 ); ui->artistLabel->setFont( f ); QPalette p = ui->biography->palette(); diff --git a/src/sourcetree/SourceDelegate.cpp b/src/sourcetree/SourceDelegate.cpp index e4c0cbb54..90d91aa15 100644 --- a/src/sourcetree/SourceDelegate.cpp +++ b/src/sourcetree/SourceDelegate.cpp @@ -165,7 +165,7 @@ SourceDelegate::paintCollection( QPainter* painter, const QStyleOptionViewItem& QFont figFont = bold; figFont.setFamily( "Arial Bold" ); figFont.setWeight( QFont::Black ); - figFont.setPointSize( 8 ); + figFont.setPointSize( 7 ); SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >(); SourceItem* colItem = qobject_cast< SourceItem* >( item ); @@ -300,7 +300,7 @@ SourceDelegate::paintCategory( QPainter* painter, const QStyleOptionViewItem& op text = tr( "Hide" ); QFont font = painter->font(); - font.setPointSize( 9 ); + font.setPointSize( 8 ); font.setBold( true ); painter->setFont( font ); QTextOption to( Qt::AlignVCenter | Qt::AlignRight ); @@ -318,7 +318,7 @@ void SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const { QFont font = painter->font(); - font.setPointSize( 10 ); + font.setPointSize( 9 ); font.setBold( true ); painter->setFont( font ); @@ -364,7 +364,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co painter->save(); QFont font = painter->font(); - font.setPointSize( 9 ); + font.setPointSize( 8 ); painter->setFont( font ); o.font = font; o3.font = font; @@ -464,7 +464,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co QFont font = painter->font(); - font.setPointSize( 8 ); + font.setPointSize( 7 ); painter->setFont( font ); QFont fontBold = painter->font(); fontBold.setBold( true ); diff --git a/src/sourcetree/SourceTreeView.cpp b/src/sourcetree/SourceTreeView.cpp index 58b75f69b..deda27b5e 100644 --- a/src/sourcetree/SourceTreeView.cpp +++ b/src/sourcetree/SourceTreeView.cpp @@ -69,7 +69,7 @@ SourceTreeView::SourceTreeView( QWidget* parent ) setContentsMargins( 0, 0, 0, 0 ); QFont dummyFont; - dummyFont.setPointSize( 10 ); + dummyFont.setPointSize( 9 ); QFontMetrics fm( dummyFont ); // This is sort of the longest string in there. With translations // we will never get it right so setting it to something reasonable for the average case