Move new icons to their own theme folder.

src/base/iconprovider.cpp

@@ -58,7 +58,7 @@ IconProvider *IconProvider::instance()
 
 QString IconProvider::getIconPath(const QString &iconId)
 {
-    return ":/icons/oxygen/" + iconId + ".png";
+    return ":/icons/qbt-theme/" + iconId + ".png";
 }
 
 IconProvider *IconProvider::m_instance = 0;

src/base/rss/rssfeed.cpp

@@ -61,7 +61,7 @@ using namespace Rss;
 Feed::Feed(const QString &url, Manager *manager)
     : m_manager(manager)
     , m_url (QUrl::fromEncoded(url.toUtf8()).toString())
-    , m_icon(":/icons/oxygen/application-rss+xml.png")
+    , m_icon(":/icons/qbt-theme/application-rss+xml.png")
     , m_unreadCount(0)
     , m_dirty(false)
     , m_inErrorState(false)
@@ -247,7 +247,7 @@ QString Feed::url() const
 QString Feed::iconPath() const
 {
     if (m_inErrorState)
-        return QLatin1String(":/icons/oxygen/unavailable.png");
+        return QLatin1String(":/icons/qbt-theme/unavailable.png");
 
     return m_icon;
 }

src/gui/optionsdlg.cpp

