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

This breaks too many things: Revert "Some dashboard design tweaks"

Browse Source 
This reverts commit 22ce38adbb.
This commit is contained in:
Christian Muehlhaeuser
2013-06-20 19:42:13 +02:00
committed by Michael Zanetti
parent 42c0199f53
commit ef00f9c21a
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/utils/TomahawkStyle.h
View File

@@ -89,8 +89,6 @@ namespace TomahawkStyle
static const QColor FOOTNOTES_BACKGROUND = QColor( "#272b2e" ); static const QColor FOOTNOTES_BACKGROUND = QColor( "#272b2e" );
static const QColor DASHBOARD_ROUNDFIGURE_BACKGROUND = QColor( "#454e59" ); static const QColor DASHBOARD_ROUNDFIGURE_BACKGROUND = QColor( "#454e59" );
static const QColor DASHBOARD_ROUNDFIGURE_KNOCKOUT = QColor( "#DBDBDB" );
static const QColor DASHBOARD_ROUNDFIGURE_KNOCKOUT_TEXT = QColor( "#292F34" );
static const QColor SIDEBAR_ROUNDFIGURE_BACKGROUND = QColor( 167, 183, 211 ); static const QColor SIDEBAR_ROUNDFIGURE_BACKGROUND = QColor( 167, 183, 211 );
static const QColor SIDEBAR_ROUNDFIGURE_INBOX_BACKGROUND = QColor( 239, 140, 51 ); static const QColor SIDEBAR_ROUNDFIGURE_INBOX_BACKGROUND = QColor( 239, 140, 51 );

13
src/libtomahawk/widgets/Dashboard.cpp
View File

@@ -92,7 +92,6 @@ Dashboard::Dashboard( QWidget* parent )
ui->playlistWidget->overlay()->resize( 380, 86 ); ui->playlistWidget->overlay()->resize( 380, 86 );
ui->playlistWidget->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel ); ui->playlistWidget->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
QPalette p = ui->playlistWidget->palette(); QPalette p = ui->playlistWidget->palette();
p.setColor( QPalette::Text, TomahawkStyle::HEADER_TEXT ); p.setColor( QPalette::Text, TomahawkStyle::HEADER_TEXT );
p.setColor( QPalette::BrightText, TomahawkStyle::HEADER_TEXT ); p.setColor( QPalette::BrightText, TomahawkStyle::HEADER_TEXT );
@@ -336,17 +335,15 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
font.setPointSize( TomahawkUtils::defaultFontSize() - 1 ); font.setPointSize( TomahawkUtils::defaultFontSize() - 1 );
QFont boldFont = font; QFont boldFont = font;
boldFont.setFamily( "Titillium Web" );
boldFont.setBold( true ); boldFont.setBold( true );
boldFont.setPointSize( TomahawkUtils::defaultFontSize() + 2 ); boldFont.setPointSize( TomahawkUtils::defaultFontSize() );
QFontMetrics boldFontMetrics( boldFont ); QFontMetrics boldFontMetrics( boldFont );
QFont figFont = boldFont; QFont figFont = boldFont;
figFont.setFamily( "Titillium Web" );
figFont.setPointSize( TomahawkUtils::defaultFontSize() - 1 ); figFont.setPointSize( TomahawkUtils::defaultFontSize() - 1 );
QPixmap icon; QPixmap icon;
QRect pixmapRect = option.rect.adjusted( 10, 14, -option.rect.width() + option.rect.height() - 27, - 21 ); QRect pixmapRect = option.rect.adjusted( 10, 14, -option.rect.width() + option.rect.height() - 18, -14 );
RecentlyPlayedPlaylistsModel::PlaylistTypes type = (RecentlyPlayedPlaylistsModel::PlaylistTypes)index.data( RecentlyPlayedPlaylistsModel::PlaylistTypeRole ).toInt(); RecentlyPlayedPlaylistsModel::PlaylistTypes type = (RecentlyPlayedPlaylistsModel::PlaylistTypes)index.data( RecentlyPlayedPlaylistsModel::PlaylistTypeRole ).toInt();
if ( type == RecentlyPlayedPlaylistsModel::StaticPlaylist ) if ( type == RecentlyPlayedPlaylistsModel::StaticPlaylist )
@@ -369,11 +366,11 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
// bottom edge flush with bottom of pixmap // bottom edge flush with bottom of pixmap
QRect rect( pixmapRect.right() - width, 0, width - 8, 0 ); QRect rect( pixmapRect.right() - width, 0, width - 8, 0 );
rect.adjust( -2, 0, 0, 0 ); rect.adjust( -2, 0, 0, 0 );
rect.setTop( pixmapRect.bottom() - painter->fontMetrics().height() - 2 ); rect.setTop( pixmapRect.bottom() - painter->fontMetrics().height() - 1 );
rect.setBottom( pixmapRect.bottom() + 1 ); rect.setBottom( pixmapRect.bottom() + 1 );
QColor figColor( TomahawkStyle::DASHBOARD_ROUNDFIGURE_KNOCKOUT ); QColor figColor( TomahawkStyle::DASHBOARD_ROUNDFIGURE_BACKGROUND );
painter->setPen( TomahawkStyle::DASHBOARD_ROUNDFIGURE_KNOCKOUT_TEXT ); painter->setPen( Qt::white );
painter->setBrush( figColor ); painter->setBrush( figColor );
TomahawkUtils::drawBackgroundAndNumbers( painter, tracks, rect ); TomahawkUtils::drawBackgroundAndNumbers( painter, tracks, rect );

2
src/libtomahawk/widgets/HeaderLabel.cpp
View File

@@ -38,7 +38,7 @@ HeaderLabel::HeaderLabel( QWidget* parent )
f.setPointSize( TomahawkUtils::defaultFontSize() ); f.setPointSize( TomahawkUtils::defaultFontSize() );
setFont( f ); setFont( f );
setFixedHeight( TomahawkUtils::defaultFontHeight() * 2 ); setFixedHeight( TomahawkUtils::defaultFontHeight() * 1.4 );
setMouseTracking( true ); setMouseTracking( true );
} }