diff --git a/AUTHORS b/AUTHORS index 18e686e17..cb876facd 100644 --- a/AUTHORS +++ b/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 diff --git a/Changelog b/Changelog index 5aeb2df9f..06f9c5004 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,12 @@ +* Unknown - Christophe Dumez - v1.3.3 + - COSMETIC: Redesigned program preferences + - COSMETIC: Updated icons set + +* Sat Mar 7 2009 - Christophe Dumez - 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 - 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 diff --git a/src/FinishedTorrents.cpp b/src/FinishedTorrents.cpp index 65c73299e..04a65b384 100644 --- a/src/FinishedTorrents.cpp +++ b/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; icolumnCount()-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; diff --git a/src/GUI.cpp b/src/GUI.cpp index 507f6172e..1dbc6e4c7 100644 --- a/src/GUI.cpp +++ b/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"))); - actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/newmsg.png"))); + actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/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"))); @@ -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); diff --git a/src/Icons/bt_settings.png b/src/Icons/bt_settings.png deleted file mode 100644 index cd1dcbfc3..000000000 Binary files a/src/Icons/bt_settings.png and /dev/null differ diff --git a/src/Icons/button_cancel.png b/src/Icons/button_cancel.png deleted file mode 100644 index c6464d90a..000000000 Binary files a/src/Icons/button_cancel.png and /dev/null differ diff --git a/src/Icons/button_ok.png b/src/Icons/button_ok.png deleted file mode 100644 index 230de5302..000000000 Binary files a/src/Icons/button_ok.png and /dev/null differ diff --git a/src/Icons/configure.png b/src/Icons/configure.png deleted file mode 100644 index 4461aa753..000000000 Binary files a/src/Icons/configure.png and /dev/null differ diff --git a/src/Icons/connection.png b/src/Icons/connection.png deleted file mode 100644 index e2b1bc553..000000000 Binary files a/src/Icons/connection.png and /dev/null differ diff --git a/src/Icons/description.png b/src/Icons/description.png deleted file mode 100644 index 30b4262a6..000000000 Binary files a/src/Icons/description.png and /dev/null differ diff --git a/src/Icons/download.png b/src/Icons/download.png deleted file mode 100644 index a867ed478..000000000 Binary files a/src/Icons/download.png and /dev/null differ diff --git a/src/Icons/filter.png b/src/Icons/filter.png deleted file mode 100644 index 5ebb6ce6e..000000000 Binary files a/src/Icons/filter.png and /dev/null differ diff --git a/src/Icons/gear.png b/src/Icons/gear.png deleted file mode 100644 index 7e338cad2..000000000 Binary files a/src/Icons/gear.png and /dev/null differ diff --git a/src/Icons/home.png b/src/Icons/home.png deleted file mode 100644 index e9612a381..000000000 Binary files a/src/Icons/home.png and /dev/null differ diff --git a/src/Icons/log.png b/src/Icons/log.png deleted file mode 100644 index 112c58ca1..000000000 Binary files a/src/Icons/log.png and /dev/null differ diff --git a/src/Icons/newmsg.png b/src/Icons/newmsg.png deleted file mode 100644 index 1cad024ae..000000000 Binary files a/src/Icons/newmsg.png and /dev/null differ diff --git a/src/Icons/oxygen/bt_settings.png b/src/Icons/oxygen/bt_settings.png new file mode 100644 index 000000000..83598180c Binary files /dev/null and b/src/Icons/oxygen/bt_settings.png differ diff --git a/src/Icons/oxygen/bug.png b/src/Icons/oxygen/bug.png new file mode 100644 index 000000000..44c7ae1ed Binary files /dev/null and b/src/Icons/oxygen/bug.png differ diff --git a/src/Icons/oxygen/button_cancel.png b/src/Icons/oxygen/button_cancel.png new file mode 100644 index 000000000..351659ba4 Binary files /dev/null and b/src/Icons/oxygen/button_cancel.png differ diff --git a/src/Icons/oxygen/button_ok.png b/src/Icons/oxygen/button_ok.png new file mode 100644 index 000000000..118a441b3 Binary files /dev/null and b/src/Icons/oxygen/button_ok.png differ diff --git a/src/Icons/oxygen/configure.png b/src/Icons/oxygen/configure.png new file mode 100644 index 000000000..2afbd23cc Binary files /dev/null and b/src/Icons/oxygen/configure.png differ diff --git a/src/Icons/oxygen/connection.png b/src/Icons/oxygen/connection.png new file mode 100644 index 000000000..2c49e920d Binary files /dev/null and b/src/Icons/oxygen/connection.png differ diff --git a/src/Icons/oxygen/download.png b/src/Icons/oxygen/download.png new file mode 100644 index 000000000..6c650c97b Binary files /dev/null and b/src/Icons/oxygen/download.png differ diff --git a/src/Icons/edit_clear.png b/src/Icons/oxygen/edit_clear.png similarity index 100% rename from src/Icons/edit_clear.png rename to src/Icons/oxygen/edit_clear.png diff --git a/src/Icons/encrypted.png b/src/Icons/oxygen/encrypted.png similarity index 100% rename from src/Icons/encrypted.png rename to src/Icons/oxygen/encrypted.png diff --git a/src/Icons/file.png b/src/Icons/oxygen/file.png similarity index 100% rename from src/Icons/file.png rename to src/Icons/oxygen/file.png diff --git a/src/Icons/oxygen/filter.png b/src/Icons/oxygen/filter.png new file mode 100644 index 000000000..d20f31d86 Binary files /dev/null and b/src/Icons/oxygen/filter.png differ diff --git a/src/Icons/folder.png b/src/Icons/oxygen/folder.png similarity index 100% rename from src/Icons/folder.png rename to src/Icons/oxygen/folder.png diff --git a/src/Icons/oxygen/gear.png b/src/Icons/oxygen/gear.png new file mode 100644 index 000000000..9ab8c04f4 Binary files /dev/null and b/src/Icons/oxygen/gear.png differ diff --git a/src/Icons/oxygen/log.png b/src/Icons/oxygen/log.png new file mode 100644 index 000000000..24ce63b0e Binary files /dev/null and b/src/Icons/oxygen/log.png differ diff --git a/src/Icons/subscribe.png b/src/Icons/oxygen/subscribe.png similarity index 100% rename from src/Icons/subscribe.png rename to src/Icons/oxygen/subscribe.png diff --git a/src/Icons/subscribe16.png b/src/Icons/oxygen/subscribe16.png similarity index 100% rename from src/Icons/subscribe16.png rename to src/Icons/oxygen/subscribe16.png diff --git a/src/Icons/time.png b/src/Icons/oxygen/time.png similarity index 100% rename from src/Icons/time.png rename to src/Icons/oxygen/time.png diff --git a/src/Icons/oxygen/unavailable.png b/src/Icons/oxygen/unavailable.png new file mode 100644 index 000000000..2c2f99eb4 Binary files /dev/null and b/src/Icons/oxygen/unavailable.png differ diff --git a/src/Icons/unsubscribe.png b/src/Icons/oxygen/unsubscribe.png similarity index 100% rename from src/Icons/unsubscribe.png rename to src/Icons/oxygen/unsubscribe.png diff --git a/src/Icons/unsubscribe16.png b/src/Icons/oxygen/unsubscribe16.png similarity index 100% rename from src/Icons/unsubscribe16.png rename to src/Icons/oxygen/unsubscribe16.png diff --git a/src/Icons/oxygen/webui.png b/src/Icons/oxygen/webui.png new file mode 100644 index 000000000..51a98345f Binary files /dev/null and b/src/Icons/oxygen/webui.png differ diff --git a/src/Icons/password.png b/src/Icons/password.png deleted file mode 100644 index cb8501922..000000000 Binary files a/src/Icons/password.png and /dev/null differ diff --git a/src/Icons/mascot.png b/src/Icons/skin/mascot.png similarity index 100% rename from src/Icons/mascot.png rename to src/Icons/skin/mascot.png diff --git a/src/Icons/qbittorrent16.png b/src/Icons/skin/qbittorrent16.png similarity index 100% rename from src/Icons/qbittorrent16.png rename to src/Icons/skin/qbittorrent16.png diff --git a/src/Icons/qbittorrent22.png b/src/Icons/skin/qbittorrent22.png similarity index 100% rename from src/Icons/qbittorrent22.png rename to src/Icons/skin/qbittorrent22.png diff --git a/src/Icons/qbittorrent32.png b/src/Icons/skin/qbittorrent32.png similarity index 100% rename from src/Icons/qbittorrent32.png rename to src/Icons/skin/qbittorrent32.png diff --git a/src/Icons/splash.png b/src/Icons/skin/splash.png similarity index 100% rename from src/Icons/splash.png rename to src/Icons/skin/splash.png diff --git a/src/Icons/star.png b/src/Icons/star.png deleted file mode 100644 index 5bf532844..000000000 Binary files a/src/Icons/star.png and /dev/null differ diff --git a/src/Icons/style.png b/src/Icons/style.png deleted file mode 100644 index f8810f245..000000000 Binary files a/src/Icons/style.png and /dev/null differ diff --git a/src/Icons/systemtray.png b/src/Icons/systemtray.png deleted file mode 100644 index e4d5f5558..000000000 Binary files a/src/Icons/systemtray.png and /dev/null differ diff --git a/src/Icons/unavailable.png b/src/Icons/unavailable.png deleted file mode 100644 index b2cc9be41..000000000 Binary files a/src/Icons/unavailable.png and /dev/null differ diff --git a/src/Icons/wizard.png b/src/Icons/wizard.png deleted file mode 100644 index 686a2daab..000000000 Binary files a/src/Icons/wizard.png and /dev/null differ diff --git a/src/MainWindow.ui b/src/MainWindow.ui index 0071b804c..a0dcc524a 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -258,7 +258,7 @@ - :/Icons/log.png + :/Icons/oxygen/log.png Console diff --git a/src/about_imp.h b/src/about_imp.h index 820ab5d6b..9d19b4d22 100644 --- a/src/about_imp.h +++ b/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"))); - mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/mascot.png"))); + logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png"))); + mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png"))); //Title lb_name->setText(QString::fromUtf8("

