mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-05 13:47:26 +02:00
decrease font sizes by 1 point
This commit is contained in:
@@ -51,11 +51,11 @@ FlexibleHeader::FlexibleHeader( FlexibleView* parent )
|
|||||||
ui->descLabel->setPalette( pal );
|
ui->descLabel->setPalette( pal );
|
||||||
|
|
||||||
QFont font = ui->captionLabel->font();
|
QFont font = ui->captionLabel->font();
|
||||||
font.setPointSize( 14 );
|
font.setPointSize( 13 );
|
||||||
font.setBold( true );
|
font.setBold( true );
|
||||||
ui->captionLabel->setFont( font );
|
ui->captionLabel->setFont( font );
|
||||||
|
|
||||||
font.setPointSize( 9 );
|
font.setPointSize( 8 );
|
||||||
ui->descLabel->setFont( font );
|
ui->descLabel->setFont( font );
|
||||||
|
|
||||||
ui->radioNormal->setFocusPolicy( Qt::NoFocus );
|
ui->radioNormal->setFocusPolicy( Qt::NoFocus );
|
||||||
|
@@ -157,19 +157,19 @@ PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem&
|
|||||||
}
|
}
|
||||||
|
|
||||||
QFont figureFont = opt.font;
|
QFont figureFont = opt.font;
|
||||||
figureFont.setPointSize( 16 );
|
figureFont.setPointSize( 17 );
|
||||||
figureFont.setWeight( 99 );
|
figureFont.setWeight( 99 );
|
||||||
|
|
||||||
QFont boldFont = opt.font;
|
QFont boldFont = opt.font;
|
||||||
boldFont.setPointSize( 13 );
|
boldFont.setPointSize( 12 );
|
||||||
boldFont.setWeight( 99 );
|
boldFont.setWeight( 99 );
|
||||||
|
|
||||||
QFont smallBoldFont = opt.font;
|
QFont smallBoldFont = opt.font;
|
||||||
smallBoldFont.setPointSize( 10 );
|
smallBoldFont.setPointSize( 9 );
|
||||||
smallBoldFont.setWeight( 60 );
|
smallBoldFont.setWeight( 60 );
|
||||||
|
|
||||||
QFont durationFont = opt.font;
|
QFont durationFont = opt.font;
|
||||||
durationFont.setPointSize( 10 );
|
durationFont.setPointSize( 9 );
|
||||||
durationFont.setWeight( 80 );
|
durationFont.setWeight( 80 );
|
||||||
QFontMetrics durationFontMetrics( durationFont );
|
QFontMetrics durationFontMetrics( durationFont );
|
||||||
|
|
||||||
@@ -183,18 +183,18 @@ PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem&
|
|||||||
{
|
{
|
||||||
figureFont.setPointSize( 28 );
|
figureFont.setPointSize( 28 );
|
||||||
boldFont.setPointSize( 20 );
|
boldFont.setPointSize( 20 );
|
||||||
smallBoldFont.setPointSize( 16 );
|
smallBoldFont.setPointSize( 15 );
|
||||||
}
|
}
|
||||||
else if ( index.row() == 2 )
|
else if ( index.row() == 2 )
|
||||||
{
|
{
|
||||||
figureFont.setPointSize( 20 );
|
figureFont.setPointSize( 20 );
|
||||||
boldFont.setPointSize( 16 );
|
boldFont.setPointSize( 15 );
|
||||||
smallBoldFont.setPointSize( 12 );
|
smallBoldFont.setPointSize( 11 );
|
||||||
}
|
}
|
||||||
else if ( index.row() >= 10 )
|
else if ( index.row() >= 10 )
|
||||||
{
|
{
|
||||||
boldFont.setPointSize( 10 );
|
boldFont.setPointSize( 9 );
|
||||||
smallBoldFont.setPointSize( 9 );
|
smallBoldFont.setPointSize( 8 );
|
||||||
}
|
}
|
||||||
|
|
||||||
QRect figureRect = r.adjusted( 0, 0, -option.rect.width() + 60 - 6 + r.left(), 0 );
|
QRect figureRect = r.adjusted( 0, 0, -option.rect.width() + 60 - 6 + r.left(), 0 );
|
||||||
|
@@ -205,18 +205,18 @@ PlaylistLargeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem&
|
|||||||
painter->drawPixmap( avatarRect, avatar );
|
painter->drawPixmap( avatarRect, avatar );
|
||||||
|
|
||||||
QFont boldFont = opt.font;
|
QFont boldFont = opt.font;
|
||||||
boldFont.setPointSize( 12 );
|
boldFont.setPointSize( 11 );
|
||||||
boldFont.setWeight( 99 );
|
boldFont.setWeight( 99 );
|
||||||
QFontMetrics boldFontMetrics( boldFont );
|
QFontMetrics boldFontMetrics( boldFont );
|
||||||
|
|
||||||
QFont smallBoldFont = opt.font;
|
QFont smallBoldFont = opt.font;
|
||||||
smallBoldFont.setPointSize( 9 );
|
smallBoldFont.setPointSize( 8 );
|
||||||
smallBoldFont.setBold( true );
|
smallBoldFont.setBold( true );
|
||||||
smallBoldFont.setWeight( 60 );
|
smallBoldFont.setWeight( 60 );
|
||||||
QFontMetrics smallBoldFontMetrics( smallBoldFont );
|
QFontMetrics smallBoldFontMetrics( smallBoldFont );
|
||||||
|
|
||||||
QFont smallFont = opt.font;
|
QFont smallFont = opt.font;
|
||||||
smallFont.setPointSize( 8 );
|
smallFont.setPointSize( 7 );
|
||||||
|
|
||||||
r.adjust( pixmapRect.width() + 12, 1, -28 - avatar.width(), 0 );
|
r.adjust( pixmapRect.width() + 12, 1, -28 - avatar.width(), 0 );
|
||||||
QRect leftRect = r.adjusted( 0, 0, -48, 0 );
|
QRect leftRect = r.adjusted( 0, 0, -48, 0 );
|
||||||
|
@@ -42,9 +42,9 @@ QueueView::QueueView( AnimatedSplitter* parent )
|
|||||||
setContentsMargins( 0, 0, 0, 0 );
|
setContentsMargins( 0, 0, 0, 0 );
|
||||||
|
|
||||||
QFont f;
|
QFont f;
|
||||||
f.setPointSize( 10 );
|
f.setPointSize( 9 );
|
||||||
QFontMetrics fm( f );
|
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->setProxyModel( new QueueProxyModel( ui->queue ) );
|
||||||
ui->queue->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
|
ui->queue->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
|
||||||
|
@@ -26,7 +26,7 @@
|
|||||||
#include "utils/StyleHelper.h"
|
#include "utils/StyleHelper.h"
|
||||||
#include "utils/TomahawkUtilsGui.h"
|
#include "utils/TomahawkUtilsGui.h"
|
||||||
|
|
||||||
static const int s_defaultFontSize = 10;
|
static const int s_defaultFontSize = 9;
|
||||||
|
|
||||||
|
|
||||||
HeaderLabel::HeaderLabel( QWidget* parent )
|
HeaderLabel::HeaderLabel( QWidget* parent )
|
||||||
|
@@ -123,7 +123,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
|
|||||||
m_tracksModel->setSource( source_ptr() );
|
m_tracksModel->setSource( source_ptr() );
|
||||||
|
|
||||||
QFont f;
|
QFont f;
|
||||||
f.setPointSize( 10 );
|
f.setPointSize( 9 );
|
||||||
f.setBold( true );
|
f.setBold( true );
|
||||||
QFontMetrics fm( f );
|
QFontMetrics fm( f );
|
||||||
ui->tracksView->setMinimumWidth( fm.width( tr("Recently played tracks") ) * 2 );
|
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
|
int height = 2 * 6; // margins
|
||||||
QFont font = option.font;
|
QFont font = option.font;
|
||||||
QFontMetrics fm1( font );
|
QFontMetrics fm1( font );
|
||||||
font.setPointSize( 9 );
|
font.setPointSize( 8 );
|
||||||
height += fm1.height() * 3;
|
height += fm1.height() * 3;
|
||||||
font.setPointSize( 12 );
|
font.setPointSize( 9 );
|
||||||
QFontMetrics fm2( font );
|
QFontMetrics fm2( font );
|
||||||
height += fm2.height();
|
height += fm2.height();
|
||||||
|
|
||||||
@@ -286,15 +286,15 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
|
|||||||
QTextOption to;
|
QTextOption to;
|
||||||
to.setAlignment( Qt::AlignCenter );
|
to.setAlignment( Qt::AlignCenter );
|
||||||
QFont font = opt.font;
|
QFont font = opt.font;
|
||||||
font.setPointSize( 9 );
|
font.setPointSize( 8 );
|
||||||
|
|
||||||
QFont boldFont = font;
|
QFont boldFont = font;
|
||||||
boldFont.setBold( true );
|
boldFont.setBold( true );
|
||||||
boldFont.setPointSize( 10 );
|
boldFont.setPointSize( 9 );
|
||||||
QFontMetrics boldFontMetrics( boldFont );
|
QFontMetrics boldFontMetrics( boldFont );
|
||||||
|
|
||||||
QFont figFont = boldFont;
|
QFont figFont = boldFont;
|
||||||
figFont.setPointSize( 9 );
|
figFont.setPointSize( 8 );
|
||||||
|
|
||||||
QPixmap icon;
|
QPixmap icon;
|
||||||
RecentlyPlayedPlaylistsModel::PlaylistTypes type = (RecentlyPlayedPlaylistsModel::PlaylistTypes)index.data( RecentlyPlayedPlaylistsModel::PlaylistTypeRole ).toInt();
|
RecentlyPlayedPlaylistsModel::PlaylistTypes type = (RecentlyPlayedPlaylistsModel::PlaylistTypes)index.data( RecentlyPlayedPlaylistsModel::PlaylistTypeRole ).toInt();
|
||||||
|
@@ -104,7 +104,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
|
|||||||
|
|
||||||
QFont f = font();
|
QFont f = font();
|
||||||
f.setBold( true );
|
f.setBold( true );
|
||||||
f.setPointSize( 15 );
|
f.setPointSize( 14 );
|
||||||
ui->artistLabel->setFont( f );
|
ui->artistLabel->setFont( f );
|
||||||
|
|
||||||
QPalette p = ui->biography->palette();
|
QPalette p = ui->biography->palette();
|
||||||
|
@@ -165,7 +165,7 @@ SourceDelegate::paintCollection( QPainter* painter, const QStyleOptionViewItem&
|
|||||||
QFont figFont = bold;
|
QFont figFont = bold;
|
||||||
figFont.setFamily( "Arial Bold" );
|
figFont.setFamily( "Arial Bold" );
|
||||||
figFont.setWeight( QFont::Black );
|
figFont.setWeight( QFont::Black );
|
||||||
figFont.setPointSize( 8 );
|
figFont.setPointSize( 7 );
|
||||||
|
|
||||||
SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
|
SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
|
||||||
SourceItem* colItem = qobject_cast< SourceItem* >( item );
|
SourceItem* colItem = qobject_cast< SourceItem* >( item );
|
||||||
@@ -300,7 +300,7 @@ SourceDelegate::paintCategory( QPainter* painter, const QStyleOptionViewItem& op
|
|||||||
text = tr( "Hide" );
|
text = tr( "Hide" );
|
||||||
|
|
||||||
QFont font = painter->font();
|
QFont font = painter->font();
|
||||||
font.setPointSize( 9 );
|
font.setPointSize( 8 );
|
||||||
font.setBold( true );
|
font.setBold( true );
|
||||||
painter->setFont( font );
|
painter->setFont( font );
|
||||||
QTextOption to( Qt::AlignVCenter | Qt::AlignRight );
|
QTextOption to( Qt::AlignVCenter | Qt::AlignRight );
|
||||||
@@ -318,7 +318,7 @@ void
|
|||||||
SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
|
SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
|
||||||
{
|
{
|
||||||
QFont font = painter->font();
|
QFont font = painter->font();
|
||||||
font.setPointSize( 10 );
|
font.setPointSize( 9 );
|
||||||
font.setBold( true );
|
font.setBold( true );
|
||||||
painter->setFont( font );
|
painter->setFont( font );
|
||||||
|
|
||||||
@@ -364,7 +364,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
|
|||||||
painter->save();
|
painter->save();
|
||||||
|
|
||||||
QFont font = painter->font();
|
QFont font = painter->font();
|
||||||
font.setPointSize( 9 );
|
font.setPointSize( 8 );
|
||||||
painter->setFont( font );
|
painter->setFont( font );
|
||||||
o.font = font;
|
o.font = font;
|
||||||
o3.font = font;
|
o3.font = font;
|
||||||
@@ -464,7 +464,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
|
|||||||
|
|
||||||
QFont font = painter->font();
|
QFont font = painter->font();
|
||||||
|
|
||||||
font.setPointSize( 8 );
|
font.setPointSize( 7 );
|
||||||
painter->setFont( font );
|
painter->setFont( font );
|
||||||
QFont fontBold = painter->font();
|
QFont fontBold = painter->font();
|
||||||
fontBold.setBold( true );
|
fontBold.setBold( true );
|
||||||
|
@@ -69,7 +69,7 @@ SourceTreeView::SourceTreeView( QWidget* parent )
|
|||||||
setContentsMargins( 0, 0, 0, 0 );
|
setContentsMargins( 0, 0, 0, 0 );
|
||||||
|
|
||||||
QFont dummyFont;
|
QFont dummyFont;
|
||||||
dummyFont.setPointSize( 10 );
|
dummyFont.setPointSize( 9 );
|
||||||
QFontMetrics fm( dummyFont );
|
QFontMetrics fm( dummyFont );
|
||||||
// This is sort of the longest string in there. With translations
|
// 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
|
// we will never get it right so setting it to something reasonable for the average case
|
||||||
|
Reference in New Issue
Block a user