From 3894452840d4487b05d91e82d95cdf59a4526ffc Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sun, 8 Mar 2009 10:28:58 +0000 Subject: [PATCH] - COSMETIC: Redesigned program preferences - COSMETIC: Updated icons set --- AUTHORS | 5 + Changelog | 9 + src/FinishedTorrents.cpp | 12 +- src/GUI.cpp | 10 +- src/Icons/bt_settings.png | Bin 1559 -> 0 bytes src/Icons/button_cancel.png | Bin 1468 -> 0 bytes src/Icons/button_ok.png | Bin 1393 -> 0 bytes src/Icons/configure.png | Bin 1423 -> 0 bytes src/Icons/connection.png | Bin 820 -> 0 bytes src/Icons/description.png | Bin 821 -> 0 bytes src/Icons/download.png | Bin 1188 -> 0 bytes src/Icons/filter.png | Bin 998 -> 0 bytes src/Icons/gear.png | Bin 1282 -> 0 bytes src/Icons/home.png | Bin 1199 -> 0 bytes src/Icons/log.png | Bin 846 -> 0 bytes src/Icons/newmsg.png | Bin 532 -> 0 bytes src/Icons/oxygen/bt_settings.png | Bin 0 -> 3254 bytes src/Icons/oxygen/bug.png | Bin 0 -> 733 bytes src/Icons/oxygen/button_cancel.png | Bin 0 -> 1333 bytes src/Icons/oxygen/button_ok.png | Bin 0 -> 1076 bytes src/Icons/oxygen/configure.png | Bin 0 -> 2171 bytes src/Icons/oxygen/connection.png | Bin 0 -> 1267 bytes src/Icons/oxygen/download.png | Bin 0 -> 1705 bytes src/Icons/{ => oxygen}/edit_clear.png | Bin src/Icons/{ => oxygen}/encrypted.png | Bin src/Icons/{ => oxygen}/file.png | Bin src/Icons/oxygen/filter.png | Bin 0 -> 885 bytes src/Icons/{ => oxygen}/folder.png | Bin src/Icons/oxygen/gear.png | Bin 0 -> 1403 bytes src/Icons/oxygen/log.png | Bin 0 -> 541 bytes src/Icons/{ => oxygen}/subscribe.png | Bin src/Icons/{ => oxygen}/subscribe16.png | Bin src/Icons/{ => oxygen}/time.png | Bin src/Icons/oxygen/unavailable.png | Bin 0 -> 813 bytes src/Icons/{ => oxygen}/unsubscribe.png | Bin src/Icons/{ => oxygen}/unsubscribe16.png | Bin src/Icons/oxygen/webui.png | Bin 0 -> 1577 bytes src/Icons/password.png | Bin 5345 -> 0 bytes src/Icons/{ => skin}/mascot.png | Bin src/Icons/{ => skin}/qbittorrent16.png | Bin src/Icons/{ => skin}/qbittorrent22.png | Bin src/Icons/{ => skin}/qbittorrent32.png | Bin src/Icons/{ => skin}/splash.png | Bin src/Icons/star.png | Bin 1145 -> 0 bytes src/Icons/style.png | Bin 1098 -> 0 bytes src/Icons/systemtray.png | Bin 1235 -> 0 bytes src/Icons/unavailable.png | Bin 888 -> 0 bytes src/Icons/wizard.png | Bin 1325 -> 0 bytes src/MainWindow.ui | 2 +- src/about_imp.h | 4 +- src/console.ui | 4 +- src/download.ui | 4 +- src/downloadingTorrents.cpp | 20 +- src/engineSelectDlg.cpp | 4 +- src/icons.qrc | 58 +- src/main.cpp | 2 +- src/options.ui | 4114 +++++++++++----------- src/options_imp.cpp | 8 + src/options_imp.h | 1 + src/properties_imp.cpp | 4 +- src/rss.h | 2 +- src/rss_imp.cpp | 12 +- src/search.ui | 2 +- src/seeding.ui | 4 +- src/torrentAddition.h | 4 +- src/trackerLogin.h | 2 +- src/webui/scripts/client.js | 2 +- 67 files changed, 2232 insertions(+), 2057 deletions(-) delete mode 100644 src/Icons/bt_settings.png delete mode 100644 src/Icons/button_cancel.png delete mode 100644 src/Icons/button_ok.png delete mode 100644 src/Icons/configure.png delete mode 100644 src/Icons/connection.png delete mode 100644 src/Icons/description.png delete mode 100644 src/Icons/download.png delete mode 100644 src/Icons/filter.png delete mode 100644 src/Icons/gear.png delete mode 100644 src/Icons/home.png delete mode 100644 src/Icons/log.png delete mode 100644 src/Icons/newmsg.png create mode 100644 src/Icons/oxygen/bt_settings.png create mode 100644 src/Icons/oxygen/bug.png create mode 100644 src/Icons/oxygen/button_cancel.png create mode 100644 src/Icons/oxygen/button_ok.png create mode 100644 src/Icons/oxygen/configure.png create mode 100644 src/Icons/oxygen/connection.png create mode 100644 src/Icons/oxygen/download.png rename src/Icons/{ => oxygen}/edit_clear.png (100%) rename src/Icons/{ => oxygen}/encrypted.png (100%) rename src/Icons/{ => oxygen}/file.png (100%) create mode 100644 src/Icons/oxygen/filter.png rename src/Icons/{ => oxygen}/folder.png (100%) create mode 100644 src/Icons/oxygen/gear.png create mode 100644 src/Icons/oxygen/log.png rename src/Icons/{ => oxygen}/subscribe.png (100%) rename src/Icons/{ => oxygen}/subscribe16.png (100%) rename src/Icons/{ => oxygen}/time.png (100%) create mode 100644 src/Icons/oxygen/unavailable.png rename src/Icons/{ => oxygen}/unsubscribe.png (100%) rename src/Icons/{ => oxygen}/unsubscribe16.png (100%) create mode 100644 src/Icons/oxygen/webui.png delete mode 100644 src/Icons/password.png rename src/Icons/{ => skin}/mascot.png (100%) rename src/Icons/{ => skin}/qbittorrent16.png (100%) rename src/Icons/{ => skin}/qbittorrent22.png (100%) rename src/Icons/{ => skin}/qbittorrent32.png (100%) rename src/Icons/{ => skin}/splash.png (100%) delete mode 100644 src/Icons/star.png delete mode 100644 src/Icons/style.png delete mode 100644 src/Icons/systemtray.png delete mode 100644 src/Icons/unavailable.png delete mode 100644 src/Icons/wizard.png 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 cd1dcbfc323a33a6fe4b92e62b146a5e26fe02a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1559 zcmV+y2I%>TP)-xzvN6rV-i}t(~pt zttl=$g85M5sv4H1@y$(59@}2v`;QFsz1^MY84E0fbw9xqN>ATl=dS^Dfd2lrL%yPt zwM|spWVRk5WPqc_2q8g8M#VKYZ`?#So8_^+2Pvx?(0cAega(=&BccQ^N*>+yrQaS> zJ9~fBu~>Hcu?(C@Fjw_hcOoivpU@46{g5O|*l78fhKXsIl%Oh#MvMYw7F*JFQ&$an~@=TT@g5iLWT2C?F&v7MOm69XX%2wl?B8rY8fTmg3W0 zYg}4Ui6hC@p#qknadoa*)`5Go?P->)F4>w-Q`NBy9Ys@-u|QE3x|%aAgbf_e#Sa2X z-QDEV9+Q9h7k)4bio$Bmr&0G%HFZoI9^JinEf8Ccj18tvw$&yO5>P-2^d#bu0R`V} za^b=`q9DSyE&hJ-U0#3dDlNskNx}rD8L+feC#7pC-7vIi5lf^HI8MMF3e>#_03#NB zZNy{pwO81@c?*`6W%}|QfBf^?%&deIw>?f<#zcz}Dh-d$LWYHFYwzpXto4ubs)vXY zk|4%y_~@F39R%$A6r7wm&YeTUoczNiSDR@vodcwXK12U#J4q0cF*R0$h_+UX&iYQmhq8@6UUFSq14Cpm3eACyXYQl3+!B=I8(hR+uV8yr7&n6#at87j=EV^}Rk5`$+r< zDQ?|+s?G?pB|A@zhD04Tpyw-osn7 zDn`d$#EC>z6##k)X|65QxN)FKdX}mi%#s2*V;+M{?%D(Np)Xq{Hc1w!hVh&eGuB`=xhKZKTV0UDR zGz}w;->lD6J~w;rz}yFkr<X(Y5 zbOKM=`H_2CI!1P+x&}t=LaDeKG#zhscFvjq=X=fS^hFu@SCpgVrIa6kCp&lU{QA() z&^PAh=3YE|_U!WjilXF!UZ4*c1O|X2&;aIvxsUXMlrs7#`X6Oo$VX%NM^gX*002ov JPDHLkV1iY)?5Y3& diff --git a/src/Icons/button_cancel.png b/src/Icons/button_cancel.png deleted file mode 100644 index c6464d90a6f2c00e81f1d237c7f35ab9a5a4af8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1468 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 diff --git a/src/Icons/configure.png b/src/Icons/configure.png deleted file mode 100644 index 4461aa75373ba2bf0380c62608dc3f0b7a251e07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1423 zcmV;A1#tR_P)6vsV9L!=DoG}I%Ai_|NGzdW&B4biSYz7-31GXEC zJ^c}Sia+75D z>gqc7=zeHu$ZEA(>6aTf%rP-BuFne1%E~&{-+zZj4Wnc<8mO(UZK1fhc-Y(9+l`38 zHW-alJXcpfpU+<(BoehU3=>I2i&(pOVzKC?z|#{R?jC4rY8p#ROFKF}J>5b?Rseud zC=4i9D)0ZU)jG{)v$M9g?o$A)wG_+ca?!PG*T`fVr@6T~YHDig2JpnRE@rcNQl(Or zm`rAukdTnDprD}mO`CjJ5=nSlPEHOjm&!1VOJro^VWBWEN+1w`h`{6VHZY8{d)KbF zhF;n9lKj%8pQ73HpJ@*mhWWx|8vnJRpx|OsQet-Z?cVha!+cCcj%93iU|_)eUS1oZ zzc+;EJUk!}taAwq+fh|t|Fd;wX4a!mt1VpqDV)&I(4Fn=?NcKoBlJ#UQl)=D0Qd2p zl$4af=9Xq>>W67GsMpb<^mO{ItCMPK)l_%6j!vBT+{$LNUt~Qlg@_h_*;fQF!C71`*Eiv9S?#G)xq+>kmihUGd2Vf84WtP&^!NAc z+uGVn1_lON0O$eO0XQD6>Z;%+I1?Nk{Ho7p-|KmKUvUO?I_Pvd3=a?M&YwRY2jCw7 zi$vsn>hW6pdgREFtyivGnL2RrBYG_=iU#$1YHn_F{M~ulsQ!dgf;D1bRmB+@8IpvA zgw~3RAKkicbs=o~4p=Of`R~58a(OHhY`42nS#OsgzKAMX0m5Dhnw_1!Q!16#m6nxq zwc1{YMZxg*_kZB2&+NA87h^o!0c-}M-sBb6dD#WKB+L)>oix9y6#$sr+}ynyjmEJr zC7D7(gGnZnQc+RStdEaRyx0fPC21JHt6-egyCC}z$ac?HT(~eD8yidI<>ij}`1k?8uNtf8hiJV4YkpFZcEJ4e9OeZE0v|I8H%vWan0h{$T(B002ovPDHLkV1jf!ojL#j diff --git a/src/Icons/connection.png b/src/Icons/connection.png deleted file mode 100644 index e2b1bc5539851bd72def68d5a62898230719076f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 820 zcmV-41Izr0P)Mm3Bv{#rO5kFTq$I+RYQ;Sc&@ z`5$5Q&Tkx^mP)UqQEx03Gq0+>@&j33Uaq6Py}cNJIu6(I7yLXe!PD8)y0s zS1c?njB1)Tw70j1v$HdV!(ptfte{XVqP?Soer#>UXJ%&J+lCJg4xTBBQq^_cb$))1 zXfz5*lF--Jhwbg{uaQXP@pWiJczSx8=Q!>G0H?0&@OV5>RTY6i06RN7si~={!JAN^ z!5*j6X;*)LKXSPoS1Oe#o6S~zJ|8lfOw%ZUzuPSo3ds`_6W@}_q*f>t4i!a#VHg=v z6hAL6E-p2T0++TT6bcDrV`FcV$)vWwzyEz>W8-15SgaC}We2S1;^ZeHL?V&!@bK`* yU@$0Op1;lbXCfF33jd1|QS*n8-Pry$HJd+>skZ7)1cT`S0000A3 z$GwVYmppskb4s3BDq1V2W&jo_00fYTFhqd>JZO*Sob0KxSAQ}Yj=4P=1t&=_NCylC!X6oQjA60nh-lTykNTm_%m; zKNyb^o^_NTgvMeh5o8(~fB_g#Ina;uC{>m={W$;aQM)|jteh&^hQGgFYqdJ{qtVB2 zt**^m1SkL^xdNhOlIJ;5{_U;3YQ=qi(XBOu<}kT(`L)CC`j6k;`0S?*0syESibxZ< zal&Os-SorJBvqhquJ10*xmWM(JzciH`23>>KVLb&Fn4vc4M1rY0RRLik&wE*b5yX+ z4>#+}3+^zIahfiboO^!DR%Bc1(vkx2Cc8S9zV3+}9=lq%Tfzx^N#2Js}_c|7o3 zRh@GP8UP6kh?&)HH`;1N_xzUM9QL}S?r=mbwxzwIJ?JHGynOD<%P&nelZard6%Y|3 z0uX2Uzrkp~A8#KFHg`Lzs87~kc;##f1Q7lQ?g)bq@o-?300000NkvXXu0mjf$OUro diff --git a/src/Icons/download.png b/src/Icons/download.png deleted file mode 100644 index a867ed478c9f7fccd47fcd7425d6880d4659131a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1188 zcmV;V1Y7%wP)rzp1sp z^W2IJ!x%jLVi>g42ERlzw32lkGCWQnqvB@;95P)teM>&{8&)PSa0&82zGo{YCML>1 zuiW8Kd4;i3z;L`py}gAOnJBHdXH7utbU1d_#xd{n=Tei}Tvp_Axq+VW`1p9`!sJCh z`TkSZp8Q4IUT3Y-#&@=1tw9L5{r5bJtrdo?0^Nmi-hb&5KOX&|(i5JXoE)=ln|CMP zW;w3&AoB$>2kmb6UlqHS#bLJ}b@wPAyz(AODW;~Tsy*RSsZ^@fYD`T{aintuKk}Fh zu3?&w*oOEw_Xzprw>UO&j5JMISy^FpbhI~|&*ulK)hZhs8@R5^Y5x>n&E;SY!IKRHe$rnzNrYW6Hhf1Zw(9qEEUQ6y>gkczHt%;%tAp~(8<8Efi-9Ae( zt}-enSiG7eS>0lOejdxRSXx>_DMc8D;d5ajM8@}hM=8bX>MBYplv0?cNwoZkwXY8I z;HrnGTrA5X2!fp)N+~?gJ0ye<&uc}_^E^u_h3mR>yW9VQY&OfebLS`&3dC_ttJOj& zg_M#sP3iCNCrwj)-_HOZ(B20-j?ZU^3Ng=w0hQp%W_nE@b45{ktll}d#$3~?L>$8iY5kZQF`xm>2vXpkfcv$M0L zY1#(_`&x1Q`0=t*im|aVk|ZIHWA5F%hwuA%p2y(eAX;l$triOl3v@aiOw+_PO$vnq zp6AIR2=e>jt*x!%`ue((Qi>>w&|0IEqTOyIr9>$OK$@lqAutSsIF6B0V%s)rYiqh# zERO7h>-BnedU{%x%Vn-#zs|_W2!n%zyA#lEx3O)TJqOSI&VAH;HDS#d6nYjIN<7a(ws(Qk{b?a6qj^nL%yWQG(L1?Xc zI)8nD1K2?3>Fqw<+u0XD0(5~V|9Nf#9iXeV*8c$9TfMM{TOVBj0000T4Ok+N7%uJF=W+u+u=Uw=L?TZoW zg}XZE{5bbs?!$-(OG`_mv$L~bE-Wm}O;1lx`Fy?)tJSLS=H|u&07T^2wp}$%v)1i) zdAHluJDpD3FpQ327)=0&$z-y_*4Ea(ou8kNEiNvKU@-W})YR0XrfFVPRYR((GS0c) zXf)b^K%gFpM9Q)(UrkI*sNrz91fb%&Zf#>@W7agyh&K|6jL*!>G)kq?*yiSD?Ck7J z4hDmMA_C_ex~`8C(Kvt^JXwCfzd1QMxxc!)`s4EQ^7+xx(H9Ix3BfjQG4>uLM8>;Bg$sm(6BB zs#Ge*#l^)1?gd<4UUn0S#LxMBo&#`oU2h8^1Y-WM+uPee6bgkJ0Jm5yHXX+y*L6tV}H?-+(5dc7Vwjzf;)xIze+rWxd%Hxh}&-s$OS%Vt)c52UM zo`nGb5edc^0)YS<7#NTkV}1R7#rxL-07gX8Oa8v1>$(Jh05AX&V~q9lztrpjCJ~Y6 z9{T@aj^nT=%{;HVGskfNfbPH4>zeg?J&A}On@N)Nx@L^AN7zfvy#2&tvAA0@X UISJqc>Hq)$07*qoM6N<$f=TenP5=M^ diff --git a/src/Icons/gear.png b/src/Icons/gear.png deleted file mode 100644 index 7e338cad2800b71b84ebfeaf22f2fc82afa3fa87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1282 zcmV+d1^xPoP)#h0)Q` z`-Wi<&-37U9t^`EqobpX)6>(R0l>n-!t#q3FRHV%vlA@=`Bco#&VGII;>G)kL_%SV zVRLh{+S%C|i^t=VZ$k)y|6eMVxM`aE!^6X!vMi%mEV>ULKK%ar_3POd;A}Qq9T^$v zlw}!&5D-EFFaS6TesnB^fDi(VF+6|%+`M$@lF`EP_V)JgiA3VZj*bqZC<-J=f)E0n zb1=qGtJNTcKzn;TD5a1jDL4UR45n#{w{PG6af}K8n4h07rBbP0S(YJ$K)qgvrfDsr z_?ualg;S?aK~+`QwvE-*)xFD?FZUi3@5YTAUknTk^f1QIY&Kzz?^S)bNUhZ95S_+fJ#l`yI;9#31Nswh3vMj@O z-T!u#WfTepdtzcDe3XuCHftr5NzJk>*tQKxlAviCD5c<>V|#nMAvuntIF19?b-@^e z=Xn8-oOA5#?5yI0_U_%gyz9EKEDMY=ghHVpAjffF+qNRPuFHKuze|!7&=844KK>B6 zy}f;~Ua!NlEVQ+?K~>cjf6w!{RIk@xmrA8drBZQyfe0Z%^aBF}{h3TA?SszE&Hdcf z)%B6%IM8(+;cz$*wo<9MrBbO{tJT(mbh~rs&abId>Z+nB2#3RPT^F45AZN?va)WbD zVzHR6s%lU~p->2xWx;VAJbn7~w`m{+LZKc2gmVtpby2I;S_Dy56_H2;lu}Si5s5^C zhzTK(B#C&Q*W=>_C4KJPxo3TSeY!6mr4)n^ba!_LS>n%AO5r#Tgb<*VLQxdN<8gg# zZ0s3;cnk2s!NI1gs{NEw$g&&&3n4%V0i`r3>1MMTWQZS#EX#QR{{5Ce-*Q*ny?Zxz z{`~o|{r!FG<;$0uWHLE^`t<1whGD4wtp)(5X*SE{^6PTB{AhT1_@`Jb7G7Ih`}4|` zD`SC?U;BQ~WHL9?>GaUyh9sR%r}Fu{c=P6sSYKZk`FvhXPfvddfE=z5&CSi-{1E3D zaIgSG0emtvH1t(2m-99@HpIrphREe|ULukB2EgY41_4C=&;O)1j{{&^TU&oWc<^A} sFpQ)Sf>f*3VzF4P0rEUz2L2FS})%Gynhq07*qoM6N<$g6=Y8lmGw# diff --git a/src/Icons/home.png b/src/Icons/home.png deleted file mode 100644 index e9612a381ff4dff455d57313bb2a7fabb84fc352..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1199 zcmV;g1W@~lP)L zm1}HNMHq&kIlJ4v^z3f8E$wbE+Z!pjluIlDDn(G*Pz)s!gT|mgzzdPY;5D&{A^spl zqb7#L3neBRjkf?oKp>?=4T6x08Usj>2u*DZ?Xv7{yY23obH*P{*WGFab&~lpGw=80 zoo~LG5lSg;r~R~E-yXj<>c23`*2jC4yp>+Nm0(w+u>Z0#{OODpYdeBY9&XUt^VwqI z|6kz!%Y?sWVfFFp%kEvTIh+6#IcTqO^W}jiQT3m|-77`7ac;tk)`5}e+B+_m6$(gM)*W&eZy>I8e|G&8l`EDNsVq}W+;yXT}#F4+XA0iEn4dW z9P(+YO62$i)JTCe(46`1Y^~cyS;)!9$D75bsT`4A6+gF&wN-vTaNF@AG;B2sAwK{X z-0bZo8Hr&V`TZ~M3=5-wj29OlQ?F0X*|P;De&?e;-R8?o44g*=${6f7iOy<8n-{{< zy_-VYKu*p9hh=9YkO5~L@4MUOYnd0is=FNplZ&R!%hdr3vwbVoZ4V)Yp!Z}K*83e) z6(n%PuKelRRO&>Zx^qRBbt=bkU2SE%URIfbrkp{3yF7&c^edFjnvW0yfN)a_1ECr& zz4IL5+S%ywa}$<9l$(iGAQxO%UbUQp5Fm&e0s3!@5`6Y;&hCAe6Nf&hx+YA(=VR!? zX=bimhvWI(T>j`)N&^9cjzKUbZZmNY@Ny;F}b5T^FQEqwjj zQ=IBP2qiOd`3lG{4w62147V$fRonOA%J(wx)qecHo~F7kKzyiQ9zWbwvF`BjH9NrU zB}V!z_5QBJs)oGEh-AF1v-UNioK0uPTz(%f}5Y*atz3TEz3em ziD{Y`hB0yahJmJOSeAuSDo5Mh-Th2S=jNmL^{Df9fOS3UTt`R8a5Ngl>-FY{V?%=+ zedz&=w1Kq15O&tTc`!#aX<%ezU>UBIGxT&G#a(sZnu^lkRBgrdVwUB7WmvY z24g8q)5J8*9B@1yClZN#Kgr9y72CFLlgVUKN-4?imSy30Y3ObZPoBWq*$ diff --git a/src/Icons/log.png b/src/Icons/log.png deleted file mode 100644 index 112c58ca11d1c13fafa5bb9c7bf018ad84f76a5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmV-U1F`&xP){HsKifI7G}hf1&I|TwuqIHfsu)^0)ePN zDng*pfq@pWl&V8oKqeCEj|!@O6>$h9m`#-F&uj8b*_rhxB{ukN#cV=Hb`y8d>ke-Jz zav!Ob4NPHroRx)1Zd}_TUitXy_Zts?URzr`NJ@odbmC-nq&7XxXgNhq83ZM$;-k{b zBfVVd`$$#*S3be&*!bD^UV7#8sfm-%IyHRox#ojNdjKJT8bpPD-zZrEW{7~L#z7nA z9#key-M_o!_q)0CQDgAA_6C7=A3_`gRAJCpe3F7ek_f)F%c*NW^6-y4hnHHd4;Q_^ z=gbJv=X#h&_C06>v!Rc2g@S>A_H*LpZ_%q8_$A+O^$UMvkf;%2@H+4T5l94FGIUfU z8U%&>`Y-5rU$eRJBDM3+ltznEH6RJ9!TVf83}mTLc2Funxc~`Jy7p!CgWwA*baKl%g-r^#=-LM4+L2F@T_ z407?2%9(Adh2~=s`KP`o48_0Dy4KBz#Zkb^-!~c;y>6{+}zs81r@HsD>0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+ YQe|Oed2z{QJOBUy07*qoM6N<$f-(?)`v3p{ diff --git a/src/Icons/newmsg.png b/src/Icons/newmsg.png deleted file mode 100644 index 1cad024ae18d9880843aeca4c0a8efe52b1014a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 532 zcmV+v0_**WP)HP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10g*{WK~yM_osmsz6JZpEpZ9ArGiirPXgd*<((Y_@QNfL%Tetop zapT%QBLrMXaa#nTlTcE+Ne#7hI*Cq_$$VtSg=rK;+IrUaIrrRq#H%-NUq5I)e8zvM z8ytSrdrzLeeDVD8qneSog44XjcD;t|9`yzX$0MRRyD=Qa83)HBx<|c%v{YHFIEvsj zrZ*T588 z3A9!cOaHvz(h|=xy#IW`j_TI<4ZWkXu+yuFiN7e7NmKOs7kh*-gOPK-SmjQC8T+d)&lKs z`s=QdxSn$@e5Gci&NNB!H~n=zjKa&hYu^~YQr)!~M&YGyx7+Xf{r=gl9e_@!^XUgn W6OUr$>v59+0000e0 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 literal 0 HcmV?d00001 diff --git a/src/Icons/oxygen/bug.png b/src/Icons/oxygen/bug.png new file mode 100644 index 0000000000000000000000000000000000000000..44c7ae1ed3140738c15fb87880d3bdff0418e552 GIT binary patch literal 733 zcmV<30wVp1P)Y`MskBx%3DsDvZFA;R(PTZ9i7sXN#H%cK3+iqH+jSp&K+6LMrGqID$T(8jJI9c=u zXEA5K^UXOQ3>ahol_-h|021tTLj0W^>w1upQw86rg273D;O(h`6b z_@D?-E|)*MsycWBxYjPq$NG7-0q2<@^g5371pz2pVN{l5y%VXYRzgZQI!L-}ggnwT ztsPDFF~Ios?E!e@VW(!ArK(}>*rD5ZM&+Xb$i4=us#6YZw6f#L=f~)&#Z#f>$p{~ zONW8bU+upQe53(84{WwqtA{+sP`7R5D-L!<5n2A6(zLA{P(_oV0ncG@j^XDiZZNsK z3mZU+e>ufZDpHE6%I}<_D4hV-TMYKXyqs}slQXf{S+`I?m=Hu6LygzVWD-X9*DMeE zwBLaGhDjokQ0FS;7k!28_uu%?3a^gq?g~GXWD-rVdtQ- z)eByHw%>lw^Zh>G|M{K&|9=hv_)nP&@c#~QlF0D1rDelefBzfR1_sVEH9bw_^nj334Uwb1;nE|$4J((T-rE!6AzsfEKm<(lDT9|V zR-ndYO%=|)<_O*!Vw`k@c9Nc-7CYlX**Ca<>RX7%NgW}k9e$hzRV*A;@4#eM7K8^? z6*%K*53UWB6HPgeqeLzhTs!0CfO|(Yn9R(?-~0Aq;zS9=OFYF}Z-8S&^_46b`1C!D zr*FsY?T<-M$3%H4zV}dpdxmA;znUT#A|mY$3#3 zZ-7!F#}cB!YCBW>xgj1siHX`ICu8K$S19CxJ9zL0qVe5M*67dQi|(YPDgA#PIlzIf zA)ex`H-J#Yjm3PPCu|p?XMHp-M{Cm=6NA3IY-BoGAl<Eb0N|2F>4e2v2GRGmM>Shz%&H~p^<5Qymuub0llARU{Iq*1%EoC6^|Es z6z8+SL86;wR>tUxeI2d7zK;kDL}yeKx>HhdZPR9SZQO`oSFAu&up5qA8bLIoot1Y1 zo4Mq(VX1_8HykZ|wJm(*=Ts`x&YOo?A_%RkJW#^JrB^hw_A<(4vphB}wlqdtuqVzE zO$XP!AU)EXJ6i#Ah@AJc;bAKibcA}Ni6ufK(;z%rEBhT`J~(W>2%^b((IXH8wS1A- zuq)gT9Yhe?nTyN?LDrA5S0NtEv)zW-M2>q{s9}TN$Ytm!(xQ)PjSND7jT!uz^K0I~4XHgv zZ_Jy}s4O8~;yI%LyNu_%v0zYy{cLcHNQ+UXGbRKp?X0kp=w1-f{S~~vv^HF7Q~LYk zBB8OjMUJ82P?4XXyWRj<<|e&)OT2M&T@>ySX)(cEi+u}WDjTdOy1SLgQwZiD;ky!xwreA>ig?w`?I0A2h8NhAKH((YXL00000NkvXXu0mjfs{d(= literal 0 HcmV?d00001 diff --git a/src/Icons/oxygen/button_ok.png b/src/Icons/oxygen/button_ok.png new file mode 100644 index 0000000000000000000000000000000000000000..118a441b31c6807be30b487d949917311daf2f79 GIT binary patch literal 1076 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 literal 0 HcmV?d00001 diff --git a/src/Icons/oxygen/connection.png b/src/Icons/oxygen/connection.png new file mode 100644 index 0000000000000000000000000000000000000000..2c49e920de0d14c0a71d74dd585697db13d4e10e GIT binary patch literal 1267 zcmX|B2~3k`7;f>ZXfe#8;LKtO5tWXONw^t@E!e`!RYw6GS13ZqQOYPd3iX#FXM=#8 ziV7%kuyV*{!G;#bRiqs4=qMG+IiTez6hob`4^8$Y-~YY;o9};)H(<PrNHq`+3()3_u zI5?!GrPv8EL?RLN>+0%8M@NN1;b(@dtSmO0 z4OBQBPES{tKqx??(M%?@q@)Bi%gV}HTU*=P+h2b|czAeHQWBu8sHnhVv4DX@A^~qX zIXS>aO-)U0Z7oRD-Q8_sVq#`yW?^9g%v)Pq+uGU!dybBd&d$z&AA`ZTxVYeOI6NNj z;o;%s<>lk!Lm&`*eSQ6YLI>W&g#}{(GmyJ|`*sA05J|#CMn*4qoae% z<#tVU@pwG`&`2M^OkaP0|A0XB_U+r@;bAb?v9Yo7@o|wzBo>P&CMF~j$>ijuR4SdC znv%(6?*NpW(?a3&^z_Wkj9f0Cot>SVo134XUszaJTwGiNSXKWckt{DSudJ-BuC6LN zI~59rQmI^9Tie*!P^nbg+uLfjdS_>6cXwB#(fs>ye{W<2+#-8V%`tGR+~U3QJ}@`{ z0)a&8=$ryDGO{6)V`HgQI{hGOMMYh6b7yCFw?H7D1>!*Hlg9cdY^meY+1*9#oup!n_wwx&Gb-YX-oJz_v0}g#dI6ZLmG$DZoQ{> z-VWj2aH1GGo)ocrnsP-lDqTWqoz^6*cU1;0w<>@5u7PZO=7^g`%$8ccbqcZZeoMxU zy8HtAv)sb<@KI(OlX(~uE$uw)!>dG=L)W^iLP9F}RhBXSIWL3c8e}77^YRhD%bW7A zEKz(yLy(e_ktR~S$XAH^)vISJao=lgc8bZZaNds6F+^Fmdr5WPKN6KsEvhHJxr5ZN z`}s|XX_H;?4p*=DevQSqf!yRH`l!HnP#r@U+ov*k?8^GF%>FE#WH=yoe`58V6!zi4 zwJ(ST@F(i+ia~zFLICTWSxCWBi`L+hBG8t+^q1c6lKF3Vs=l4G_5NIs)7e@dm+gOD zcHEts+*6h*N>sn#zWzg;S#Vb+D>!M@sDB}HU3}B)K_R@bZHBjq)*IKbn>fAcYuH8N zf`R!>nION`hGSex2^F4D={z6Cu%fLNp4(rIy5+9;QXShbxI?lTcxjT|FxyY&b4u~v tiK#y0gJCgvG}}1{`VSDWogM%H literal 0 HcmV?d00001 diff --git a/src/Icons/oxygen/download.png b/src/Icons/oxygen/download.png new file mode 100644 index 0000000000000000000000000000000000000000..6c650c97bac647ee4cba2609b6bcb643f2dd62b2 GIT binary patch literal 1705 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 LNkvXXu0mjfxE+w2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9ab8c04f4ce514c83d3b86d2abbd6a8a0e56b3bf GIT binary patch literal 1403 zcmV->1%&#EP)tN#p37~2FWN=O2B}nB z`59b@fxt<=x%b?j^SSqTe&=`k4ghQ@wD-B(g1<^i9^^3?9xmu_*(hf%$QIO|$jF$8 z3m3xu@qQcXJuM&IesA&2kB z$ERO|+3ZXXK08rdTwb)iY=+rcjSl_KHv``1K_|j5LOai2(Wx~vi26GIUGY<;ItoiKO z^Eb&?zX8*%t+)S_o6B#Rno_~w;0UCqW%*Q>359rCCt?=c04O9@A2rU5~`{mL1tzSczd6toSf)h zYi#gVH#hIm_;{uX`y1r)2`pP5DMKK6If)^*FEQ~(Q9%J;+S%E!9vB#fhY!V&l9En& zd42b6y#wIxe)?Q+aG0sQyb7?4FfcG?!4~`{JDVrAxBv7U0sqk4+@+GsC!xE02wGd8 zLt|qLBqrWm^7ReOSr6>*?{6Ix6lRf1o1vwp3)KsRf!zcyF7!+S_K%HaHl?Q*jPiIQ zeRg&!^!2@f{QN>=XlQuFdf=$2tNUYP<1NF(FQK&bF<>raWE4%Z*}Ru_cKg``{4we` z6f+{?nlvj*0R8=PkjVzjk&)3ebb9!gzjkkNPw;+GnY&!57%@b( zMmgBn*z%;(wuRo_A&^R&@N|hmB&x=;)FP}FpEW>FPcOW9F#@5XVfAFQP~W1?pmwY` zHl5?*653@lIW~T;-re1!_V(@DJqm@wq*N+#hKR>PLPF}f+}!?GuOdZ7N$rVO$-vPedP;;s2>oB zU~iMkLTf?94^R;8#6S>4ktA4{SSUWwr~wVj#x>bo?@o4ih8@8JhrP_)bM9jqhKRrz z3j;s|dSLKBkXR#aBjg?o)$4CX1k?yXbW8<-;Kl_0ol2$B6z+$FCGy+y?K3wJBEjhJ zfZL+@cm`bLVDI>{Cv+=$$jrq-({<%sF<6`#|Br zU0#>~UDH$p<}NNXJI-S*P+ge(J%TUTIXqVqSJFv{QQMMGHK0pgd1*euV|OP!mKlT? zCeXG6Ilj7i;FQkr&k?o{&ZH!Dft^kVTCElshVd;M_?xFBF@j{!Xner?%OhO>e8Neg zP^ng{r^*gMbRdiQUc#CM@#!RNY;N7JX0wxs$UE>JQ^YjQGF4@z+LN*e%d$YH%7tR_ zZY`HfkmeOUI0l4K!!+BJi0yWplV(NRwz1po;#aeY>-l_%^7@^8iGBxtbQzQW3JW}4 fn^>k?3j+8BB;ThDN2Hu(00000NkvXXu0mjfOMvCQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2c2f99eb46be90636f98984936190752350370af GIT binary patch literal 813 zcmV+|1JeA7P)E-4*}<0=h{= zK~#9!WzSn^)dc{@@z4K%&e_h+uIFq=%jRlhi`pDHEu;s75`r%D5=B@K77|LMhcYtB zu_)9aeCwfntVjt2>7mQOAXr+9^^#1|9GtD`ZtZrqbGCB}A8nt9-{Tj40h@h9LxO!V z9temQ$rQNw4io<8j=*th8yKhw!#7%Y@2*Yv^ax`yi{s-m!^7olE_Z&Nw~vw86c}Jj z6W_OP-`>~P->3c$VnnTx?4w_de8rShOxK5(ZQP zN|Z|!OC5~hy?t0~b6;C=n z)zxm_N=G8;IHwSVh$J|ijD%uMd4=Yrnr+*49Xe*Zv@SC@uH(%k>N`8dd%G=7PDs_) zOYq`*G)E4Q?%sk^EO23`--RVK`hNN^?k3WC<(delcw71NvYRrn(QjIEF!*z;P z2uhTT6iX}?Q+l6#4nX_Phs8U3RT`;kCQ?HTF$&>1CPG%%bL18opHJB{Fr;&U2HSaeDWsC5=5FFCVs!)oxmmJTNUXBK&;g!bWF-JV!{;2kpSPBY zt%j7V5fT=NZ_tEgE_}eDQKnIe0AT%Feu*)BAN9$KbX`#*QJ}75wan!|7&yquoBWFk r1U3tiK&qRTdZHuDlvzL)B>?yjfS~`FyINaO00000NkvXXu0mjf;$wU` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..51a98345fd907a198cfa1de975ce0c6e0f9262bc GIT binary patch literal 1577 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 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 5bf53284493eab3c741a5df1630d8d814bd1aa75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1145 zcmV-<1cv*GP)>qJqPCF-PCbmNH{`e zKkQw(S1G3lDK%Y7A43P%_LomTJ@9|F;$^3A<84lU9q4J$K6dwVgj793+J|pO6gO&K zVMwe7w%Xmdzm;F}in3%3CQ5v0qF7VCc+}WEYhUv(9e#aa+qi#2;Y4VYu)K#&YzIge{w(XF$g-*I^m#JWag-fATxfCe)FCR!Hk)R6GC4!p%SZ03gPW^S0f6 z=kDyXM@f0NA}trGG?E5{;}F+cZgmZG1B7TfSG}0jAli6n;}ZH8XjX=4R?kdE!NfkR z5zCcb3m?GiUj@Ng2z_V*0uU02!PLNLkaDg7IzTi^C}#yqdDyw7xP9xW75e&%Kfm#u zRh&w{n!0>qbGm1l&~nxvzZw2w}4elmIaeW&%VBWW5EEWEFrFgS7xe6GRPUlh~vw{q`=upCA5U>W6hKaaoJ~+~Wl;wifwDn0LHaAwakoH9+;;7mWRJYPjS(J9a)l z75(EJk9=$|>F)Bz@^`I~PWEEbsJ1Ww3WN(H3o=hIGf45r<1?48M(elio*A8+YPIvc zbW{Q@(N$2x{RmuzTmZxzC zB7~(7G8RD;IzaGm!a*ENGX8ar*;<3CYA{^!)zHHD6n@BN3c5JCbD-~#CcZh}k#7f`gGr~sG+>TL)BKgr==I!ETzqHG4(00000 LNkvXXu0mjfA%znT diff --git a/src/Icons/style.png b/src/Icons/style.png deleted file mode 100644 index f8810f245ea6201b1322a10f33007c5ffaf251e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1098 zcmV-Q1hxB#P)eQKUhtx0ctR!$MLWC=0L}!N? z?Ycz%iG)2>!Gl_bB>2L~S6$8eaeq}%>cP-~^quQ#49^^a#}xjnn`o>x`ij4)?KSK% zgx}Gl$4_+PrYSC5XJ&fwbk`+T9vMaaef-gust+ojK6c92@NB)PFeUaFxE7RFV6Bhj zz|58TA@|CoG8O>E0(L%S4cW3nX2v_@0ac%VzytkK#`9=xmM_JT!sKf$BAPi2CrNk0;!6Xz4kxVA> z8AfAOAkZM&x?X(i&*>01hg<1re+kW~U~u9GH2DS>9(+ns1W*JRcMbwCBds;|2@S(A zP_9A~Mf&>s7#tj=ySsY>i7tQcUp?1XbGm0LE4guNicH3$rs^a5jYG6G1krVkoC694 zKz7N-%H>gN8RaTUB_H+m^)xj#VObVJtn-#D&wuq+g=m_F zl#+NnzB73lE5qd7Ns6W7w%-(>Q7o3QvJQsfD?8P7oj@S4GkF>ygkXGhjP~{pd_MoK z9najGWobD@I2e9o?N)jQo^=E7n zTo*3niByG9O1WjAl+v~&S(Tvx@OlkO%0-pRJJ$Y*D?)DANt7)dA+`=tD?_1_A`*!p zTz6Zy>$SFKVPy(^S{kqUPvTNO%rUx_pl;!KjA55$|k>?cq)}5m&;{0uJHq2{=drq4Wg={EF~^a Q0RR9107*qoM6N<$f@y2~5&!@I diff --git a/src/Icons/systemtray.png b/src/Icons/systemtray.png deleted file mode 100644 index e4d5f555804fe3654dc9b5ccc05eb5c24e77f996..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1235 zcmV;^1T6cBP)p21{->bVNh*~}y3uHyCZd!1WQ-Z~ zdc8ySI>KvfYoD#Ht$pg8^Z!1VQi`3Oo!#r#uYaM05Ga?+fe=D@?_ViOL~>sJ>BTmxwFuRkM!6Cp3?-O7%+MkkWEc!m z#65#jI>fi1zXK@*(lmt-0?Z8O+yobtAOev@p)~p#-~$3HAO}Nb1oj>_^%$nWASDbk zLMS5)1_{_R!Z3uCa*AW(lM+J0GcY(d5TS-3z%#>UIiwWh1c%h*FhdJtECw#aa5zLD z7(@i`J(w8)AcU9*6Nm{fUmU~agwwM%SnCi35<-p`7lnh(3M5H}y+4oPl!J2)I*=%r z%TvD2Ih0DJkuYdv6nl?@{RFOHRBIYhq#(u>7dgWii?}z$(a{hyvwF;vrtMY~1+2Bm z^L)gZK#)qJT-ES0Ko}_y5!eG@56>QM{LC;?s8l1UU}V-{kYHzL2i|)aVI0M%-BY9av0Mx(j3{N}>SeBGfT z`{}9B@KS@+sW78fkfNy!W&(qT9B^p=N*bzf=bI#y65`?RL-h80kV4|oqeqi!^Ucl8 zExEnDy?y)k4?k~w_x(=~9z1+rsZtt@U%~&X+D; zytuS~xDRVA1PK^pP^;D8z0bF{wzecQXZ?PEcX@d^x_R^FSC=neeoF{JN-0#URcNh| z=Q-N#wzzWT%9&25Q;VWVbvm8-cB_p_xdH%KSXh8k3Q3aWckkZa5|f`R48w*}YSvnd zD2gDZM3!Yp(-c~3XswZD83jRbo|zZ(JcrFK!Z1X=UZ3_cGZO%k6X9;R`~3d>`!A1< zj@rhUa+;#(KS8@6XTAUx?$__xpWLlEfQhytNj4 zdwYXBckcXnaRsoSU2b5J36F x5I`Kqy=Tv!ZN6&e(Rlg){QCdgoeU4a{|!hhTOcNoV%@7uS~f4;PDyD}=KXBpMAk(wUGX1n}GRv{+tQ z`SH%e!WRJYe&x?~eK>IWvZS3pjlHXjN})hybCb&ECgoxgM|U?Jx=!zn8&c5W82&mQ z9|4djG)*-Nh5K4GDs{zTSZy}cK!A>uC;3n;QZAM7o;!!y*@?sL=Ci&&ywRv+FBI-4 zG)+}}x<2-CanV`Z-KDy_i`8xiz#9rtGYs0CPTYY&Ym{20f@v5yvsvevSZqwOC`wEM zwx2&|vDxJOty_4G9|s_C_Uxg5$iIBa>eLi_^YgR;E=3uzBz(Sa8e3Z(MlOfEx5t}w z8eb%W!|gtl{3e}dd3+q}{5+M_RV+gA!RNCm&3^-$rb#}Tq`lds`u;rxgNF!qUcbgn zCTUw+!zBa?U;$)owhXfTX;nQv3_g6wiAaQ_=(}=-?tAwrd%ZXTr^Q0UX3NS(y}oF5 zxv2a73_W>5Xkeg~^w-=R`Anu|$F5(;H#tdNQE;j%f7k0NzVvw12jOt}@!+8NXc%H2 ze?EIAW+3E5+l>wJ%cV|eIQL$JujvX6qZf%K~+qbDztE8Vk z<@cL6IkCP@WMzfqwQJ;Gy<+FxJN}rQ#GcEEHBB2`E*49zQ~ov{p9z@ea7Q>S)t8p= zzj%QPpPnqUaq%MU{ryODbK)nPt#!(W#B?_vAL*=CzdNHS4$bSuR;%Gq6zuKo$lKfe zy0=$JIvk@D|0kw>Bs5Juuj^x8t2O2_&0Y&owOTVd(@g!G&5kb}k@G(*zFP~W^S&DZ O0000DEP~0|IUhdKs+#XoRGWO zZ%8SMQwjMH6N2C^9=7iNHRTm;r4Ixc5D{;rwPT`66Swby*9u<13p2_w&Rh|P@__OH z9tfVJlz`gTjY}hriYfhB3efFBtBFznY#l|7m@yPelCD5_l{H4?j@T5;w3dam~to zhQyr~NaLT}i=F~T!FwT41%4NE=Tedq&$oR(hR3g{6g;`m#ucIeh*}Wy8b283mCPsk z$iMlO(Wg5MuG~Nq1f1X>03YCk-s^mAdxNcmBE$a;7eN7Sh`Z9yH(uZQ0^_X0yqGz; z78Sb?jM<=G0Obd{4M7J4u0aq8gu(H{oO!IhaT>Q$s!~Ke(GYlS8!Dv?fH?u;s@9WP zu$%NDFw zYZ+hz6fh_vF2Ducl}JZzvrp5>eZ|F2ZKS`v}u!MWMo{>zuGdX z&1ls7c9E)GKpUv#+!%Rd&z?OyP+wm!#l^*9G#X3wckz=>Ktvch#M*8})ayr-Xo>&Uj$P*fFQm+1uRQEEN?MVltW5=p+)NSug4$98)ts z5g8gg=5RQ+=j7y&mzT%l#fuNO}4N+kNoz<;(7_ zt}d1>TecZUCal7^Yv7a-5Rtyl&d#c~wl<7LV;3OsTTjq0!2vzk)Ml$4aT&1f|C j4h{~U0W=W_j*a;nNf=4vr))`B00000NkvXXu0mjf{m*Xg 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,833 +1,642 @@ - + + 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: - - - + + General + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/configure.png:/Icons/oxygen/configure.png + + + ItemIsSelectable|ItemIsEnabled + + + + + Downloads + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/download.png:/Icons/oxygen/download.png + + + ItemIsSelectable|ItemIsEnabled + + + + + Network + + + AlignHCenter|AlignVCenter|AlignCenter + + + + :/Icons/oxygen/connection.png:/Icons/oxygen/connection.png + + + ItemIsSelectable|ItemIsEnabled + + + + + 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 + + - - - - System default - - - - - Plastique style (KDE like) - - + - - Cleanlooks style (Gnome like) - + + + Language: + + - - Motif style (Unix like) - + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + + 0 + + - - CDE style (Common Desktop Environment like) - + + + Qt::Horizontal + + + + 40 + 20 + + + - - - - - - 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 + + + + 8 + true + - - 1500 + + <b>Note:</b> Changes will be applied after qBittorrent is restarted. - - - - - - ms + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - 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 - - - - - - - - - - Qt::Vertical - - - - 623 - 20 - - - - - - - - - Downloads - - - - :/Icons/download.png:/Icons/download.png - - - - - - - 0 - 0 - - - - File system - - - - - - Put downloads in this folder: - - - - - - - 6 - - - 0 - - - - - 6 - - - 0 - + - - - + + + 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 + + + + - - - - - - Pre-allocate all files - - - - - - - - - - - 0 - 0 - - - - When adding a torrent - - - - - - - Display torrent content and some options + + + Ask for confirmation on exit when download list is not empty - + true - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Do not start download automatically - - - - - - - - - - - - - 0 - 0 - - - - Folder watching - - - - - - Automatically download torrents present in this folder: - - - - - - - 6 - - - 0 - - - - - false - - - - - - - false + + + Display top toolbar - - ... + + true - - - - - - - - - - 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 - + + + transfer lists refresh interval: + + - - Display torrent properties - + + + 10 + + + 99999 + + + 1500 + + - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - In seeding list: - - - - - - - Pause/Start torrent - + + + ms + + - - Open destination folder - + + + Qt::Horizontal + + + + 40 + 20 + + + - - - Display torrent properties - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - + - - - - - - - - - Connection - - - - :/Icons/connection.png:/Icons/connection.png - - - - + + - + - - - Listening port + + + System tray icon - + - - - - - Port range: - - - - - - - 1000 - - - 65525 - - - 6881 - - - - - - - to - - - Qt::AlignCenter - - - - - - - 1000 - - - 65525 - - - 6889 - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - + + + Disable system tray icon + + - - - Enable UPnP port mapping - - - true + + + Close to tray - - - Enable NAT-PMP port mapping + + + Minimize to tray - - true + + false - - - - - - - - - - - Global bandwidth limiting - - - - - - - - - - 0 - 45 - - - - Upload: - - - true + + + Start minimized - - - - 0 - 37 - + + + Show notification balloons in tray - - Download: + + true - - - - - + + + + + + + + + 0 + 0 + + + + Transfer lists double-click + + - - - true - - - - 0 - 27 - - - - - - - 1 - - - 1000000 - - - 50 - - + + + + + Download list: + + + + + + + + 0 + 0 + + + + 0 + + + + Pause/Start torrent + + + + + Open destination folder + + + + + Display torrent properties + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - KiB/s - - + + + + + Seeding list: + + + + + + + + Pause/Start torrent + + + + + Open destination folder + + + + + Display torrent properties + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Qt::Vertical + + + + 623 + 20 + + + + + + + + + + + + + 0 + 0 + + + + File system + + + + + + Put downloads in this folder: + + + + + + + 6 + + + 0 + - + + + 6 + + + 0 + - - - false - - - - 0 - 27 - - - + + - - 1 - - - 1000000 - - - 100 - - - - KiB/s + + + ... @@ -836,584 +645,852 @@ - - - Qt::Horizontal - - - - 40 - 20 - + + + Pre-allocate all files - + - - - - - - - - Qt::Vertical - - - - 623 - 121 - - - - - - - - - Bittorrent - - - - :/Icons/bt_settings.png:/Icons/bt_settings.png - - - - - - Connections limit - - - - - - - - Global maximum number of connections: - - - true - - + + + + + + + 0 + 0 + + + + When adding a torrent + + + + + + + + Display torrent content and some options + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Do not start download automatically + + + + - - - - true - - - - 8 - - - - 2 - - - 2000 - - - 500 + + + + + + + + 0 + 0 + + + + Folder watching + + + + + + Automatically download torrents present in this folder: - - - Qt::Horizontal + + + 6 - - - 40 - 20 - + + 0 - + + + + false + + + + + + + false + + + ... + + + + - - - + + + + + + Torrent queueing + + - - - Maximum number of connections per torrent: - - - true + + + Enable queueing system - - - - 8 - - - - 2 - - - 2000 - - - 100 - - + + + + + false + + + Maximum active downloads: + + + + + + + false + + + -1 + + + 999 + + + 3 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - 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 - + + + false + + + Maximum active uploads: + + - - Forced - + + + false + + + -1 + + + 999 + + + 3 + + - - Disabled - + + + Qt::Horizontal + + + + 40 + 20 + + + - - - - - - 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 - - - + + + + + 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 + + - - - Remove finished torrents when their ratio reaches: - - + + + + + Global maximum number of connections: + + + true + + + + + + + true + + + + 8 + + + + 2 + + + 2000 + + + 500 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - false - - - - 8 - - - - Qt::AlignHCenter - - - 1 - - - 1.000000000000000 - - - 10.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - + + + + + Maximum number of connections per torrent: + + + true + + + + + + + + 8 + + + + 2 + + + 2000 + + + 100 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - Qt::Horizontal - - - - 40 - 20 - - - + + + + + Maximum number of upload slots per torrent: + + + true + + + + + + + + 8 + + + + 500 + + + 4 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - Proxy - - - - :/Icons/proxy.png:/Icons/proxy.png - - - - - - Search engine proxy settings - - - - - - - - Type: - - - + + + + + + Global bandwidth limiting + + - + - - (None) - + + + + + + 0 + 45 + + + + Upload: + + + true + + + + + + + + 0 + 37 + + + + Download: + + + + - - HTTP - + + + + + + + true + + + + 0 + 27 + + + + + + + 1 + + + 1000000 + + + 50 + + + + + + + KiB/s + + + + + + + + + + + false + + + + 0 + 27 + + + + + + + 1 + + + 1000000 + + + 100 + + + + + + + KiB/s + + + + + + - - - - - - false - - - Proxy: - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::Vertical + + + + 623 + 121 + + + + + + + + + + + + Bittorrent features + + - - - false - - - + + + Enable DHT network (decentralized) - - 75 - - - QLineEdit::Normal + + true - - - false + + + Enable Local Peer Discovery - - Port: + + true - - - false - - - 65525 - - - 8080 + + + Spoof Azureus to avoid ban (requires restart) - - - Qt::Horizontal - - - - 21 - 29 - - - + + + + + Encryption: + + + + + + + + Enabled + + + + + Forced + + + + + Disabled + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - + + + + + + Share ratio settings + + - - - false - - - Authentication - - + + + + + Desired ratio: + + + + + + + false + + + + 8 + + + + Qt::AlignHCenter + + + 1 + + + 1.000000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - + - - - - - false - - - Username: - - - - - - - false - - - Password: - - - - + + + Remove finished torrents when their ratio reaches: + + - - - - - false - - - - - - 1000 - - - QLineEdit::Normal - - - - - - - false - - - - - - 1000 - - - QLineEdit::Password - - - - + + + false + + + + 8 + + + + Qt::AlignHCenter + + + 1 + + + 1.000000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + - + Qt::Horizontal - + 40 20 @@ -1424,843 +1501,935 @@ - - - - - - - - true - - - Bittorrent proxy settings - - - - - - - - Type: - - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Search engine proxy settings + + - + - - (None) - + + + Type: + + - - HTTP - + + + + (None) + + + + + HTTP + + + - - SOCKS5 - + + + false + + + Proxy: + + - - - - - - false - - - Proxy: - - - - - - - false - - - - - - 75 - - - QLineEdit::Normal - - - - - - - false - - - Port: - - - - - - - false - - - 65525 - - - 8080 - - - - - - - Qt::Horizontal - - - - 21 - 29 - - - - - - - - - - - - false - - - Authentication - - + + + + false + + + + + + 75 + + + QLineEdit::Normal + + + + + + + false + + + Port: + + + + + + + false + + + 65525 + + + 8080 + + + + + + + Qt::Horizontal + + + + 21 + 29 + + + + + - + + + + + false + + + Authentication + + + - + - - - false - - - Username: - - + + + + + false + + + Username: + + + + + + + false + + + Password: + + + + + + + + + + + false + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + false + + + + + + 1000 + + + QLineEdit::Password + + + + - - - false + + + Qt::Horizontal - - Password: + + + 40 + 20 + - + + + + + + + + + + true + + + Bittorrent proxy settings + + + + + + + + Type: + + + - + - - - false - - - - - - 1000 - - - QLineEdit::Normal - - + + (None) + - - - false - - - - - - 1000 - - - QLineEdit::Password - - + + HTTP + - + + + SOCKS5 + + + + + + + + false + + + Proxy: + + + + + + + false + + + + + + 75 + + + QLineEdit::Normal + + + + + + + false + + + Port: + + + + + + + false + + + 65525 + + + 8080 + + - + Qt::Horizontal - + - 40 - 20 + 21 + 29 - - - - - - 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 + + + Authentication + + + + + + + + + + + false + + + Username: + + + + + + + false + + + Password: + + + + + + + + + + + false + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + false + + + + + + 1000 + + + QLineEdit::Password + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + - - + + false - - - - - - false + + + 0 + 110 + - - ... + + Affected connections - - - - - - - - - - - RSS - - - - - - Enable RSS support - - - - - - - false - - - RSS settings - - - - + - - - - 48 - 48 - + + + + 0 + 0 + - - - 48 - 48 - + + Use proxy for connections to trackers + + + true - - + + + + + + + 0 + 0 + - - :/Icons/rss32.png + + Use proxy for connections to regular peers - + true - - - - - - - RSS feeds refresh interval: - - - - - - - 1 - - - 999999 - - - 5 - - - - - - - minutes - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Maximum number of articles per feed: - - - - - - - 9999 - - - 50 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - + + + + 0 + 0 + + + + Use proxy for DHT messages + + + true + + + + + + + + 0 + 0 + + + + Use proxy for connections to web seeds + + + true + + - - - - - - - - - - - Torrent queueing - - - - - - Enable queueing system - - - - - - - - - false - - - Maximum active downloads: - - - - - false - - - -1 - - - 999 - - - 3 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + true + + + Filter Settings + + + + + + Activate IP Filtering + + + + :/Icons/filter.png:/Icons/filter.png - - - Qt::Horizontal - - - - 40 - 20 - - - + + + + + false + + + Filter file path: + + + + + + + false + + + + + + + false + + + ... + + + + - - - - - - - false + + + + + + Qt::Vertical + + + + 623 + 20 + + + + + + + + + + + + true + + + Enable Web User Interface + + + true + + + + + + + true + + + HTTP Server + + + + + + true - - Maximum active uploads: + + Port: - - - false - - - -1 + + + true - - 999 + + 65525 - - 3 + + 80 - + Qt::Horizontal - + - 40 - 20 + 21 + 29 - - - - - - - false - - - Maximum active torrents: - - + + + + + + true + + + Authentication + + + + + + + + true + + + Username: + + + + + + + true + + + Password: + + + + - - - false - - - -1 - - - 999 - - - 5 - - + + + + + true + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + true + + + + + + 1000 + + + QLineEdit::Password + + + + - + Qt::Horizontal - + - 381 - 20 + 198 + 57 - - - - - - - - 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: - - - - - - - + + + + + + Qt::Vertical + + + + 623 + 41 + + + + + + + + + + + + RSS + + - - - true - - - - - - 1000 - - - QLineEdit::Normal + + + Enable RSS support - - - true - - - - - - 1000 + + + false - - QLineEdit::Password + + RSS settings + + + + + + + + 48 + 48 + + + + + 48 + 48 + + + + + + + :/Icons/rss32.png + + + true + + + + + + + + + + + RSS feeds refresh interval: + + + + + + + 1 + + + 999999 + + + 5 + + + + + + + minutes + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Maximum number of articles per feed: + + + + + + + 9999 + + + 50 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + - - - - - 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':