- COSMETIC: Redesigned program preferences

- COSMETIC: Updated icons set

AUTHORS

@@ -17,6 +17,11 @@ Images Authors:
   license: GPLv2
   url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
 
+* files: src/oxygen/*.png
+  copyright: Oxygen Icon Theme (KDE)
+  license: LGPL
+  url: http://www.oxygen-icons.org
+
 * files: src/Icons/flags/*.png
   copyright: Open Clip Art Library
   license: Creative Commons Public Domain Dedication

Changelog

@@ -1,3 +1,12 @@
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.3.3
+    - COSMETIC: Redesigned program preferences
+    - COSMETIC: Updated icons set
+
+* Sat Mar 7 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.2
+    - BUGFIX: Fix top toolbar disabling
+    - BUGFIX: Fix building with Qt 4.5
+    - BUGFIX: RSS items read status is now remembered upon restart
+
 * Mon Jan 26 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.1
     - BUGFIX: Torrents paused due to an I/O error were displayed as queued
     - BUGFIX: qBittorrent now prints backtrace in terminal when segfaulting

src/FinishedTorrents.cpp

@@ -240,7 +240,7 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
     // Update queued torrent
     if(BTSession->isQueueingEnabled() && h.is_queued()) {
         if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
         } else {
             finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
         }
@@ -251,7 +251,7 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
         return;
     }
     if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
       setRowColor(row, QString::fromUtf8("grey"));
       return;
     }
@@ -426,12 +426,12 @@ void FinishedTorrents::hideOrShowColumn(int index) {
     if(nbVisibleColumns <= 1) return;
     // User can hide the column, do it.
     finishedList->setColumnHidden(index, true);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
     --nbVisibleColumns;
   } else {
     // User want to display the column
     finishedList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
     ++nbVisibleColumns;
   }
   //resize all others non-hidden columns
@@ -481,9 +481,9 @@ bool FinishedTorrents::loadHiddenColumns() {
   for(int i=0; i<finishedListModel->columnCount()-1; i++) {
     if(loaded && ishidden_list.at(i) == "0") {
       finishedList->setColumnHidden(i, true);
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
     } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
     }
   }
   return loaded;

src/GUI.cpp

@@ -90,14 +90,14 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
     qDebug("Info: System tray unavailable");
   }
   // Setting icons
-  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent32.png")));
+  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
   actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png")));
   actionExit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/exit.png")));
   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/qbittorrent32.png")));
+  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/qbittorrent32.png")));
-  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/newmsg.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")));
@@ -1492,10 +1492,10 @@ void GUI::createSystrayDelayed() {
 void GUI::createTrayIcon() {
   // Tray icon
  #ifdef Q_WS_WIN
-  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent16.png")), this);
+  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent16.png")), this);
  #endif
  #ifndef Q_WS_WIN
-  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent22.png")), this);
+  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")), this);
 #endif
   // Tray icon Menu
   myTrayIconMenu = new QMenu(this);

src/MainWindow.ui

@@ -258,7 +258,7 @@
   </action>
   <action name="actionShow_console" >
    <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+	   <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
    </property>
    <property name="text" >
     <string>Console</string>

src/about_imp.h

@@ -37,8 +37,8 @@ class about : public QDialog, private Ui::AboutDlg{
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
-      logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/qbittorrent22.png")));
+      logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
-      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/mascot.png")));
+      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png")));
       //Title
       lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks

src/console.ui

@@ -13,7 +13,7 @@
    <string>qBittorrent console</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+	  <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <item>
@@ -26,7 +26,7 @@
        <string>General</string>
       </attribute>
       <attribute name="icon" >
-       <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+	      <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
       </attribute>
       <layout class="QVBoxLayout" >
        <item>

src/download.ui

@@ -92,7 +92,7 @@
   <action name="actionOpen_destination_folder" >
    <property name="icon" >
     <iconset resource="icons.qrc" >
-     <normaloff>:/Icons/folder.png</normaloff>:/Icons/folder.png</iconset>
+	    <normaloff>:/Icons/oxygen/folder.png</normaloff>:/Icons/oxygen/folder.png</iconset>
    </property>
    <property name="text" >
     <string>Open destination folder</string>
@@ -173,7 +173,7 @@
   <action name="actionForce_recheck" >
    <property name="icon" >
     <iconset resource="icons.qrc" >
-     <normaloff>:/Icons/gear.png</normaloff>:/Icons/gear.png</iconset>
+	    <normaloff>:/Icons/oxygen/gear.png</normaloff>:/Icons/oxygen/gear.png</iconset>
    </property>
    <property name="text" >
     <string>Force recheck</string>

src/downloadingTorrents.cpp

@@ -44,8 +44,8 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
   actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
   actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
-//   tabBottom->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/log.png")));
+//   tabBottom->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/oxygen/log.png")));
-//   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/filter.png")));
+//   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/oxygen/filter.png")));
 
   // Set Download list model
   DLListModel = new QStandardItemModel(0,10);
@@ -317,12 +317,12 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
     if(nbVisibleColumns <= 1) return;
     // User can hide the column, do it.
     downloadList->setColumnHidden(index, true);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
     --nbVisibleColumns;
   } else {
     // User want to display the column
     downloadList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
     ++nbVisibleColumns;
   }
   //resize all others non-hidden columns
@@ -336,9 +336,9 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
 void DownloadingTorrents::hidePriorityColumn(bool hide) {
   downloadList->setColumnHidden(PRIORITY, hide);
   if(hide)
-    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
   else
-    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
 }
 
 // save the hidden columns in settings
@@ -376,9 +376,9 @@ bool DownloadingTorrents::loadHiddenColumns() {
   for(int i=0; i<DLListModel->columnCount()-1; i++) {
     if(loaded && ishidden_list.at(i) == "0") {
       downloadList->setColumnHidden(i, true);
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
     } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
     }
   }
   return loaded;
@@ -488,7 +488,7 @@ bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
           DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
           if(h.is_queued()) {
               if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking) {
-                  DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+                  DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
                   if(!downloadList->isColumnHidden(PROGRESS)) {
                       DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
                   }
@@ -515,7 +515,7 @@ bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
       switch(h.state()) {
         case torrent_status::checking_files:
         case torrent_status::queued_for_checking:
-          DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+          DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
           setRowColor(row, QString::fromUtf8("grey"));
           break;
         case torrent_status::downloading:

src/engineSelectDlg.cpp

@@ -47,8 +47,8 @@ engineSelectDlg::engineSelectDlg(QWidget *parent) : QDialog(parent) {
   pluginsTree->header()->resizeSection(0, 170);
   pluginsTree->header()->resizeSection(1, 220);
   pluginsTree->hideColumn(ENGINE_ID);
-  actionEnable->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+  actionEnable->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
-  actionDisable->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+  actionDisable->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
   actionUninstall->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/remove.png")));
   connect(actionEnable, SIGNAL(triggered()), this, SLOT(enableSelection()));
   connect(actionDisable, SIGNAL(triggered()), this, SLOT(disableSelection()));

src/icons.qrc

@@ -2,51 +2,19 @@
 <qresource>
   <file>Icons/add_file.png</file>
   <file>Icons/add_folder.png</file>
-  <file>Icons/bt_settings.png</file>
-  <file>Icons/button_cancel.png</file>
-  <file>Icons/button_ok.png</file>
-  <file>Icons/configure.png</file>
-  <file>Icons/connection.png</file>
-  <file>Icons/description.png</file>
   <file>Icons/downarrow.png</file>
-  <file>Icons/download.png</file>
-  <file>Icons/edit_clear.png</file>
-  <file>Icons/encrypted.png</file>
-  <file>Icons/file.png</file>
-  <file>Icons/filter.png</file>
-  <file>Icons/folder.png</file>
-  <file>Icons/gear.png</file>
   <file>Icons/gnome-shutdown.png</file>
-  <file>Icons/home.png</file>
   <file>Icons/loading.png</file>
   <file>Icons/locale.png</file>
-  <file>Icons/log.png</file>
-  <file>Icons/mascot.png</file>
   <file>Icons/money.png</file>
-  <file>Icons/newmsg.png</file>
-  <file>Icons/password.png</file>
   <file>Icons/proxy.png</file>
-  <file>Icons/qbittorrent16.png</file>
-  <file>Icons/qbittorrent22.png</file>
-  <file>Icons/qbittorrent32.png</file>
   <file>Icons/refresh.png</file>
   <file>Icons/rss16.png</file>
   <file>Icons/rss32.png</file>
   <file>Icons/sphere.png</file>
   <file>Icons/sphere2.png</file>
-  <file>Icons/splash.png</file>
-  <file>Icons/star.png</file>
-  <file>Icons/style.png</file>
-  <file>Icons/subscribe.png</file>
-  <file>Icons/subscribe16.png</file>
-  <file>Icons/systemtray.png</file>
-  <file>Icons/time.png</file>
-  <file>Icons/unavailable.png</file>
-  <file>Icons/unsubscribe.png</file>
-  <file>Icons/unsubscribe16.png</file>
   <file>Icons/uparrow.png</file>
   <file>Icons/url.png</file>
-  <file>Icons/wizard.png</file>
   <file>Icons/flags/brazil.png</file>
   <file>Icons/flags/bulgaria.png</file>
   <file>Icons/flags/china.png</file>
@@ -74,6 +42,27 @@
   <file>Icons/flags/turkey.png</file>
   <file>Icons/flags/ukraine.png</file>
   <file>Icons/flags/united_kingdom.png</file>
+  <file>Icons/oxygen/bt_settings.png</file>
+  <file>Icons/oxygen/bug.png</file>
+  <file>Icons/oxygen/button_cancel.png</file>
+  <file>Icons/oxygen/button_ok.png</file>
+  <file>Icons/oxygen/configure.png</file>
+  <file>Icons/oxygen/connection.png</file>
+  <file>Icons/oxygen/download.png</file>
+  <file>Icons/oxygen/edit_clear.png</file>
+  <file>Icons/oxygen/encrypted.png</file>
+  <file>Icons/oxygen/file.png</file>
+  <file>Icons/oxygen/filter.png</file>
+  <file>Icons/oxygen/folder.png</file>
+  <file>Icons/oxygen/gear.png</file>
+  <file>Icons/oxygen/log.png</file>
+  <file>Icons/oxygen/subscribe.png</file>
+  <file>Icons/oxygen/subscribe16.png</file>
+  <file>Icons/oxygen/time.png</file>
+  <file>Icons/oxygen/unavailable.png</file>
+  <file>Icons/oxygen/unsubscribe.png</file>
+  <file>Icons/oxygen/unsubscribe16.png</file>
+  <file>Icons/oxygen/webui.png</file>
   <file>Icons/skin/add.png</file>
   <file>Icons/skin/connected.png</file>
   <file>Icons/skin/decrease.png</file>
@@ -85,6 +74,7 @@
   <file>Icons/skin/firewalled.png</file>
   <file>Icons/skin/increase.png</file>
   <file>Icons/skin/info.png</file>
+  <file>Icons/skin/mascot.png</file>
   <file>Icons/skin/new.png</file>
   <file>Icons/skin/open.png</file>
   <file>Icons/skin/pause.png</file>
@@ -95,11 +85,15 @@
   <file>Icons/skin/preview.png</file>
   <file>Icons/skin/properties.png</file>
   <file>Icons/skin/qb_question.png</file>
+  <file>Icons/skin/qbittorrent16.png</file>
+  <file>Icons/skin/qbittorrent22.png</file>
+  <file>Icons/skin/qbittorrent32.png</file>
   <file>Icons/skin/queued.png</file>
   <file>Icons/skin/remove.png</file>
   <file>Icons/skin/search.png</file>
   <file>Icons/skin/seeding.png</file>
   <file>Icons/skin/settings.png</file>
+  <file>Icons/skin/splash.png</file>
   <file>Icons/skin/stalled.png</file>
   <file>Icons/skin/tabs.gif</file>
   <file>Icons/skin/url.png</file>

src/main.cpp

@@ -169,7 +169,7 @@ int main(int argc, char *argv[]){
   app = new QApplication(argc, argv);
   useStyle(app, settings.value("Preferences/General/Style", 0).toInt());
   app->setStyleSheet("QStatusBar::item { border-width: 0; }");
-  QSplashScreen *splash = new QSplashScreen(QPixmap(QString::fromUtf8(":/Icons/splash.png")));
+  QSplashScreen *splash = new QSplashScreen(QPixmap(QString::fromUtf8(":/Icons/oxygen/splash.png")));
   splash->show();
   // Open options file to read locale
   locale = settings.value(QString::fromUtf8("Preferences/General/Locale"), QString()).toString();

src/options_imp.cpp

@@ -236,6 +236,8 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
     checkSystrayBalloons->setChecked(false);
     checkSystrayBalloons->setEnabled(false);
   }
+  // Tab selection mecanism
+  connect(tabSelection, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem*)));
 }
 
 // Main destructor
@@ -243,6 +245,12 @@ options_imp::~options_imp(){
   qDebug("-> destructing Options");
 }
 
+void options_imp::changePage(QListWidgetItem *current, QListWidgetItem *previous) {
+     if (!current)
+         current = previous;
+     tabOption->setCurrentIndex(tabSelection->row(current));
+ }
+
 void options_imp::useStyle(){
   int style = getStyle();
   switch(style) {

src/options_imp.h

@@ -155,6 +155,7 @@ class options_imp : public QDialog, private Ui::Dialog {
     void disableSystrayOptions();
     void setSystrayOptionsState(int checkBoxValue);
     void enableWebUi(bool checkBoxValue);
+    void changePage(QListWidgetItem*, QListWidgetItem*);
 
   public slots:
     void setLocale(QString locale);

src/properties_imp.cpp

@@ -151,9 +151,9 @@ void properties::addFilesToTree(const torrent_file *root, QStandardItem *parent)
   // Name
   QStandardItem *first;
   if(root->isDir()) {
-    first = new QStandardItem(QIcon(":/Icons/folder.png"), root->name());
+    first = new QStandardItem(QIcon(":/Icons/oxygen/folder.png"), root->name());
   } else {
-    first = new QStandardItem(QIcon(":/Icons/file.png"), root->name());
+    first = new QStandardItem(QIcon(":/Icons/oxygen/file.png"), root->name());
   }
   child << first;
   // Size

src/rss.h

@@ -410,7 +410,7 @@ class RssStream : public QObject{
 
     QString getIconPath() const{
       if(downloadFailure)
-        return ":/Icons/unavailable.png";
+        return ":/Icons/oxygen/unavailable.png";
       return iconPath;
     }
 

src/rss_imp.cpp

@@ -298,15 +298,15 @@
     RSSImp::RSSImp() : QWidget(){
       setupUi(this);
       // icons of bottom buttons
-      addStream_button->setIcon(QIcon(QString::fromUtf8(":/Icons/subscribe.png")));
+      addStream_button->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/subscribe.png")));
-      delStream_button->setIcon(QIcon(QString::fromUtf8(":/Icons/unsubscribe.png")));
+      delStream_button->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/unsubscribe.png")));
       refreshAll_button->setIcon(QIcon(QString::fromUtf8(":/Icons/refresh.png")));
-      actionMark_all_as_read->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+      actionMark_all_as_read->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
       // icons of right-click menu
-      actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/unsubscribe16.png")));
+      actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/unsubscribe16.png")));
-      actionRename->setIcon(QIcon(QString::fromUtf8(":/Icons/log.png")));
+      actionRename->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/log.png")));
       actionRefresh->setIcon(QIcon(QString::fromUtf8(":/Icons/refresh.png")));
-      actionCreate->setIcon(QIcon(QString::fromUtf8(":/Icons/subscribe16.png")));
+      actionCreate->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/subscribe16.png")));
       actionRefreshAll->setIcon(QIcon(QString::fromUtf8(":/Icons/refresh.png")));
 
       // Hide second column (url)

src/search.ui

@@ -68,7 +68,7 @@
        </property>
        <property name="icon" >
         <iconset resource="icons.qrc" >
-         <normaloff>:/Icons/edit_clear.png</normaloff>:/Icons/edit_clear.png</iconset>
+		<normaloff>:/Icons/oxygen/edit_clear.png</normaloff>:/Icons/oxygen/edit_clear.png</iconset>
        </property>
        <property name="iconSize" >
         <size>

src/seeding.ui

@@ -80,7 +80,7 @@
   <action name="actionOpen_destination_folder" >
    <property name="icon" >
     <iconset resource="icons.qrc" >
-     <normaloff>:/Icons/folder.png</normaloff>:/Icons/folder.png</iconset>
+	    <normaloff>:/Icons/oxygen/folder.png</normaloff>:/Icons/oxygen/folder.png</iconset>
    </property>
    <property name="text" >
     <string>Open destination folder</string>
@@ -123,7 +123,7 @@
   <action name="actionForce_recheck" >
    <property name="icon" >
     <iconset resource="icons.qrc" >
-     <normaloff>:/Icons/gear.png</normaloff>:/Icons/gear.png</iconset>
+	    <normaloff>:/Icons/oxygen/gear.png</normaloff>:/Icons/oxygen/gear.png</iconset>
    </property>
    <property name="text" >
     <string>Force recheck</string>

src/torrentAddition.h

@@ -146,9 +146,9 @@ class torrentAdditionDialog : public QDialog, private Ui_addTorrentDialog{
       // Name
       QStandardItem *first;
       if(root->isDir()) {
-        first = new QStandardItem(QIcon(":/Icons/folder.png"), root->name());
+        first = new QStandardItem(QIcon(":/Icons/oxygen/folder.png"), root->name());
       } else {
-        first = new QStandardItem(QIcon(":/Icons/file.png"), root->name());
+        first = new QStandardItem(QIcon(":/Icons/oxygen/file.png"), root->name());
       }
       child << first;
       // Size

src/trackerLogin.h

@@ -40,7 +40,7 @@ class trackerLogin : public QDialog, private Ui::authentication{
     trackerLogin(QWidget *parent, QTorrentHandle h): QDialog(parent), h(h){
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
-      login_logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/encrypted.png")));
+      login_logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/oxygen/encrypted.png")));
       tracker_url->setText(h.current_tracker());
       connect(this, SIGNAL(trackerLoginCancelled(QPair<QTorrentHandle,QString>)), parent, SLOT(addUnauthenticatedTracker(QPair<QTorrentHandle,QString>)));
       show();

src/webui/scripts/client.js

@@ -49,7 +49,7 @@ window.addEvent('domready', function(){
       case 'seeding':
           return '<img src="images/skin/seeding.png"/>';
       case 'checking':
-          return '<img src="images/time.png"/>';
+          return '<img src="images/oxygen/time.png"/>';
       case 'downloading':
           return '<img src="images/skin/downloading.png"/>';
       case 'stalled':