Use more mono icons

cantata.qrc

@@ -3,10 +3,6 @@
 <file alias="stars.svg">icons/stars.svg</file>
 <file alias="consume.svg">icons/consume.svg</file>
 
-<file alias="mpd.svg">icons/mpd.svg</file>
-<file alias="home.svg">icons/home.svg</file>
-<file alias="hdd.svg">icons/hdd.svg</file>
-
 <file alias="sidebar-library">icons/sidebar-library.svg</file>
 <file alias="sidebar-devices">icons/sidebar-devices.svg</file>
 <file alias="sidebar-folders">icons/sidebar-folders.svg</file>
@@ -16,28 +12,20 @@
 <file alias="sidebar-playqueue">icons/sidebar-playqueue.svg</file>
 <file alias="sidebar-search">icons/sidebar-search.svg</file>
 
-<file alias="soundcloud">online/icons/soundcloud.svg</file>
-<file alias="jamendo">online/icons/jamendo.svg</file>
-<file alias="magnatune">online/icons/magnatune.svg</file>
-<file alias="podcasts">online/icons/podcasts.svg</file>
+<file alias="magnatune.svg">online/icons/magnatune.svg</file>
 <file alias="bbc">online/icons/bbc.svg</file>
 <file alias="cbc">online/icons/cbc.svg</file>
 
-<file alias="favourites">streams/icons/favourites.svg</file>
-<file alias="icecast">streams/icons/icecast.svg</file>
-<file alias="shoutcast">streams/icons/shoutcast.svg</file>
-<file alias="tunein">streams/icons/tunein.svg</file>
-<file alias="dirble">streams/icons/dirble.svg</file>
+<file alias="shoutcast.svg">streams/icons/shoutcast.svg</file>
+<file alias="tunein.svg">streams/icons/tunein.svg</file>
+<file alias="dirble.svg">streams/icons/dirble.svg</file>
 
 <file alias="album.svg">icons/media-optical.svg</file>
 <file alias="album32.svg">icons/media-optical32.svg</file>
 <file alias="mono-album.svg">icons/view-media-album.svg</file>
 <file alias="artist.svg">icons/view-media-artist.svg</file>
 <file alias="genre.svg">icons/view-media-genre.svg</file>
-<file alias="dice.svg">icons/dice.svg</file>
-<file alias="playlist.svg">icons/playlist.svg</file>
 <file alias="radio.svg">icons/radio.svg</file>
-<file alias="gradcap.svg">icons/gradcap.svg</file>
 
 <file alias="podcast_directories.xml">online/podcast_directories.xml</file>
 <file alias="lyrics_providers.xml">context/lyrics_providers.xml</file>

devices/audiocddevice.cpp

