mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-01-17 22:38:33 +01:00
Code Issues Releases Wiki Activity

A bunch of styling to the Arist Page. WIP.

Browse Source
This commit is contained in:
Jason Herskowitz 2013-06-13 19:11:27 -04:00
parent e441577776
commit 2dbd92c50f
6 changed files with 56 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/fonts/FaunaOne-Regular.ttf Normal file
View File

Binary file not shown.

45
data/images/album-placeholder-grid.svg
View File

@ -1,21 +1,44 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="400px" height="400px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<svg width="355px" height="355px" viewBox="0 0 355 355" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<title>album-placeholder-grid</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs>
<radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="70.6690133%" id="radialGradient-1">
<stop stop-color="rgb(187,190,185)" offset="0%"></stop>
<stop stop-color="rgb(213,211,209)" offset="0.923389476%"></stop>
<stop stop-color="rgb(241,240,240)" offset="100%"></stop>
<stop stop-color="#BBBFBA" offset="0%"></stop>
<stop stop-color="#D6D4D2" offset="0.923389476%"></stop>
<stop stop-color="#F2F1F1" offset="100%"></stop>
</radialGradient>
<path d="M201,260 C234.137087,260 261,233.137087 261,200 C261,166.862913 234.137087,140 201,140 C167.862913,140 141,166.862913 141,200 C141,233.137087 167.862913,260 201,260 Z M200.5,377 C102.469452,377 23,297.530548 23,199.5 C23,101.469452 102.469452,22 200.5,22 C298.530548,22 378,101.469452 378,199.5 C378,297.530548 298.530548,377 200.5,377 Z M200.5,377" id="path-2"></path>
<filter x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" id="filter-2">
<feMorphology radius="2" in="SourceAlpha" operator="dilate" result="shadowSpreadInner1"></feMorphology>
<feOffset dx="0" dy="1" in="shadowSpreadInner1" result="shadowOffsetInner1"></feOffset>
<feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"></feGaussianBlur>
<feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
<feColorMatrix values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"></feColorMatrix>
<feMerge>
<feMergeNode in="SourceGraphic"></feMergeNode>
<feMergeNode in="shadowMatrixInner1"></feMergeNode>
</feMerge>
</filter>
<path d="M178,238 C211.137087,238 238,211.137087 238,178 C238,144.862913 211.137087,118 178,118 C144.862913,118 118,144.862913 118,178 C118,211.137087 144.862913,238 178,238 Z M177.5,355 C79.4694521,355 0,275.530548 0,177.5 C0,79.4694521 79.4694521,0 177.5,0 C275.530548,0 355,79.4694521 355,177.5 C355,275.530548 275.530548,355 177.5,355 Z M177.5,355" id="path-3"></path>
<filter x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" id="filter-4">
<feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"></feOffset>
<feGaussianBlur stdDeviation="1.5" in="shadowOffsetInner1" result="shadowBlurInner1"></feGaussianBlur>
<feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.7 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"></feColorMatrix>
<feMerge>
<feMergeNode in="SourceGraphic"></feMergeNode>
<feMergeNode in="shadowMatrixInner1"></feMergeNode>
</feMerge>
</filter>
</defs>
<g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
<path d="M0,0 L0,400 L400,400 L400,0 L0,0 Z M0,0" id="Rectangle 1" fill="rgb(0,0,0)"></path>
<g id="Group">
<use id="Oval 1" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
<use id="Oval 1-1" stroke="none" fill="none" xlink:href="#path-2"></use>
<path d="M201,260 C167.862913,260 141,233.137087 141,200 C141,166.862913 167.862913,140 201,140 C234.137087,140 261,166.862913 261,200 C261,233.137087 234.137087,260 201,260 Z M201.5,226 C216.135547,226 228,214.359404 228,200 C228,185.640596 216.135547,174 201.5,174 C186.864453,174 175,185.640596 175,200 C175,214.359404 186.864453,226 201.5,226 Z M201.5,226" id="Oval 2" stroke="rgb(150,150,150)" stroke-width="1" fill="rgb(137,137,137)"></path>
<g id="Page 1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<rect d="M-23,-22 L-23,378 L377,378 L377,-22 L-23,-22 Z M-23,-22" id="Rectangle 1" sketch:type="MSShapeGroup" x="-23" y="-22" width="400" height="400"></rect>
<g id="Group" sketch:type="MSLayerGroup">
<g id="Oval 1" filter="url(#filter-2)">
<use fill="url(#radialGradient-1)" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-3"></use>
<use fill="none" xlink:href="#path-3"></use>
</g>
<path d="M178,238 C144.862913,238 118,211.137087 118,178 C118,144.862913 144.862913,118 178,118 C211.137087,118 238,144.862913 238,178 C238,211.137087 211.137087,238 178,238 Z M178.5,204 C193.135547,204 205,192.359404 205,178 C205,163.640596 193.135547,152 178.5,152 C163.864453,152 152,163.640596 152,178 C152,192.359404 163.864453,204 178.5,204 Z M178.5,204" id="Oval 2" stroke="#979797" fill="#898989" filter="url(#filter-4)" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

16
data/images/artist-placeholder-grid.svg
View File