")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"

")); // Thanks diff --git a/src/console.ui b/src/console.ui index 14afcc5fa..28d294826 100644 --- a/src/console.ui +++ b/src/console.ui @@ -13,7 +13,7 @@ qBittorrent console - :/Icons/log.png + :/Icons/oxygen/log.png @@ -26,7 +26,7 @@ General - :/Icons/log.png + :/Icons/oxygen/log.png diff --git a/src/download.ui b/src/download.ui index 2abe6e936..a1ae73cd1 100644 --- a/src/download.ui +++ b/src/download.ui @@ -92,7 +92,7 @@ - :/Icons/folder.png:/Icons/folder.png + :/Icons/oxygen/folder.png:/Icons/oxygen/folder.png Open destination folder @@ -173,7 +173,7 @@ - :/Icons/gear.png:/Icons/gear.png + :/Icons/oxygen/gear.png:/Icons/oxygen/gear.png Force recheck diff --git a/src/downloadingTorrents.cpp b/src/downloadingTorrents.cpp index 621236308..611bdb95f 100644 --- a/src/downloadingTorrents.cpp +++ b/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(1, QIcon(QString::fromUtf8(":/Icons/filter.png"))); +// tabBottom->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/oxygen/log.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; icolumnCount()-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: diff --git a/src/engineSelectDlg.cpp b/src/engineSelectDlg.cpp index bc6d54186..e5ef2dfcb 100644 --- a/src/engineSelectDlg.cpp +++ b/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"))); - actionDisable->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png"))); + 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/skin/remove.png"))); connect(actionEnable, SIGNAL(triggered()), this, SLOT(enableSelection())); connect(actionDisable, SIGNAL(triggered()), this, SLOT(disableSelection())); diff --git a/src/icons.qrc b/src/icons.qrc index 1c1e9b724..8f00505f8 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -2,51 +2,19 @@ Icons/add_file.png Icons/add_folder.png - Icons/bt_settings.png - Icons/button_cancel.png - Icons/button_ok.png - Icons/configure.png - Icons/connection.png - Icons/description.png Icons/downarrow.png - Icons/download.png - Icons/edit_clear.png - Icons/encrypted.png - Icons/file.png - Icons/filter.png - Icons/folder.png - Icons/gear.png Icons/gnome-shutdown.png - Icons/home.png Icons/loading.png Icons/locale.png - Icons/log.png - Icons/mascot.png Icons/money.png - Icons/newmsg.png - Icons/password.png Icons/proxy.png - Icons/qbittorrent16.png - Icons/qbittorrent22.png - Icons/qbittorrent32.png Icons/refresh.png Icons/rss16.png Icons/rss32.png Icons/sphere.png Icons/sphere2.png - Icons/splash.png - Icons/star.png - Icons/style.png - Icons/subscribe.png - Icons/subscribe16.png - Icons/systemtray.png - Icons/time.png - Icons/unavailable.png - Icons/unsubscribe.png - Icons/unsubscribe16.png Icons/uparrow.png Icons/url.png - Icons/wizard.png Icons/flags/brazil.png Icons/flags/bulgaria.png Icons/flags/china.png @@ -74,6 +42,27 @@ Icons/flags/turkey.png Icons/flags/ukraine.png Icons/flags/united_kingdom.png + Icons/oxygen/bt_settings.png + Icons/oxygen/bug.png + Icons/oxygen/button_cancel.png + Icons/oxygen/button_ok.png + Icons/oxygen/configure.png + Icons/oxygen/connection.png + Icons/oxygen/download.png + Icons/oxygen/edit_clear.png + Icons/oxygen/encrypted.png + Icons/oxygen/file.png + Icons/oxygen/filter.png + Icons/oxygen/folder.png + Icons/oxygen/gear.png + Icons/oxygen/log.png + Icons/oxygen/subscribe.png + Icons/oxygen/subscribe16.png + Icons/oxygen/time.png + Icons/oxygen/unavailable.png + Icons/oxygen/unsubscribe.png + Icons/oxygen/unsubscribe16.png + Icons/oxygen/webui.png Icons/skin/add.png Icons/skin/connected.png Icons/skin/decrease.png @@ -85,6 +74,7 @@ Icons/skin/firewalled.png Icons/skin/increase.png Icons/skin/info.png + Icons/skin/mascot.png Icons/skin/new.png Icons/skin/open.png Icons/skin/pause.png @@ -95,11 +85,15 @@ Icons/skin/preview.png Icons/skin/properties.png Icons/skin/qb_question.png + Icons/skin/qbittorrent16.png + Icons/skin/qbittorrent22.png + Icons/skin/qbittorrent32.png Icons/skin/queued.png Icons/skin/remove.png Icons/skin/search.png Icons/skin/seeding.png Icons/skin/settings.png + Icons/skin/splash.png Icons/skin/stalled.png Icons/skin/tabs.gif Icons/skin/url.png diff --git a/src/main.cpp b/src/main.cpp index 8cadab37d..92a1eb852 100644 --- a/src/main.cpp +++ b/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(); diff --git a/src/options.ui b/src/options.ui index 96ab6a620..c41944a0a 100644 --- a/src/options.ui +++ b/src/options.ui @@ -1,712 +1,443 @@ - + + Dialog - - + + 0 0 - 663 + 788 586 - - - 463 - 389 - + + + 0 + 0 + - - Options -- qBittorrent + + Preferences - - - 6 - - - 9 - + - - - - Sans Serif - 12 - 75 - false - true - false - false - - - - Preferences - - - Qt::AlignCenter - - - - - - - Qt::Horizontal - - - - - - - QTabWidget::North - - - QTabWidget::Rounded - - - 0 - - - - 22 - 22 - - - - Qt::ElideLeft - - - - General - - - - :/Icons/star.png:/Icons/star.png - - + + + + + + 0 + 0 + + + + + 121 + 0 + + + + QFrame::StyledPanel + + + false + + + + 30 + 30 + + + + Qt::ElideNone + + + QListView::Static + + + QListView::LeftToRight + + + true + + + QListView::Adjust + + + QListView::SinglePass + + + 0 + + + + 107 + 60 + + + + QListView::IconMode + + + false + + + false + + + false + + + 0 + - - - User interface settings - - - - - - - - Language: - - - - - - - QComboBox::AdjustToContents - - - 0 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 8 - true - - - - <b>Note:</b> Changes will be applied after qBittorrent is restarted. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - - Visual style: - - - - - - - - System default - - - - - Plastique style (KDE like) - - - - - Cleanlooks style (Gnome like) - - - - - Motif style (Unix like) - - - - - CDE style (Common Desktop Environment like) - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Ask for confirmation on exit when download list is not empty - - - true - - - - - - - Display top toolbar - - - true - - - - - - - Display current speed in title bar - - - - - - - - - transfer lists refresh interval: - - - - - - - 10 - - - 99999 - - - 1500 - - - - - - - ms - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - + + General + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/configure.png:/Icons/oxygen/configure.png + + + ItemIsSelectable|ItemIsEnabled + - - - System tray icon - - - - - - Disable system tray icon - - - - - - - Close to tray - - - - - - - Minimize to tray - - - false - - - - - - - Start minimized - - - - - - - Show notification balloons in tray - - - true - - - - - + + Downloads + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/download.png:/Icons/oxygen/download.png + + + ItemIsSelectable|ItemIsEnabled + - - - Qt::Vertical - - - - 623 - 20 - - - + + Network + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/connection.png:/Icons/oxygen/connection.png + + + ItemIsSelectable|ItemIsEnabled + - - - - - Downloads - - - - :/Icons/download.png:/Icons/download.png - - - - - - 0 - 0 - - - - File system - - - - - - Put downloads in this folder: - - - - - - - 6 - - - 0 - + + Bittorrent + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/bt_settings.png:/Icons/oxygen/bt_settings.png + + + ItemIsSelectable|ItemIsEnabled + + + + + IP Filter + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/filter.png:/Icons/oxygen/filter.png + + + ItemIsSelectable|ItemIsEnabled + + + + + Web UI + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/webui.png:/Icons/oxygen/webui.png + + + ItemIsSelectable|ItemIsEnabled + + + + + RSS + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/rss32.png:/Icons/rss32.png + + + ItemIsSelectable|ItemIsEnabled + + + + + + + + 0 + + + + + + + User interface settings + + - - - 6 - - - 0 - + - - - + + + Language: - - - ... + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + + 0 + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - - Pre-allocate all files - - - - - - - - - - - 0 - 0 - - - - When adding a torrent - - - - - - - Display torrent content and some options + + + + 8 + true + - + + <b>Note:</b> Changes will be applied after qBittorrent is restarted. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + + Visual style: + + + + + + + + System default + + + + + Plastique style (KDE like) + + + + + Cleanlooks style (Gnome like) + + + + + Motif style (Unix like) + + + + + CDE style (Common Desktop Environment like) + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Ask for confirmation on exit when download list is not empty + + true - - - Qt::Horizontal + + + Display top toolbar - - - 40 - 20 - - - - - - - - Do not start download automatically - - - - - - - - - - - - - 0 - 0 - - - - Folder watching - - - - - - Automatically download torrents present in this folder: - - - - - - - 6 - - - 0 - - - - - false + + true - - - false - - - ... - - - - - - - - - - - - - 0 - 0 - - - - Action on double click in transfer lists - - - - - - - - In download list: + + + Display current speed in title bar - - - - 0 - 0 - - - - 0 - + - - Pause/Start torrent - - - - - Open destination folder - - - - - Display torrent properties - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - In seeding list: - - - - - - - - Pause/Start torrent - - - - - Open destination folder - - - - - Display torrent properties - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - Connection - - - - :/Icons/connection.png:/Icons/connection.png - - - - - - - - - - Listening port - - - - - - - - Port range: - - - - - - - 1000 - - - 65525 - - - 6881 - - - - - - - to - - - Qt::AlignCenter - - - - - - - 1000 - - - 65525 - - - 6889 - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - - Enable UPnP port mapping - - - true + + + transfer lists refresh interval: - - - Enable NAT-PMP port mapping + + + 10 - + + 99999 + + + 1500 + + + + + + + ms + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + System tray icon + + + + + + Disable system tray icon + + + + + + + Close to tray + + + + + + + Minimize to tray + + + false + + + + + + + Start minimized + + + + + + + Show notification balloons in tray + + true @@ -714,1553 +445,1991 @@ + + + + + + + 0 + 0 + + + + Transfer lists double-click + + + + + + + + Download list: + + + + + + + + 0 + 0 + + + + 0 + + + + Pause/Start torrent + + + + + Open destination folder + + + + + Display torrent properties + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Seeding list: + + + + + + + + Pause/Start torrent + + + + + Open destination folder + + + + + Display torrent properties + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Vertical + + + + 623 + 20 + + + + - - - - - Global bandwidth limiting - - - - + + + + + + + + 0 + 0 + + + + File system + + - + + + Put downloads in this folder: + + + + + + + 6 + + + 0 + - - - - 0 - 45 - + + + 6 - - Upload: + + 0 - + + + + + + + + + + + ... + + + + + + + + + + + Pre-allocate all files + + + + + + + + + + + 0 + 0 + + + + When adding a torrent + + + + + + + + Display torrent content and some options + + true - - + + + Qt::Horizontal + + - 0 - 37 + 40 + 20 - - Download: + + + + + + Do not start download automatically + + + + + + + + + + + + + 0 + 0 + + + + Folder watching + + + + + + Automatically download torrents present in this folder: + + + + + + + 6 + + + 0 + + + + + false + + + + + + + false + + + ... + + + + + + + + + + + + Torrent queueing + + + + + + Enable queueing system + + + + + + + + + false + + + Maximum active downloads: + + + + + + + false + + + -1 + + + 999 + + + 3 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + false + + + Maximum active uploads: + + + + + + + false + + + -1 + + + 999 + + + 3 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + false + + + Maximum active torrents: + + + + + + + false + + + -1 + + + 999 + + + 5 + + + + + + + Qt::Horizontal + + + + 381 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + + Listening port + + + + + + + + Port range: + + + + + + + 1000 + + + 65525 + + + 6881 + + + + + + + to + + + Qt::AlignCenter + + + + + + + 1000 + + + 65525 + + + 6889 + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + + + Enable UPnP port mapping + + + true + + + + + + + Enable NAT-PMP port mapping + + + true + + + + + + + + + + + + + + Connections limit + + + + + + + + Global maximum number of connections: + + + true + + + + + + + true + + + + 8 + + + + 2 + + + 2000 + + + 500 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Maximum number of connections per torrent: + + + true + + + + + + + + 8 + + + + 2 + + + 2000 + + + 100 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Maximum number of upload slots per torrent: + + + true + + + + + + + + 8 + + + + 500 + + + 4 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Global bandwidth limiting + + + + + + + + + + + 0 + 45 + + + + Upload: + + + true + + + + + + + + 0 + 37 + + + + Download: + + + + + + + + + + + + + true + + + + 0 + 27 + + + + + + + 1 + + + 1000000 + + + 50 + + + + + + + KiB/s + + + + + + + + + + + false + + + + 0 + 27 + + + + + + + 1 + + + 1000000 + + + 100 + + + + + + + KiB/s + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 623 + 121 + + + + + + + + + + + + Bittorrent features + + + + + + Enable DHT network (decentralized) + + + true + + + + + + + Enable Local Peer Discovery + + + true + + + + + + + Spoof Azureus to avoid ban (requires restart) + + + + + + + + + Encryption: + + + + + + + + Enabled + + + + + Forced + + + + + Disabled + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Share ratio settings + + + + + + + + Desired ratio: + + + + + + + false + + + + 8 + + + + Qt::AlignHCenter + + + 1 + + + 1.000000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Remove finished torrents when their ratio reaches: + + + + + + + false + + + + 8 + + + + Qt::AlignHCenter + + + 1 + + + 1.000000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Search engine proxy settings + + + + + + + + Type: + + + + + + + + (None) + + + + + HTTP + + + + + + + + false + + + Proxy: + + + + + + + false + + + + + + 75 + + + QLineEdit::Normal + + + + + + + false + + + Port: + + + + + + + false + + + 65525 + + + 8080 + + + + + + + Qt::Horizontal + + + + 21 + 29 + + + + + + + + + + + + false + + + Authentication + + + + + + + + + + + false + + + Username: + + + + + + + false + + + Password: + + + + + + + + + + + false + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + false + + + + + + 1000 + + + QLineEdit::Password + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + true + + + Bittorrent proxy settings + + + + + + + + Type: + + + + + + + + (None) + + + + + HTTP + + + + + SOCKS5 + + + + + + + + false + + + Proxy: + + + + + + + false + + + + + + 75 + + + QLineEdit::Normal + + + + + + + false + + + Port: + + + + + + + false + + + 65525 + + + 8080 + + + + + + + Qt::Horizontal + + + + 21 + 29 + + + + + + + + + + + + false + + + Authentication + + + + + + + + + + + false + + + Username: + + + + + + + false + + + Password: + + + + + + + + + + + false + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + false + + + + + + 1000 + + + QLineEdit::Password + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + false + + + + 0 + 110 + + + + Affected connections + + + + + + + 0 + 0 + + + + Use proxy for connections to trackers + + + true + + + + + + + + 0 + 0 + + + + Use proxy for connections to regular peers + + + true + + + + + + + + 0 + 0 + + + + Use proxy for DHT messages + + + true + + + + + + + + 0 + 0 + + + + Use proxy for connections to web seeds + + + true + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + true + + + Filter Settings + + + + + + Activate IP Filtering + + + + :/Icons/filter.png:/Icons/filter.png + + + + + + + + + false + + + Filter file path: + + + + + + + false + + + + + + + false + + + ... + + + + + + + + + + + + Qt::Vertical + + + + 623 + 20 + + + + + + + + + + + + true + + + Enable Web User Interface + + + true + + + + + + + true + + + HTTP Server + + + + + + true + + + Port: + + + + + + + true + + + 65525 + + + 80 + + + + + + + Qt::Horizontal + + + + 21 + 29 + + + + + + + + + + + true + + + Authentication + + + + + + + + true + + + Username: + + + + + + + true + + + Password: - + - - - - - true - - - - 0 - 27 - - - - - - - 1 - - - 1000000 - - - 50 - - - - - - - KiB/s - - - - + + + true + + + + + + 1000 + + + QLineEdit::Normal + + - - - - - false - - - - 0 - 27 - - - - - - - 1 - - - 1000000 - - - 100 - - - - - - - KiB/s - - - - + + + true + + + + + + 1000 + + + QLineEdit::Password + + - + Qt::Horizontal - + - 40 - 20 + 198 + 57 - - - - - - - - Qt::Vertical - - - - 623 - 121 - - - - - - - - - Bittorrent - - - - :/Icons/bt_settings.png:/Icons/bt_settings.png - - - - - - Connections limit - - - - + + + + + + Qt::Vertical + + + + 623 + 41 + + + + + + + + + + + + RSS + + - - - Global maximum number of connections: - - - true + + + Enable RSS support - - - true - - - - 8 - - - - 2 - - - 2000 - - - 500 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Maximum number of connections per torrent: - - - true - - - - - - - - 8 - - - - 2 - - - 2000 - - - 100 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Maximum number of upload slots per torrent: - - - true - - - - - - - - 8 - - - - 500 - - - 4 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Additional Bittorrent features - - - - - - Enable DHT network (decentralized) - - - true - - - - - - - Enable Local Peer Discovery - - - true - - - - - - - Spoof Azureus to avoid ban (requires restart) - - - - - - - - - Encryption: - - - - - - - - Enabled - - - - - Forced - - - - - Disabled - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Share ratio settings - - - - - - - - Desired ratio: - - - - - - + + false - - - 8 - + + RSS settings - - Qt::AlignHCenter - - - 1 - - - 1.000000000000000 - - - 10.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Remove finished torrents when their ratio reaches: - - - - - - - false - - - - 8 - - - - Qt::AlignHCenter - - - 1 - - - 1.000000000000000 - - - 10.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - Proxy - - - - :/Icons/proxy.png:/Icons/proxy.png - - - - - - Search engine proxy settings - - - - - - - - Type: - - - - - - - - (None) - - - - - HTTP - - - - - - - - false - - - Proxy: - - - - - - - false - - - - - - 75 - - - QLineEdit::Normal - - - - - - - false - - - Port: - - - - - - - false - - - 65525 - - - 8080 - - - - - - - Qt::Horizontal - - - - 21 - 29 - - - - - - - - - - - - false - - - Authentication - - - - - - - - - - - false - - - Username: - - - - - - - false - - - Password: - - - - - - - - - - - false - - - - - - 1000 - - - QLineEdit::Normal - - - - - - - false - - - - - - 1000 - - - QLineEdit::Password - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - true - - - Bittorrent proxy settings - - - - - - - - Type: - - - - - - - - (None) - - - - - HTTP - - - - - SOCKS5 - - - - - - - - false - - - Proxy: - - - - - - - false - - - - - - 75 - - - QLineEdit::Normal - - - - - - - false - - - Port: - - - - - - - false - - - 65525 - - - 8080 - - - - - - - Qt::Horizontal - - - - 21 - 29 - - - - - - - - - - - - false - - - Authentication - - - - - - - - - - - false - - - Username: - - - - - - - false - - - Password: - - - - - - - - - - - false - - - - - - 1000 - - - QLineEdit::Normal - - - - - - - false - - - - - - 1000 - - - QLineEdit::Password - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - false - - - - 0 - 110 - - - - Affected connections - - - - - - - 0 - 0 - - - - Use proxy for connections to trackers - - - true - - - - - - - - 0 - 0 - - - - Use proxy for connections to regular peers - - - true - - - - - - - - 0 - 0 - - - - Use proxy for DHT messages - - - true - - - - - - - - 0 - 0 - - - - Use proxy for connections to web seeds - - - true - - - - - - - - - - - - - - Misc - - - - :/Icons/configure.png:/Icons/configure.png - - - - - - true - - - Filter Settings - - - - - - Activate IP Filtering - - - - :/Icons/filter.png:/Icons/filter.png - - - - - - - - - false - - - Filter file path: - - - - - - - false - - - - - - - false - - - ... - - - - - - - - - - - - RSS - - - - - - Enable RSS support - - - - - - - false - - - RSS settings - - - - + - - - - 48 - 48 - - - - - 48 - 48 - - - - - - - :/Icons/rss32.png - - - true - - - - - + - - - - - RSS feeds refresh interval: - - - - - - - 1 - - - 999999 - - - 5 - - - - - - - minutes - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + 48 + 48 + + + + + 48 + 48 + + + + + + + :/Icons/rss32.png + + + true + + - + - - - Maximum number of articles per feed: - - + + + + + RSS feeds refresh interval: + + + + + + + 1 + + + 999999 + + + 5 + + + + + + + minutes + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - 9999 - - - 50 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - + + + + + Maximum number of articles per feed: + + + + + + + 9999 + + + 50 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - - - - - - - - Torrent queueing - - - - - - Enable queueing system - - - - - - - - - false - - - Maximum active downloads: - - - - - - - false - - - -1 - - - 999 - - - 3 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - false - - - Maximum active uploads: - - - - - - - false - - - -1 - - - 999 - - - 3 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - false - - - Maximum active torrents: - - - - - - - false - - - -1 - - - 999 - - - 5 - - - - - - - Qt::Horizontal - - - - 381 - 20 - - - - - - - - - - - - - Qt::Vertical - - - - 623 - 20 - - - - - - - - - Web UI - - - - :/Icons/password.png:/Icons/password.png - - - - - - true - - - Enable Web User Interface - - - true - - - - - - - true - - - HTTP Server - - - - - - true - - - Port: - - - - - - - true - - - 65525 - - - 80 - - - - - - - Qt::Horizontal - - - - 21 - 29 - - - - - - - - - - - true - - - Authentication - - - - - - - - true - - - Username: - - - - - - - true - - - Password: - - - - - - - - true - - - - - - 1000 - - - QLineEdit::Normal - - - - - - - true - - - - - - 1000 - - - QLineEdit::Password - - - - - - - - - Qt::Horizontal - - - - 198 - 57 - - - - - - - - - - - Qt::Vertical - - - - 623 - 41 - - - - - - - + + + + + + Qt::Vertical + + + + 20 + 317 + + + + + + + + + - - - 6 - - - 0 - + - - + + Qt::Horizontal - - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + 208 + 20 + - - true + + + + + + 6 - + + 0 + + + + + Qt::Horizontal + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + false + + + + @@ -2285,18 +2454,10 @@ checkStartPaused checkScanDir browseScanDirButton - actionTorrentDlOnDblClBox - actionTorrentFnOnDblClBox spinPortMin spinPortMax checkUPnP checkNATPMP - checkMaxConnecs - spinMaxConnec - checkMaxConnecsPerTorrent - spinMaxConnecPerTorrent - checkMaxUploadsPerTorrent - spinMaxUploadsPerTorrent checkDHT checkLSD comboEncryption @@ -2307,16 +2468,13 @@ checkIPFilter textFilterPath browseFilterButton - spinRSSRefresh - spinRSSMaxArticlesPerFeed checkWebUi spinWebUiPort textWebUiUsername textWebUiPassword - buttonBox - + diff --git a/src/options_imp.cpp b/src/options_imp.cpp index 890ea2271..0cdb26613 100644 --- a/src/options_imp.cpp +++ b/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) { diff --git a/src/options_imp.h b/src/options_imp.h index ac0df0348..305b1fd6f 100644 --- a/src/options_imp.h +++ b/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); diff --git a/src/properties_imp.cpp b/src/properties_imp.cpp index f358795db..54b0e2be8 100644 --- a/src/properties_imp.cpp +++ b/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 diff --git a/src/rss.h b/src/rss.h index d3b42134a..10db8187d 100644 --- a/src/rss.h +++ b/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; } diff --git a/src/rss_imp.cpp b/src/rss_imp.cpp index 990e21d6b..57f463df5 100644 --- a/src/rss_imp.cpp +++ b/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"))); - delStream_button->setIcon(QIcon(QString::fromUtf8(":/Icons/unsubscribe.png"))); + addStream_button->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/subscribe.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"))); - actionRename->setIcon(QIcon(QString::fromUtf8(":/Icons/log.png"))); + actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/unsubscribe16.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) diff --git a/src/search.ui b/src/search.ui index 077af0fba..5d5a2df90 100644 --- a/src/search.ui +++ b/src/search.ui @@ -68,7 +68,7 @@ - :/Icons/edit_clear.png:/Icons/edit_clear.png + :/Icons/oxygen/edit_clear.png:/Icons/oxygen/edit_clear.png diff --git a/src/seeding.ui b/src/seeding.ui index 66f98a9d2..e2587fc5a 100644 --- a/src/seeding.ui +++ b/src/seeding.ui @@ -80,7 +80,7 @@ - :/Icons/folder.png:/Icons/folder.png + :/Icons/oxygen/folder.png:/Icons/oxygen/folder.png Open destination folder @@ -123,7 +123,7 @@ - :/Icons/gear.png:/Icons/gear.png + :/Icons/oxygen/gear.png:/Icons/oxygen/gear.png Force recheck diff --git a/src/torrentAddition.h b/src/torrentAddition.h index 82c472fc1..5b55934cd 100644 --- a/src/torrentAddition.h +++ b/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 diff --git a/src/trackerLogin.h b/src/trackerLogin.h index 7fc4aae66..ad24d9761 100644 --- a/src/trackerLogin.h +++ b/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)), parent, SLOT(addUnauthenticatedTracker(QPair))); show(); diff --git a/src/webui/scripts/client.js b/src/webui/scripts/client.js index 78921db74..5b07e2b14 100644 --- a/src/webui/scripts/client.js +++ b/src/webui/scripts/client.js @@ -49,7 +49,7 @@ window.addEvent('domready', function(){ case 'seeding': return ''; case 'checking': - return ''; + return ''; case 'downloading': return ''; case 'stalled':