Browse Source

Show speed in title

adaptive-webui-19844
buinsky 10 years ago
parent
commit
b2876b7f66
  1. 3
      src/webui/btjson.cpp
  2. 5
      src/webui/www/public/scripts/client.js

3
src/webui/btjson.cpp

@ -33,6 +33,7 @@
#include "qbtsession.h" #include "qbtsession.h"
#include "torrentpersistentdata.h" #include "torrentpersistentdata.h"
#include "jsonutils.h" #include "jsonutils.h"
#include "preferences.h"
#include <QDebug> #include <QDebug>
#include <QVariant> #include <QVariant>
@ -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_DLDATA[] = "dl_info_data";
static const char KEY_TRANSFER_UPSPEED[] = "up_info_speed"; static const char KEY_TRANSFER_UPSPEED[] = "up_info_speed";
static const char KEY_TRANSFER_UPDATA[] = "up_info_data"; 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) static QVariantMap toMap(const QTorrentHandle& h)
{ {
@ -394,5 +396,6 @@ QByteArray btjson::getTransferInfo()
info[KEY_TRANSFER_DLDATA] = static_cast<qlonglong>(sessionStatus.total_payload_download); info[KEY_TRANSFER_DLDATA] = static_cast<qlonglong>(sessionStatus.total_payload_download);
info[KEY_TRANSFER_UPSPEED] = sessionStatus.payload_upload_rate; info[KEY_TRANSFER_UPSPEED] = sessionStatus.payload_upload_rate;
info[KEY_TRANSFER_UPDATA] = static_cast<qlonglong>(sessionStatus.total_payload_upload); info[KEY_TRANSFER_UPDATA] = static_cast<qlonglong>(sessionStatus.total_payload_upload);
info[KEY_SHOW_SPEED_IN_TITLE] = Preferences::instance()->speedInTitleBar();
return json::toJson(info); return json::toJson(info);
} }

5
src/webui/www/public/scripts/client.js

@ -112,6 +112,11 @@ window.addEvent('load', function(){
.replace("%2", friendlyUnit(info.dl_info_data, false))); .replace("%2", friendlyUnit(info.dl_info_data, false)));
$("UpInfos").set('html', "_(U: %1 - T: %2)".replace("%1", friendlyUnit(info.up_info_speed, true)) $("UpInfos").set('html', "_(U: %1 - T: %2)".replace("%1", friendlyUnit(info.up_info_speed, true))
.replace("%2", friendlyUnit(info.up_info_data, false))); .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; waitingTrInfo=false;
loadTransferInfo.delay(3000); loadTransferInfo.delay(3000);
} }

Loading…
Cancel
Save