Move all icon resources to icon folder root

AUTHORS

@@ -62,7 +62,7 @@ Images Authors:
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* file: src/icons/skin/tabs.gif
+* file: src/icons/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 

dist/unix/CMakeLists.txt

@@ -40,9 +40,9 @@ if (Qt5Widgets_FOUND)
             COMPONENT data)
 
     install(FILES
-            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray.svg
-            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-dark.svg
-            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-light.svg
+            ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent-tray.svg
+            ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent-tray-dark.svg
+            ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent-tray-light.svg
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status
         COMPONENT data)
 endif()

src/app/main.cpp

@@ -353,7 +353,7 @@ void sigAbnormalHandler(int signum)
 #if !defined(DISABLE_GUI)
 void showSplashScreen()
 {
-    QPixmap splashImg(":/icons/skin/splash.png");
+    QPixmap splashImg(":/icons/splash.png");
     QPainter painter(&splashImg);
     const QString version = QBT_VERSION;
     painter.setPen(QPen(Qt::white));

src/base/iconprovider.cpp

@@ -58,11 +58,11 @@ IconProvider *IconProvider::instance()
 QString IconProvider::getIconPath(const QString &iconId) const
 {
     // there are a few icons not available in svg
-    const QString pathSvg = ":/icons/qbt-theme/" + iconId + ".svg";
+    const QString pathSvg = ":/icons/" + iconId + ".svg";
     if (QFileInfo::exists(pathSvg))
         return pathSvg;
 
-    const QString pathPng = ":/icons/qbt-theme/" + iconId + ".png";
+    const QString pathPng = ":/icons/" + iconId + ".png";
     return pathPng;
 }
 

src/gui/aboutdialog.cpp

@@ -45,7 +45,7 @@ AboutDialog::AboutDialog(QWidget *parent)
     // Title
     m_ui->labelName->setText(QString::fromLatin1("<b><h2>qBittorrent " QBT_VERSION " (%1-bit)</h2></b>").arg(QT_POINTER_SIZE * 8));
 
-    m_ui->logo->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/skin/qbittorrent-tray.svg", this, 32));
+    m_ui->logo->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbittorrent-tray.svg", this, 32));
 
     // About
     const QString aboutText = QString(
@@ -65,7 +65,7 @@ AboutDialog::AboutDialog(QWidget *parent)
             , tr("Bug Tracker:"));
     m_ui->labelAbout->setText(aboutText);
 
-    m_ui->labelMascot->setPixmap(Utils::Gui::scaledPixmap(":/icons/skin/mascot.png", this));
+    m_ui->labelMascot->setPixmap(Utils::Gui::scaledPixmap(":/icons/mascot.png", this));
 
     // Thanks
     QFile thanksfile(":/thanks.html");

src/gui/mainwindow.cpp

@@ -152,10 +152,10 @@ MainWindow::MainWindow(QWidget *parent)
 #ifndef Q_OS_MACOS
 #ifdef Q_OS_UNIX
     const QIcon appLogo = Preferences::instance()->useSystemIconTheme()
-        ? QIcon::fromTheme("qbittorrent", QIcon(":/icons/skin/qbittorrent-tray.svg"))
-        : QIcon(":/icons/skin/qbittorrent-tray.svg");
+        ? QIcon::fromTheme("qbittorrent", QIcon(":/icons/qbittorrent-tray.svg"))
+        : QIcon(":/icons/qbittorrent-tray.svg");
 #else
-    const QIcon appLogo(":/icons/skin/qbittorrent-tray.svg");
+    const QIcon appLogo(":/icons/qbittorrent-tray.svg");
 #endif // Q_OS_UNIX
     setWindowIcon(appLogo);
 #endif // Q_OS_MACOS
@@ -1539,10 +1539,10 @@ void MainWindow::reloadSessionStats()
                 "qBittorrent"
                 "</div>"
                 "<div style='vertical-align: baseline; height: 18px;'>"
-                "<img src=':/icons/skin/download.svg' height='14'/>&nbsp;%1"
+                "<img src=':/icons/downloading_small.svg' height='14'/>&nbsp;%1"
                 "</div>"
                 "<div style='vertical-align: baseline; height: 18px;'>"
-                "<img src=':/icons/skin/seeding.svg' height='14'/>&nbsp;%2"
+                "<img src=':/icons/seeding.svg' height='14'/>&nbsp;%2"
                 "</div>")
             .arg(tr("DL speed: %1", "e.g: Download speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true))
                  , tr("UP speed: %1", "e.g: Upload speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadUploadRate, true)));
@@ -1984,18 +1984,18 @@ QIcon MainWindow::getSystrayIcon() const
 #else
     switch (style) {
     case TrayIcon::NORMAL:
-        return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray.svg"));
+        return QIcon(QLatin1String(":/icons/qbittorrent-tray.svg"));
     case TrayIcon::MONO_DARK:
-        return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray-dark.svg"));
+        return QIcon(QLatin1String(":/icons/qbittorrent-tray-dark.svg"));
     case TrayIcon::MONO_LIGHT:
-        return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray-light.svg"));
+        return QIcon(QLatin1String(":/icons/qbittorrent-tray-light.svg"));
     default:
         break;
     }
 #endif
 
     // As a failsafe in case the enum is invalid
-    return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray.svg"));
+    return QIcon(QLatin1String(":/icons/qbittorrent-tray.svg"));
 }
 #endif // Q_OS_MACOS
 

src/gui/optionsdialog.cpp

@@ -1691,7 +1691,7 @@ QString OptionsDialog::webUiPassword() const
 void OptionsDialog::webUIHttpsCertChanged(const QString &path, const ShowError showError)
 {
     m_ui->textWebUIHttpsCert->setSelectedPath(path);
-    m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-low.svg", this, 24));
+    m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/security-low.svg", this, 24));
 
     if (path.isEmpty())
         return;
@@ -1709,13 +1709,13 @@ void OptionsDialog::webUIHttpsCertChanged(const QString &path, const ShowError s
         return;
     }
 
-    m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-high.svg", this, 24));
+    m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/security-high.svg", this, 24));
 }
 
 void OptionsDialog::webUIHttpsKeyChanged(const QString &path, const ShowError showError)
 {
     m_ui->textWebUIHttpsKey->setSelectedPath(path);
-    m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-low.svg", this, 24));
+    m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/security-low.svg", this, 24));
 
     if (path.isEmpty())
         return;
@@ -1733,7 +1733,7 @@ void OptionsDialog::webUIHttpsKeyChanged(const QString &path, const ShowError sh
         return;
     }
 
-    m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-high.svg", this, 24));
+    m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/security-high.svg", this, 24));
 }
 
 void OptionsDialog::showConnectionTab()

src/gui/statusbar.cpp

@@ -62,14 +62,14 @@ StatusBar::StatusBar(QWidget *parent)
     m_connecStatusLblIcon->setFlat(true);
     m_connecStatusLblIcon->setFocusPolicy(Qt::NoFocus);
     m_connecStatusLblIcon->setCursor(Qt::PointingHandCursor);
-    m_connecStatusLblIcon->setIcon(QIcon(":/icons/skin/firewalled.svg"));
+    m_connecStatusLblIcon->setIcon(QIcon(":/icons/firewalled.svg"));
     m_connecStatusLblIcon->setToolTip(
         QString::fromLatin1("<b>%1</b><br><i>%2</i>").arg(tr("Connection status:")
             , tr("No direct connections. This may indicate network configuration problems.")));
     connect(m_connecStatusLblIcon, &QAbstractButton::clicked, this, &StatusBar::connectionButtonClicked);
 
     m_dlSpeedLbl = new QPushButton(this);
-    m_dlSpeedLbl->setIcon(QIcon(":/icons/skin/download.svg"));
+    m_dlSpeedLbl->setIcon(QIcon(":/icons/downloading_small.svg"));
     connect(m_dlSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capDownloadSpeed);
     m_dlSpeedLbl->setFlat(true);
     m_dlSpeedLbl->setFocusPolicy(Qt::NoFocus);
@@ -78,7 +78,7 @@ StatusBar::StatusBar(QWidget *parent)
     m_dlSpeedLbl->setMinimumWidth(200);
 
     m_upSpeedLbl = new QPushButton(this);
-    m_upSpeedLbl->setIcon(QIcon(":/icons/skin/seeding.svg"));
+    m_upSpeedLbl->setIcon(QIcon(":/icons/seeding.svg"));
     connect(m_upSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capUploadSpeed);
     m_upSpeedLbl->setFlat(true);
     m_upSpeedLbl->setFocusPolicy(Qt::NoFocus);
@@ -173,17 +173,17 @@ void StatusBar::updateConnectionStatus()
     const BitTorrent::SessionStatus &sessionStatus = BitTorrent::Session::instance()->status();
 
     if (!BitTorrent::Session::instance()->isListening()) {
-        m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/disconnected.svg")));
+        m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/disconnected.svg")));
         m_connecStatusLblIcon->setToolTip(QLatin1String("<b>") + tr("Connection Status:") + QLatin1String("</b><br>") + tr("Offline. This usually means that qBittorrent failed to listen on the selected port for incoming connections."));
     }
     else {
         if (sessionStatus.hasIncomingConnections) {
             // Connection OK
-            m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/connected.svg")));
+            m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/connected.svg")));
             m_connecStatusLblIcon->setToolTip(QLatin1String("<b>") + tr("Connection Status:") + QLatin1String("</b><br>") + tr("Online"));
         }
         else {
-            m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/firewalled.svg")));
+            m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/firewalled.svg")));
             m_connecStatusLblIcon->setToolTip(QLatin1String("<b>") + tr("Connection status:") + QLatin1String("</b><br>") + QLatin1String("<i>") + tr("No direct connections. This may indicate network configuration problems.") + QLatin1String("</i>"));
         }
     }

src/gui/transferlistfilterswidget.cpp

@@ -165,40 +165,40 @@ StatusFilterWidget::StatusFilterWidget(QWidget *parent, TransferListWidget *tran
     // Add status filters
     auto *all = new QListWidgetItem(this);
     all->setData(Qt::DisplayRole, tr("All (0)", "this is for the status filter"));
-    all->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterall.svg"));
+    all->setData(Qt::DecorationRole, QIcon(":/icons/filterall.svg"));
     auto *downloading = new QListWidgetItem(this);
     downloading->setData(Qt::DisplayRole, tr("Downloading (0)"));
-    downloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/downloading.svg"));
+    downloading->setData(Qt::DecorationRole, QIcon(":/icons/downloading.svg"));
     auto *seeding = new QListWidgetItem(this);
     seeding->setData(Qt::DisplayRole, tr("Seeding (0)"));
-    seeding->setData(Qt::DecorationRole, QIcon(":/icons/skin/uploading.svg"));
+    seeding->setData(Qt::DecorationRole, QIcon(":/icons/uploading.svg"));
     auto *completed = new QListWidgetItem(this);
     completed->setData(Qt::DisplayRole, tr("Completed (0)"));
-    completed->setData(Qt::DecorationRole, QIcon(":/icons/skin/completed.svg"));
+    completed->setData(Qt::DecorationRole, QIcon(":/icons/completed.svg"));
     auto *resumed = new QListWidgetItem(this);
     resumed->setData(Qt::DisplayRole, tr("Resumed (0)"));
-    resumed->setData(Qt::DecorationRole, QIcon(":/icons/skin/resumed.svg"));
+    resumed->setData(Qt::DecorationRole, QIcon(":/icons/resumed.svg"));
     auto *paused = new QListWidgetItem(this);
     paused->setData(Qt::DisplayRole, tr("Paused (0)"));
-    paused->setData(Qt::DecorationRole, QIcon(":/icons/skin/paused.svg"));
+    paused->setData(Qt::DecorationRole, QIcon(":/icons/paused.svg"));
     auto *active = new QListWidgetItem(this);
     active->setData(Qt::DisplayRole, tr("Active (0)"));
-    active->setData(Qt::DecorationRole, QIcon(":/icons/skin/filteractive.svg"));
+    active->setData(Qt::DecorationRole, QIcon(":/icons/filteractive.svg"));
     auto *inactive = new QListWidgetItem(this);
     inactive->setData(Qt::DisplayRole, tr("Inactive (0)"));
-    inactive->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterinactive.svg"));
+    inactive->setData(Qt::DecorationRole, QIcon(":/icons/filterinactive.svg"));
     auto *stalled = new QListWidgetItem(this);
     stalled->setData(Qt::DisplayRole, tr("Stalled (0)"));
-    stalled->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterstalled.svg"));
+    stalled->setData(Qt::DecorationRole, QIcon(":/icons/filterstalled.svg"));
     auto *stalledUploading = new QListWidgetItem(this);
     stalledUploading->setData(Qt::DisplayRole, tr("Stalled Uploading (0)"));
-    stalledUploading->setData(Qt::DecorationRole, QIcon(":/icons/skin/stalledUP.svg"));
+    stalledUploading->setData(Qt::DecorationRole, QIcon(":/icons/stalledUP.svg"));
     auto *stalledDownloading = new QListWidgetItem(this);
     stalledDownloading->setData(Qt::DisplayRole, tr("Stalled Downloading (0)"));
-    stalledDownloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/stalledDL.svg"));
+    stalledDownloading->setData(Qt::DecorationRole, QIcon(":/icons/stalledDL.svg"));
     auto *errored = new QListWidgetItem(this);
     errored->setData(Qt::DisplayRole, tr("Errored (0)"));
-    errored->setData(Qt::DecorationRole, QIcon(":/icons/skin/error.svg"));
+    errored->setData(Qt::DecorationRole, QIcon(":/icons/error.svg"));
 
     const Preferences *const pref = Preferences::instance();
     setCurrentRow(pref->getTransSelFilter(), QItemSelectionModel::SelectCurrent);

src/gui/transferlistmodel.cpp

@@ -727,55 +727,55 @@ QColor getDefaultColorByState(const BitTorrent::TorrentState state)
 
 QIcon getPausedIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/paused.svg");
+    static QIcon cached = QIcon(":/icons/paused.svg");
     return cached;
 }
 
 QIcon getQueuedIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/queued.svg");
+    static QIcon cached = QIcon(":/icons/queued.svg");
     return cached;
 }
 
 QIcon getDownloadingIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/downloading.svg");
+    static QIcon cached = QIcon(":/icons/downloading.svg");
     return cached;
 }
 
 QIcon getStalledDownloadingIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/stalledDL.svg");
