Rename sidebar icons

cantata.qrc

@@ -11,28 +11,28 @@
 <file alias="shuffle22.png">icons/view-media-shuffle22.png</file>
 <file alias="shuffle32.png">icons/view-media-shuffle32.png</file>
 <file alias="shuffle48.png">icons/view-media-shuffle48.png</file>
-<file alias="sidebar-albums">icons/sidebar-albums.svg</file>
-<file alias="sidebar-artists">icons/sidebar-artists.svg</file>
-<file alias="sidebar-devices">icons/sidebar-devices.svg</file>
-<file alias="sidebar-dynamic">icons/sidebar-dynamic.svg</file>
-<file alias="sidebar-folders">icons/sidebar-folders.svg</file>
-<file alias="sidebar-info">icons/sidebar-info.svg</file>
-<file alias="sidebar-lyrics">icons/sidebar-lyrics.svg</file>
-<file alias="sidebar-online">icons/sidebar-online.svg</file>
-<file alias="sidebar-playlists">icons/sidebar-playlists.svg</file>
-<file alias="sidebar-playqueue">icons/sidebar-playqueue.svg</file>
-<file alias="sidebar-streams">icons/sidebar-streams.svg</file>
 
-<file alias="sidebar-albums-white">icons/sidebar-albums-white.svg</file>
-<file alias="sidebar-artists-white">icons/sidebar-artists-white.svg</file>
-<file alias="sidebar-devices-white">icons/sidebar-devices-white.svg</file>
-<file alias="sidebar-dynamic-white">icons/sidebar-dynamic-white.svg</file>
-<file alias="sidebar-folders-white">icons/sidebar-folders-white.svg</file>
-<file alias="sidebar-info-white">icons/sidebar-info-white.svg</file>
-<file alias="sidebar-lyrics-white">icons/sidebar-lyrics-white.svg</file>
-<file alias="sidebar-online-white">icons/sidebar-online-white.svg</file>
-<file alias="sidebar-playlists-white">icons/sidebar-playlists-white.svg</file>
-<file alias="sidebar-playqueue-white">icons/sidebar-playqueue-white.svg</file>
-<file alias="sidebar-streams-white">icons/sidebar-streams-white.svg</file>
+<file alias="sidebar-albums-dark">icons/sidebar-albums-dark.svg</file>
+<file alias="sidebar-artists-dark">icons/sidebar-artists-dark.svg</file>
+<file alias="sidebar-devices-dark">icons/sidebar-devices-dark.svg</file>
+<file alias="sidebar-dynamic-dark">icons/sidebar-dynamic-dark.svg</file>
+<file alias="sidebar-folders-dark">icons/sidebar-folders-dark.svg</file>
+<file alias="sidebar-info-dark">icons/sidebar-info-dark.svg</file>
+<file alias="sidebar-lyrics-dark">icons/sidebar-lyrics-dark.svg</file>
+<file alias="sidebar-online-dark">icons/sidebar-online-dark.svg</file>
+<file alias="sidebar-playlists-dark">icons/sidebar-playlists-dark.svg</file>
+<file alias="sidebar-playqueue-dark">icons/sidebar-playqueue-dark.svg</file>
+<file alias="sidebar-streams-dark">icons/sidebar-streams-dark.svg</file>
+<file alias="sidebar-albums-light">icons/sidebar-albums-light.svg</file>
+<file alias="sidebar-artists-light">icons/sidebar-artists-light.svg</file>
+<file alias="sidebar-devices-light">icons/sidebar-devices-light.svg</file>
+<file alias="sidebar-dynamic-light">icons/sidebar-dynamic-light.svg</file>
+<file alias="sidebar-folders-light">icons/sidebar-folders-light.svg</file>
+<file alias="sidebar-info-light">icons/sidebar-info-light.svg</file>
+<file alias="sidebar-lyrics-light">icons/sidebar-lyrics-light.svg</file>
+<file alias="sidebar-online-light">icons/sidebar-online-light.svg</file>
+<file alias="sidebar-playlists-light">icons/sidebar-playlists-light.svg</file>
+<file alias="sidebar-playqueue-light">icons/sidebar-playqueue-light.svg</file>
+<file alias="sidebar-streams-light">icons/sidebar-streams-light.svg</file>
 </qresource>
 </RCC>

widgets/icons.cpp

@@ -361,12 +361,12 @@ static void updateSidebarIcon(Icon &i, const QString &name, const QColor &color,
     }
 
     if (darkValue==constDarkValue && isVeryDark(adjusted)) {
-        i.addFile(":sidebar-"+name, QSize(), mode);
+        i.addFile(":sidebar-"+name+"-dark", QSize(), mode);
     } else if (lightValue==constLightValue && isVeryLight(adjusted)) {
-        i.addFile(":sidebar-"+name+"-white", QSize(), mode);
+        i.addFile(":sidebar-"+name+"-light", QSize(), mode);
     } else { // Neither black nor white, so we need to recolour...
         Icon std;
-        std.addFile(":sidebar-"+name, QSize(), mode);
+        std.addFile(":sidebar-"+name+"-dark", QSize(), mode);
         // Now recolour the icon!
         QList<int> sizes=QList<int>() << 16 << 22 << 32 << 48 << 64;
         QColor col=clampColor(adjusted, constDarkLimit, darkValue, constLightLimit, lightValue);