From 1a0c93e8cebe08a4685de853c7ebda00cb2484f2 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Wed, 4 Feb 2015 01:55:32 +0100
Subject: [PATCH] Removed old VolumeFull icon entirely.

---
 data/images/volume-icon-full.svg                 | 16 ----------------
 .../{volume-icon-muted.svg => volume-icon.svg}   |  0
 resources.qrc                                    |  3 +--
 src/libtomahawk/utils/TomahawkUtils.h            |  3 +--
 src/libtomahawk/utils/TomahawkUtilsGui.cpp       |  7 ++-----
 src/tomahawk/AudioControls.cpp                   |  3 +--
 6 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 data/images/volume-icon-full.svg
 rename data/images/{volume-icon-muted.svg => volume-icon.svg} (100%)

diff --git a/data/images/volume-icon-full.svg b/data/images/volume-icon-full.svg
deleted file mode 100644
index ef9875972..000000000
--- a/data/images/volume-icon-full.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="70px" height="70px" 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>volume-icon-full</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="60.1321578%" cy="50%" fx="60.1321578%" fy="50%" r="100%" id="radialGradient-1">
-            <stop stop-color="rgb(254,255,254)" stop-opacity="0.5" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </radialGradient>
-        <path d="M44.974563,24.947998 C45.90479,24.802002 46.8319666,25.1810303 47.055363,25.7979981 C47.611263,27.3779978 47.891763,28.9909979 47.897883,30.6099979 C47.888703,32.2399978 47.607183,33.8709978 47.047203,35.4659978 C46.858503,35.9929978 46.144503,36.3509978 45.360123,36.3509978 L44.965383,36.3219978 C44.031063,36.1759979 43.441503,35.5639979 43.664883,34.9479979 C44.167743,33.5229982 44.430903,32.0639981 44.425803,30.6099981 C44.430903,29.166998 44.182023,27.7209981 43.681203,26.3199981 L43.686303,26.3189981 C43.468023,25.7009981 44.045343,25.086998 44.974563,24.947998 Z M36.9451135,12.4069824 C40.0102185,10.4790039 40.4029285,13.7340088 40.4029136,13.7349824 L40.4029136,30.3079824 L40.4029136,31.0769824 L40.4029136,47.6499823 C40.4029136,47.6499823 40.0102136,50.9039824 36.9451135,48.9769824 C34.5399537,47.4649823 28.4699335,42.4019823 24.8203734,39.3049824 L13.9522737,39.3049824 C13.2423537,39.3049824 12.6660537,38.7399824 12.6660537,38.0439824 L12.6660537,23.542982 C12.6660537,22.845982 13.2433737,22.280982 13.9522737,22.280982 L24.5816932,22.280982 C28.2006536,19.2089825 34.4869134,13.9519824 36.9451135,12.4069824 Z M57.4460925,15.1989746 C60.928374,20.0839844 62.6828064,25.3530273 62.6827727,30.6209752 C62.6827727,35.8949744 60.9293924,41.163975 57.4450725,46.0469749 C57.1462124,46.4599749 56.5209524,46.7049749 55.8671324,46.7029749 C55.6253925,46.7039749 55.3765125,46.6689749 55.1378325,46.5979749 C54.2647125,46.3289748 53.8934325,45.6469749 54.3024525,45.0749749 C57.5746123,40.4979743 59.2035523,35.5639743 59.2035523,30.6209744 C59.2035523,25.6799744 57.5735925,20.7489747 54.3024525,16.1709746 L54.3106125,16.1709746 C53.9056725,15.5989746 54.2738925,14.9169746 55.1388524,14.6509746 C55.9997325,14.3819746 57.0360525,14.6229746 57.4460925,15.1989746 Z M52.8683569,21.4260254 C54.4319751,24.3780518 55.1980334,27.4909668 55.197017,30.6030257 C55.1980369,33.737026 54.4075371,36.8650263 52.861217,39.8400262 C52.6102971,40.3150262 51.935057,40.6110262 51.211877,40.6110262 C51.025217,40.6110262 50.8354971,40.5910262 50.6488371,40.5490262 C49.7420571,40.3460261 49.2616371,39.6910262 49.5747771,39.0970262 C51.004817,36.363026 51.727997,33.4820257 51.730037,30.6030257 C51.730037,27.7370256 51.0211369,24.8780254 49.5972169,22.1730254 C49.2830569,21.5770254 49.7634769,20.9250254 50.6641369,20.7230254 C51.562757,20.5150254 52.5501169,20.8270254 52.8683569,21.4260254 Z M52.8683569,21.4260254" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <use id="Shape" fill-opacity="0.5" fill="rgb(48,55,58)" xlink:href="#path-2"></use>
-        <use id="Shape-1" stroke="none" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/volume-icon-muted.svg b/data/images/volume-icon.svg
similarity index 100%
rename from data/images/volume-icon-muted.svg
rename to data/images/volume-icon.svg
diff --git a/resources.qrc b/resources.qrc
index ddf043a32..fc4c86701 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -20,8 +20,7 @@
         <file>data/images/list-remove.svg</file>
         <file>data/images/arrow-down-double.svg</file>
         <file>data/images/view-refresh.svg</file>