+    static QIcon cached = QIcon(":/icons/stalledDL.svg");
     return cached;
 }
 
 QIcon getUploadingIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/uploading.svg");
+    static QIcon cached = QIcon(":/icons/uploading.svg");
     return cached;
 }
 
 QIcon getStalledUploadingIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/stalledUP.svg");
+    static QIcon cached = QIcon(":/icons/stalledUP.svg");
     return cached;
 }
 
 QIcon getCompletedIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/completed.svg");
+    static QIcon cached = QIcon(":/icons/completed.svg");
     return cached;
 }
 
 QIcon getCheckingIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/checking.svg");
+    static QIcon cached = QIcon(":/icons/checking.svg");
     return cached;
 }
 
 QIcon getErrorIcon()
 {
-    static QIcon cached = QIcon(":/icons/skin/error.svg");
+    static QIcon cached = QIcon(":/icons/error.svg");
     return cached;
 }
 

src/gui/transferlistwidget.cpp

@@ -865,7 +865,7 @@ void TransferListWidget::displayListMenu(const QPoint &)
     connect(actionDelete, &QAction::triggered, this, &TransferListWidget::softDeleteSelectedTorrents);
     auto *actionPreviewFile = new QAction(UIThemeManager::instance()->getIcon("view-preview"), tr("Preview file..."), listMenu);
     connect(actionPreviewFile, &QAction::triggered, this, &TransferListWidget::previewSelectedTorrents);