@@ -89,10 +89,7 @@ AudioCdDevice::AudioCdDevice(MusicLibraryModel *m, Solid::Device &dev)
     , lookupInProcess(false)
     , autoPlay(false)
 {
-    icn=Icon("media-optical");
-    if (icn.isNull()) {
-        icn=Icons::self()->albumMonoIcon;
-    }
+    icn=Icons::self()->albumMonoIcon;
     drive=dev.parent().as<Solid::OpticalDrive>();
     Solid::Block *block=dev.as<Solid::Block>();
     if (block) {

devices/device.cpp

@@ -47,6 +47,7 @@
 #include "models/musiclibraryitemalbum.h"
 #include "models/musiclibraryitemsong.h"
 #include "models/musiclibrarymodel.h"
+#include "widgets/icons.h"
 #include "solid-lite/portablemediaplayer.h"
 #include "solid-lite/storageaccess.h"
 #include "solid-lite/storagedrive.h"
@@ -311,7 +312,7 @@ Device::Device(MusicLibraryModel *m, Solid::Device &dev, bool albumArtistSupport
     , transcoding(false)
 {
     m_model=m;
-    icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
+    icn=Icons::self()->folderListIcon;
     m_itemData[0]=m_itemData[0].toUpper();
 }
 

devices/mtpdevice.cpp

@@ -1212,10 +1212,7 @@ MtpDevice::MtpDevice(MusicLibraryModel *m, Solid::Device &dev, unsigned int busN
         DBUG << "setName" << opts.name;
         setData(opts.name);
     }
-    icn=Icon("multimedia-player");
-    if (icn.isNull()) {
-        icn=MonoIcon::icon(FontAwesome::mobilephone, Utils::clampColor(qApp->palette().text().color()));
-    }
+    icn=MonoIcon::icon(FontAwesome::mobilephone, Utils::monoIconColor());
 }
 
 MtpDevice::~MtpDevice()

devices/remotefsdevice.cpp

@@ -216,18 +216,11 @@ RemoteFsDevice::RemoteFsDevice(MusicLibraryModel *m, const DeviceOptions &option
 //    details.path=Utils::fixPath(details.path);
     load();
     mount();
-    icn=details.isLocalFile()
-            ? Icon("inode-directory")
-            : constSshfsProtocol==details.url.scheme()
-                ? Icon(QStringList() << "folder-network" << "utilities-terminal")
-                : Icon(QStringList() << "folder-samba" << "network-server");
-    if (icn.isNull()) {
-        icn=MonoIcon::icon(details.isLocalFile()
-                            ? FontAwesome::foldero
-                            : constSshfsProtocol==details.url.scheme()
-                                ? FontAwesome::linux_os
-                                : FontAwesome::windows, Utils::clampColor(qApp->palette().text().color()));
-    }
+    icn=MonoIcon::icon(details.isLocalFile()
+                       ? FontAwesome::foldero
+                       : constSshfsProtocol==details.url.scheme()
+                         ? FontAwesome::linux_os
+                         : FontAwesome::windows, Utils::monoIconColor());
 }
 
 RemoteFsDevice::RemoteFsDevice(MusicLibraryModel *m, const Details &d)
@@ -241,7 +234,11 @@ RemoteFsDevice::RemoteFsDevice(MusicLibraryModel *m, const Details &d)
 {
 //    details.path=Utils::fixPath(details.path);
     setup();
-    icn=Icon(details.isLocalFile() ? "inode-directory" : (constSshfsProtocol==details.url.scheme() ? "utilities-terminal" : "network-server"));
+    icn=MonoIcon::icon(details.isLocalFile()
+                       ? FontAwesome::foldero
+                       : constSshfsProtocol==details.url.scheme()
+                         ? FontAwesome::linux_os
+                         : FontAwesome::windows, Utils::monoIconColor());
 }
 
 RemoteFsDevice::~RemoteFsDevice() {

devices/umsdevice.cpp

@@ -57,11 +57,7 @@ UmsDevice::UmsDevice(MusicLibraryModel *m, Solid::Device &dev)
     defaultName=data()+details;
     setData(defaultName);
     setup();
-    icn=Icon(QStringList() << "drive-removable-media-usb-pendrive" << "drive-removable-media-usb"
-                           << "multimedia-player");
-    if (icn.isNull()) {
-        icn=MonoIcon::icon(FontAwesome::usb, Utils::clampColor(qApp->palette().text().color()));
-    }
+    icn=MonoIcon::icon(FontAwesome::usb, Utils::monoIconColor());
 }
 
 UmsDevice::~UmsDevice()

gui/localfolderpage.cpp

@@ -28,6 +28,7 @@
 #include "widgets/menubutton.h"
 #include "support/monoicon.h"
 #include "support/configuration.h"
+#include "support/utils.h"
 #ifdef TAGLIB_FOUND
 #include "tags/tags.h"
 #endif
@@ -37,10 +38,11 @@ LocalFolderBrowsePage::LocalFolderBrowsePage(bool isHome, QWidget *p)
     : SinglePageWidget(p)
     , isHomeFolder(isHome)
 {
-    model = isHome ? new LocalBrowseModel(QLatin1String("localbrowsehome"), tr("Home"), tr("Browse files in your home folder"), ":home.svg", this)
-                   : new LocalBrowseModel(QLatin1String("localbrowseroot"), tr("Root"), tr("Browse files on your computer"), ":hdd.svg", this);
+    QColor col = Utils::monoIconColor();
+    model = isHome ? new LocalBrowseModel(QLatin1String("localbrowsehome"), tr("Home"), tr("Browse files in your home folder"), MonoIcon::icon(FontAwesome::home, col), this)
+                   : new LocalBrowseModel(QLatin1String("localbrowseroot"), tr("Root"), tr("Browse files on your computer"), MonoIcon::icon(FontAwesome::hddo, col), this);
     proxy = new FileSystemProxyModel(model);
-    browseAction = new Action(MonoIcon::icon(FontAwesome::folderopen, Utils::monoIconColor()), tr("Open In File Manager"), this);
+    browseAction = new Action(MonoIcon::icon(FontAwesome::folderopen, col), tr("Open In File Manager"), this);
     connect(view, SIGNAL(itemsSelected(bool)), this, SLOT(controlActions()));
     connect(view, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(itemDoubleClicked(const QModelIndex &)));
     connect(view, SIGNAL(headerClicked(int)), SLOT(headerClicked(int)));