diff --git a/cantata.qrc b/cantata.qrc
index 8af70714b6..87ee22cb16 100644
--- a/cantata.qrc
+++ b/cantata.qrc
@@ -41,6 +41,8 @@
streams/icons/tunein.svg
streams/icons/dirble.svg
+icons/media-optical.svg
+icons/media-optical32.svg
icons/view-media-artist.svg
icons/view-media-genre.svg
icons/view-radiostream16.png
diff --git a/devices/albumdetailsdialog.cpp b/devices/albumdetailsdialog.cpp
index 34eaff20fc..6b8b67030a 100644
--- a/devices/albumdetailsdialog.cpp
+++ b/devices/albumdetailsdialog.cpp
@@ -365,7 +365,7 @@ void AlbumDetailsDialog::update(QTreeWidgetItem *i, const Song &s)
void AlbumDetailsDialog::setCover()
{
int iconSize=cover->size().width()<=128 ? 128 : 256;
- cover->setPixmap(Icons::self()->albumIcon.pixmap(iconSize, iconSize).scaled(cover->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+ cover->setPixmap(Icons::self()->albumIcon(iconSize).pixmap(iconSize, iconSize).scaled(cover->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
}
bool AlbumDetailsDialog::eventFilter(QObject *object, QEvent *event)
diff --git a/gui/covers.cpp b/gui/covers.cpp
index 1b16385538..62b20ed458 100644
--- a/gui/covers.cpp
+++ b/gui/covers.cpp
@@ -1223,7 +1223,7 @@ QPixmap * Covers::defaultPix(const Song &song, int size, int origSize)
? Icons::self()->artistIcon
: podcast
? Icons::self()->podcastIcon
- : Icons::self()->albumIcon;
+ : Icons::self()->albumIcon(size);
pix=new QPixmap(icn.pixmap(size, size).scaled(QSize(size, size), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
#if QT_VERSION >= 0x050100
if (size!=origSize) {
@@ -1263,7 +1263,7 @@ QPixmap * Covers::get(const Song &song, int size, bool urgent)
// Load artist image...
pix=new QPixmap(Icons::self()->artistIcon.pixmap(size, size).scaled(QSize(size, size), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
} else if (Song::SingleTracks==song.type) {
- pix=new QPixmap(Icons::self()->albumIcon.pixmap(size, size).scaled(QSize(size, size), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+ pix=new QPixmap(Icons::self()->albumIcon(size).pixmap(size, size).scaled(QSize(size, size), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
} else if (song.isStandardStream()) {
pix=new QPixmap(Icons::self()->streamIcon.pixmap(size, size).scaled(QSize(size, size), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
} else if (isOnlineServiceImage(song)) {
diff --git a/gui/currentcover.cpp b/gui/currentcover.cpp
index da8f420610..bb150e188b 100644
--- a/gui/currentcover.cpp
+++ b/gui/currentcover.cpp
@@ -136,7 +136,7 @@ const QImage & CurrentCover::stdImage(bool stream)
#else
if (img.isNull()) {
int iconSize=Icon::stdSize(Utils::scaleForDpi(128));
- img = (stream ? Icons::self()->streamIcon : Icons::self()->albumIcon).pixmap(iconSize, iconSize).toImage();
+ img = (stream ? Icons::self()->streamIcon : Icons::self()->albumIcon(iconSize)).pixmap(iconSize, iconSize).toImage();
QString &file=stream ? noStreamCoverFileName : noCoverFileName;
if (stream && file.isEmpty()) {
diff --git a/icons/media-optical.svg b/icons/media-optical.svg
new file mode 100644
index 0000000000..0eb3467a67
--- /dev/null
+++ b/icons/media-optical.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/icons/media-optical32.svg b/icons/media-optical32.svg
new file mode 100644
index 0000000000..e35ac63fbd
--- /dev/null
+++ b/icons/media-optical32.svg
@@ -0,0 +1,64 @@
+
+
diff --git a/models/musicmodel.cpp b/models/musicmodel.cpp
index c612020e10..2a4fd1aab2 100644
--- a/models/musicmodel.cpp
+++ b/models/musicmodel.cpp
@@ -104,7 +104,7 @@ QVariant MusicModel::data(const QModelIndex &index, int role) const
case MusicLibraryItem::Type_Artist:
return Icons::self()->artistIcon;
case MusicLibraryItem::Type_Album:
- return Icons::self()->albumIcon;
+ return Icons::self()->albumIcon(32);
case MusicLibraryItem::Type_Song:
return Song::Playlist==static_cast(item)->song().type ? Icons::self()->playlistListIcon : Icons::self()->audioListIcon;
default:
diff --git a/models/sqllibrarymodel.cpp b/models/sqllibrarymodel.cpp
index 734c1429ce..73ca007bec 100644
--- a/models/sqllibrarymodel.cpp
+++ b/models/sqllibrarymodel.cpp
@@ -340,7 +340,7 @@ QVariant SqlLibraryModel::data(const QModelIndex &index, int role) const
case T_Artist:
return Icons::self()->artistIcon;
case T_Album:
- return Icons::self()->albumIcon;
+ return Icons::self()->albumIcon(32);
case T_Track:
return Song::Playlist==item->getSong().type ? Icons::self()->playlistListIcon : Icons::self()->audioListIcon;
default:
diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp
index 53f0031414..eaebeee78d 100644
--- a/widgets/groupedview.cpp
+++ b/widgets/groupedview.cpp
@@ -374,7 +374,7 @@ class GroupedViewDelegate : public ActionItemDelegate
pix=index.data(Qt::DecorationRole).value().pixmap(constCoverSize, constCoverSize);
} else {
QPixmap *cover=/*stream ? 0 : */Covers::self()->get(song, constCoverSize);
- pix=cover ? *cover : (stream && !song.isCdda() ? Icons::self()->streamIcon : Icons::self()->albumIcon).pixmap(constCoverSize, constCoverSize);
+ pix=cover ? *cover : (stream && !song.isCdda() ? Icons::self()->streamIcon : Icons::self()->albumIcon(constCoverSize)).pixmap(constCoverSize, constCoverSize);
}
#if QT_VERSION >= 0x050100
diff --git a/widgets/icons.cpp b/widgets/icons.cpp
index 094678aa39..c0d6d48f17 100644
--- a/widgets/icons.cpp
+++ b/widgets/icons.cpp
@@ -408,7 +408,6 @@ Icons::Icons()
if (streamIcon.isNull()) {
streamIcon=Icon("applications-internet");
}
- albumIcon=Icon(QStringList() << "media-optical" << "media-optical-audio");
podcastIcon=Icon("inode-directory");
audioFileIcon=Icon("audio-x-generic");
playlistFileIcon=Icon(QStringList() << "view-media-playlist" << "audio-x-mp3-playlist" << "playlist" << "audio-x-generic");
@@ -420,6 +419,8 @@ Icons::Icons()
filesIcon=Icon(QStringList() << "folder-downloads" << "folder-download" << "folder" << "go-down");
radioStreamIcon=Icon::create("radio", constStdSizes);
addRadioStreamIcon=Icon::create("addradio", constStdSizes);
+ albumIconSmall.addFile(":album32.svg");
+ albumIconLarge.addFile(":album.svg");
artistIcon.addFile(":artist.svg");
genreIcon.addFile(":genre.svg");
#if !defined ENABLE_KDE_SUPPORT && !defined ENABLE_UBUNTU
diff --git a/widgets/icons.h b/widgets/icons.h
index 70867b118d..09bc8b9cb8 100644
--- a/widgets/icons.h
+++ b/widgets/icons.h
@@ -42,7 +42,9 @@ class Icons
#endif
Icon genreIcon;
Icon artistIcon;
- Icon albumIcon;
+ Icon & albumIcon(int size) { return size<48 ? albumIconSmall : albumIconLarge; }
+ Icon albumIconLarge;
+ Icon albumIconSmall;
Icon podcastIcon;
Icon folderIcon;
Icon audioFileIcon;
diff --git a/widgets/sizegrip.cpp b/widgets/sizegrip.cpp
index 479318da4b..b1497fa24c 100644
--- a/widgets/sizegrip.cpp
+++ b/widgets/sizegrip.cpp
@@ -40,11 +40,10 @@ SizeGrip::SizeGrip(QWidget *parent)
ToolButton tb;
tb.move(65535, 65535);
tb.setToolButtonStyle(Qt::ToolButtonIconOnly);
- tb.setIcon(Icons::self()->albumIcon);
+ tb.setIcon(Icons::self()->artistIcon);
tb.ensurePolished();
tb.setAttribute(Qt::WA_DontShowOnScreen);
tb.setVisible(true);
setMinimumWidth(qMax(grip->sizeHint().width(), tb.sizeHint().width()));
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
}
-
diff --git a/windows/icons/128/media-optical.png b/windows/icons/128/media-optical.png
deleted file mode 100644
index 85912eac55..0000000000
Binary files a/windows/icons/128/media-optical.png and /dev/null differ
diff --git a/windows/icons/16/media-optical.png b/windows/icons/16/media-optical.png
deleted file mode 100644
index fae7acf794..0000000000
Binary files a/windows/icons/16/media-optical.png and /dev/null differ
diff --git a/windows/icons/22/media-optical.png b/windows/icons/22/media-optical.png
deleted file mode 100644
index 715b5dfb19..0000000000
Binary files a/windows/icons/22/media-optical.png and /dev/null differ
diff --git a/windows/icons/256/media-optical.png b/windows/icons/256/media-optical.png
deleted file mode 100644
index f353699073..0000000000
Binary files a/windows/icons/256/media-optical.png and /dev/null differ
diff --git a/windows/icons/32/media-optical.png b/windows/icons/32/media-optical.png
deleted file mode 100644
index 6b533afaee..0000000000
Binary files a/windows/icons/32/media-optical.png and /dev/null differ
diff --git a/windows/icons/48/media-optical.png b/windows/icons/48/media-optical.png
deleted file mode 100644
index c511d1761a..0000000000
Binary files a/windows/icons/48/media-optical.png and /dev/null differ
diff --git a/windows/icons/64/media-optical.png b/windows/icons/64/media-optical.png
deleted file mode 100644
index c11bf8a23e..0000000000
Binary files a/windows/icons/64/media-optical.png and /dev/null differ
diff --git a/windows/icons/AUTHORS b/windows/icons/AUTHORS
index d5cc3d2eba..04f10ebf54 100755
--- a/windows/icons/AUTHORS
+++ b/windows/icons/AUTHORS
@@ -1,7 +1,3 @@
-media-optical.svg is modified from Gnome icon theme
-
---------------------------------------------------------------------
-
svg64/dialog-*.svg are from breeze
--------------------------------------------------------------------