-    auto *actionSetMaxRatio = new QAction(QIcon(QLatin1String(":/icons/skin/ratio.svg")), tr("Limit share ratio..."), listMenu);
+    auto *actionSetMaxRatio = new QAction(QIcon(QLatin1String(":/icons/ratio.svg")), tr("Limit share ratio..."), listMenu);
     connect(actionSetMaxRatio, &QAction::triggered, this, &TransferListWidget::setMaxRatioSelectedTorrents);
     auto *actionSetUploadLimit = new QAction(UIThemeManager::instance()->getIcon("kt-set-max-upload-speed"), tr("Limit upload rate..."), listMenu);
     connect(actionSetUploadLimit, &QAction::triggered, this, &TransferListWidget::setUpLimitSelectedTorrents);

src/icons/icons.qrc

@@ -1,6 +1,52 @@
 <RCC>
     <qresource prefix="/icons">
         <file>3-state-checkbox.gif</file>
+        <file>application-exit.svg</file>
+        <file>application-rss+xml.svg</file>
+        <file>application-x-mswinurl.svg</file>
+        <file>arrow-right.gif</file>
+        <file>bg-dropdown.gif</file>
+        <file>bg-handle-horizontal.gif</file>
+        <file>bg-header.gif</file>
+        <file>bg-panel-header.gif</file>
+        <file>checked.svg</file>
+        <file>checking.svg</file>
+        <file>collapse.svg</file>
+        <file>completed.svg</file>
+        <file>configure.svg</file>
+        <file>connected.svg</file>
+        <file>dialog-cancel.svg</file>
+        <file>dialog-information.svg</file>
+        <file>dialog-warning.svg</file>
+        <file>disconnected.svg</file>
+        <file>dock-tabs.gif</file>
+        <file>document-edit-verify.svg</file>
+        <file>document-edit.svg</file>
+        <file>document-encrypt.svg</file>
+        <file>document-import.svg</file>
+        <file>document-new.svg</file>
+        <file>document-properties.svg</file>
+        <file>document-save.svg</file>
+        <file>download.svg</file>
+        <file>downloading.svg</file>
+        <file>downloading_small.svg</file>
+        <file>edit-clear-history.svg</file>
+        <file>edit-clear.svg</file>
+        <file>edit-copy.svg</file>
+        <file>edit-cut.svg</file>
+        <file>edit-delete.svg</file>
+        <file>edit-find-user.svg</file>
+        <file>edit-find.svg</file>
+        <file>edit-paste.svg</file>
+        <file>edit-rename.svg</file>
+        <file>error.svg</file>
+        <file>expand.svg</file>
+        <file>fileicon.svg</file>
+        <file>filteractive.svg</file>
+        <file>filterall.svg</file>
+        <file>filterinactive.svg</file>
+        <file>filterstalled.svg</file>
+        <file>firewalled.svg</file>
         <file>flags/ad.svg</file>
         <file>flags/ae.svg</file>
         <file>flags/af.svg</file>