@@ -1637,11 +1637,11 @@ void OptionsDialog::setSslKey(const QByteArray &key, bool interactive)
 {
 #ifndef QT_NO_OPENSSL
     if (!key.isEmpty() && !QSslKey(key, QSsl::Rsa).isNull()) {
-        m_ui->lblSslKeyStatus->setPixmap(QPixmap(":/icons/oxygen/security-high.png").scaledToHeight(20, Qt::SmoothTransformation));
+        m_ui->lblSslKeyStatus->setPixmap(QPixmap(":/icons/qbt-theme/security-high.png").scaledToHeight(20, Qt::SmoothTransformation));
         m_sslKey = key;
     }
     else {
-        m_ui->lblSslKeyStatus->setPixmap(QPixmap(":/icons/oxygen/security-low.png").scaledToHeight(20, Qt::SmoothTransformation));
+        m_ui->lblSslKeyStatus->setPixmap(QPixmap(":/icons/qbt-theme/security-low.png").scaledToHeight(20, Qt::SmoothTransformation));
         m_sslKey.clear();
         if (interactive)
             QMessageBox::warning(this, tr("Invalid key"), tr("This is not a valid SSL key."));
@@ -1656,11 +1656,11 @@ void OptionsDialog::setSslCertificate(const QByteArray &cert, bool interactive)
 {
 #ifndef QT_NO_OPENSSL
     if (!cert.isEmpty() && !QSslCertificate(cert).isNull()) {
-        m_ui->lblSslCertStatus->setPixmap(QPixmap(":/icons/oxygen/security-high.png").scaledToHeight(20, Qt::SmoothTransformation));
+        m_ui->lblSslCertStatus->setPixmap(QPixmap(":/icons/qbt-theme/security-high.png").scaledToHeight(20, Qt::SmoothTransformation));
         m_sslCert = cert;
     }
     else {
-        m_ui->lblSslCertStatus->setPixmap(QPixmap(":/icons/oxygen/security-low.png").scaledToHeight(20, Qt::SmoothTransformation));
+        m_ui->lblSslCertStatus->setPixmap(QPixmap(":/icons/qbt-theme/security-low.png").scaledToHeight(20, Qt::SmoothTransformation));
         m_sslCert.clear();
         if (interactive)
             QMessageBox::warning(this, tr("Invalid certificate"), tr("This is not a valid SSL certificate."));

src/gui/rss/rsssettingsdlg.ui

@@ -22,7 +22,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../../icons.qrc">:/icons/oxygen/application-rss+xml.png</pixmap>
+        <pixmap resource="../../icons.qrc">:/icons/qbt-theme/application-rss+xml.png</pixmap>
        </property>
       </widget>
      </item>

src/gui/statusbar.cpp

@@ -155,7 +155,7 @@ void StatusBar::showRestartRequired()
     // Restart required notification
     const QString restartText = tr("qBittorrent needs to be restarted");
     QLabel *restartIconLbl = new QLabel(m_bar);
-    restartIconLbl->setPixmap(QPixmap(":/icons/oxygen/dialog-warning.png").scaled(QSize(24,24)));
+    restartIconLbl->setPixmap(QPixmap(":/icons/qbt-theme/dialog-warning.png").scaled(QSize(24,24)));
     restartIconLbl->setToolTip(restartText);
     m_bar->insertWidget(0, restartIconLbl);
     QLabel *restartLbl = new QLabel(m_bar);

src/gui/trackerlogin.cpp

@@ -37,7 +37,7 @@ trackerLogin::trackerLogin(QWidget *parent, BitTorrent::TorrentHandle *const tor
 {
   setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
-  login_logo->setPixmap(QPixmap(QString::fromUtf8(":/icons/oxygen/encrypted.png")));
+  login_logo->setPixmap(QPixmap(QString::fromUtf8(":/icons/qbt-theme/encrypted.png")));
   tracker_url->setText(torrent->currentTracker());
   connect(this, SIGNAL(trackerLoginCancelled(QPair<BitTorrent::TorrentHandle*, QString>)), parent, SLOT(addUnauthenticatedTracker(QPair<BitTorrent::TorrentHandle*, QString>)));
   show();

src/icons.qrc

@@ -251,77 +251,77 @@
   <file>icons/flags/za.png</file>
   <file>icons/flags/zm.png</file>
   <file>icons/flags/zw.png</file>
-  <file>icons/oxygen/application-exit.png</file>
-  <file>icons/oxygen/application-rss+xml.png</file>
-  <file>icons/oxygen/application-x-mswinurl.png</file>
-  <file>icons/oxygen/chronometer.png</file>
-  <file>icons/oxygen/dialog-cancel.png</file>
-  <file>icons/oxygen/dialog-information.png</file>
-  <file>icons/oxygen/dialog-warning.png</file>
-  <file>icons/oxygen/document-edit-verify.png</file>
-  <file>icons/oxygen/document-edit.png</file>
-  <file>icons/oxygen/document-encrypt.png</file>
-  <file>icons/oxygen/document-import.png</file>
-  <file>icons/oxygen/document-new.png</file>
-  <file>icons/oxygen/document-properties.png</file>
-  <file>icons/oxygen/document-save.png</file>
-  <file>icons/oxygen/download.png</file>
-  <file>icons/oxygen/edit-clear-history.png</file>
-  <file>icons/oxygen/edit-clear.png</file>
-  <file>icons/oxygen/edit-copy.png</file>
-  <file>icons/oxygen/edit-cut.png</file>
-  <file>icons/oxygen/edit-delete.png</file>
-  <file>icons/oxygen/edit-find-user.png</file>
-  <file>icons/oxygen/edit-find.png</file>
-  <file>icons/oxygen/edit-paste.png</file>
-  <file>icons/oxygen/edit-rename.png</file>
-  <file>icons/oxygen/folder-documents.png</file>
-  <file>icons/oxygen/folder-new.png</file>
-  <file>icons/oxygen/folder-remote.png</file>
-  <file>icons/oxygen/gear.png</file>
-  <file>icons/oxygen/gear32.png</file>
-  <file>icons/oxygen/go-down.png</file>
-  <file>icons/oxygen/go-up.png</file>
-  <file>icons/oxygen/help-about.png</file>
-  <file>icons/oxygen/help-contents.png</file>
-  <file>icons/oxygen/inode-directory.png</file>
-  <file>icons/oxygen/insert-link.png</file>
-  <file>icons/oxygen/list-add.png</file>
-  <file>icons/oxygen/list-remove.png</file>
-  <file>icons/oxygen/mail-folder-inbox.png</file>
-  <file>icons/oxygen/mail-mark-read.png</file>
-  <file>icons/oxygen/media-playback-pause.png</file>
-  <file>icons/oxygen/media-playback-start.png</file>
-  <file>icons/oxygen/media-seek-forward.png</file>
-  <file>icons/oxygen/network-server.png</file>
-  <file>icons/oxygen/network-wired.png</file>
-  <file>icons/oxygen/object-locked.png</file>
-  <file>icons/oxygen/preferences-desktop.png</file>
-  <file>icons/oxygen/preferences-other.png</file>
-  <file>icons/oxygen/preferences-system-network.png</file>
-  <file>icons/oxygen/preferences-system.png</file>
-  <file>icons/oxygen/preferences-web-browser-cookies.png</file>
-  <file>icons/oxygen/security-high.png</file>
-  <file>icons/oxygen/security-low.png</file>
-  <file>icons/oxygen/services.png</file>
-  <file>icons/oxygen/tab-close.png</file>
-  <file>icons/oxygen/task-attention.png</file>
-  <file>icons/oxygen/task-complete.png</file>
-  <file>icons/oxygen/task-ongoing.png</file>
-  <file>icons/oxygen/task-reject.png</file>
-  <file>icons/oxygen/text-plain.png</file>
-  <file>icons/oxygen/tools-report-bug.png</file>
-  <file>icons/oxygen/unavailable.png</file>
-  <file>icons/oxygen/user-group-delete.png</file>
-  <file>icons/oxygen/user-group-new.png</file>
-  <file>icons/oxygen/view-calendar-journal.png</file>
-  <file>icons/oxygen/view-categories.png</file>
-  <file>icons/oxygen/view-filter.png</file>
-  <file>icons/oxygen/view-preview.png</file>
-  <file>icons/oxygen/view-refresh.png</file>
-  <file>icons/oxygen/view-statistics.png</file>
-  <file>icons/oxygen/wallet-open.png</file>
-  <file>icons/oxygen/webui.png</file>
+  <file>icons/qbt-theme/application-exit.png</file>
+  <file>icons/qbt-theme/application-rss+xml.png</file>
+  <file>icons/qbt-theme/application-x-mswinurl.png</file>
+  <file>icons/qbt-theme/chronometer.png</file>
+  <file>icons/qbt-theme/dialog-cancel.png</file>
+  <file>icons/qbt-theme/dialog-information.png</file>
+  <file>icons/qbt-theme/dialog-warning.png</file>
+  <file>icons/qbt-theme/document-edit-verify.png</file>
+  <file>icons/qbt-theme/document-edit.png</file>
+  <file>icons/qbt-theme/document-encrypt.png</file>
+  <file>icons/qbt-theme/document-import.png</file>
+  <file>icons/qbt-theme/document-new.png</file>
+  <file>icons/qbt-theme/document-properties.png</file>
+  <file>icons/qbt-theme/document-save.png</file>
+  <file>icons/qbt-theme/download.png</file>
+  <file>icons/qbt-theme/edit-clear-history.png</file>
+  <file>icons/qbt-theme/edit-clear.png</file>
+  <file>icons/qbt-theme/edit-copy.png</file>
+  <file>icons/qbt-theme/edit-cut.png</file>
+  <file>icons/qbt-theme/edit-delete.png</file>
+  <file>icons/qbt-theme/edit-find-user.png</file>
+  <file>icons/qbt-theme/edit-find.png</file>
+  <file>icons/qbt-theme/edit-paste.png</file>
+  <file>icons/qbt-theme/edit-rename.png</file>
+  <file>icons/qbt-theme/folder-documents.png</file>
+  <file>icons/qbt-theme/folder-new.png</file>
+  <file>icons/qbt-theme/folder-remote.png</file>
+  <file>icons/qbt-theme/gear.png</file>
+  <file>icons/qbt-theme/gear32.png</file>
+  <file>icons/qbt-theme/go-down.png</file>
+  <file>icons/qbt-theme/go-up.png</file>
+  <file>icons/qbt-theme/help-about.png</file>
+  <file>icons/qbt-theme/help-contents.png</file>
+  <file>icons/qbt-theme/inode-directory.png</file>
+  <file>icons/qbt-theme/insert-link.png</file>
+  <file>icons/qbt-theme/list-add.png</file>
+  <file>icons/qbt-theme/list-remove.png</file>
+  <file>icons/qbt-theme/mail-folder-inbox.png</file>
+  <file>icons/qbt-theme/mail-mark-read.png</file>
+  <file>icons/qbt-theme/media-playback-pause.png</file>
+  <file>icons/qbt-theme/media-playback-start.png</file>
+  <file>icons/qbt-theme/media-seek-forward.png</file>
+  <file>icons/qbt-theme/network-server.png</file>
+  <file>icons/qbt-theme/network-wired.png</file>
+  <file>icons/qbt-theme/object-locked.png</file>
+  <file>icons/qbt-theme/preferences-desktop.png</file>
+  <file>icons/qbt-theme/preferences-other.png</file>
+  <file>icons/qbt-theme/preferences-system-network.png</file>
+  <file>icons/qbt-theme/preferences-system.png</file>
+  <file>icons/qbt-theme/preferences-web-browser-cookies.png</file>
+  <file>icons/qbt-theme/security-high.png</file>
+  <file>icons/qbt-theme/security-low.png</file>
+  <file>icons/qbt-theme/services.png</file>
+  <file>icons/qbt-theme/tab-close.png</file>
+  <file>icons/qbt-theme/task-attention.png</file>
+  <file>icons/qbt-theme/task-complete.png</file>
+  <file>icons/qbt-theme/task-ongoing.png</file>
+  <file>icons/qbt-theme/task-reject.png</file>
+  <file>icons/qbt-theme/text-plain.png</file>
+  <file>icons/qbt-theme/tools-report-bug.png</file>
+  <file>icons/qbt-theme/unavailable.png</file>
+  <file>icons/qbt-theme/user-group-delete.png</file>
+  <file>icons/qbt-theme/user-group-new.png</file>
+  <file>icons/qbt-theme/view-calendar-journal.png</file>
+  <file>icons/qbt-theme/view-categories.png</file>
+  <file>icons/qbt-theme/view-filter.png</file>
+  <file>icons/qbt-theme/view-preview.png</file>
+  <file>icons/qbt-theme/view-refresh.png</file>
+  <file>icons/qbt-theme/view-statistics.png</file>
+  <file>icons/qbt-theme/wallet-open.png</file>
+  <file>icons/qbt-theme/webui.png</file>
   <file>icons/skin/arrow-right.gif</file>
   <file>icons/skin/bg-dropdown.gif</file>
   <file>icons/skin/bg-handle-horizontal.gif</file>
@@ -368,11 +368,11 @@
   <file>icons/skin/resumed.png</file>
   <file>icons/skin/uploading.png</file>
   <file>icons/skin/completed.png</file>
-  <file>icons/oxygen/system-log-out.png</file>
-  <file>icons/oxygen/go-bottom.png</file>
-  <file>icons/oxygen/go-top.png</file>
-  <file>icons/oxygen/checked.png</file>
-  <file>icons/oxygen/office-chart-line.png</file>
+  <file>icons/qbt-theme/system-log-out.png</file>
+  <file>icons/qbt-theme/go-bottom.png</file>
+  <file>icons/qbt-theme/go-top.png</file>
+  <file>icons/qbt-theme/checked.png</file>
+  <file>icons/qbt-theme/office-chart-line.png</file>
   <file>icons/skin/downloadLimit.png</file>
   <file>icons/skin/uploadLimit.png</file>
 </qresource>