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 @@ - - - volume-icon-full - Created with Sketch (http://www.bohemiancoding.com/sketch) - - - - - - - - - - - - \ 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 @@ data/images/list-remove.svg data/images/arrow-down-double.svg data/images/view-refresh.svg - data/images/volume-icon-muted.svg - data/images/volume-icon-full.svg + data/images/volume-icon.svg data/images/echonest_logo.png data/images/info.svg data/images/back.svg 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 );