@@ -141,6 +187,7 @@
         <file>flags/mc.svg</file>
         <file>flags/md.svg</file>
         <file>flags/me.svg</file>
+        <file>flags/mf.svg</file>
         <file>flags/mg.svg</file>
         <file>flags/mh.svg</file>
         <file>flags/mk.svg</file>
@@ -249,138 +296,97 @@
         <file>flags/za.svg</file>
         <file>flags/zm.svg</file>
         <file>flags/zw.svg</file>
+        <file>folder-documents.svg</file>
+        <file>folder-download.svg</file>
+        <file>folder-new.svg</file>
+        <file>folder-remote.svg</file>
+        <file>gear.svg</file>
+        <file>gear32.svg</file>
+        <file>go-bottom.svg</file>
+        <file>go-down.svg</file>
+        <file>go-top.svg</file>
+        <file>go-up.svg</file>
+        <file>handle-icon-horizontal.gif</file>
+        <file>handle-icon.gif</file>
+        <file>help-about.svg</file>
+        <file>help-contents.svg</file>
+        <file>inode-directory.svg</file>
+        <file>insert-link.svg</file>
+        <file>knob.gif</file>
+        <file>kt-magnet.svg</file>
+        <file>kt-set-max-download-speed.svg</file>
+        <file>kt-set-max-upload-speed.svg</file>
         <file>L.gif</file>