-        <file>data/images/volume-icon-muted.svg</file>
-        <file>data/images/volume-icon-full.svg</file>
+        <file>data/images/volume-icon.svg</file>
         <file>data/images/echonest_logo.png</file>
         <file>data/images/info.svg</file>
         <file>data/images/back.svg</file>
diff --git a/src/libtomahawk/utils/TomahawkUtils.h b/src/libtomahawk/utils/TomahawkUtils.h
index 3dddd15e0..85a9aaf8d 100644
--- a/src/libtomahawk/utils/TomahawkUtils.h
+++ b/src/libtomahawk/utils/TomahawkUtils.h
@@ -72,8 +72,7 @@ namespace TomahawkUtils
         RepeatAllPressed,
         RepeatOff,
         RepeatOffPressed,
-        VolumeMuted,
-        VolumeFull,
+        Volume,
         Share,
         NotLoved,
         Loved,
diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
index 4f694af35..4528387fb 100644
--- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
@@ -594,11 +594,8 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
             pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/repeat.svg", size, TomahawkUtils::Original, 1.0, Qt::white );
             break;
 
-        case VolumeMuted:
-            pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/volume-icon-muted.svg", size, TomahawkUtils::Original, 0.7, Qt::white );
-            break;
-        case VolumeFull:
-            pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/volume-icon-muted.svg", size, TomahawkUtils::Original, 0.7, Qt::white );
+        case Volume:
+            pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/volume-icon.svg", size, TomahawkUtils::Original, 0.7, Qt::white );
             break;
 
         case Share:
diff --git a/src/tomahawk/AudioControls.cpp b/src/tomahawk/AudioControls.cpp
index d350dd06e..8d8cd2f30 100644
--- a/src/tomahawk/AudioControls.cpp
+++ b/src/tomahawk/AudioControls.cpp
@@ -121,8 +121,7 @@ AudioControls::AudioControls( QWidget* parent )
     ui->shuffleButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::ShuffleOffPressed, TomahawkUtils::Original, ui->shuffleButton->size() ), QIcon::Off, QIcon::Active );
     ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatOff, TomahawkUtils::Original, ui->repeatButton->size() ) );
     ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatOffPressed, TomahawkUtils::Original, ui->repeatButton->size() ), QIcon::Off, QIcon::Active );
-    ui->volumeLowButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::VolumeMuted, TomahawkUtils::Original, ui->volumeLowButton->size() ) );
-//    ui->volumeHighButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::VolumeFull, TomahawkUtils::Original, scaled( 16, 16 ) ) );
+    ui->volumeLowButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::Volume, TomahawkUtils::Original, ui->volumeLowButton->size() ) );
 //    ui->socialButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::Share, TomahawkUtils::Original, scaled( 20, 20 ) ) );
 //    ui->loveButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::NotLoved, TomahawkUtils::Original, scaled( 20, 20 ) ) );
 //    ui->loveButton->setCheckable( true );