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

Shuffle One vs Shuffle All. Shuffle All icon needs a bit more cleanup.

Browse Source
This commit is contained in:
Jason Herskowitz 2015-02-02 20:20:21 -05:00
parent 053390eb5a
commit 80426a1739
5 changed files with 43 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/images/repeat-all.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" 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>Slice 1</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="repeat_all_a" sketch:type="MSLayerGroup" fill="#000000">
<g id="Group" sketch:type="MSShapeGroup">
<path d="M15.7,7.3 C15.7,6.4 15.4,5.5 15.1,4.7 L14.3,5 C14.6,5.7 14.8,6.4 14.8,7.2 C14.9,10.2 13,12.8 10.2,13.6 L10.6,12.9 L9.8,12.5 L8.7,14.5 L10.7,15.6 L11.1,14.8 L10.4,14.4 C13.6,13.7 15.9,10.8 15.7,7.3 L15.7,7.3 Z" id="Shape"></path>
<path d="M2.1,7.9 C2.1,7.4 2.1,7 2.2,6.5 L2.6,7.1 L3.3,6.6 L2,4.8 L0.1,6 L0.6,6.7 L1.3,6.3 C1.2,6.8 1.1,7.4 1.1,8 C1.2,11.3 3.6,14 6.6,14.7 L6.8,13.8 C4.2,13.1 2.2,10.8 2.1,7.9 L2.1,7.9 Z" id="Shape"></path>
<path d="M11.1,2.3 L11.2,3.2 L13.5,2.8 L13.1,0.5 L12.2,0.6 L12.3,1.4 C11.1,0.6 9.8,0.2 8.3,0.2 L8,0.2 C6.1,0.4 4.2,1.4 3,2.8 L3.7,3.4 C4.8,2.1 6.4,1.3 8.2,1.2 L8.5,1.2 C9.7,1.2 10.9,1.6 11.9,2.2 L11.1,2.3 L11.1,2.3 Z" id="Shape"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

11
data/images/repeat-one.svg Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="15px" height="15px" viewBox="0 0 15 15" 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>Slice 1</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="repeat_one_a" sketch:type="MSLayerGroup" fill="#000000">
<path d="M14.1,4.7 L13.3,5 C13.6,5.7 13.8,6.4 13.8,7.2 C14,10.7 11.2,13.7 7.7,13.9 L7.4,13.9 C4,14 1.2,11.3 1.1,7.9 C0.9,4.4 3.6,1.4 7.2,1.2 L7.5,1.2 C8.7,1.2 9.9,1.6 10.9,2.2 L10.2,2.3 L10.3,3.2 L12.6,2.8 L12.2,0.5 L11.3,0.6 L11.4,1.4 C10.2,0.6 8.9,0.2 7.4,0.2 L7.1,0.2 C3.1,0.5 1.77635684e-15,3.9 0.1,8 C0.3,11.9 3.5,15 7.4,15 L7.7,15 C11.7,14.8 14.8,11.4 14.7,7.4 C14.7,6.4 14.5,5.5 14.1,4.7 L14.1,4.7 Z" id="Shape" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

109
data/images/repeat.svg
View File

@ -1,98 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px"
height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
<g id="Layer_2">
</g>
<g id="Layer_3">
</g>
<g id="Layer_4">
</g>
<g id="Layer_5">
</g>
<g id="Layer_6">
</g>
<g id="Layer_8">
</g>
<g id="Layer_9">
</g>
<g id="Layer_10">
</g>
<g id="Layer_11">
</g>
<g id="Layer_12">
<g>
<path d="M8,16c-1.3,0-2.7-0.3-3.8-1c-0.8-0.4-1.4-0.9-2-1.6c-0.5-0.5-0.9-1.1-1.3-1.8C0.3,10.5,0,9.3,0,8c0-4.4,3.6-8,8-8
c1.1,0,2.1,0.2,3,0.6l-0.4,0.9C9.8,1.2,8.9,1,8,1C4.1,1,1,4.1,1,8c0,1.1,0.3,2.2,0.8,3.2c0.3,0.6,0.7,1.1,1.1,1.6
c0.5,0.5,1.1,1,1.8,1.4C5.7,14.7,6.8,15,8,15c3.9,0,7-3.1,7-7c0-1-0.2-2-0.6-2.9l0.9-0.4C15.8,5.7,16,6.8,16,8
C16,12.4,12.4,16,8,16z"/>
</g>
</g>
<g id="Layer_13">
</g>
<g id="Layer_14">
</g>
<g id="Layer_15">
</g>
<g id="Layer_16">
</g>
<g id="Layer_17">
</g>
<g id="Layer_18">
</g>
<g id="Layer_19">
</g>
<g id="Layer_20">
</g>
<g id="Layer_21">
</g>
<g id="Layer_24">
</g>
<g id="Layer_25">
</g>
<g id="Layer_26">
</g>
<g id="Layer_27">
</g>
<g id="Layer_28">
</g>
<g id="Layer_29">
</g>
<g id="Layer_47">
</g>
<g id="Layer_30">
</g>
<g id="Layer_31">
</g>
<g id="Layer_32">
</g>
<g id="Layer_33">
</g>
<g id="Layer_34">
</g>
<g id="Layer_35">
</g>
<g id="Layer_36">
</g>
<g id="Layer_37">
</g>
<g id="Layer_38">
</g>
<g id="Layer_39">
</g>
<g id="Layer_40">
</g>
<g id="Layer_41">
</g>
<g id="Layer_42">
</g>
<g id="Layer_43">
</g>
<g id="Layer_44">
</g>
<g id="Layer_45">
</g>
<g id="Layer_46">
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="15px" height="15px" viewBox="0 0 15 15" 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>Slice 1</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="repeat_no_a" sketch:type="MSLayerGroup" fill="#000000">
<path d="M13.3,5.1 C13.6,5.8 13.8,6.5 13.8,7.3 C14,10.8 11.2,13.8 7.7,14 L7.4,14 C4,14 1.2,11.3 1.1,7.9 C0.9,4.4 3.6,1.4 7.2,1.2 L7.5,1.2 C9.2,1.2 10.7,1.8 11.8,2.9 L12.4,2.2 C11.1,1 9.3,0.2 7.4,0.2 L7.1,0.2 C3.1,0.5 1.77635684e-15,3.9 0.1,8 C0.3,11.9 3.5,15 7.4,15 L7.7,15 C11.7,14.8 14.8,11.4 14.7,7.4 C14.7,6.5 14.4,5.6 14.1,4.8 L13.3,5.1 L13.3,5.1 Z" id="Shape" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1006 B

2
resources.qrc
View File

@ -164,5 +164,7 @@
<file>data/icons/tomahawk-icon-1024x1024.png</file>
<file>data/images/plugins.svg</file>
<file>data/icons/tomahawk-white-icon-128x128.png</file>
<file>data/images/repeat-all.svg</file>
<file>data/images/repeat-one.svg</file>
</qresource>
</RCC>

8
src/libtomahawk/utils/TomahawkUtilsGui.cpp
View File

@ -591,16 +591,16 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
break;
case RepeatOne:
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat-one.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
break;
case RepeatOnePressed:
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat-one.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
break;
case RepeatAll:
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat-all.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
break;
case RepeatAllPressed:
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat-all.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
break;
case RepeatOff:
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat.svg", size, TomahawkUtils::Original, 0.7, Qt::white );