+        <file>list-add.svg</file>
+        <file>list-remove.svg</file>
         <file>loading.png</file>
-        <file>qbt-theme/application-exit.svg</file>
-        <file>qbt-theme/application-rss+xml.svg</file>
-        <file>qbt-theme/application-x-mswinurl.svg</file>
-        <file>qbt-theme/checked.svg</file>
-        <file>qbt-theme/configure.svg</file>
-        <file>qbt-theme/dialog-cancel.svg</file>
-        <file>qbt-theme/dialog-information.svg</file>
-        <file>qbt-theme/dialog-warning.svg</file>
-        <file>qbt-theme/document-edit-verify.svg</file>
-        <file>qbt-theme/document-edit.svg</file>
-        <file>qbt-theme/document-encrypt.svg</file>
-        <file>qbt-theme/document-import.svg</file>
-        <file>qbt-theme/document-new.svg</file>
-        <file>qbt-theme/document-properties.svg</file>
-        <file>qbt-theme/document-save.svg</file>
-        <file>qbt-theme/download.svg</file>
-        <file>qbt-theme/edit-clear-history.svg</file>
-        <file>qbt-theme/edit-clear.svg</file>
-        <file>qbt-theme/edit-copy.svg</file>
-        <file>qbt-theme/edit-cut.svg</file>
-        <file>qbt-theme/edit-delete.svg</file>
-        <file>qbt-theme/edit-find-user.svg</file>
-        <file>qbt-theme/edit-find.svg</file>
-        <file>qbt-theme/edit-paste.svg</file>
-        <file>qbt-theme/edit-rename.svg</file>
-        <file>qbt-theme/folder-documents.svg</file>
-        <file>qbt-theme/folder-download.svg</file>
-        <file>qbt-theme/folder-new.svg</file>
-        <file>qbt-theme/folder-remote.svg</file>
-        <file>qbt-theme/gear.svg</file>
-        <file>qbt-theme/gear32.svg</file>
-        <file>qbt-theme/go-bottom.svg</file>
-        <file>qbt-theme/go-down.svg</file>
-        <file>qbt-theme/go-top.svg</file>
-        <file>qbt-theme/go-up.svg</file>
-        <file>qbt-theme/help-about.svg</file>
-        <file>qbt-theme/help-contents.svg</file>
-        <file>qbt-theme/inode-directory.svg</file>
-        <file>qbt-theme/insert-link.svg</file>
-        <file>qbt-theme/kt-magnet.svg</file>
-        <file>qbt-theme/kt-set-max-download-speed.svg</file>
-        <file>qbt-theme/kt-set-max-upload-speed.svg</file>
-        <file>qbt-theme/list-add.svg</file>
-        <file>qbt-theme/list-remove.svg</file>
-        <file>qbt-theme/mail-folder-inbox.svg</file>
-        <file>qbt-theme/mail-mark-read.svg</file>
-        <file>qbt-theme/media-playback-pause.svg</file>
-        <file>qbt-theme/media-playback-start.svg</file>
-        <file>qbt-theme/media-seek-forward.svg</file>
-        <file>qbt-theme/network-server.svg</file>
-        <file>qbt-theme/network-wired.svg</file>
-        <file>qbt-theme/object-locked.svg</file>
-        <file>qbt-theme/office-chart-line.svg</file>
-        <file>qbt-theme/preferences-desktop.svg</file>
-        <file>qbt-theme/preferences-other.svg</file>
-        <file>qbt-theme/preferences-system-network.svg</file>
-        <file>qbt-theme/preferences-web-browser-cookies.svg</file>
-        <file>qbt-theme/rss-config.svg</file>
-        <file>qbt-theme/security-high.svg</file>
-        <file>qbt-theme/security-low.svg</file>
-        <file>qbt-theme/services.svg</file>
-        <file>qbt-theme/speedometer.svg</file>
-        <file>qbt-theme/system-log-out.svg</file>
-        <file>qbt-theme/tab-close.svg</file>
-        <file>qbt-theme/task-attention.svg</file>
-        <file>qbt-theme/task-complete.svg</file>
-        <file>qbt-theme/task-ongoing.svg</file>
-        <file>qbt-theme/task-reject.svg</file>
-        <file>qbt-theme/text-plain.svg</file>
-        <file>qbt-theme/tools-report-bug.svg</file>
-        <file>qbt-theme/unavailable.svg</file>
-        <file>qbt-theme/user-group-delete.svg</file>
-        <file>qbt-theme/user-group-new.svg</file>
-        <file>qbt-theme/view-calendar-journal.svg</file>
-        <file>qbt-theme/view-categories.svg</file>
-        <file>qbt-theme/view-filter.svg</file>
-        <file>qbt-theme/view-preview.svg</file>
-        <file>qbt-theme/view-refresh.svg</file>
-        <file>qbt-theme/view-statistics.svg</file>
-        <file>qbt-theme/wallet-open.svg</file>
-        <file>qbt-theme/webui.svg</file>
-        <file>skin/arrow-right.gif</file>
-        <file>skin/bg-dropdown.gif</file>
-        <file>skin/bg-handle-horizontal.gif</file>
-        <file>skin/bg-header.gif</file>
-        <file>skin/bg-panel-header.gif</file>
-        <file>skin/checking.svg</file>
-        <file>skin/collapse.svg</file>
-        <file>skin/completed.svg</file>
-        <file>skin/connected.svg</file>
-        <file>skin/disconnected.svg</file>
-        <file>skin/dock-tabs.gif</file>
-        <file>skin/download.svg</file>
-        <file>skin/downloading.svg</file>
-        <file>skin/error.svg</file>
-        <file>skin/filteractive.svg</file>
-        <file>skin/filterall.svg</file>
-        <file>skin/filterinactive.svg</file>
-        <file>skin/filterstalled.svg</file>
-        <file>skin/firewalled.svg</file>
-        <file>skin/handle-icon-horizontal.gif</file>
-        <file>skin/handle-icon.gif</file>
-        <file>skin/knob.gif</file>
-        <file>skin/logo-blank.gif</file>
-        <file>skin/logo.gif</file>
-        <file>skin/logo2.gif</file>
-        <file>skin/mascot.png</file>
-        <file>skin/paused.svg</file>
-        <file>skin/qbittorrent-tray.svg</file>
-        <file>skin/qbittorrent-tray-dark.svg</file>
-        <file>skin/qbittorrent-tray-light.svg</file>
-        <file>skin/qbittorrent32.png</file>
-        <file>skin/queued.svg</file>
-        <file>skin/ratio.svg</file>
-        <file>skin/resumed.svg</file>
-        <file>skin/seeding.svg</file>
-        <file>skin/slider-area.gif</file>
-        <file>skin/spacer.gif</file>
-        <file>skin/spinner-placeholder.gif</file>
-        <file>skin/spinner.gif</file>
-        <file>skin/splash.png</file>
-        <file>skin/stalledDL.svg</file>
-        <file>skin/stalledUP.svg</file>
-        <file>skin/tabs.gif</file>
-        <file>skin/toolbox-divider.gif</file>
-        <file>skin/toolbox-divider2.gif</file>
-        <file>skin/uploading.svg</file>
+        <file>logo-blank.gif</file>
+        <file>logo.gif</file>
+        <file>logo2.gif</file>
+        <file>mail-folder-inbox.svg</file>
+        <file>mail-mark-read.svg</file>
+        <file>mascot.png</file>
+        <file>media-playback-pause.svg</file>
+        <file>media-playback-start.svg</file>
+        <file>media-seek-forward.svg</file>
+        <file>network-server.svg</file>
+        <file>network-wired.svg</file>
+        <file>object-locked.svg</file>
+        <file>office-chart-line.svg</file>
+        <file>paused.svg</file>
+        <file>preferences-desktop.svg</file>
+        <file>preferences-other.svg</file>
+        <file>preferences-system-network.svg</file>
+        <file>preferences-web-browser-cookies.svg</file>
+        <file>qbittorrent-tray-dark.svg</file>
+        <file>qbittorrent-tray-light.svg</file>
+        <file>qbittorrent-tray-with-font.svg</file>
+        <file>qbittorrent-tray.svg</file>
+        <file>qbittorrent.ico</file>
+        <file>qbittorrent32.png</file>
+        <file>qbittorrent_file.ico</file>
+        <file>queued.svg</file>
+        <file>ratio.svg</file>
+        <file>resumed.svg</file>
+        <file>rss-config.svg</file>
+        <file>security-high.svg</file>
+        <file>security-low.svg</file>
+        <file>seeding.svg</file>
+        <file>services.svg</file>
+        <file>slider-area.gif</file>
         <file>slow.svg</file>
         <file>slow_off.svg</file>
