Initial support for system Icons (incomplete but good progress)

src/confirmdeletiondlg.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>463</width>
-    <height>152</height>
+    <height>128</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -23,9 +23,9 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="lbl_warn">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -33,9 +33,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../icons.qrc">:/Icons/oxygen/dialog-warning.png</pixmap>
-       </property>
       </widget>
      </item>
      <item>
@@ -72,14 +69,10 @@
        <property name="text">
         <string notr="true"/>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/encrypted.png</normaloff>:/Icons/oxygen/encrypted.png</iconset>
-       </property>
        <property name="iconSize">
         <size>
-         <width>20</width>
+         <width>24</width>
-         <height>18</height>
+         <height>24</height>
         </size>
        </property>
       </widget>
@@ -122,9 +115,7 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

src/console.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>qBittorrent log viewer</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../icons.qrc">
-    <normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
-  </property>
   <layout class="QVBoxLayout">
    <item>
     <widget class="QTabWidget" name="tabConsole">
@@ -24,10 +20,6 @@
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
-      <attribute name="icon">
-       <iconset resource="../icons.qrc">
-        <normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
-      </attribute>
       <attribute name="title">
        <string>General</string>
       </attribute>
@@ -38,10 +30,6 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
-      <attribute name="icon">
-       <iconset resource="../icons.qrc">
-        <normaloff>:/Icons/oxygen/filter.png</normaloff>:/Icons/oxygen/filter.png</iconset>
-      </attribute>
       <attribute name="title">
        <string>Blocked IPs</string>
       </attribute>
@@ -55,8 +43,6 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections/>
 </ui>

src/console_imp.h

@@ -33,6 +33,7 @@
 
 #include "qbtsession.h"
 #include "ui_console.h"