@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<title>artist-placeholder-grid</title>
<title>Slice 1</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs>
<g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
<g id="artist-placeholder" fill="rgb(0,0,0)">
<g id="Page 1" fill="rgb(214,215,214)">
<path d="M0,200 L200,200 L200,0 L0,0 L0,200 Z M0,200" id="Rectangle 4" fill="rgb(0,0,0)"></path>
<path d="M187,78 C187,76 185,74 182,74 L125,73 L107,16 C106,14 104,13 102,13 C99,13 98,14 97,16 L78,73 L21,74 C19,74 17,76 16,78 C16,80 16,83 18,84 L63,120 L47,178 C46,180 47,182 49,184 C51,185 53,185 55,184 L102,149 L149,184 C149,184 150,185 152,185 C153,185 154,184 155,184 C156,182 157,180 156,178 L140,120 L185,84 C187,83 188,80 187,78 C187,78 188,80 187,78 L187,78 M131,114 C129,115 128,117 129,120 L142,166 L105,138 C103,137 101,137 99,138 L61,166 L74,120 C75,117 74,115 73,114 L36,85 L82,84 C84,84 86,82 87,80 L102,34 L117,80 C117,82 119,84 122,84 L167,85 L131,114" id="Shape" fill="rgb(254,254,254)"></path>
<g id="Page 1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="artist-placeholder-grid" sketch:type="MSLayerGroup" transform="translate(-1.000000, 0.000000)">
<g id="Page 1" sketch:type="MSShapeGroup">
<g id="artist-placeholder">
<g id="Page 1">
<path d="M0,200 L200,200 L200,0 L0,0 L0,200 L0,200 Z M0,200" id="Rectangle 4"></path>
<path d="M187,78 C187,76 185,74 182,74 L125,73 L107,16 C106,14 104,13 102,13 C99,13 98,14 97,16 L78,73 L21,74 C19,74 17,76 16,78 C16,80 16,83 18,84 L63,120 L47,178 C46,180 47,182 49,184 C51,185 53,185 55,184 L102,149 L149,184 C149,184 150,185 152,185 C153,185 154,184 155,184 C156,182 157,180 156,178 L140,120 L185,84 C187,83 188,80 187,78 C187,78 188,80 187,78 L187,78 M131,114 C129,115 128,117 129,120 L142,166 L105,138 C103,137 101,137 99,138 L61,166 L74,120 C75,117 74,115 73,114 L36,85 L82,84 C84,84 86,82 87,80 L102,34 L117,80 C117,82 119,84 122,84 L167,85 L131,114" id="Shape" fill="#9B9B9B"></path>
</g>
</g>
</g>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

1
resources.qrc
View File

@ -155,5 +155,6 @@
<file>data/images/inbox-512x512.png</file>
<file>data/images/network-activity.svg</file>
<file>data/fonts/TitilliumWeb-Bold.ttf</file>
<file>data/fonts/FaunaOne-Regular.ttf</file>
</qresource>
</RCC>

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

@ -61,15 +61,15 @@ namespace TomahawkStyle
static const QColor SELECTION_BACKGROUND = QColor( "#962c26" );
static const QColor SELECTION_FOREGROUND = QColor( "#ffffff" );
static const QColor HEADER_UPPER = QColor( "#25292c" );
static const QColor HEADER_LOWER = QColor( "#1e1e1e" );
static const QColor HEADER_TEXT = QColor( "#eaeaea" );
static const QColor HEADER_UPPER = QColor( "#292f34" );
static const QColor HEADER_LOWER = QColor( "#292f34" );
static const QColor HEADER_TEXT = QColor( "#ffffff" );
static const QColor HEADER_HIGHLIGHT = QColor( "#333" );
static const QColor PAGE_TEXT = Qt::gray;
static const QColor PAGE_TEXT = QColor( "#ABCCE8" );
static const QColor PAGE_ITEM_BACKGROUND = QColor( "#1e1e1e" ).lighter( 290 );
static const QColor PAGE_FOREGROUND = QColor( "#ffffff" );
static const QColor PAGE_BACKGROUND = QColor( "#1e1e1e" ).lighter();
static const QColor PAGE_FOREGROUND = QColor( "#292f34" );
static const QColor PAGE_BACKGROUND = QColor( "#DBDBDB" );
static const QColor FOOTNOTES_BACKGROUND = QColor( "#272b2e" );
static const QColor DASHBOARD_ROUNDFIGURE_BACKGROUND = QColor( "#454e59" );

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

@ -98,7 +98,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
QPalette trackViewPal = ui->topHits->palette();
trackViewPal.setColor( QPalette::Foreground, TomahawkStyle::PAGE_FOREGROUND );
trackViewPal.setColor( QPalette::Text, TomahawkStyle::PAGE_FOREGROUND );
trackViewPal.setColor( QPalette::Highlight, QColor( "#252020" ) );
trackViewPal.setColor( QPalette::Highlight, QColor( "#292f34" ) );
trackViewPal.setColor( QPalette::HighlightedText, Qt::white );
ui->topHits->setPalette( trackViewPal );
ui->topHits->setAlternatingRowColors( false );
@ -121,7 +121,8 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
ui->cover->setShowText( false );
QFont f = font();
f.setPointSize( f.pointSize() + 3 );
f.setPointSize( f.pointSize() + 1 );
f.setFamily( "Fauna One" );
ui->biography->setOpenLinks( false );
ui->biography->setOpenExternalLinks( true );
ui->biography->setFrameShape( QFrame::NoFrame );
@ -140,8 +141,8 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
ui->label_3->setPalette( p );
QFont font = ui->label->font();
font.setBold( true );
font.setFamily( "Titillium Web" );
font.setBold( false );
font.setFamily( "Fauna One" );
ui->label->setFont( font );
ui->label_2->setFont( font );
ui->label_3->setFont( font );