+        <file>spacer.gif</file>
+        <file>speedometer.svg</file>
         <file>sphere.png</file>
         <file>sphere2.png</file>
+        <file>spinner-placeholder.gif</file>
+        <file>spinner.gif</file>
+        <file>splash.png</file>
+        <file>stalledDL.svg</file>
+        <file>stalledUP.svg</file>
+        <file>system-log-out.svg</file>
+        <file>tab-close.svg</file>
+        <file>tabs.gif</file>
+        <file>task-attention.svg</file>
+        <file>task-complete.svg</file>
+        <file>task-ongoing.svg</file>
+        <file>task-reject.svg</file>
+        <file>text-plain.svg</file>
+        <file>toolbox-divider.gif</file>
+        <file>toolbox-divider2.gif</file>
+        <file>tools-report-bug.svg</file>
+        <file>unavailable.svg</file>
+        <file>uploading.svg</file>
+        <file>user-group-delete.svg</file>
+        <file>user-group-new.svg</file>
+        <file>view-calendar-journal.svg</file>
+        <file>view-categories.svg</file>
+        <file>view-filter.svg</file>
+        <file>view-preview.svg</file>
+        <file>view-refresh.svg</file>
+        <file>view-statistics.svg</file>
+        <file>wallet-open.svg</file>
+        <file>webui.svg</file>
     </qresource>
 </RCC>