mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-09-01 09:53:57 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Thierry Goeckel
2013-06-14 22:40:37 +02:00
parent 6a7d0dfd27 cdd75599e8
commit ecd1b0398d
7 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,12 +62,13 @@ namespace TomahawkStyle
static const QColor SELECTION_FOREGROUND = QColor( "#ffffff" );
static const QColor HEADER_GAUGE_HIGHLIGHT = QColor( "#7DC4FF" );
static const QColor HEADER_GAUGE_BACKGROUND = QColor( "#DBDBDB" );
static const QColor HEADER_GAUGE_TEXT = QColor( "#292f34" );
static const QColor HEADER_GAUGE_LABEL_BACKGROUND = QColor( "#DBDBDB" );
static const QColor HEADER_GAUGE_BACKGROUND = QColor( "#0B0A0A" );
static const QColor HEADER_GAUGE_TEXT = QColor( "#FFFFFF" );
static const QColor HEADER_GAUGE_LABEL_BACKGROUND = QColor( "#0B0A0A" );
static const QColor HEADER_BACKGROUND = QColor( "#292f34" );
static const QColor HEADER_TEXT = QColor( "#ffffff" );
static const QColor HEADER_LABEL = QColor( "#FFFFFF" );
static const QColor HEADER_TEXT = QColor( "#DBDBDB" );
static const QColor HEADER_LINK = QColor( "#7DC4FF" );
static const QColor HEADER_HIGHLIGHT = QColor( "#333" );
@@ -81,7 +82,7 @@ namespace TomahawkStyle
static const QColor PAGE_BACKGROUND = QColor( "#DBDBDB" );
static const QColor PAGE_TRACKLIST_TRACK_SOLVED = QColor( "#292F34" );
static const QColor PAGE_TRACKLIST_TRACK_UNRESOLVED = QColor( "#8597A6" ).lighter( 200 );
static const QColor PAGE_TRACKLIST_TRACK_UNRESOLVED = QColor( "#8597A6" ).lighter( 150 );
static const QColor PAGE_TRACKLIST_NUMBER = QColor( "#8DBF2D" ).darker( 400 );
static const QColor PAGE_TRACKLIST_HIGHLIGHT = QColor( "#292f34" );
static const QColor PAGE_TRACKLIST_HIGHLIGHT_TEXT = QColor( "#ffffff" );

1
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
View File

@@ -54,6 +54,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
m_albumsModel = new PlayableModel( ui->albums );
ui->albums->setPlayableModel( m_albumsModel );
ui->albums->setEmptyTip( tr( "Sorry, we could not find any other albums for this artist!" ) );
m_tracksModel = new TreeModel( ui->tracks );
m_tracksModel->setMode( Mixed );

8
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
View File

@@ -111,7 +111,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
QHBoxLayout* l = new QHBoxLayout( ui->statsWidget );
m_playStatsGauge = new StatsGauge( ui->statsWidget );
m_playStatsGauge->setText( tr( "# IN YOUR CHARTS" ) );
m_playStatsGauge->setText( tr( "YOUR ARTIST RANK" ) );
m_playStatsGauge->setInvertedAppearance( true );
l->addSpacerItem( new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) );
@@ -126,7 +126,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
{
QFont f = ui->biography->font();
f.setPointSize( f.pointSize() + 2 );
f.setPointSize( f.pointSize() + 4 );
f.setFamily( "Titillium Web" );
QPalette p = ui->biography->palette();
@@ -149,9 +149,11 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
{
QFont f = ui->artistLabel->font();
f.setFamily( "Titillium Web" );
f.setPointSize( TomahawkUtils::defaultFontSize() + 20 );
f.setBold( true );
QPalette p = ui->artistLabel->palette();
p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT );
p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_LABEL );
ui->artistLabel->setFont( f );
ui->artistLabel->setPalette( p );

7
src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
View File

@@ -71,9 +71,11 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
{
QFont f = ui->trackLabel->font();
f.setFamily( "Titillium Web" );
f.setPointSize( TomahawkUtils::defaultFontSize() + 20 );
f.setBold( true );
QPalette p = ui->trackLabel->palette();
p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT );
p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_LABEL );
ui->trackLabel->setFont( f );
ui->trackLabel->setPalette( p );
@@ -82,6 +84,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
{
QFont f = ui->artistLabel->font();
f.setFamily( "Titillium Web" );
f.setPointSize( TomahawkUtils::defaultFontSize() + 10 );
QPalette p = ui->artistLabel->palette();
p.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT );
@@ -145,7 +148,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
m_playStatsGauge = new StatsGauge( ui->statsWidget );
m_playStatsGauge->setText( tr( "# PLAYS / ARTIST" ) );
m_playStatsTotalGauge = new StatsGauge( ui->statsWidget );
m_playStatsTotalGauge->setText( tr( "# IN YOUR CHARTS" ) );
m_playStatsTotalGauge->setText( tr( "YOUR SONG RANK" ) );
m_playStatsTotalGauge->setInvertedAppearance( true );
l->addSpacerItem( new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) );