Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git

CMakeLists.txt

@@ -1388,16 +1388,12 @@ if(UNIX AND NOT APPLE)
 
   # Icon files for menu entry
   install(
-    FILES
-      "${CMAKE_CURRENT_SOURCE_DIR}/res/images/icons/mixxx.svg"
-    DESTINATION
-      "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps"
-  )
-  install(
-    FILES
-      "${CMAKE_CURRENT_SOURCE_DIR}/res/images/icons/mixxx.png"
+    DIRECTORY
+      "${CMAKE_CURRENT_SOURCE_DIR}/res/images/icons"
     DESTINATION
-      "${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps"
+      "${CMAKE_INSTALL_DATADIR}/icons/hicolor"
+    # This file is for Windows.
+    PATTERN ic_mixxx.ico EXCLUDE
   )
 
   # .metainfo.xml file for KDE/GNOME AppStream initiative

res/mixxx.qrc

@@ -31,7 +31,7 @@
         <file>images/library/ic_library_serato.svg</file>
       <!-- logo and icons for 'About' dialog -->
         <file>images/mixxx_logo.svg</file>
-        <file>images/icons/mixxx.svg</file>
+        <file>images/icons/scalable/apps/mixxx.svg</file>
         <file>images/heart_icon_light.svg</file>
         <file>images/heart_icon_dark.svg</file>
         <file>images/heart_icon_rainbow.svg</file>

src/dialog/dlgabout.cpp

@@ -12,7 +12,7 @@
 DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
     setupUi(this);
 
-    mixxx_icon->load(QString(":/images/icons/mixxx.svg"));
+    mixxx_icon->load(QString(":/images/icons/scalable/apps/mixxx.svg"));
     mixxx_logo->load(QString(":/images/mixxx_logo.svg"));
 
     version_label->setText(VersionStore::applicationName() +

src/library/scanner/libraryscannerdlg.cpp

@@ -10,7 +10,7 @@
 LibraryScannerDlg::LibraryScannerDlg(QWidget* parent, Qt::WindowFlags f)
         : QWidget(parent, f),
           m_bCancelled(false) {
-    setWindowIcon(QIcon(":/images/icons/mixxx.svg"));
+    setWindowIcon(QIcon(":/images/icons/scalable/apps/mixxx.svg"));
 
     QVBoxLayout* pLayout = new QVBoxLayout(this);
 

src/preferences/upgrade.cpp

@@ -452,7 +452,7 @@ UserSettingsPointer Upgrade::versionUpgrade(const QString& settingsPath) {
 
 bool Upgrade::askReScanLibrary() {
     QMessageBox msgBox;
-    msgBox.setIconPixmap(QPixmap(":/images/icons/mixxx.svg"));
+    msgBox.setIconPixmap(QPixmap(":/images/icons/scalable/apps/mixxx.svg"));
     msgBox.setWindowTitle(QMessageBox::tr("Upgrading Mixxx"));
     msgBox.setText(QMessageBox::tr("Mixxx now supports displaying cover art.\n"
                       "Do you want to scan your library for cover files now?"));