diff --git a/src/Icons/oxygen/browse.png b/src/Icons/oxygen/browse.png deleted file mode 100644 index bc8cface2..000000000 Binary files a/src/Icons/oxygen/browse.png and /dev/null differ diff --git a/src/Icons/oxygen/bt_settings.png b/src/Icons/oxygen/bt_settings.png deleted file mode 100644 index 83598180c..000000000 Binary files a/src/Icons/oxygen/bt_settings.png and /dev/null differ diff --git a/src/Icons/oxygen/bug.png b/src/Icons/oxygen/bug.png deleted file mode 100644 index 44c7ae1ed..000000000 Binary files a/src/Icons/oxygen/bug.png and /dev/null differ diff --git a/src/Icons/oxygen/button_cancel.png b/src/Icons/oxygen/button_cancel.png deleted file mode 100644 index 351659ba4..000000000 Binary files a/src/Icons/oxygen/button_cancel.png and /dev/null differ diff --git a/src/Icons/oxygen/button_ok.png b/src/Icons/oxygen/button_ok.png deleted file mode 100644 index 118a441b3..000000000 Binary files a/src/Icons/oxygen/button_ok.png and /dev/null differ diff --git a/src/Icons/oxygen/connection.png b/src/Icons/oxygen/connection.png deleted file mode 100644 index 2c49e920d..000000000 Binary files a/src/Icons/oxygen/connection.png and /dev/null differ diff --git a/src/Icons/oxygen/cookies.png b/src/Icons/oxygen/cookies.png deleted file mode 100644 index 83512ea9f..000000000 Binary files a/src/Icons/oxygen/cookies.png and /dev/null differ diff --git a/src/Icons/oxygen/document-new.png b/src/Icons/oxygen/document-new.png index fbb4ce058..3d0f5cc1d 100644 Binary files a/src/Icons/oxygen/document-new.png and b/src/Icons/oxygen/document-new.png differ diff --git a/src/Icons/oxygen/download.png b/src/Icons/oxygen/download.png index 6c650c97b..ec888b8dd 100644 Binary files a/src/Icons/oxygen/download.png and b/src/Icons/oxygen/download.png differ diff --git a/src/Icons/oxygen/edit-find.png b/src/Icons/oxygen/edit-find.png index ad916d13f..9b3fe6bca 100644 Binary files a/src/Icons/oxygen/edit-find.png and b/src/Icons/oxygen/edit-find.png differ diff --git a/src/Icons/oxygen/edit_clear.png b/src/Icons/oxygen/edit_clear.png deleted file mode 100644 index 23389ba69..000000000 Binary files a/src/Icons/oxygen/edit_clear.png and /dev/null differ diff --git a/src/Icons/oxygen/emblem-favorite.png b/src/Icons/oxygen/emblem-favorite.png index e9c6e7d41..1b96fc8ec 100644 Binary files a/src/Icons/oxygen/emblem-favorite.png and b/src/Icons/oxygen/emblem-favorite.png differ diff --git a/src/Icons/oxygen/encrypted.png b/src/Icons/oxygen/encrypted.png deleted file mode 100644 index 04a05c1cb..000000000 Binary files a/src/Icons/oxygen/encrypted.png and /dev/null differ diff --git a/src/Icons/oxygen/encrypted32.png b/src/Icons/oxygen/encrypted32.png deleted file mode 100644 index 353a22ca2..000000000 Binary files a/src/Icons/oxygen/encrypted32.png and /dev/null differ diff --git a/src/Icons/oxygen/feed-subscribe.png b/src/Icons/oxygen/feed-subscribe.png deleted file mode 100644 index 6acc38b31..000000000 Binary files a/src/Icons/oxygen/feed-subscribe.png and /dev/null differ diff --git a/src/Icons/oxygen/file.png b/src/Icons/oxygen/file.png deleted file mode 100644 index 3bf4121aa..000000000 Binary files a/src/Icons/oxygen/file.png and /dev/null differ diff --git a/src/Icons/oxygen/folder-documents.png b/src/Icons/oxygen/folder-documents.png index cb457a538..3396f36c1 100644 Binary files a/src/Icons/oxygen/folder-documents.png and b/src/Icons/oxygen/folder-documents.png differ diff --git a/src/Icons/oxygen/folder-new.png b/src/Icons/oxygen/folder-new.png index bd34174a3..448a57f7b 100644 Binary files a/src/Icons/oxygen/folder-new.png and b/src/Icons/oxygen/folder-new.png differ diff --git a/src/Icons/oxygen/folder-remote16.png b/src/Icons/oxygen/folder-remote16.png deleted file mode 100644 index 38465e573..000000000 Binary files a/src/Icons/oxygen/folder-remote16.png and /dev/null differ diff --git a/src/Icons/oxygen/folder.png b/src/Icons/oxygen/folder.png deleted file mode 100644 index c8ea7e73e..000000000 Binary files a/src/Icons/oxygen/folder.png and /dev/null differ diff --git a/src/Icons/oxygen/go-bottom.png b/src/Icons/oxygen/go-bottom.png deleted file mode 100644 index d5c65e248..000000000 Binary files a/src/Icons/oxygen/go-bottom.png and /dev/null differ diff --git a/src/Icons/oxygen/go-down.png b/src/Icons/oxygen/go-down.png index 63331a575..b834f25a5 100644 Binary files a/src/Icons/oxygen/go-down.png and b/src/Icons/oxygen/go-down.png differ diff --git a/src/Icons/oxygen/go-top.png b/src/Icons/oxygen/go-top.png deleted file mode 100644 index 01ae90a32..000000000 Binary files a/src/Icons/oxygen/go-top.png and /dev/null differ diff --git a/src/Icons/oxygen/go-up.png b/src/Icons/oxygen/go-up.png index 4459024ea..86d1f71a1 100644 Binary files a/src/Icons/oxygen/go-up.png and b/src/Icons/oxygen/go-up.png differ diff --git a/src/Icons/oxygen/help-about.png b/src/Icons/oxygen/help-about.png index e1eb7972d..2658ccad1 100644 Binary files a/src/Icons/oxygen/help-about.png and b/src/Icons/oxygen/help-about.png differ diff --git a/src/Icons/oxygen/list-add.png b/src/Icons/oxygen/list-add.png index e029787c7..5724694a9 100644 Binary files a/src/Icons/oxygen/list-add.png and b/src/Icons/oxygen/list-add.png differ diff --git a/src/Icons/oxygen/list-remove.png b/src/Icons/oxygen/list-remove.png index 2bb1a5983..53506b02a 100644 Binary files a/src/Icons/oxygen/list-remove.png and b/src/Icons/oxygen/list-remove.png differ diff --git a/src/Icons/oxygen/log.png b/src/Icons/oxygen/log.png deleted file mode 100644 index 24ce63b0e..000000000 Binary files a/src/Icons/oxygen/log.png and /dev/null differ diff --git a/src/Icons/oxygen/network-server.png b/src/Icons/oxygen/network-server.png index d2a954d44..bd82964be 100644 Binary files a/src/Icons/oxygen/network-server.png and b/src/Icons/oxygen/network-server.png differ diff --git a/src/Icons/oxygen/peer.png b/src/Icons/oxygen/peer.png deleted file mode 100644 index c974107d2..000000000 Binary files a/src/Icons/oxygen/peer.png and /dev/null differ diff --git a/src/Icons/oxygen/proxy.png b/src/Icons/oxygen/proxy.png deleted file mode 100644 index bd82964be..000000000 Binary files a/src/Icons/oxygen/proxy.png and /dev/null differ diff --git a/src/Icons/oxygen/remove.png b/src/Icons/oxygen/remove.png deleted file mode 100755 index e3a4422e7..000000000 Binary files a/src/Icons/oxygen/remove.png and /dev/null differ diff --git a/src/Icons/oxygen/run-build.png b/src/Icons/oxygen/run-build.png deleted file mode 100644 index 36167d5f0..000000000 Binary files a/src/Icons/oxygen/run-build.png and /dev/null differ diff --git a/src/Icons/oxygen/subscribe.png b/src/Icons/oxygen/subscribe.png deleted file mode 100644 index e1d6a2f4d..000000000 Binary files a/src/Icons/oxygen/subscribe.png and /dev/null differ diff --git a/src/Icons/oxygen/subscribe16.png b/src/Icons/oxygen/subscribe16.png deleted file mode 100644 index a41c5d5c7..000000000 Binary files a/src/Icons/oxygen/subscribe16.png and /dev/null differ diff --git a/src/Icons/oxygen/unsubscribe.png b/src/Icons/oxygen/unsubscribe.png deleted file mode 100644 index dcb3c6947..000000000 Binary files a/src/Icons/oxygen/unsubscribe.png and /dev/null differ diff --git a/src/Icons/oxygen/unsubscribe16.png b/src/Icons/oxygen/unsubscribe16.png deleted file mode 100644 index 2da2d8f59..000000000 Binary files a/src/Icons/oxygen/unsubscribe16.png and /dev/null differ diff --git a/src/Icons/oxygen/urlseed.png b/src/Icons/oxygen/urlseed.png deleted file mode 100644 index d0746f663..000000000 Binary files a/src/Icons/oxygen/urlseed.png and /dev/null differ diff --git a/src/Icons/oxygen/filter.png b/src/Icons/oxygen/view-filter.png similarity index 100% rename from src/Icons/oxygen/filter.png rename to src/Icons/oxygen/view-filter.png diff --git a/src/Icons/rss16.png b/src/Icons/rss16.png deleted file mode 100644 index 30cf1a03d..000000000 Binary files a/src/Icons/rss16.png and /dev/null differ diff --git a/src/Icons/rss32.png b/src/Icons/rss32.png deleted file mode 100644 index d6f23522a..000000000 Binary files a/src/Icons/rss32.png and /dev/null differ diff --git a/src/confirmdeletiondlg.ui b/src/confirmdeletiondlg.ui index bc7d70ecb..1e53b5d62 100644 --- a/src/confirmdeletiondlg.ui +++ b/src/confirmdeletiondlg.ui @@ -7,7 +7,7 @@ 0 0 463 - 152 + 128 @@ -23,9 +23,9 @@ - + - + 0 0 @@ -33,9 +33,6 @@ - - :/Icons/oxygen/dialog-warning.png - @@ -72,14 +69,10 @@ - - - :/Icons/oxygen/encrypted.png:/Icons/oxygen/encrypted.png - - 20 - 18 + 24 + 24 @@ -122,9 +115,7 @@ - - - + buttonBox diff --git a/src/console.ui b/src/console.ui index 2fd328ea4..a473c11a2 100644 --- a/src/console.ui +++ b/src/console.ui @@ -13,10 +13,6 @@ qBittorrent log viewer - - - :/Icons/oxygen/log.png:/Icons/oxygen/log.png - @@ -24,10 +20,6 @@ 0 - - - :/Icons/oxygen/log.png:/Icons/oxygen/log.png - General @@ -38,10 +30,6 @@ - - - :/Icons/oxygen/filter.png:/Icons/oxygen/filter.png - Blocked IPs @@ -55,8 +43,6 @@ - - - + diff --git a/src/console_imp.h b/src/console_imp.h index 1a0b08034..6f1dcbc8d 100644 --- a/src/console_imp.h +++ b/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("
")); textBannedPeers->setHtml(QBtSession::instance()->getPeerBanMessages().join("
")); show(); diff --git a/src/deletionconfirmationdlg.h b/src/deletionconfirmationdlg.h index c0fa2df25..6be5f693d 100644 --- a/src/deletionconfirmationdlg.h +++ b/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())); diff --git a/src/icons.qrc b/src/icons.qrc index 9dea07a47..cc6cfe4f1 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -2,8 +2,6 @@ Icons/url.png Icons/loading.png - Icons/rss16.png - Icons/rss32.png Icons/3-state-checkbox.gif Icons/uparrow.png Icons/sphere.png @@ -304,59 +302,63 @@ Icons/flags/tk.png Icons/flags/bg.png Icons/flags/wf.png - Icons/oxygen/peer.png + Icons/oxygen/preferences-system.png Icons/oxygen/unavailable.png - Icons/oxygen/subscribe.png + Icons/oxygen/document-edit-verify.png Icons/oxygen/list-remove.png Icons/oxygen/dialog-warning.png Icons/oxygen/mail-folder-inbox.png - Icons/oxygen/folder.png + Icons/oxygen/edit-clear-history.png Icons/oxygen/edit-copy.png Icons/oxygen/folder-documents.png - Icons/oxygen/urlseed.png + Icons/oxygen/network-wired.png + Icons/oxygen/mail-mark-read.png Icons/oxygen/go-up.png + Icons/oxygen/application-exit.png + Icons/oxygen/edit-rename.png Icons/oxygen/edit-cut.png Icons/oxygen/gear32.png - Icons/oxygen/go-bottom.png + Icons/oxygen/media-playback-start.png Icons/oxygen/user-group-delete.png - Icons/oxygen/unsubscribe.png + Icons/oxygen/edit-find-user.png + Icons/oxygen/media-playback-pause.png Icons/oxygen/tab-close.png - Icons/oxygen/file.png + Icons/oxygen/inode-directory.png + Icons/oxygen/tools-report-bug.png + Icons/oxygen/view-filter.png Icons/oxygen/services.png + Icons/oxygen/view-preview.png Icons/oxygen/view-refresh.png - Icons/oxygen/feed-subscribe.png - Icons/oxygen/remove.png + Icons/oxygen/text-plain.png + Icons/oxygen/edit-delete.png Icons/oxygen/chronometer.png - Icons/oxygen/filter.png - Icons/oxygen/run-build.png - Icons/oxygen/button_ok.png + Icons/oxygen/dialog-cancel.png + Icons/oxygen/preferences-system-network.png + Icons/oxygen/document-properties.png Icons/oxygen/user-group-new.png - Icons/oxygen/cookies.png Icons/oxygen/network-server.png - Icons/oxygen/unsubscribe16.png - Icons/oxygen/encrypted32.png + Icons/oxygen/preferences-web-browser-cookies.png Icons/oxygen/list-add.png Icons/oxygen/edit-paste.png Icons/oxygen/folder-remote.png Icons/oxygen/help-about.png - Icons/oxygen/encrypted.png - Icons/oxygen/folder-remote16.png - Icons/oxygen/go-top.png + Icons/oxygen/document-save.png Icons/oxygen/emblem-favorite.png - Icons/oxygen/edit_clear.png - Icons/oxygen/bug.png Icons/oxygen/gear.png - Icons/oxygen/connection.png + Icons/oxygen/view-categories.png + Icons/oxygen/emblem-locked.png Icons/oxygen/document-new.png - Icons/oxygen/browse.png - Icons/oxygen/proxy.png - Icons/oxygen/button_cancel.png + Icons/oxygen/dialog-information.png + Icons/oxygen/preferences-other.png + Icons/oxygen/view-calendar-journal.png + Icons/oxygen/application-rss+xml.png + Icons/oxygen/document-encrypt.png + Icons/oxygen/help-contents.png Icons/oxygen/preferences-desktop.png - Icons/oxygen/bt_settings.png + Icons/oxygen/application-x-mswinurl.png Icons/oxygen/go-down.png - Icons/oxygen/subscribe16.png + Icons/oxygen/document-import.png Icons/oxygen/download.png - Icons/oxygen/log.png Icons/oxygen/edit-find.png Icons/oxygen/edit-clear.png Icons/oxygen/webui.png diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d0063a5fa..dc233afa1 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -101,27 +101,37 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo connect(static_cast(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"))); - 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/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"))); + actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png"))); // FIXME + actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png"))); // FIXME 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"))); - actionLock_qBittorrent->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/encrypted32.png"))); - lockMenu = new QMenu(); + actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png"))); + actionAbout->setIcon(misc::getIcon("help-about")); + 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 { diff --git a/src/mainwindow.h b/src/mainwindow.h index ae4dd98e8..3d7327077 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -175,7 +175,6 @@ private: QAction *prioSeparator2; QSplitter *hSplitter; QSplitter *vSplitter; - QMenu *lockMenu; // Search QPointer searchEngine; // RSS diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 8111be4bd..2c806b272 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -36,8 +36,6 @@ &Edit - - @@ -132,11 +130,8 @@ - - - @@ -182,17 +177,11 @@ &Delete - - - P&ause All - - - - - R&esume All - - + + + :/Icons/skin/qbittorrent32.png:/Icons/skin/qbittorrent32.png + Visit &Website @@ -207,16 +196,6 @@ Torrent &creator - - - Preview file - - - - - Clear log - - Report a &bug @@ -248,10 +227,6 @@ - - - :/Icons/skin/decrease.png:/Icons/skin/decrease.png - Decrease priority @@ -260,10 +235,6 @@ - - - :/Icons/skin/increase.png:/Icons/skin/increase.png - Increase priority @@ -272,10 +243,6 @@ - - - :/Icons/oxygen/log.png:/Icons/oxygen/log.png - &Log viewer... @@ -363,10 +330,6 @@ - - - :/Icons/oxygen/list-add.png:/Icons/oxygen/list-add.png - Import existing torrent... @@ -375,10 +338,6 @@ - - - :/Icons/oxygen/emblem-favorite.png:/Icons/oxygen/emblem-favorite.png - Donate money @@ -386,6 +345,16 @@ If you like qBittorrent, please donate! + + + R&esume All + + + + + P&ause All + + diff --git a/src/misc.h b/src/misc.h index ab5c5c2de..84495f9e8 100644 --- a/src/misc.h +++ b/src/misc.h @@ -42,6 +42,10 @@ #include #include +#ifndef DISABLE_GUI +#include +#endif + #include #include @@ -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) { diff --git a/src/preferences/options.ui b/src/preferences/options.ui index 11f2512f3..801be29a7 100644 --- a/src/preferences/options.ui +++ b/src/preferences/options.ui @@ -88,15 +88,14 @@ - UI + UI + + + User Interface AlignHCenter|AlignVCenter|AlignCenter - - - :/Icons/oxygen/preferences-desktop.png:/Icons/oxygen/preferences-desktop.png - ItemIsSelectable|ItemIsEnabled @@ -108,10 +107,6 @@ AlignHCenter|AlignVCenter|AlignCenter - - - :/Icons/oxygen/download.png:/Icons/oxygen/download.png - ItemIsSelectable|ItemIsEnabled @@ -123,10 +118,6 @@ AlignHCenter|AlignVCenter|AlignCenter - - - :/Icons/oxygen/connection.png:/Icons/oxygen/connection.png - ItemIsSelectable|ItemIsEnabled @@ -135,10 +126,6 @@ Speed - - - :/Icons/oxygen/chronometer.png:/Icons/oxygen/chronometer.png - @@ -147,10 +134,6 @@ AlignHCenter|AlignVCenter|AlignCenter - - - :/Icons/oxygen/bt_settings.png:/Icons/oxygen/bt_settings.png - ItemIsSelectable|ItemIsEnabled @@ -162,10 +145,6 @@ AlignHCenter|AlignVCenter|AlignCenter - - - :/Icons/oxygen/webui.png:/Icons/oxygen/webui.png - ItemIsSelectable|ItemIsEnabled @@ -174,10 +153,6 @@ Advanced - - - :/Icons/oxygen/gear32.png:/Icons/oxygen/gear32.png - @@ -202,7 +177,7 @@ 0 0 - 507 + 506 430 @@ -506,7 +481,7 @@ 0 0 - 507 + 506 698 @@ -612,9 +587,8 @@ QGroupBox { 27 - - - :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png + + ... @@ -685,9 +659,8 @@ QGroupBox { 27 - - - :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png + + ... @@ -849,9 +822,8 @@ QGroupBox { 27 - - - :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png + + ... @@ -951,8 +923,8 @@ QGroupBox { 0 - -51 - 507 + 0 + 506 457 @@ -1381,9 +1353,8 @@ QGroupBox { 22 - - - :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png + + ... @@ -1799,8 +1770,8 @@ QGroupBox { 0 - -25 - 570 + -7 + 581 422 diff --git a/src/preferences/options_imp.cpp b/src/preferences/options_imp.cpp index c3b0715ea..926833376 100644 --- a/src/preferences/options_imp.cpp +++ b/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 diff --git a/src/preferences/options_imp.h b/src/preferences/options_imp.h index 4ef635626..34fb2cff4 100644 --- a/src/preferences/options_imp.h +++ b/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 diff --git a/src/properties/peerlistwidget.cpp b/src/properties/peerlistwidget.cpp index 1a85f0cbe..e37370162 100644 --- a/src/properties/peerlistwidget.cpp +++ b/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; diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp index c4055582f..6009e01c0 100644 --- a/src/properties/propertieswidget.cpp +++ b/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; diff --git a/src/properties/propertieswidget.ui b/src/properties/propertieswidget.ui index 440f6cf72..6fc32091a 100644 --- a/src/properties/propertieswidget.ui +++ b/src/properties/propertieswidget.ui @@ -54,8 +54,8 @@ 0 0 - 534 - 314 + 520 + 355 @@ -515,9 +515,10 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;"> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style="-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';"></p></td></tr></table></body></html> @@ -579,10 +580,6 @@ p, li { white-space: pre-wrap; } - - - :/Icons/uparrow.png:/Icons/uparrow.png - @@ -624,10 +621,6 @@ p, li { white-space: pre-wrap; } - - - :/Icons/downarrow.png:/Icons/downarrow.png - @@ -680,34 +673,26 @@ p, li { white-space: pre-wrap; } - 24 - 24 + 32 + 32 - - - :/Icons/oxygen/list-remove.png:/Icons/oxygen/list-remove.png - - 24 - 24 + 32 + 32 - - - :/Icons/oxygen/list-add.png:/Icons/oxygen/list-add.png - @@ -841,8 +826,6 @@ p, li { white-space: pre-wrap; } - - - + diff --git a/src/properties/proptabbar.cpp b/src/properties/proptabbar.cpp index bd4b71015..b9637754f 100644 --- a/src/properties/proptabbar.cpp +++ b/src/properties/proptabbar.cpp @@ -34,6 +34,7 @@ #include #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); diff --git a/src/properties/trackerlist.cpp b/src/properties/trackerlist.cpp index 38fb95132..60de8a239 100644 --- a/src/properties/trackerlist.cpp +++ b/src/properties/trackerlist.cpp @@ -344,13 +344,13 @@ void TrackerList::showTrackerListMenu(QPoint) { //QList 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) { diff --git a/src/properties/trackersadditiondlg.h b/src/properties/trackersadditiondlg.h index 47d32850f..7fa2f53eb 100644 --- a/src/properties/trackersadditiondlg.h +++ b/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); diff --git a/src/properties/trackersadditiondlg.ui b/src/properties/trackersadditiondlg.ui index cb7a52cb3..c4c3c0a73 100644 --- a/src/properties/trackersadditiondlg.ui +++ b/src/properties/trackersadditiondlg.ui @@ -30,8 +30,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-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;"></p></body></html> false @@ -67,10 +67,6 @@ p, li { white-space: pre-wrap; } - - - :/Icons/oxygen/download.png:/Icons/oxygen/download.png - @@ -87,9 +83,7 @@ p, li { white-space: pre-wrap; } - - - + buttonBox diff --git a/src/rss/automatedrssdownloader.cpp b/src/rss/automatedrssdownloader.cpp index 4ae18d468..64394f835 100644 --- a/src/rss/automatedrssdownloader.cpp +++ b/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 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); } diff --git a/src/rss/automatedrssdownloader.ui b/src/rss/automatedrssdownloader.ui index 340a048ca..ef6305a7d 100644 --- a/src/rss/automatedrssdownloader.ui +++ b/src/rss/automatedrssdownloader.ui @@ -32,7 +32,7 @@ Qt::Horizontal - + @@ -70,10 +70,6 @@ - - - :/Icons/oxygen/list-remove.png:/Icons/oxygen/list-remove.png - 24 @@ -87,10 +83,6 @@ - - - :/Icons/oxygen/list-add.png:/Icons/oxygen/list-add.png - 24 @@ -123,7 +115,7 @@ - + @@ -246,7 +238,7 @@ - + @@ -320,9 +312,7 @@ - - - + buttonBox diff --git a/src/rss/cookiesdlg.cpp b/src/rss/cookiesdlg.cpp index 47e0baaaa..9f755d3b6 100644 --- a/src/rss/cookiesdlg.cpp +++ b/src/rss/cookiesdlg.cpp @@ -30,6 +30,7 @@ #include "cookiesdlg.h" #include "ui_cookiesdlg.h" +#include "misc.h" #include @@ -40,6 +41,10 @@ CookiesDlg::CookiesDlg(QWidget *parent, const QList &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 cookie_parts = raw_cookie.split('='); diff --git a/src/rss/cookiesdlg.ui b/src/rss/cookiesdlg.ui index a57dbfcc3..ebaf4e03f 100644 --- a/src/rss/cookiesdlg.ui +++ b/src/rss/cookiesdlg.ui @@ -33,12 +33,12 @@ - Key + Key - Value + Value @@ -63,10 +63,6 @@ - - - :/Icons/oxygen/list-add.png:/Icons/oxygen/list-add.png - 20 @@ -96,10 +92,6 @@ - - - :/Icons/oxygen/list-remove.png:/Icons/oxygen/list-remove.png - 20 @@ -142,9 +134,7 @@ - - - + buttonBox diff --git a/src/rss/feedlistwidget.cpp b/src/rss/feedlistwidget.cpp index 4022ada47..156887377 100644 --- a/src/rss/feedlistwidget.cpp +++ b/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); diff --git a/src/rss/rss.ui b/src/rss/rss.ui index 448fe257d..f4065849b 100644 --- a/src/rss/rss.ui +++ b/src/rss/rss.ui @@ -24,10 +24,6 @@ New subscription - - - :/Icons/oxygen/subscribe.png:/Icons/oxygen/subscribe.png - Qt::ToolButtonTextBesideIcon @@ -38,10 +34,6 @@ Mark items read - - - :/Icons/oxygen/button_ok.png:/Icons/oxygen/button_ok.png - Qt::ToolButtonTextBesideIcon @@ -61,10 +53,6 @@ Update all - - - :/Icons/oxygen/view-refresh.png:/Icons/oxygen/view-refresh.png - 24 @@ -187,10 +175,6 @@ p, li { white-space: pre-wrap; } - - - :/Icons/oxygen/remove.png:/Icons/oxygen/remove.png - Delete @@ -199,10 +183,6 @@ p, li { white-space: pre-wrap; } - - - :/Icons/oxygen/edit_clear.png:/Icons/oxygen/edit_clear.png - Rename... @@ -211,10 +191,6 @@ p, li { white-space: pre-wrap; } - - - :/Icons/oxygen/view-refresh.png:/Icons/oxygen/view-refresh.png - Update @@ -223,19 +199,11 @@ p, li { white-space: pre-wrap; } - - - :/Icons/oxygen/subscribe16.png:/Icons/oxygen/subscribe16.png - New subscription... - - - :/Icons/oxygen/view-refresh.png:/Icons/oxygen/view-refresh.png - Update all feeds @@ -244,10 +212,6 @@ p, li { white-space: pre-wrap; } - - - :/Icons/oxygen/button_ok.png:/Icons/oxygen/button_ok.png - Mark items read @@ -256,53 +220,31 @@ p, li { white-space: pre-wrap; } - - - :/Icons/oxygen/download.png:/Icons/oxygen/download.png - Download torrent - - - :/Icons/url.png:/Icons/url.png - Open news URL - - - :/Icons/oxygen/edit-copy.png:/Icons/oxygen/edit-copy.png - Copy feed URL - - - :/Icons/oxygen/folder-new.png:/Icons/oxygen/folder-new.png - New folder... - - - :/Icons/oxygen/cookies.png:/Icons/oxygen/cookies.png - Manage cookies... - - - + diff --git a/src/rss/rss_imp.cpp b/src/rss/rss_imp.cpp index 253a6faee..a2c415b94 100644 --- a/src/rss/rss_imp.cpp +++ b/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(); diff --git a/src/rss/rssfeed.cpp b/src/rss/rssfeed.cpp index d618426dc..37b56db68 100644 --- a/src/rss/rssfeed.cpp +++ b/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(); diff --git a/src/rss/rsssettingsdlg.ui b/src/rss/rsssettingsdlg.ui index 56542a135..956685e39 100644 --- a/src/rss/rsssettingsdlg.ui +++ b/src/rss/rsssettingsdlg.ui @@ -34,7 +34,7 @@ - :/Icons/rss32.png + :/Icons/oxygen/application-rss+xml.png true diff --git a/src/searchengine/engineselect.ui b/src/searchengine/engineselect.ui index 53051e949..da832485d 100644 --- a/src/searchengine/engineselect.ui +++ b/src/searchengine/engineselect.ui @@ -112,13 +112,11 @@ - - Enable + + true - - - Disable + Enabled diff --git a/src/searchengine/engineselectdlg.cpp b/src/searchengine/engineselectdlg.cpp index ccc64c812..65a8b081d 100644 --- a/src/searchengine/engineselectdlg.cpp +++ b/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"))); - actionDisable->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png"))); - actionUninstall->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/list-remove.png"))); - connect(actionEnable, SIGNAL(triggered()), this, SLOT(enableSelection())); - connect(actionDisable, SIGNAL(triggered()), this, SLOT(disableSelection())); + actionUninstall->setIcon(misc::getIcon("list-remove")); + connect(actionEnable, SIGNAL(toggled(bool)), this, SLOT(enableSelection(bool))); 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 items = pluginsTree->selectedItems(); - bool has_enable = false, has_disable = false; - QTreeWidgetItem *item; - foreach(item, items) { - 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; - } + if(items.isEmpty()) return; + QString first_id = items.first()->text(ENGINE_ID); + actionEnable->setChecked(supported_engines->value(first_id)->isEnabled()); + myContextMenu.addAction(actionEnable); myContextMenu.addSeparator(); myContextMenu.addAction(actionUninstall); myContextMenu.exec(QCursor::pos()); @@ -194,29 +181,21 @@ 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 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); - item->setText(ENGINE_STATE, tr("Yes")); - setRowColor(index, "green"); - } -} - -void engineSelectDlg::disableSelection() { - QList 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"); + supported_engines->value(id)->setEnabled(enable); + if(enable) { + item->setText(ENGINE_STATE, tr("Yes")); + setRowColor(index, "green"); + } else { + item->setText(ENGINE_STATE, tr("No")); + setRowColor(index, "red"); + } } } diff --git a/src/searchengine/engineselectdlg.h b/src/searchengine/engineselectdlg.h index 92aeadeac..16be96c6e 100644 --- a/src/searchengine/engineselectdlg.h +++ b/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 disableSelection(); + void enableSelection(bool enable); void on_actionUninstall_triggered(); void on_updateButton_clicked(); void on_installButton_clicked(); diff --git a/src/searchengine/searchengine.cpp b/src/searchengine/searchengine.cpp index 63ad7def6..416a020fd 100644 --- a/src/searchengine/searchengine.cpp +++ b/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 copyAct(QIcon(":/Icons/oxygen/edit-copy.png"), tr("Copy"), &myMenu); - QAction pasteAct(QIcon(":/Icons/oxygen/edit-paste.png"), tr("Paste"), &myMenu); - QAction clearAct(QIcon(":/Icons/oxygen/edit_clear.png"), tr("Clear field"), &myMenu); - QAction clearHistoryAct(QIcon(":/Icons/oxygen/edit-clear.png"), tr("Clear completion history"), &myMenu); + QAction cutAct(misc::getIcon("edit-cut"), tr("Cut"), &myMenu); + QAction copyAct(misc::getIcon("edit-copy"), tr("Copy"), &myMenu); + QAction pasteAct(misc::getIcon("edit-paste"), tr("Paste"), &myMenu); + QAction clearAct(misc::getIcon("edit-clear"), tr("Clear field"), &myMenu); + QAction clearHistoryAct(misc::getIcon("edit-clear-history"), tr("Clear completion history"), &myMenu); bool hasCopyAct = false; if(search_pattern->hasSelectedText()) { myMenu.addAction(&cutAct); diff --git a/src/torrentadditiondlg.cpp b/src/torrentadditiondlg.cpp index 56c7ec9eb..cc2f97013 100644 --- a/src/torrentadditiondlg.cpp +++ b/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; diff --git a/src/torrentcreator/createtorrent.ui b/src/torrentcreator/createtorrent.ui index 4a234f2dd..d68ecaffb 100644 --- a/src/torrentcreator/createtorrent.ui +++ b/src/torrentcreator/createtorrent.ui @@ -64,10 +64,6 @@ Add file - - - :/Icons/oxygen/document-new.png:/Icons/oxygen/document-new.png - @@ -75,10 +71,6 @@ Add folder - - - :/Icons/oxygen/folder-new.png:/Icons/oxygen/folder-new.png - @@ -317,8 +309,6 @@ - - - + diff --git a/src/torrentcreator/torrentcreatordlg.cpp b/src/torrentcreator/torrentcreatordlg.cpp index 1a25d4b0e..04be6077c 100644 --- a/src/torrentcreator/torrentcreatordlg.cpp +++ b/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); diff --git a/src/torrentfilesmodel.h b/src/torrentfilesmodel.h index 005e50d0b..a015682ee 100644 --- a/src/torrentfilesmodel.h +++ b/src/torrentfilesmodel.h @@ -434,9 +434,9 @@ public: TreeItem *item = static_cast(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) diff --git a/src/torrentimportdlg.cpp b/src/torrentimportdlg.cpp index e7acaf5ef..d75f67bad 100644 --- a/src/torrentimportdlg.cpp +++ b/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); diff --git a/src/torrentimportdlg.ui b/src/torrentimportdlg.ui index ebf69ca6a..6e3b2fd08 100644 --- a/src/torrentimportdlg.ui +++ b/src/torrentimportdlg.ui @@ -7,7 +7,7 @@ 0 0 464 - 233 + 236 @@ -20,19 +20,16 @@ 15 - + - - 0 - 0 + + 32 + 32 - - :/Icons/skin/info.png - @@ -118,16 +115,10 @@ Import - - - :/Icons/oxygen/list-add.png:/Icons/oxygen/list-add.png - - - - + diff --git a/src/transferlistfilterswidget.h b/src/transferlistfilterswidget.h index df7d82942..7ac486556 100644 --- a/src/transferlistfilterswidget.h +++ b/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")); - QAction *addAct = labelMenu.addAction(QIcon(":/Icons/oxygen/list-add.png"), tr("Add label...")); + removeAct = labelMenu.addAction(misc::getIcon("list-remove"), tr("Remove 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 *pauseAct = labelMenu.addAction(QIcon(":/Icons/skin/pause22.png"), tr("Pause torrents")); - QAction *deleteTorrentsAct = labelMenu.addAction(QIcon(":/Icons/skin/delete22.png"), tr("Delete torrents")); + QAction *startAct = labelMenu.addAction(misc::getIcon("media-playback-start"), tr("Resume torrents")); + QAction *pauseAct = labelMenu.addAction(misc::getIcon("media-playback-pause"), tr("Pause torrents")); + QAction *deleteTorrentsAct = labelMenu.addAction(misc::getIcon("edit-delete"), tr("Delete torrents")); QAction *act = 0; act = labelMenu.exec(QCursor::pos()); if(act) { diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp index 85c9380dd..5e21945ea 100644 --- a/src/transferlistwidget.cpp +++ b/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); - //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); + QAction actionIncreasePriority(misc::getIcon("go-up"), 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 labelActions; - QMenu *labelMenu = listMenu.addMenu(QIcon(":/Icons/oxygen/feed-subscribe.png"), tr("Label")); - labelActions << labelMenu->addAction(QIcon(":/Icons/oxygen/list-add.png"), tr("New...", "New label...")); - labelActions << labelMenu->addAction(QIcon(":/Icons/oxygen/edit-clear.png"), tr("Reset", "Reset label")); + QMenu *labelMenu = listMenu.addMenu(misc::getIcon("view-categories"), tr("Label")); + labelActions << labelMenu->addAction(misc::getIcon("list-add"), tr("New...", "New 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()); diff --git a/src/webui/css/style.css b/src/webui/css/style.css index 61f524fea..ddfaf9889 100644 --- a/src/webui/css/style.css +++ b/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.prioUp { background-image:url(../images/oxygen/go-up.png); } -#contextmenu li a.prioDown { background-image:url(../images/oxygen/go-down.png); } -#contextmenu li a.prioBottom { background-image:url(../images/oxygen/go-bottom.png); } +#contextmenu li a.prioTop { background-image:url(../images/oxygen/go-top22.png); } +#contextmenu li a.prioUp { background-image:url(../images/oxygen/go-up22.png); } +#contextmenu li a.prioDown { background-image:url(../images/oxygen/go-down22.png); } +#contextmenu li a.prioBottom { background-image:url(../images/oxygen/go-bottom22.png); } /* Sliders */