+#include "misc.h"
 
 class consoleDlg : public QDialog, private Ui_ConsoleDlg{
   Q_OBJECT
@@ -42,6 +43,8 @@ class consoleDlg : public QDialog, private Ui_ConsoleDlg{
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       setModal(true);
+      tabConsole->setTabIcon(0, misc::getIcon("view-calendar-journal"));
+      tabConsole->setTabIcon(1, misc::getIcon("view-filter"));
       textConsole->setHtml(QBtSession::instance()->getConsoleMessages().join("<br>"));
       textBannedPeers->setHtml(QBtSession::instance()->getPeerBanMessages().join("<br>"));
       show();

src/deletionconfirmationdlg.h

@@ -42,6 +42,11 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
   public:
   DeletionConfirmationDlg(QWidget *parent=0): QDialog(parent) {
     setupUi(this);
+    // Icons
+    lbl_warn->setPixmap(misc::getIcon("dialog-warning").pixmap(lbl_warn->height()));
+    lbl_warn->setFixedWidth(lbl_warn->height());
+    rememberBtn->setIcon(misc::getIcon("emblem-locked"));
+
     move(misc::screenCenter(this));
     checkPermDelete->setChecked(Preferences().deleteTorrentFilesAsDefault());
     connect(checkPermDelete, SIGNAL(clicked()), this, SLOT(updateRememberButtonState()));

src/icons.qrc

@@ -2,8 +2,6 @@
 <qresource>
   <file>Icons/url.png</file>
   <file>Icons/loading.png</file>
-  <file>Icons/rss16.png</file>
-  <file>Icons/rss32.png</file>
   <file>Icons/3-state-checkbox.gif</file>
   <file>Icons/uparrow.png</file>
   <file>Icons/sphere.png</file>
@@ -304,59 +302,63 @@
   <file>Icons/flags/tk.png</file>
   <file>Icons/flags/bg.png</file>
   <file>Icons/flags/wf.png</file>
-  <file>Icons/oxygen/peer.png</file>
+  <file>Icons/oxygen/preferences-system.png</file>
   <file>Icons/oxygen/unavailable.png</file>
-  <file>Icons/oxygen/subscribe.png</file>
+  <file>Icons/oxygen/document-edit-verify.png</file>
   <file>Icons/oxygen/list-remove.png</file>
   <file>Icons/oxygen/dialog-warning.png</file>
   <file>Icons/oxygen/mail-folder-inbox.png</file>
-  <file>Icons/oxygen/folder.png</file>
+  <file>Icons/oxygen/edit-clear-history.png</file>
   <file>Icons/oxygen/edit-copy.png</file>
   <file>Icons/oxygen/folder-documents.png</file>
-  <file>Icons/oxygen/urlseed.png</file>
+  <file>Icons/oxygen/network-wired.png</file>
+  <file>Icons/oxygen/mail-mark-read.png</file>
   <file>Icons/oxygen/go-up.png</file>
+  <file>Icons/oxygen/application-exit.png</file>
+  <file>Icons/oxygen/edit-rename.png</file>
   <file>Icons/oxygen/edit-cut.png</file>
   <file>Icons/oxygen/gear32.png</file>
-  <file>Icons/oxygen/go-bottom.png</file>
+  <file>Icons/oxygen/media-playback-start.png</file>
   <file>Icons/oxygen/user-group-delete.png</file>
-  <file>Icons/oxygen/unsubscribe.png</file>
+  <file>Icons/oxygen/edit-find-user.png</file>
+  <file>Icons/oxygen/media-playback-pause.png</file>
   <file>Icons/oxygen/tab-close.png</file>
-  <file>Icons/oxygen/file.png</file>
+  <file>Icons/oxygen/inode-directory.png</file>
+  <file>Icons/oxygen/tools-report-bug.png</file>
+  <file>Icons/oxygen/view-filter.png</file>
   <file>Icons/oxygen/services.png</file>
+  <file>Icons/oxygen/view-preview.png</file>
   <file>Icons/oxygen/view-refresh.png</file>
-  <file>Icons/oxygen/feed-subscribe.png</file>
+  <file>Icons/oxygen/text-plain.png</file>
-  <file>Icons/oxygen/remove.png</file>
+  <file>Icons/oxygen/edit-delete.png</file>
   <file>Icons/oxygen/chronometer.png</file>
-  <file>Icons/oxygen/filter.png</file>
+  <file>Icons/oxygen/dialog-cancel.png</file>
-  <file>Icons/oxygen/run-build.png</file>
+  <file>Icons/oxygen/preferences-system-network.png</file>
-  <file>Icons/oxygen/button_ok.png</file>
+  <file>Icons/oxygen/document-properties.png</file>
   <file>Icons/oxygen/user-group-new.png</file>
-  <file>Icons/oxygen/cookies.png</file>
   <file>Icons/oxygen/network-server.png</file>
-  <file>Icons/oxygen/unsubscribe16.png</file>
+  <file>Icons/oxygen/preferences-web-browser-cookies.png</file>
-  <file>Icons/oxygen/encrypted32.png</file>
   <file>Icons/oxygen/list-add.png</file>
   <file>Icons/oxygen/edit-paste.png</file>
   <file>Icons/oxygen/folder-remote.png</file>
   <file>Icons/oxygen/help-about.png</file>
-  <file>Icons/oxygen/encrypted.png</file>
+  <file>Icons/oxygen/document-save.png</file>
-  <file>Icons/oxygen/folder-remote16.png</file>
-  <file>Icons/oxygen/go-top.png</file>
   <file>Icons/oxygen/emblem-favorite.png</file>
-  <file>Icons/oxygen/edit_clear.png</file>
-  <file>Icons/oxygen/bug.png</file>
   <file>Icons/oxygen/gear.png</file>
-  <file>Icons/oxygen/connection.png</file>
+  <file>Icons/oxygen/view-categories.png</file>
+  <file>Icons/oxygen/emblem-locked.png</file>
   <file>Icons/oxygen/document-new.png</file>
-  <file>Icons/oxygen/browse.png</file>
+  <file>Icons/oxygen/dialog-information.png</file>
-  <file>Icons/oxygen/proxy.png</file>
+  <file>Icons/oxygen/preferences-other.png</file>
-  <file>Icons/oxygen/button_cancel.png</file>
+  <file>Icons/oxygen/view-calendar-journal.png</file>
+  <file>Icons/oxygen/application-rss+xml.png</file>
+  <file>Icons/oxygen/document-encrypt.png</file>
+  <file>Icons/oxygen/help-contents.png</file>
   <file>Icons/oxygen/preferences-desktop.png</file>
-  <file>Icons/oxygen/bt_settings.png</file>
+  <file>Icons/oxygen/application-x-mswinurl.png</file>
   <file>Icons/oxygen/go-down.png</file>
-  <file>Icons/oxygen/subscribe16.png</file>
+  <file>Icons/oxygen/document-import.png</file>
   <file>Icons/oxygen/download.png</file>
-  <file>Icons/oxygen/log.png</file>
   <file>Icons/oxygen/edit-find.png</file>
   <file>Icons/oxygen/edit-clear.png</file>
   <file>Icons/oxygen/webui.png</file>

src/mainwindow.cpp

@@ -101,27 +101,37 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   connect(static_cast<SessionApplication*>(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteBTSession()));
   // Setting icons
   this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
-  actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png")));
+  actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png"))); // FIXME
-  actionExit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/exit.png")));
+  actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png"))); // FIXME
-  actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png")));
-  actionOptions->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/settings.png")));
-  actionAbout->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/info.png")));
-  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
-  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/bug.png")));
-  actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
-  actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
-  actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
-  actionPause_All->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause_all.png")));
-  actionStart_All->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play_all.png")));
-  actionClearLog->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
-  actionPreview_file->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")));
   actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
   actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png")));
   actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
   actionSet_global_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png")));
-  actionDocumentation->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qb_question.png")));
+  actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png")));
-  actionLock_qBittorrent->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/encrypted32.png")));
+  actionAbout->setIcon(misc::getIcon("help-about"));
-  lockMenu = new QMenu();
+  actionBugReport->setIcon(misc::getIcon("tools-report-bug"));
+  actionDecreasePriority->setIcon(misc::getIcon("go-down"));
+  actionDelete->setIcon(misc::getIcon("edit-delete"));
+  actionDocumentation->setIcon(misc::getIcon("help-contents"));
+  actionDonate_money->setIcon(misc::getIcon("emblem-favorite"));
+  actionExit->setIcon(misc::getIcon("application-exit"));
+  actionIncreasePriority->setIcon(misc::getIcon("go-up"));
+  actionLock_qBittorrent->setIcon(misc::getIcon("emblem-locked"));
+  actionOptions->setIcon(misc::getIcon("preferences-system"));
+  actionPause->setIcon(misc::getIcon("media-playback-pause"));
+  actionPause_All->setIcon(misc::getIcon("media-playback-pause"));
+  actionStart->setIcon(misc::getIcon("media-playback-start"));
+  actionStart_All->setIcon(misc::getIcon("media-playback-start"));
+  action_Import_Torrent->setIcon(misc::getIcon("list-add"));
+  actionShow_console->setIcon(misc::getIcon("view-calendar-journal"));
+
+  QMenu *startAllMenu = new QMenu(this);
+  startAllMenu->addAction(actionStart_All);
+  actionStart->setMenu(startAllMenu);
+  QMenu *pauseAllMenu = new QMenu(this);
+  pauseAllMenu->addAction(actionPause_All);
+  actionPause->setMenu(pauseAllMenu);
+  QMenu *lockMenu = new QMenu(this);
   QAction *defineUiLockPasswdAct = lockMenu->addAction(tr("Set the password..."));
   connect(defineUiLockPasswdAct, SIGNAL(triggered()), this, SLOT(defineUILockPassword()));
   actionLock_qBittorrent->setMenu(lockMenu);
@@ -129,7 +139,6 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   prioSeparator2 = menu_Edit->insertSeparator(actionDecreasePriority);
   prioSeparator->setVisible(false);
   prioSeparator2->setVisible(false);
-  actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png")));
   // Fix Tool bar layout
   toolBar->layout()->setSpacing(7);
   // Creating Bittorrent session
@@ -162,7 +171,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   vSplitter->addWidget(hSplitter);
   vSplitter->setCollapsible(0, true);
   vSplitter->setCollapsible(1, false);
-  tabs->addTab(vSplitter, QIcon(QString::fromUtf8(":/Icons/oxygen/folder-remote.png")), tr("Transfers"));
+  tabs->addTab(vSplitter, misc::getIcon("folder-remote"), tr("Transfers"));
   connect(transferList->getSourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(updateNbTorrents()));
   connect(transferList->getSourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(updateNbTorrents()));
 
@@ -290,7 +299,6 @@ MainWindow::~MainWindow() {
   delete search_filter;
   delete transferList;
   delete guiUpdater;
-  delete lockMenu;
   if(createTorrentDlg)
     delete createTorrentDlg;
   if(console)
@@ -366,7 +374,7 @@ void MainWindow::displayRSSTab(bool enable) {
     if(!rssWidget) {
       rssWidget = new RSSImp(tabs);
       int index_tab = tabs->addTab(rssWidget, tr("RSS"));
-      tabs->setTabIcon(index_tab, QIcon(QString::fromUtf8(":/Icons/rss32.png")));
+      tabs->setTabIcon(index_tab, misc::getIcon("application-rss+xml"));
     }
     tabs->showTabBar(true);
   } else {
@@ -383,7 +391,7 @@ void MainWindow::displaySearchTab(bool enable) {
     // RSS tab
     if(!searchEngine) {
       searchEngine = new SearchEngine(this);
-      tabs->insertTab(1, searchEngine, QIcon(QString::fromUtf8(":/Icons/oxygen/edit-find.png")), tr("Search"));
+      tabs->insertTab(1, searchEngine, misc::getIcon("edit-find"), tr("Search"));
     }
     tabs->showTabBar(true);
   } else {

src/mainwindow.h

@@ -175,7 +175,6 @@ private:
   QAction *prioSeparator2;
   QSplitter *hSplitter;
   QSplitter *vSplitter;
-  QMenu *lockMenu;
   // Search
   QPointer<SearchEngine> searchEngine;
   // RSS

src/mainwindow.ui

@@ -36,8 +36,6 @@
     <property name="title">
      <string>&amp;Edit</string>
     </property>
-    <addaction name="actionStart_All"/>
-    <addaction name="actionPause_All"/>
     <addaction name="separator"/>
     <addaction name="actionStart"/>
     <addaction name="actionPause"/>
@@ -132,11 +130,8 @@
    <addaction name="actionStart"/>
    <addaction name="actionPause"/>
    <addaction name="separator"/>
-   <addaction name="actionStart_All"/>
-   <addaction name="actionPause_All"/>
    <addaction name="actionDecreasePriority"/>
    <addaction name="actionIncreasePriority"/>
-   <addaction name="separator"/>
    <addaction name="actionOptions"/>
    <addaction name="separator"/>
    <addaction name="actionExit"/>
@@ -182,17 +177,11 @@
     <string>&amp;Delete</string>
    </property>
   </action>
-  <action name="actionPause_All">
-   <property name="text">
-    <string>P&amp;ause All</string>
-   </property>
-  </action>
-  <action name="actionStart_All">
-   <property name="text">
-    <string>R&amp;esume All</string>
-   </property>
-  </action>
   <action name="actionWebsite">
+   <property name="icon">
+    <iconset resource="icons.qrc">
+     <normaloff>:/Icons/skin/qbittorrent32.png</normaloff>:/Icons/skin/qbittorrent32.png</iconset>
+   </property>
    <property name="text">
     <string>Visit &amp;Website</string>
    </property>
@@ -207,16 +196,6 @@
     <string>Torrent &amp;creator</string>
    </property>
   </action>
-  <action name="actionPreview_file">
-   <property name="text">
-    <string>Preview file</string>
-   </property>
-  </action>
-  <action name="actionClearLog">
-   <property name="text">
-    <string>Clear log</string>
-   </property>
-  </action>
   <action name="actionBugReport">
    <property name="text">
     <string>Report a &amp;bug</string>
@@ -248,10 +227,6 @@
    </property>
   </action>
   <action name="actionDecreasePriority">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/skin/decrease.png</normaloff>:/Icons/skin/decrease.png</iconset>
-   </property>
    <property name="text">
     <string>Decrease priority</string>
    </property>
@@ -260,10 +235,6 @@
    </property>
   </action>
   <action name="actionIncreasePriority">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/skin/increase.png</normaloff>:/Icons/skin/increase.png</iconset>
-   </property>
    <property name="text">
     <string>Increase priority</string>
    </property>
@@ -272,10 +243,6 @@
    </property>
   </action>
   <action name="actionShow_console">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Log viewer...</string>
    </property>
@@ -363,10 +330,6 @@
    </property>
   </action>
   <action name="action_Import_Torrent">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
-   </property>
    <property name="text">
     <string>Import existing torrent...</string>
    </property>
@@ -375,10 +338,6 @@
    </property>
   </action>
   <action name="actionDonate_money">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/emblem-favorite.png</normaloff>:/Icons/oxygen/emblem-favorite.png</iconset>
-   </property>
    <property name="text">
     <string>Donate money</string>
    </property>
@@ -386,6 +345,16 @@
     <string>If you like qBittorrent, please donate!</string>
    </property>
   </action>
+  <action name="actionStart_All">
+   <property name="text">
+    <string>R&amp;esume All</string>
+   </property>
+  </action>
+  <action name="actionPause_All">
+   <property name="text">
+    <string>P&amp;ause All</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="icons.qrc"/>

src/misc.h

@@ -42,6 +42,10 @@
 #include <QFile>
 #include <QDir>
 
+#ifndef DISABLE_GUI
+#include <QIcon>
+#endif
+
 #include <libtorrent/torrent_info.hpp>
 #include <libtorrent/torrent_handle.hpp>
 
@@ -81,6 +85,18 @@ public:
     return libtorrent::sha1_hash(qPrintable(hash));
   }
 
+#ifndef DISABLE_GUI
+  static inline QIcon getIcon(const QString& id) {
+#if (QT_VERSION >= QT_VERSION_CHECK(4,6,0))
+    const QIcon icon = QIcon::fromTheme(id, QIcon(":/Icons/oxygen/"+id+".png"));
+#else
+    const QIcon icon(":/Icons/oxygen/"+id+".png");
+#endif
+    Q_ASSERT(!icon.isNull());
+    return icon;
+  }
+#endif
+
   static void chmod644(const QDir& folder);
 
   static inline QString removeLastPathPart(QString path) {

src/preferences/options.ui

@@ -88,15 +88,14 @@
       </property>
       <item>
        <property name="text">
-        <string>UI</string>
+        <string extracomment="User Interface">UI</string>
+       </property>
+       <property name="toolTip">
+        <string>User Interface</string>
        </property>
        <property name="textAlignment">
         <set>AlignHCenter|AlignVCenter|AlignCenter</set>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/preferences-desktop.png</normaloff>:/Icons/oxygen/preferences-desktop.png</iconset>
-       </property>
        <property name="flags">
         <set>ItemIsSelectable|ItemIsEnabled</set>
        </property>
@@ -108,10 +107,6 @@
        <property name="textAlignment">
         <set>AlignHCenter|AlignVCenter|AlignCenter</set>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/download.png</normaloff>:/Icons/oxygen/download.png</iconset>
-       </property>
        <property name="flags">
         <set>ItemIsSelectable|ItemIsEnabled</set>
        </property>
@@ -123,10 +118,6 @@
        <property name="textAlignment">
         <set>AlignHCenter|AlignVCenter|AlignCenter</set>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/connection.png</normaloff>:/Icons/oxygen/connection.png</iconset>
-       </property>
        <property name="flags">
         <set>ItemIsSelectable|ItemIsEnabled</set>
        </property>
@@ -135,10 +126,6 @@
        <property name="text">
         <string>Speed</string>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/chronometer.png</normaloff>:/Icons/oxygen/chronometer.png</iconset>
-       </property>
       </item>
       <item>
        <property name="text">
@@ -147,10 +134,6 @@
        <property name="textAlignment">
         <set>AlignHCenter|AlignVCenter|AlignCenter</set>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/bt_settings.png</normaloff>:/Icons/oxygen/bt_settings.png</iconset>
-       </property>
        <property name="flags">
         <set>ItemIsSelectable|ItemIsEnabled</set>
        </property>
@@ -162,10 +145,6 @@
        <property name="textAlignment">
         <set>AlignHCenter|AlignVCenter|AlignCenter</set>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/webui.png</normaloff>:/Icons/oxygen/webui.png</iconset>
-       </property>
        <property name="flags">
         <set>ItemIsSelectable|ItemIsEnabled</set>
        </property>
@@ -174,10 +153,6 @@
        <property name="text">
         <string>Advanced</string>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/gear32.png</normaloff>:/Icons/oxygen/gear32.png</iconset>
-       </property>
       </item>
      </widget>
      <widget class="QStackedWidget" name="tabOption">
@@ -202,7 +177,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>507</width>
+             <width>506</width>
              <height>430</height>
             </rect>
            </property>
@@ -506,7 +481,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>507</width>
+             <width>506</width>
              <height>698</height>
             </rect>
            </property>
@@ -612,9 +587,8 @@ QGroupBox {
                         <height>27</height>
                        </size>
                       </property>
-                      <property name="icon">
+                      <property name="text">
-                       <iconset resource="../icons.qrc">
+                       <string notr="true">...</string>
-                        <normaloff>:/Icons/oxygen/browse.png</normaloff>:/Icons/oxygen/browse.png</iconset>
                       </property>
                      </widget>
                     </item>
@@ -685,9 +659,8 @@ QGroupBox {
                       <height>27</height>
                      </size>
                     </property>
-                    <property name="icon">
+                    <property name="text">
-                     <iconset resource="../icons.qrc">
+                     <string notr="true">...</string>
-                      <normaloff>:/Icons/oxygen/browse.png</normaloff>:/Icons/oxygen/browse.png</iconset>
                     </property>
                    </widget>
                   </item>
@@ -849,9 +822,8 @@ QGroupBox {
                       <height>27</height>
                      </size>
                     </property>
-                    <property name="icon">
+                    <property name="text">
-                     <iconset resource="../icons.qrc">
+                     <string notr="true">...</string>
-                      <normaloff>:/Icons/oxygen/browse.png</normaloff>:/Icons/oxygen/browse.png</iconset>
                     </property>
                    </widget>
                   </item>
@@ -951,8 +923,8 @@ QGroupBox {
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>-51</y>
+             <y>0</y>
-             <width>507</width>
+             <width>506</width>
              <height>457</height>
             </rect>
            </property>
@@ -1381,9 +1353,8 @@ QGroupBox {
                    <height>22</height>
                   </size>
                  </property>
-                 <property name="icon">
+                 <property name="text">
-                  <iconset resource="../icons.qrc">
+                  <string notr="true">...</string>
-                   <normaloff>:/Icons/oxygen/browse.png</normaloff>:/Icons/oxygen/browse.png</iconset>
                  </property>
                 </widget>
                </item>
@@ -1799,8 +1770,8 @@ QGroupBox {
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>-25</y>
+             <y>-7</y>
-             <width>570</width>
+             <width>581</width>
              <height>422</height>
             </rect>
            </property>

src/preferences/options_imp.cpp

@@ -55,10 +55,18 @@ using namespace libtorrent;
 // Constructor
 options_imp::options_imp(QWidget *parent):QDialog(parent){
   qDebug("-> Constructing Options");
+  setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
   setModal(true);
+  // Icons
+  tabSelection->item(TAB_UI)->setIcon(misc::getIcon("preferences-desktop"));
+  tabSelection->item(TAB_BITTORRENT)->setIcon(misc::getIcon("preferences-system-network"));
+  tabSelection->item(TAB_CONNECTION)->setIcon(misc::getIcon("network-wired"));
+  tabSelection->item(TAB_DOWNLOADS)->setIcon(misc::getIcon("download"));
+  tabSelection->item(TAB_SPEED)->setIcon(misc::getIcon("chronometer"));
+  tabSelection->item(TAB_WEBUI)->setIcon(misc::getIcon("network-server"));
+  tabSelection->item(TAB_ADVANCED)->setIcon(misc::getIcon("preferences-other"));
 
-  setupUi(this);
   hsplitter->setCollapsible(0, false);
   hsplitter->setCollapsible(1, false);
   // Get apply button in button box

src/preferences/options_imp.h

@@ -42,6 +42,8 @@ class AdvancedSettings;
 
 class options_imp : public QDialog, private Ui_Preferences {
   Q_OBJECT
+private:
+  enum Tabs {TAB_UI, TAB_DOWNLOADS, TAB_CONNECTION, TAB_SPEED, TAB_BITTORRENT, TAB_WEBUI, TAB_ADVANCED};
 
 public:
   // Contructor / Destructor

src/properties/peerlistwidget.cpp

@@ -134,7 +134,7 @@ void PeerListWidget::showPeerListMenu(QPoint) {
   // Add Peer Action
   QAction *addPeerAct = 0;
   if(!h.is_queued() && !h.is_checking()) {
-    addPeerAct = menu.addAction(QIcon(":/Icons/oxygen/user-group-new.png"), tr("Add a new peer..."));
+    addPeerAct = menu.addAction(misc::getIcon("user-group-new"), tr("Add a new peer..."));
     empty_menu = false;
   }
   // Per Peer Speed limiting actions
@@ -143,12 +143,12 @@ void PeerListWidget::showPeerListMenu(QPoint) {
   QAction *banAct = 0;
   QAction *copyIPAct = 0;
   if(!selectedPeerIPs.isEmpty()) {
-    copyIPAct = menu.addAction(QIcon(":/Icons/oxygen/edit-copy.png"), tr("Copy IP"));
+    copyIPAct = menu.addAction(misc::getIcon("edit-copy"), tr("Copy IP"));
     menu.addSeparator();
     dlLimitAct = menu.addAction(QIcon(":/Icons/skin/download.png"), tr("Limit download rate..."));
     upLimitAct = menu.addAction(QIcon(":/Icons/skin/seeding.png"), tr("Limit upload rate..."));
     menu.addSeparator();
-    banAct = menu.addAction(QIcon(":/Icons/oxygen/user-group-delete.png"), tr("Ban peer permanently"));
+    banAct = menu.addAction(misc::getIcon("user-group-delete"), tr("Ban peer permanently"));
     empty_menu = false;
   }
   if(empty_menu) return;

src/properties/propertieswidget.cpp

@@ -61,6 +61,12 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra
   QWidget(parent), transferList(transferList), main_window(main_window) {
 
   setupUi(this);
+  // Icons
+  deleteWS_button->setIcon(misc::getIcon("list-remove"));
+  addWS_button->setIcon(misc::getIcon("list-add"));
+  trackerUpButton->setIcon(misc::getIcon("go-up"));
+  trackerDownButton->setIcon(misc::getIcon("go-down"));
+
   state = VISIBLE;
   setEnabled(false);
 
@@ -486,7 +492,7 @@ void PropertiesWidget::displayFilesListMenu(const QPoint&){
   QModelIndexList selectedRows = filesList->selectionModel()->selectedRows(0);
   QAction *actRename = 0;
   if(selectedRows.size() == 1) {
-    actRename = myFilesLlistMenu.addAction(QIcon(QString::fromUtf8(":/Icons/oxygen/edit_clear.png")), tr("Rename..."));
+    actRename = myFilesLlistMenu.addAction(misc::getIcon("edit-rename"), tr("Rename..."));
     myFilesLlistMenu.addSeparator();
   }
   QMenu subMenu;

src/properties/propertieswidget.ui

@@ -54,8 +54,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>534</width>
+            <width>520</width>
-            <height>314</height>
+            <height>355</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -515,9 +515,10 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <property name="openExternalLinks">
@@ -579,10 +580,6 @@ p, li { white-space: pre-wrap; }
            <property name="text">
             <string notr="true"/>
            </property>
-           <property name="icon">
-            <iconset resource="../icons.qrc">
-             <normaloff>:/Icons/uparrow.png</normaloff>:/Icons/uparrow.png</iconset>
-           </property>
           </widget>
          </item>
          <item>
@@ -624,10 +621,6 @@ p, li { white-space: pre-wrap; }
            <property name="text">
             <string notr="true"/>
            </property>
-           <property name="icon">
-            <iconset resource="../icons.qrc">
-             <normaloff>:/Icons/downarrow.png</normaloff>:/Icons/downarrow.png</iconset>
-           </property>
           </widget>
          </item>
          <item>
@@ -680,34 +673,26 @@ p, li { white-space: pre-wrap; }
           <widget class="QPushButton" name="deleteWS_button">
            <property name="maximumSize">
             <size>
-             <width>24</width>
+             <width>32</width>
-             <height>24</height>
+             <height>32</height>
             </size>
            </property>
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset resource="../icons.qrc">
-             <normaloff>:/Icons/oxygen/list-remove.png</normaloff>:/Icons/oxygen/list-remove.png</iconset>
-           </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="addWS_button">
            <property name="maximumSize">
             <size>
-             <width>24</width>
+             <width>32</width>
-             <height>24</height>
+             <height>32</height>
             </size>
            </property>
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset resource="../icons.qrc">
-             <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
-           </property>
           </widget>
          </item>
          <item>
@@ -841,8 +826,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections/>
 </ui>

src/properties/proptabbar.cpp

@@ -34,6 +34,7 @@
 #include <QKeySequence>
 
 #include "proptabbar.h"
+#include "misc.h"
 
 #ifdef Q_WS_MAC
 #define DEFAULT_BUTTON_CSS "QPushButton {border: 1px solid rgb(85, 81, 91);border-radius: 3px;padding: 2px; margin-left: 8px; margin-right: 8px;}"
@@ -51,32 +52,32 @@ PropTabBar::PropTabBar(QWidget *parent) :
   m_btnGroup = new QButtonGroup(this);
   setContentsMargins(5, 4, 5, 2);
   // General tab
-  QPushButton *main_infos_button = new QPushButton(QIcon(":/Icons/oxygen/help-about.png"), tr("General"), parent);
+  QPushButton *main_infos_button = new QPushButton(misc::getIcon("document-properties"), tr("General"), parent);
   main_infos_button->setShortcut(QKeySequence(QString::fromUtf8("Alt+P")));
   main_infos_button->setStyleSheet(DEFAULT_BUTTON_CSS);
   main_infos_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE));
   addWidget(main_infos_button);
   m_btnGroup->addButton(main_infos_button, MAIN_TAB);
   // Trackers tab
-  QPushButton *trackers_button = new QPushButton(QIcon(":/Icons/oxygen/network-server.png"), tr("Trackers"), parent);
+  QPushButton *trackers_button = new QPushButton(misc::getIcon("network-server"), tr("Trackers"), parent);
   trackers_button->setStyleSheet(DEFAULT_BUTTON_CSS);
   trackers_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE));
   addWidget(trackers_button);
   m_btnGroup->addButton(trackers_button, TRACKERS_TAB);
   // Peers tab
-  QPushButton *peers_button = new QPushButton(QIcon(":/Icons/oxygen/peer.png"), tr("Peers"), parent);
+  QPushButton *peers_button = new QPushButton(misc::getIcon("edit-find-user"), tr("Peers"), parent);
   peers_button->setStyleSheet(DEFAULT_BUTTON_CSS);
   peers_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE));
   addWidget(peers_button);
   m_btnGroup->addButton(peers_button, PEERS_TAB);
   // URL seeds tab
-  QPushButton *urlseeds_button = new QPushButton(QIcon(":/Icons/oxygen/urlseed.png"), tr("URL Seeds"), parent);
+  QPushButton *urlseeds_button = new QPushButton(misc::getIcon("network-server"), tr("HTTP Sources"), parent);
   urlseeds_button->setStyleSheet(DEFAULT_BUTTON_CSS);
   urlseeds_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE));
   addWidget(urlseeds_button);
   m_btnGroup->addButton(urlseeds_button, URLSEEDS_TAB);
   // Files tab
-  QPushButton *files_button = new QPushButton(QIcon(":/Icons/oxygen/folder.png"), tr("Files"), parent);
+  QPushButton *files_button = new QPushButton(misc::getIcon("inode-directory"), tr("Content"), parent);
   files_button->setStyleSheet(DEFAULT_BUTTON_CSS);
   files_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE));
   addWidget(files_button);

src/properties/trackerlist.cpp

@@ -344,13 +344,13 @@ void TrackerList::showTrackerListMenu(QPoint) {
   //QList<QTreeWidgetItem*> selected_items = getSelectedTrackerItems();
   QMenu menu;
   // Add actions
-  QAction *addAct = menu.addAction(QIcon(":/Icons/oxygen/list-add.png"), tr("Add a new tracker..."));
+  QAction *addAct = menu.addAction(misc::getIcon("list-add"), tr("Add a new tracker..."));
   QAction *delAct = 0;
   if(!getSelectedTrackerItems().isEmpty()) {
-    delAct = menu.addAction(QIcon(":/Icons/oxygen/list-remove.png"), tr("Remove tracker"));
+    delAct = menu.addAction(misc::getIcon("list-remove"), tr("Remove tracker"));
   }
   menu.addSeparator();
-  QAction *reannounceAct = menu.addAction(QIcon(":/Icons/oxygen/run-build.png"), tr("Force reannounce"));
+  QAction *reannounceAct = menu.addAction(misc::getIcon("view-refresh"), tr("Force reannounce"));
   QAction *act = menu.exec(QCursor::pos());
   if(act == 0) return;
   if(act == addAct) {

src/properties/trackersadditiondlg.h

@@ -50,6 +50,8 @@ private:
 public:
   TrackersAdditionDlg(QTorrentHandle h, QWidget *parent=0): QDialog(parent), h(h) {
     setupUi(this);
+    // Icons
+    uTorrentListButton->setIcon(misc::getIcon("download"));
     // As a default, use torrentz.com link
     list_url->setText("http://www.torrentz.com/announce_"+h.hash());
     list_url->setCursorPosition(0);

src/properties/trackersadditiondlg.ui

@@ -30,8 +30,8 @@
       <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="acceptRichText">
       <bool>false</bool>
@@ -67,10 +67,6 @@ p, li { white-space: pre-wrap; }
        <property name="text">
         <string notr="true"/>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/download.png</normaloff>:/Icons/oxygen/download.png</iconset>
-       </property>
       </widget>
      </item>
     </layout>
@@ -87,9 +83,7 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

src/rss/automatedrssdownloader.cpp

@@ -43,6 +43,7 @@
 #include "qinisettings.h"
 #include "rssmanager.h"
 #include "rssfeed.h"
+#include "misc.h"
 
 AutomatedRssDownloader::AutomatedRssDownloader(QWidget *parent) :
   QDialog(parent),
@@ -50,6 +51,10 @@ AutomatedRssDownloader::AutomatedRssDownloader(QWidget *parent) :
   m_editedRule(0)
 {
   ui->setupUi(this);
+  // Icons
+  ui->removeRuleBtn->setIcon(misc::getIcon("list-remove"));
+  ui->addRuleBtn->setIcon(misc::getIcon("list-add"));
+
   // Ui Settings
   ui->listRules->setSortingEnabled(true);
   ui->listRules->setSelectionMode(QAbstractItemView::ExtendedSelection);
@@ -350,17 +355,17 @@ void AutomatedRssDownloader::displayRulesListMenu(const QPoint &pos)
 {
   Q_UNUSED(pos);
   QMenu menu;
-  QAction *addAct = menu.addAction(QIcon(":/Icons/oxygen/list-add.png"), tr("Add new rule..."));
+  QAction *addAct = menu.addAction(misc::getIcon("list-add"), tr("Add new rule..."));
   QAction *delAct = 0;
   QAction *renameAct = 0;
   const QList<QListWidgetItem*> selection = ui->listRules->selectedItems();
   if(!selection.isEmpty()) {
     if(selection.count() == 1) {
-      delAct = menu.addAction(QIcon(":/Icons/oxygen/list-remove.png"), tr("Delete rule"));
+      delAct = menu.addAction(misc::getIcon("list-remove"), tr("Delete rule"));
       menu.addSeparator();
-      renameAct = menu.addAction(QIcon(":/Icons/oxygen/edit_clear.png"), tr("Rename rule..."));
+      renameAct = menu.addAction(misc::getIcon("edit-rename"), tr("Rename rule..."));
     } else {
-      delAct = menu.addAction(QIcon(":/Icons/oxygen/list-remove.png"), tr("Delete selected rules"));
+      delAct = menu.addAction(misc::getIcon("list-remove"), tr("Delete selected rules"));
     }
   }
   QAction *act = menu.exec(QCursor::pos());
@@ -465,7 +470,7 @@ void AutomatedRssDownloader::addFeedArticlesToTree(const RssFeed *feed, const QS
     QFont f = treeFeedItem->font(0);
     f.setBold(true);
     treeFeedItem->setFont(0, f);
-    treeFeedItem->setData(0, Qt::DecorationRole, QIcon(":/Icons/oxygen/folder.png"));
+    treeFeedItem->setData(0, Qt::DecorationRole, misc::getIcon("inode-directory"));
     treeFeedItem->setData(0, Qt::UserRole, feed->getUrl());
     ui->treeMatchingArticles->addTopLevelItem(treeFeedItem);
   }

src/rss/automatedrssdownloader.ui

@@ -32,7 +32,7 @@
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QWidget" name="">
+     <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -70,10 +70,6 @@
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset resource="../icons.qrc">
-             <normaloff>:/Icons/oxygen/list-remove.png</normaloff>:/Icons/oxygen/list-remove.png</iconset>
-           </property>
            <property name="iconSize">
             <size>
              <width>24</width>
@@ -87,10 +83,6 @@
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset resource="../icons.qrc">
-             <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
-           </property>
            <property name="iconSize">
             <size>
              <width>24</width>
@@ -123,7 +115,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="">
+     <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <widget class="QGroupBox" name="ruleDefBox">
@@ -246,7 +238,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="">
+     <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QLabel" name="label_3">
@@ -320,9 +312,7 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

src/rss/cookiesdlg.cpp

@@ -30,6 +30,7 @@
 
 #include "cookiesdlg.h"
 #include "ui_cookiesdlg.h"
+#include "misc.h"
 
 #include <QNetworkCookie>
 
@@ -40,6 +41,10 @@ CookiesDlg::CookiesDlg(QWidget *parent, const QList<QByteArray> &raw_cookies) :
     ui(new Ui::CookiesDlg)
 {
   ui->setupUi(this);
+  // Icons
+  ui->add_btn->setIcon(misc::getIcon("list-add"));
+  ui->del_btn->setIcon(misc::getIcon("list-remove"));
+
   ui->infos_lbl->setText(tr("Common keys for cookies are : '%1', '%2'.\nYou should get this information from your Web browser preferences.").arg("uid").arg("pass"));
   foreach(const QByteArray &raw_cookie, raw_cookies) {
     QList<QByteArray> cookie_parts = raw_cookie.split('=');

src/rss/cookiesdlg.ui

@@ -33,12 +33,12 @@
      </attribute>
      <column>
       <property name="text">
-       <string>Key</string>
+       <string extracomment="As in Key/Value pair">Key</string>
       </property>
      </column>
      <column>
       <property name="text">
-       <string>Value</string>
+       <string extracomment="As in Key/Value pair">Value</string>
       </property>
      </column>
     </widget>
@@ -63,10 +63,6 @@
        <property name="text">
         <string notr="true"/>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
-       </property>
        <property name="iconSize">
         <size>
          <width>20</width>
@@ -96,10 +92,6 @@
        <property name="text">
         <string notr="true"/>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/list-remove.png</normaloff>:/Icons/oxygen/list-remove.png</iconset>
-       </property>
        <property name="iconSize">
         <size>
          <width>20</width>
@@ -142,9 +134,7 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

src/rss/feedlistwidget.cpp

@@ -28,10 +28,10 @@
  * Contact: chris@qbittorrent.org, arnaud@qbittorrent.org
  */
 
-#
 #include "feedlistwidget.h"
 #include "rssmanager.h"
 #include "rssfeed.h"
+#include "misc.h"
 
 FeedListWidget::FeedListWidget(QWidget *parent, RssManager *rssmanager): QTreeWidget(parent), rssmanager(rssmanager) {
   setContextMenuPolicy(Qt::CustomContextMenu);
@@ -41,7 +41,7 @@ FeedListWidget::FeedListWidget(QWidget *parent, RssManager *rssmanager): QTreeWi
   headerItem()->setText(0, tr("RSS feeds"));
   unread_item = new QTreeWidgetItem(this);
   unread_item->setText(0, tr("Unread") + QString::fromUtf8("  (") + QString::number(rssmanager->getNbUnRead(), 10)+ QString(")"));
-  unread_item->setData(0,Qt::DecorationRole, QVariant(QIcon(":/Icons/oxygen/mail-folder-inbox.png")));
+  unread_item->setData(0,Qt::DecorationRole, misc::getIcon("mail-folder-inbox"));
   itemAdded(unread_item, rssmanager);
   connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(updateCurrentFeed(QTreeWidgetItem*)));
   setCurrentItem(unread_item);

src/rss/rss.ui

@@ -24,10 +24,6 @@
        <property name="text">
         <string>New subscription</string>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/subscribe.png</normaloff>:/Icons/oxygen/subscribe.png</iconset>
-       </property>
        <property name="toolButtonStyle">
         <enum>Qt::ToolButtonTextBesideIcon</enum>
        </property>
@@ -38,10 +34,6 @@
        <property name="text">
         <string>Mark items read</string>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/button_ok.png</normaloff>:/Icons/oxygen/button_ok.png</iconset>
-       </property>
        <property name="toolButtonStyle">
         <enum>Qt::ToolButtonTextBesideIcon</enum>
        </property>
@@ -61,10 +53,6 @@
        <property name="text">
         <string>Update all</string>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/view-refresh.png</normaloff>:/Icons/oxygen/view-refresh.png</iconset>
-       </property>
        <property name="iconSize">
         <size>
          <width>24</width>
@@ -187,10 +175,6 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
   <action name="actionDelete">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/remove.png</normaloff>:/Icons/oxygen/remove.png</iconset>
-   </property>
    <property name="text">
     <string>Delete</string>
    </property>
@@ -199,10 +183,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionRename">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/edit_clear.png</normaloff>:/Icons/oxygen/edit_clear.png</iconset>
-   </property>
    <property name="text">
     <string>Rename...</string>
    </property>
@@ -211,10 +191,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionUpdate">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/view-refresh.png</normaloff>:/Icons/oxygen/view-refresh.png</iconset>
-   </property>
    <property name="text">
     <string>Update</string>
    </property>
@@ -223,19 +199,11 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionNew_subscription">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/subscribe16.png</normaloff>:/Icons/oxygen/subscribe16.png</iconset>
-   </property>
    <property name="text">
     <string>New subscription...</string>
    </property>
   </action>
   <action name="actionUpdate_all_feeds">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/view-refresh.png</normaloff>:/Icons/oxygen/view-refresh.png</iconset>
-   </property>
    <property name="text">
     <string>Update all feeds</string>
    </property>
@@ -244,10 +212,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionMark_items_read">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/button_ok.png</normaloff>:/Icons/oxygen/button_ok.png</iconset>
-   </property>
    <property name="text">
     <string>Mark items read</string>
    </property>
@@ -256,53 +220,31 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionDownload_torrent">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/download.png</normaloff>:/Icons/oxygen/download.png</iconset>
-   </property>
    <property name="text">
     <string>Download torrent</string>
    </property>
   </action>
   <action name="actionOpen_news_URL">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/url.png</normaloff>:/Icons/url.png</iconset>
-   </property>
    <property name="text">
     <string>Open news URL</string>
    </property>
   </action>
   <action name="actionCopy_feed_URL">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/edit-copy.png</normaloff>:/Icons/oxygen/edit-copy.png</iconset>
-   </property>
    <property name="text">
     <string>Copy feed URL</string>
    </property>
   </action>
   <action name="actionNew_folder">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/folder-new.png</normaloff>:/Icons/oxygen/folder-new.png</iconset>
-   </property>
    <property name="text">
     <string>New folder...</string>
    </property>
   </action>
   <action name="actionManage_cookies">
-   <property name="icon">
-    <iconset resource="../icons.qrc">
-     <normaloff>:/Icons/oxygen/cookies.png</normaloff>:/Icons/oxygen/cookies.png</iconset>
-   </property>
    <property name="text">
     <string>Manage cookies...</string>
    </property>
   </action>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections/>
 </ui>

src/rss/rss_imp.cpp

@@ -148,7 +148,7 @@ void RSSImp::askNewFolder() {
     listStreams->itemAdded(folder_item, new_folder);
     // Set Text
     folder_item->setText(0, new_folder->getName() + QString::fromUtf8("  (0)"));
-    folder_item->setData(0,Qt::DecorationRole, QVariant(QIcon(":/Icons/oxygen/folder.png")));
+    folder_item->setData(0,Qt::DecorationRole, QVariant(misc::getIcon("inode-directory")));
     // Expand parent folder to display new folder
     if(parent_item)
       parent_item->setExpanded(true);
@@ -423,7 +423,7 @@ void RSSImp::fillFeedsList(QTreeWidgetItem *parent, RssFolder *rss_parent) {
     if(rss_child->getType() == RssFile::FEED) {
       item->setData(0,Qt::DecorationRole, QVariant(QIcon(QString::fromUtf8(":/Icons/loading.png"))));
     } else {
-      item->setData(0,Qt::DecorationRole, QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/folder.png"))));
+      item->setData(0,Qt::DecorationRole, QVariant(misc::getIcon("inode-directory")));
       // Recurvive call to load sub folders/files
       fillFeedsList(item, (RssFolder*)rss_child);
     }
@@ -581,6 +581,23 @@ void RSSImp::updateRefreshInterval(unsigned int val) {
 
 RSSImp::RSSImp(QWidget *parent) : QWidget(parent) {
   setupUi(this);
+  // Icons
+  actionCopy_feed_URL->setIcon(misc::getIcon("edit-copy"));
+  actionDelete->setIcon(misc::getIcon("edit-delete"));
+  actionDownload_torrent->setIcon(misc::getIcon("download"));
+  actionManage_cookies->setIcon(misc::getIcon("preferences-web-browser-cookies"));
+  actionMark_items_read->setIcon(misc::getIcon("mail-mark-read"));
+  actionNew_folder->setIcon(misc::getIcon("folder-new"));
+  actionNew_subscription->setIcon(misc::getIcon("list-add"));
+  actionOpen_news_URL->setIcon(misc::getIcon("application-x-mswinurl"));
+  actionRename->setIcon(misc::getIcon("edit-rename"));
+  actionUpdate->setIcon(misc::getIcon("view-refresh"));
+  actionUpdate_all_feeds->setIcon(misc::getIcon("view-refresh"));
+  newFeedButton->setIcon(misc::getIcon("list-add"));
+  markReadButton->setIcon(misc::getIcon("mail-mark-read"));
+  updateAllButton->setIcon(misc::getIcon("view-refresh"));
+  rssDownloaderBtn->setIcon(misc::getIcon("download"));
+  settingsButton->setIcon(misc::getIcon("preferences-system"));
 
   rssmanager = RssManager::instance();
 

src/rss/rssfeed.cpp

@@ -37,7 +37,7 @@
 #include "misc.h"
 #include "rssdownloadrulelist.h"
 
-RssFeed::RssFeed(RssFolder* parent, QString _url): parent(parent), alias(""), iconPath(":/Icons/rss16.png"), refreshed(false), downloadFailure(false), currently_loading(false) {
+RssFeed::RssFeed(RssFolder* parent, QString _url): parent(parent), alias(""), iconPath(":/Icons/oxygen/application-rss+xml.png"), refreshed(false), downloadFailure(false), currently_loading(false) {
   qDebug("RSSStream constructed");
   QIniSettings qBTRSS("qBittorrent", "qBittorrent-rss");
   url = QUrl(_url).toString();

src/rss/rsssettingsdlg.ui

@@ -34,7 +34,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../icons.qrc">:/Icons/rss32.png</pixmap>
+        <pixmap resource="../icons.qrc">:/Icons/oxygen/application-rss+xml.png</pixmap>
        </property>
        <property name="scaledContents">
         <bool>true</bool>

src/searchengine/engineselect.ui

@@ -112,13 +112,11 @@
    </item>
   </layout>
   <action name="actionEnable">
-   <property name="text">
+   <property name="checkable">
-    <string>Enable</string>
+    <bool>true</bool>
    </property>
-  </action>
-  <action name="actionDisable">
    <property name="text">
-    <string>Disable</string>
+    <string>Enabled</string>
    </property>
   </action>
   <action name="actionUninstall">

src/searchengine/engineselectdlg.cpp

@@ -52,11 +52,8 @@ engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_en
   pluginsTree->header()->resizeSection(0, 170);
   pluginsTree->header()->resizeSection(1, 220);
   pluginsTree->hideColumn(ENGINE_ID);
-  actionEnable->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
+  actionUninstall->setIcon(misc::getIcon("list-remove"));
-  actionDisable->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+  connect(actionEnable, SIGNAL(toggled(bool)), this, SLOT(enableSelection(bool)));
-  actionUninstall->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/list-remove.png")));
-  connect(actionEnable, SIGNAL(triggered()), this, SLOT(enableSelection()));
-  connect(actionDisable, SIGNAL(triggered()), this, SLOT(disableSelection()));
   connect(pluginsTree, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayContextMenu(const QPoint&)));
   downloader = new downloadThread(this);
   connect(downloader, SIGNAL(downloadFinished(QString, QString)), this, SLOT(processDownloadedFile(QString, QString)));
@@ -132,20 +129,10 @@ void engineSelectDlg::displayContextMenu(const QPoint&) {
   QMenu myContextMenu(this);
   // Enable/disable pause/start action given the DL state
   QList<QTreeWidgetItem *> items = pluginsTree->selectedItems();
-  bool has_enable = false, has_disable = false;
+  if(items.isEmpty()) return;
-  QTreeWidgetItem *item;
+  QString first_id = items.first()->text(ENGINE_ID);
-  foreach(item, items) {
+  actionEnable->setChecked(supported_engines->value(first_id)->isEnabled());
-    QString id = item->text(ENGINE_ID);
-    if(supported_engines->value(id)->isEnabled() && !has_disable) {
-      myContextMenu.addAction(actionDisable);
-      has_disable = true;
-    }
-    if(!supported_engines->value(id)->isEnabled() && !has_enable) {
   myContextMenu.addAction(actionEnable);
-      has_enable = true;
-    }
-    if(has_enable && has_disable) break;
-  }
   myContextMenu.addSeparator();
   myContextMenu.addAction(actionUninstall);
   myContextMenu.exec(QCursor::pos());
@@ -194,30 +181,22 @@ void engineSelectDlg::on_actionUninstall_triggered() {
     QMessageBox::information(0, tr("Uninstall success"), tr("All selected plugins were uninstalled successfully"));
 }
 
-void engineSelectDlg::enableSelection() {
+void engineSelectDlg::enableSelection(bool enable) {
   QList<QTreeWidgetItem *> items = pluginsTree->selectedItems();
   QTreeWidgetItem *item;
   foreach(item, items) {
     int index = pluginsTree->indexOfTopLevelItem(item);
     Q_ASSERT(index != -1);
     QString id = item->text(ENGINE_ID);
-    supported_engines->value(id)->setEnabled(true);
+    supported_engines->value(id)->setEnabled(enable);
+    if(enable) {
       item->setText(ENGINE_STATE, tr("Yes"));
       setRowColor(index, "green");
-  }
+    } else {
-}
-
-void engineSelectDlg::disableSelection() {
-  QList<QTreeWidgetItem *> items = pluginsTree->selectedItems();
-  QTreeWidgetItem *item;
-  foreach(item, items) {
-    int index = pluginsTree->indexOfTopLevelItem(item);
-    Q_ASSERT(index != -1);
-    QString id = item->text(ENGINE_ID);
-    supported_engines->value(id)->setEnabled(false);
       item->setText(ENGINE_STATE, tr("No"));
       setRowColor(index, "red");
     }
+  }
 }
 
 // Set the color of a row in data model

src/searchengine/engineselectdlg.h

@@ -66,8 +66,7 @@ class engineSelectDlg : public QDialog, public Ui::engineSelect{
     void processDownloadedFile(QString url, QString filePath);
     void handleDownloadFailure(QString url, QString reason);
     void displayContextMenu(const QPoint& pos);
-    void enableSelection();
+    void enableSelection(bool enable);
-    void disableSelection();
     void on_actionUninstall_triggered();
     void on_updateButton_clicked();
     void on_installButton_clicked();

src/searchengine/searchengine.cpp

@@ -61,16 +61,20 @@
 /*SEARCH ENGINE START*/
 SearchEngine::SearchEngine(MainWindow *parent) : QWidget(parent), mp_mainWindow(parent) {
   setupUi(this);
+  // Icons
+  search_button->setIcon(misc::getIcon("edit-find"));
+  download_button->setIcon(misc::getIcon("download"));
+  enginesButton->setIcon(misc::getIcon("preferences-system-network"));
   // new qCompleter to the search pattern
   startSearchHistory();
   createCompleter();
-#if QT_VERSION >= 0x040500
+#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0))
   tabWidget->setTabsClosable(true);
   connect(tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
 #else
   // Add close tab button
   closeTab_button = new QPushButton();
-  closeTab_button->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/tab-close.png")));
+  closeTab_button->setIcon(misc::getIcon("tab-close"));
   closeTab_button->setFlat(true);
   tabWidget->setCornerWidget(closeTab_button);
   connect(closeTab_button, SIGNAL(clicked()), this, SLOT(closeTab_button_clicked()));
@@ -199,11 +203,11 @@ SearchEngine::~SearchEngine(){
 
 void SearchEngine::displayPatternContextMenu(QPoint) {
   QMenu myMenu(this);
-  QAction cutAct(QIcon(":/Icons/oxygen/edit-cut.png"), tr("Cut"), &myMenu);
+  QAction cutAct(misc::getIcon("edit-cut"), tr("Cut"), &myMenu);
-  QAction copyAct(QIcon(":/Icons/oxygen/edit-copy.png"), tr("Copy"), &myMenu);
+  QAction copyAct(misc::getIcon("edit-copy"), tr("Copy"), &myMenu);
-  QAction pasteAct(QIcon(":/Icons/oxygen/edit-paste.png"), tr("Paste"), &myMenu);
+  QAction pasteAct(misc::getIcon("edit-paste"), tr("Paste"), &myMenu);
-  QAction clearAct(QIcon(":/Icons/oxygen/edit_clear.png"), tr("Clear field"), &myMenu);
+  QAction clearAct(misc::getIcon("edit-clear"), tr("Clear field"), &myMenu);
-  QAction clearHistoryAct(QIcon(":/Icons/oxygen/edit-clear.png"), tr("Clear completion history"), &myMenu);
+  QAction clearHistoryAct(misc::getIcon("edit-clear-history"), tr("Clear completion history"), &myMenu);
   bool hasCopyAct = false;
   if(search_pattern->hasSelectedText()) {
     myMenu.addAction(&cutAct);

src/torrentadditiondlg.cpp

@@ -62,6 +62,9 @@ torrentAdditionDialog::torrentAdditionDialog(QWidget *parent) :
   const Preferences pref;
   setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
+  // Icons
+  CancelButton->setIcon(misc::getIcon("dialog-cancel"));
+  OkButton->setIcon(misc::getIcon("list-add"));
   // Set Properties list model
   PropListModel = new TorrentFilesModel();
   connect(PropListModel, SIGNAL(filteredFilesChanged()), SLOT(updateDiskSpaceLabels()));
@@ -327,7 +330,7 @@ void torrentAdditionDialog::displayContentListMenu(const QPoint&) {
   const QModelIndexList selectedRows = torrentContentList->selectionModel()->selectedRows(0);
   QAction *actRename = 0;
   if(selectedRows.size() == 1 && t->num_files() > 1) {
-    actRename = myFilesLlistMenu.addAction(QIcon(QString::fromUtf8(":/Icons/oxygen/edit_clear.png")), tr("Rename..."));
+    actRename = myFilesLlistMenu.addAction(misc::getIcon("edit-rename"), tr("Rename..."));
     myFilesLlistMenu.addSeparator();
   }
   QMenu subMenu;

src/torrentcreator/createtorrent.ui

@@ -64,10 +64,6 @@
        <property name="text">
         <string>Add file</string>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/document-new.png</normaloff>:/Icons/oxygen/document-new.png</iconset>
-       </property>
       </widget>
      </item>
      <item>
@@ -75,10 +71,6 @@
        <property name="text">
         <string>Add folder</string>
        </property>
-       <property name="icon">
-        <iconset resource="../icons.qrc">
-         <normaloff>:/Icons/oxygen/folder-new.png</normaloff>:/Icons/oxygen/folder-new.png</iconset>
-       </property>
       </widget>
      </item>
     </layout>
@@ -317,8 +309,6 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections/>
 </ui>

src/torrentcreator/torrentcreatordlg.cpp

@@ -45,6 +45,12 @@ using namespace libtorrent;
 
 TorrentCreatorDlg::TorrentCreatorDlg(QWidget *parent): QDialog(parent), creatorThread(0) {
   setupUi(this);
+  // Icons
+  addFile_button->setIcon(misc::getIcon("document-new"));
+  addFolder_button->setIcon(misc::getIcon("folder-new"));
+  createButton->setIcon(misc::getIcon("document-save"));
+  cancelButton->setIcon(misc::getIcon("dialog-cancel"));
+
   setAttribute(Qt::WA_DeleteOnClose);
   setModal(true);
   showProgressBar(false);

src/torrentfilesmodel.h

@@ -434,9 +434,9 @@ public:
     TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
     if(index.column() == 0 && role == Qt::DecorationRole) {
       if(item->isFolder())
-        return QIcon(":/Icons/oxygen/folder.png");
+        return misc::getIcon("inode-directory");
       else
-        return QIcon(":/Icons/oxygen/file.png");
+        return misc::getIcon("text-plain");
     }
     if(index.column() == 0 && role == Qt::CheckStateRole) {
       if(item->data(TreeItem::COL_PRIO).toInt() == IGNORED)

src/torrentimportdlg.cpp

@@ -46,6 +46,10 @@ TorrentImportDlg::TorrentImportDlg(QWidget *parent) :
   ui(new Ui::TorrentImportDlg)
 {
   ui->setupUi(this);
+  // Icons
+  ui->lbl_info->setPixmap(misc::getIcon("dialog-information").pixmap(ui->lbl_info->height()));
+  ui->lbl_info->setFixedWidth(ui->lbl_info->height());
+  ui->importBtn->setIcon(misc::getIcon("document-import"));
   // Libtorrent < 0.15 does not support skipping file checking
 #if LIBTORRENT_VERSION_MINOR < 15
   ui->checkSkipCheck->setVisible(false);

src/torrentimportdlg.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>464</width>
-    <height>233</height>
+    <height>236</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,19 +20,16 @@
       <number>15</number>
      </property>
      <item>
-      <widget class="QLabel" name="label_5">
+      <widget class="QLabel" name="lbl_info">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
+         <horstretch>32</horstretch>
-         <verstretch>0</verstretch>
+         <verstretch>32</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../icons.qrc">:/Icons/skin/info.png</pixmap>
-       </property>
       </widget>
      </item>
      <item>
@@ -118,16 +115,10 @@
      <property name="text">
       <string>Import</string>
      </property>
-     <property name="icon">
-      <iconset resource="../icons.qrc">
-       <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
-     </property>
     </widget>
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../icons.qrc"/>
- </resources>
  <connections/>
 </ui>

src/transferlistfilterswidget.h

@@ -137,11 +137,11 @@ protected:
   void setItemHover(bool hover) {
     Q_ASSERT(itemHover);
     if(hover) {
-      itemHover->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/folder-documents.png"));
+      itemHover->setData(Qt::DecorationRole, misc::getIcon("folder-documents.png"));
       itemHover->setSelected(true);
       //setCurrentItem(itemHover);
     } else {
-      itemHover->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/folder.png"));
+      itemHover->setData(Qt::DecorationRole, misc::getIcon("inode-directory.png"));
       //itemHover->setSelected(false);
       itemHover = 0;
     }
@@ -247,10 +247,10 @@ public:
     // Add Label filters
     QListWidgetItem *allLabels = new QListWidgetItem(labelFilters);
     allLabels->setData(Qt::DisplayRole, QVariant(tr("All labels") + " (0)"));
-    allLabels->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/folder.png"));
+    allLabels->setData(Qt::DecorationRole, misc::getIcon("inode-directory"));
     QListWidgetItem *noLabel = new QListWidgetItem(labelFilters);
     noLabel->setData(Qt::DisplayRole, QVariant(tr("Unlabeled") + " (0)"));
-    noLabel->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/folder.png"));
+    noLabel->setData(Qt::DecorationRole, misc::getIcon("inode-directory"));
 
     // Load settings
     loadSettings();
@@ -291,7 +291,7 @@ public:
       qDebug("Creating label QListWidgetItem: %s", qPrintable(label));
       QListWidgetItem *newLabel = new QListWidgetItem();
       newLabel->setText(label + " (0)");
-      newLabel->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/folder.png"));
+      newLabel->setData(Qt::DecorationRole, misc::getIcon("inode-directory"));
       labelFilters->addItem(newLabel);
     }
   }
@@ -321,7 +321,7 @@ protected slots:
     if(label.isEmpty() || customLabels.contains(label)) return;
     QListWidgetItem *newLabel = new QListWidgetItem();
     newLabel->setText(label + " (0)");
-    newLabel->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/folder.png"));
+    newLabel->setData(Qt::DecorationRole, misc::getIcon("inode-directory"));
     labelFilters->addItem(newLabel);
     customLabels.insert(label, 0);
     Preferences().addTorrentLabel(label);
@@ -331,12 +331,12 @@ protected slots:
     QMenu labelMenu(labelFilters);
     QAction *removeAct = 0;
     if(!labelFilters->selectedItems().empty() && labelFilters->row(labelFilters->selectedItems().first()) > 1)
-      removeAct = labelMenu.addAction(QIcon(":/Icons/oxygen/list-remove.png"), tr("Remove label"));
+      removeAct = labelMenu.addAction(misc::getIcon("list-remove"), tr("Remove label"));
-    QAction *addAct = labelMenu.addAction(QIcon(":/Icons/oxygen/list-add.png"), tr("Add label..."));
+    QAction *addAct = labelMenu.addAction(misc::getIcon("list-add"), tr("Add label..."));
     labelMenu.addSeparator();
-    QAction *startAct = labelMenu.addAction(QIcon(":/Icons/skin/play22.png"), tr("Resume torrents"));
+    QAction *startAct = labelMenu.addAction(misc::getIcon("media-playback-start"), tr("Resume torrents"));
-    QAction *pauseAct = labelMenu.addAction(QIcon(":/Icons/skin/pause22.png"), tr("Pause torrents"));
+    QAction *pauseAct = labelMenu.addAction(misc::getIcon("media-playback-pause"), tr("Pause torrents"));
-    QAction *deleteTorrentsAct = labelMenu.addAction(QIcon(":/Icons/skin/delete22.png"), tr("Delete torrents"));
+    QAction *deleteTorrentsAct = labelMenu.addAction(misc::getIcon("edit-delete"), tr("Delete torrents"));
     QAction *act = 0;
     act = labelMenu.exec(QCursor::pos());
     if(act) {

src/transferlistwidget.cpp

@@ -597,42 +597,40 @@ void TransferListWidget::removeLabelFromRows(QString label) {
 
 void TransferListWidget::displayListMenu(const QPoint&) {
   // Create actions
-  QAction actionStart(QIcon(QString::fromUtf8(":/Icons/skin/play.png")), tr("Resume", "Resume/start the torrent"), 0);
+  QAction actionStart(misc::getIcon("media-playback-start"), tr("Resume", "Resume/start the torrent"), 0);
   connect(&actionStart, SIGNAL(triggered()), this, SLOT(startSelectedTorrents()));
-  QAction actionPause(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")), tr("Pause", "Pause the torrent"), 0);
+  QAction actionPause(misc::getIcon("media-playback-pause"), tr("Pause", "Pause the torrent"), 0);
   connect(&actionPause, SIGNAL(triggered()), this, SLOT(pauseSelectedTorrents()));
-  QAction actionDelete(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")), tr("Delete", "Delete the torrent"), 0);
+  QAction actionDelete(misc::getIcon("edit-delete"), tr("Delete", "Delete the torrent"), 0);
   connect(&actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedTorrents()));
-  QAction actionPreview_file(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")), tr("Preview file..."), 0);
+  QAction actionPreview_file(misc::getIcon("view-preview"), tr("Preview file..."), 0);
   connect(&actionPreview_file, SIGNAL(triggered()), this, SLOT(previewSelectedTorrents()));
   QAction actionSet_upload_limit(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")), tr("Limit upload rate..."), 0);
   connect(&actionSet_upload_limit, SIGNAL(triggered()), this, SLOT(setUpLimitSelectedTorrents()));
   QAction actionSet_download_limit(QIcon(QString::fromUtf8(":/Icons/skin/download.png")), tr("Limit download rate..."), 0);
   connect(&actionSet_download_limit, SIGNAL(triggered()), this, SLOT(setDlLimitSelectedTorrents()));
-  QAction actionOpen_destination_folder(QIcon(QString::fromUtf8(":/Icons/oxygen/folder.png")), tr("Open destination folder"), 0);
+  QAction actionOpen_destination_folder(misc::getIcon("inode-directory"), tr("Open destination folder"), 0);
   connect(&actionOpen_destination_folder, SIGNAL(triggered()), this, SLOT(openSelectedTorrentsFolder()));
-  //QAction actionBuy_it(QIcon(QString::fromUtf8(":/Icons/oxygen/wallet.png")), tr("Buy it"), 0);
+  QAction actionIncreasePriority(misc::getIcon("go-up"), tr("Move up", "i.e. move up in the queue"), 0);
-  //connect(&actionBuy_it, SIGNAL(triggered()), this, SLOT(buySelectedTorrents()));
-  QAction actionIncreasePriority(QIcon(QString::fromUtf8(":/Icons/oxygen/go-up.png")), tr("Move up", "i.e. move up in the queue"), 0);
   connect(&actionIncreasePriority, SIGNAL(triggered()), this, SLOT(increasePrioSelectedTorrents()));
-  QAction actionDecreasePriority(QIcon(QString::fromUtf8(":/Icons/oxygen/go-down.png")), tr("Move down", "i.e. Move down in the queue"), 0);
+  QAction actionDecreasePriority(misc::getIcon("go-down"), tr("Move down", "i.e. Move down in the queue"), 0);
   connect(&actionDecreasePriority, SIGNAL(triggered()), this, SLOT(decreasePrioSelectedTorrents()));
-  QAction actionTopPriority(QIcon(QString::fromUtf8(":/Icons/oxygen/go-top.png")), tr("Move to top", "i.e. Move to top of the queue"), 0);
+  QAction actionTopPriority(misc::getIcon("go-top"), tr("Move to top", "i.e. Move to top of the queue"), 0);
   connect(&actionTopPriority, SIGNAL(triggered()), this, SLOT(topPrioSelectedTorrents()));
-  QAction actionBottomPriority(QIcon(QString::fromUtf8(":/Icons/oxygen/go-bottom.png")), tr("Move to bottom", "i.e. Move to bottom of the queue"), 0);
+  QAction actionBottomPriority(misc::getIcon("go-bottom"), tr("Move to bottom", "i.e. Move to bottom of the queue"), 0);
   connect(&actionBottomPriority, SIGNAL(triggered()), this, SLOT(bottomPrioSelectedTorrents()));
-  QAction actionSetTorrentPath(QIcon(QString::fromUtf8(":/Icons/skin/folder.png")), tr("Set location..."), 0);
+  QAction actionSetTorrentPath(misc::getIcon("inode-directory"), tr("Set location..."), 0);
   connect(&actionSetTorrentPath, SIGNAL(triggered()), this, SLOT(setSelectedTorrentsLocation()));
-  QAction actionForce_recheck(QIcon(QString::fromUtf8(":/Icons/oxygen/gear.png")), tr("Force recheck"), 0);
+  QAction actionForce_recheck(misc::getIcon("document-edit-verify"), tr("Force recheck"), 0);
   connect(&actionForce_recheck, SIGNAL(triggered()), this, SLOT(recheckSelectedTorrents()));
-  QAction actionCopy_magnet_link(QIcon(QString::fromUtf8(":/Icons/magnet.png")), tr("Copy magnet link"), 0);
+  QAction actionCopy_magnet_link(QIcon(":/Icons/magnet.png"), tr("Copy magnet link"), 0);
   connect(&actionCopy_magnet_link, SIGNAL(triggered()), this, SLOT(copySelectedMagnetURIs()));
 #if LIBTORRENT_VERSION_MINOR > 14
   QAction actionSuper_seeding_mode(tr("Super seeding mode"), 0);
   actionSuper_seeding_mode.setCheckable(true);
   connect(&actionSuper_seeding_mode, SIGNAL(triggered()), this, SLOT(toggleSelectedTorrentsSuperSeeding()));
 #endif
-  QAction actionRename(QIcon(QString::fromUtf8(":/Icons/oxygen/edit_clear.png")), tr("Rename..."), 0);
+  QAction actionRename(misc::getIcon("edit-rename"), tr("Rename..."), 0);
   connect(&actionRename, SIGNAL(triggered()), this, SLOT(renameSelectedTorrent()));
   QAction actionSequential_download(tr("Download in sequential order"), 0);
   actionSequential_download.setCheckable(true);
@@ -719,12 +717,12 @@ void TransferListWidget::displayListMenu(const QPoint&) {
   QStringList customLabels = getCustomLabels();
   customLabels.sort();
   QList<QAction*> labelActions;
-  QMenu *labelMenu = listMenu.addMenu(QIcon(":/Icons/oxygen/feed-subscribe.png"), tr("Label"));
+  QMenu *labelMenu = listMenu.addMenu(misc::getIcon("view-categories"), tr("Label"));
-  labelActions << labelMenu->addAction(QIcon(":/Icons/oxygen/list-add.png"), tr("New...", "New label..."));
+  labelActions << labelMenu->addAction(misc::getIcon("list-add"), tr("New...", "New label..."));
-  labelActions << labelMenu->addAction(QIcon(":/Icons/oxygen/edit-clear.png"), tr("Reset", "Reset label"));
+  labelActions << labelMenu->addAction(misc::getIcon("edit-clear"), tr("Reset", "Reset label"));
   labelMenu->addSeparator();
   foreach(const QString &label, customLabels) {
-    labelActions << labelMenu->addAction(QIcon(":/Icons/oxygen/folder.png"), label);
+    labelActions << labelMenu->addAction(misc::getIcon("inode-directory"), label);
   }
   listMenu.addSeparator();
   if(one_not_seed)
@@ -772,7 +770,6 @@ void TransferListWidget::displayListMenu(const QPoint&) {
   listMenu.addSeparator();
   if(one_has_metadata)
     listMenu.addAction(&actionCopy_magnet_link);
-  //listMenu.addAction(&actionBuy_it);
   // Call menu
   QAction *act = 0;
   act = listMenu.exec(QCursor::pos());

src/webui/css/style.css

@@ -203,10 +203,10 @@ a.propButton img {
 #contextmenu li a.deleteHD	{ background-image:url(../images/skin/delete_perm22.png); }
 #contextmenu li a.uploadLimit	{ background-image:url(../images/skin/seeding.png); }
 #contextmenu li a.downloadLimit	{ background-image:url(../images/skin/download.png); }
-#contextmenu li a.prioTop	{ background-image:url(../images/oxygen/go-top.png); }
+#contextmenu li a.prioTop	{ background-image:url(../images/oxygen/go-top22.png); }
-#contextmenu li a.prioUp	{ background-image:url(../images/oxygen/go-up.png); }
+#contextmenu li a.prioUp	{ background-image:url(../images/oxygen/go-up22.png); }
-#contextmenu li a.prioDown	{ background-image:url(../images/oxygen/go-down.png); }
+#contextmenu li a.prioDown	{ background-image:url(../images/oxygen/go-down22.png); }
-#contextmenu li a.prioBottom	{ background-image:url(../images/oxygen/go-bottom.png); }
+#contextmenu li a.prioBottom	{ background-image:url(../images/oxygen/go-bottom22.png); }
 
 /* Sliders */