From 5cc90844a55596a340cab5175de5b754d692b908 Mon Sep 17 00:00:00 2001 From: buinsky Date: Wed, 5 Nov 2014 04:46:34 +0300 Subject: [PATCH 1/4] Fixing setting speed limit of torrent in WEBUI Fixing setting speed limit of torrent in WEBUI when global speed limit is not set. --- src/webui/www/public/scripts/parametrics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webui/www/public/scripts/parametrics.js b/src/webui/www/public/scripts/parametrics.js index edab6c1bf..417483153 100644 --- a/src/webui/www/public/scripts/parametrics.js +++ b/src/webui/www/public/scripts/parametrics.js @@ -31,7 +31,7 @@ MochaUI.extend({ if(tmp > 0) { maximum = tmp / 1024. } else { - maximum = 0 + maximum = 1000 } } // Get torrent upload limit @@ -118,7 +118,7 @@ MochaUI.extend({ if(tmp > 0) { maximum = tmp / 1024. } else { - maximum = 0 + maximum = 1000 } } // Get torrent download limit From f44f676729e0807caef1d14fd00d773b6b41b0a2 Mon Sep 17 00:00:00 2001 From: buinsky Date: Thu, 20 Nov 2014 16:11:04 +0300 Subject: [PATCH 2/4] Update priority icons Update priority icons --- src/Icons/oxygen/go-bottom.png | Bin 0 -> 1642 bytes src/Icons/oxygen/go-down.png | Bin 1437 -> 1257 bytes src/Icons/oxygen/go-top.png | Bin 0 -> 1478 bytes src/Icons/oxygen/go-up.png | Bin 1517 -> 1096 bytes src/icons.qrc | 2 ++ src/webui/www/public/css/style.css | 2 ++ 6 files changed, 4 insertions(+) create mode 100644 src/Icons/oxygen/go-bottom.png create mode 100644 src/Icons/oxygen/go-top.png diff --git a/src/Icons/oxygen/go-bottom.png b/src/Icons/oxygen/go-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..dd433a53f8dcad2c620e680126881325626e3132 GIT binary patch literal 1642 zcmV-w29^1VP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1^-DzK~z{r?N?iD zR8usqLCpQ z1*$Pb3$zANEG;NSIu!bvfl}yedOLIP+^2h=IWwh9DeV_OtaNvud*+_A*V%iYbM}RM zxZCh>4bQx@{aJThJ<`*0A!3>~cmxRqkBAzDbW!jbP%~j|iS<*P#uP-xpK(03Q5XCD zJ|En-prR!f_Pu=I^H&_QTOzRb{hjqrRs5S(tJgt=*AI^EfNNRcm?l_;3ASN@iET4) zfQiqBVL&t_bhrO|_^+=MS4IY|f-sf?N!3A^$b&m!fRjTK8X87z>J}Jz6eMJzryR!x*L86Q z4|;;u;{ogf({e#KY{=$qP;pEK^`$H0uyyxIbwo8%%qXHnpsQuSimTrE+u?+hF?7h& zN=*xF+eUG?A@m9wV+QfB(8njZ1tr&V2#y20zikCov)(;3jslJW%c@o(6a^BP2NnquK~GRvh!``D?qyOUK^iBcrscriAJ3VB z;HkTqs2?v_nZ%S36ro>F4hwhl5^r z_z1+)>r2L)W+R>88bu1PIxIbG@#Ai9b{oejXeVT~Ed-9||P=iU>YD z^$Nzx{T@j6sPIqM$ezwb!G!61PN?u3z>yXK)j1(m) zg<>LWLQDHV2afuX51$dUB5=KRpJ`cc-Ie~H3B%Mu*K;Kj1B1hWi)K57wqVn#YZ@L* zuO$;3bUu7W+%W`2Or%baDDzfc^ZAwaRvzyJo&$7F)WjnoVca|WbVv{B?{)6q@CzSy zN6eZ4LG3?vR-X6tqk(|(n6BkYc@V}M&y|AE-ZgP3nb`Ode|=V%RS0edUb&k1w(Kna5QnGmdLQeummF#SK}z4tI@;1Mzv zAAGWFX>V$9-`}16t1Lm5SY_*>qgFzBX)FIK`pnn|Huc=i^wTnbyfgl7FA9!(9GS>Pck`r;ojw|5Gu{6iqNFYt$0iLPTx{e9ybQ)UD z4cGFn63PhJSaOy7<@Uh+j|T5NfJ(GHmh!ivj6h5lPImR2fl)AFRLjDUIu1kQ8OUU_ zkkzq9#6rZR@(fpHqszO~Hz4Gfp)wjMNmVR_5{8Os2%?c7M8YAcS+Ee6Ee`&{&6H3^ z{qZ$*_v>1I-2CUJ%kn8nc$We2KfPZ;L$v&T`v3p{07*qoM6N<$f)AegO#lD@ literal 0 HcmV?d00001 diff --git a/src/Icons/oxygen/go-down.png b/src/Icons/oxygen/go-down.png index b834f25a5375d9bcdca8385153bbca357efd292b..abf2bcdd8c335b4004f53531f901cdae3b19185e 100644 GIT binary patch delta 1237 zcmV;`1SpJen~_@R9HvtRa+H4fy|9BF{O=Kv84e!*@Nxf^F_0O(*2I_x0Yw8P zpkl_LTn)Si%p$~C6Z15tHI>luHm;{J=IVTVYYd*=f6p(^JhJ!M7oND65pPYv;Wt0( z;%yzL9)0Y2XnzexfO{N#*9FcPxDEr)ae?8O*$yzgb{q$q8+C|;RTK)KDn6)c0CZh} za7e>>9U3Abh&BWY52w)}XJby@nm(2CSay%&69vHZ$fO%rB z0PlVFhcTS`XF`x7Y68ZG`V2gE&yQylyx>@1(@B{Np66k3NrY8FGC_!cl{vY=e^4u} zgu*#|a%vb-*_GGd={~S1rvc4d1-qHaFt53hceEVZ-O?$@T_mq$6ynNE!9CEiq>(WC zizip`D1X8VoKx|FvZkq^>M8_v4F=Ao;nLsvM5-^|E9nGk6B61Q1pa3nUWWFKa8%kbULQ&V_#Ox#$54FZhxfWuucKGgqJ$#5%HR77AO zxD+S^D?zr9FhP#x6;TsG88@S$%i-iVSD2y%;(ud_u3HtBRjjk13TrXFq%_>U$U^X9 zd+Tmdde5s6uUg>>qQBZVBv^j3K>-aT7*yfg!Eu*&_g{8AtE;KGLlJ#Y?FE@*(V%$wDAgwc{{^x0`_Iq#Hw`C_r5~2tZHg@g z5K8k`rv1piNMl>mDk35w6@S9`)~k?H`2̍U!#@~5dp_s4RZ+hS`A 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 literal 0 HcmV?d00001 diff --git a/src/Icons/oxygen/go-up.png b/src/Icons/oxygen/go-up.png index 86d1f71a1ce2c1bfcd123115f916c4f553989c47..b96f05de1d394c8739ddbd26bcdfbcd3bc1be995 100644 GIT binary patch delta 1075 zcmV-31kC&G3&;qNB!3BTNLh0L01m?d01m?e$8V@)0000WV@Og>004R=004l4008;_ z004mK002@5009+P0026d000+n*IFNt000BdNkl?b4^A>jV+K0dR)o&A-sZ|4cb8!yGb{W!7u>kktkTG;7ps6w)x1llGSj(ew{ zUcU6b#34phUw_&#QEuX!51;;Q&l5N}{$kD;T8>w*i1QJ=kC2ngQsvE3Y3@SJo?k-3 z#=DtFT16B-ir{>NuJ#5D_oQ0lfb)9_P&oeVlXZ2uQ-}%9SHbxNpsp^D0~tYYTY9E6 zzj$^}0GjSR(_NiQz3F`lE{ZnYr_(89dFD zm#6;|K!5G659NI(wOH&M5o;X0^Kd@e6t~u)s>&zA!eACKGvWYDjU6JRbiOpdT-bR6 zg!hK;nP`bLf_E0ySy*e5G8WD`SZBdy=ga~k1~bDs#e*k0YvVX9^*p@9+Xl!F&YteM z5ZXVj=>uXXDzHr+#6M>3RD!pz;+;C|VBYaq{kt4g%i!SAbOK_=(1WzUPh&-i64y za`c+Gmc+G`<7Q%rN+MGhrA^ygA%GBo2PS*b+L)Q^ef0gu{}G^jbUwqv7w(;&MYlv;Cdy??g!W&JfBQOD5WbbC!*A>Y)D*hYvqVubZ| z&>DlU67(t|C;_Vh-~dnzYh(*VK=O+ZU;>O1ycMLJpvo&!PSDt##mlE}%l!27?_B^c z{RQBc)%9<~S6^Rw`=g81Yik=IRxk;O1w>nl1)y@V0HmPuoLI|cK%!t)km%-m?JR)| tMu*xyA3xIi#Wfw#ep|i|@V^E4V*vKAxTb|jZlC}F002ovPDHLkV1mFx0U!VX delta 1499 zcmV<11tj{&2<;1yB!32COGiWi{{a60|De66lK=n!32;bRa{vGvuK)lWuK`{fksJU3 z00(qQO+^RS3>^&(0d5^R`~Uz2dPzh_al|7Gp&R(z?4+PP%$46UlN06iD` z7Wfs*zU}?(vww5ru0X{jTMLWwo!xCK8uer{je)@w9$z|H&ySd&)UErtXj}>@vq`?Cp?TaQQ1jMeoCw7k?0TK95HO*;QQ(6{7DwQ6A@=_bK8j4p# zh%MuC3Q8I`*H>1Q{k(ZoYXpoT%WCB7_8vZ$?CtkwcYp8Sa3W^}ie{|0Ow0OV)5cYe z1w{p;0*evDYl8s}d~>NwfX(UNw;`RI6bSy>f`_L!+95kDdpbp)Fg#8V!_-_nSf4i? zLcEa^1!B|IG$#@jN0zrfstIwk?BW(ZP1EpwS4v#z=c`DCFUCxuU`kuD?KsEV+FIgv z$Qh-IY=8f59@p^QubC@6U^BY+Z@hTd1o9`Z1Q8g$55PIVgDe7q&joy1b6sElRy`B7 zU6e-M=D-=b$``!M+L%@nk|N4Ps7xP@bz7hLm*@jO#w`YfUdj(8h@e+a?R#JrkF2&%Yx9lK%Co>cmVt6qQnE1B0Lf8bi>e&w|l7ONJnrnv3N} zQGZ?(MqO2;Mg-oD+or%tG%YD8jJ=n*ua3!=X}UQKLwP;hho%jA(=-vXZJ35!*P%02 zo|3t`7fzl13!Pmj(Q}~(`GrN(qqWP<^qu_r_)VuER@a>GdH(P5+9{QS*>FN(ICcn@ zRMt(s zHle)q{zI>>z6>%0!#1^PZd)`_ReA2%Nd!Is+8s;_8U@uY2RaepLI;CMfeD&HU@&x< z4I7*f6R=!_S(pf<2oBN`DF;r{Mz|n^nkCcn(u1f0Fp|KaZk_heo*(GF@JG}m_J4q& zMnFJ~gH8pS*FF!y0mC$4$W&-bKvn(R=kQDqwy<&Z^LJ^-9ubc~Bj|RNkOw0j!Q~(S zJX+HRElQKfHg%Az`ZXgW2uq@Z~|Y!{|MBAiyZQL}2?~7%^wyzZla5BLW5mHaOte_OJ>%$dvr9 z?tuXW4vi$gjg5(bEJ|tyEb7{}sYsYK1{m$$Bgdo?1V#iRIVJ#2RvsYFIe(z?PYNg! zVAN!A&f(EIlXYW7a<70)zMw$V2-0in;sJv?4L1slJP{B%B_ISR2toi-S?*R-2N*rEiFP`aSXm=BI6iHSsDfmpq~ZkV;loI)SMeK;D=1a>#Nbx zCs@uD*l~ETcg=k?64U6U;>&)aZ1uIJ&@nI@6 zd(X2kv-7`P0n?391k4+ANT#rEev4RN#_+$ee*m~bWVm(b!jAv|002ovPDHLkV1i^{ BteOA- diff --git a/src/icons.qrc b/src/icons.qrc index fd91c5532..c67e6c0b6 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -363,5 +363,7 @@ Icons/skin/toolbox-divider2.gif Icons/skin/uploading.png Icons/oxygen/system-log-out.png + Icons/oxygen/go-bottom.png + Icons/oxygen/go-top.png diff --git a/src/webui/www/public/css/style.css b/src/webui/www/public/css/style.css index 035c7c6d0..f5b8f7c16 100644 --- a/src/webui/www/public/css/style.css +++ b/src/webui/www/public/css/style.css @@ -136,6 +136,8 @@ hr { #Filters ul img { padding: 2px 4px; vertical-align: middle; + width: 16px; + height: 16px; } .selectedFilter { From b2876b7f66b3b149685de454893659eab29e9746 Mon Sep 17 00:00:00 2001 From: buinsky Date: Sun, 23 Nov 2014 15:17:08 +0300 Subject: [PATCH 3/4] Show speed in title --- src/webui/btjson.cpp | 3 +++ src/webui/www/public/scripts/client.js | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/webui/btjson.cpp b/src/webui/btjson.cpp index 5faa1f4c3..84deae766 100644 --- a/src/webui/btjson.cpp +++ b/src/webui/btjson.cpp @@ -33,6 +33,7 @@ #include "qbtsession.h" #include "torrentpersistentdata.h" #include "jsonutils.h" +#include "preferences.h" #include #include @@ -131,6 +132,7 @@ static const char KEY_TRANSFER_DLSPEED[] = "dl_info_speed"; static const char KEY_TRANSFER_DLDATA[] = "dl_info_data"; static const char KEY_TRANSFER_UPSPEED[] = "up_info_speed"; static const char KEY_TRANSFER_UPDATA[] = "up_info_data"; +static const char KEY_SHOW_SPEED_IN_TITLE[] = "show_speed_in_title"; static QVariantMap toMap(const QTorrentHandle& h) { @@ -394,5 +396,6 @@ QByteArray btjson::getTransferInfo() info[KEY_TRANSFER_DLDATA] = static_cast(sessionStatus.total_payload_download); info[KEY_TRANSFER_UPSPEED] = sessionStatus.payload_upload_rate; info[KEY_TRANSFER_UPDATA] = static_cast(sessionStatus.total_payload_upload); + info[KEY_SHOW_SPEED_IN_TITLE] = Preferences::instance()->speedInTitleBar(); return json::toJson(info); } diff --git a/src/webui/www/public/scripts/client.js b/src/webui/www/public/scripts/client.js index 0e9bfe33a..606cf1079 100644 --- a/src/webui/www/public/scripts/client.js +++ b/src/webui/www/public/scripts/client.js @@ -112,6 +112,11 @@ window.addEvent('load', function(){ .replace("%2", friendlyUnit(info.dl_info_data, false))); $("UpInfos").set('html', "_(U: %1 - T: %2)".replace("%1", friendlyUnit(info.up_info_speed, true)) .replace("%2", friendlyUnit(info.up_info_data, false))); + if(info.show_speed_in_title) { + document.title = "_(D:%1 U:%2)".replace("%1", friendlyUnit(info.dl_info_speed, true)).replace("%2", friendlyUnit(info.up_info_speed, true)); + } else { + document.title = "_(qBittorrent web User Interface)"; + } waitingTrInfo=false; loadTransferInfo.delay(3000); } From 2275735b810bea7b4398115009badf36436c9a6f Mon Sep 17 00:00:00 2001 From: buinsky Date: Sun, 23 Nov 2014 16:53:41 +0300 Subject: [PATCH 4/4] Change of number of decimal places to 1 Change of number of decimal places to 1 in speed and size values. --- src/webui/www/public/scripts/misc.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/webui/www/public/scripts/misc.js b/src/webui/www/public/scripts/misc.js index b547a621a..74dbf43db 100644 --- a/src/webui/www/public/scripts/misc.js +++ b/src/webui/www/public/scripts/misc.js @@ -16,10 +16,7 @@ function friendlyUnit(value, isSpeed) { while (value >= 1024. && i++ < 6) value /= 1024.; var ret; - if (i == 0) - ret = value.toFixed(2) + " " + units[0]; - else - ret = value.toFixed(2) + " " + units[i]; + ret = value.toFixed(1) + " " + units[i]; if (isSpeed) ret += "_(/s)"; return ret;