Browse Source

WebUI rename property to match its definition

adaptive-webui-19844
Thomas Piccirello 7 years ago committed by Chocobo1
parent
commit
3f0fbc0810
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 2
      src/webui/api/serialize/serialize_torrent.cpp
  2. 2
      src/webui/api/serialize/serialize_torrent.h
  3. 2
      src/webui/api/synccontroller.cpp
  4. 6
      src/webui/www/private/scripts/dynamicTable.js

2
src/webui/api/serialize/serialize_torrent.cpp

@ -120,7 +120,7 @@ QVariantMap serialize(const BitTorrent::TorrentHandle &torrent)
ret[KEY_TORRENT_AMOUNT_UPLOADED_SESSION] = torrent.totalPayloadUpload(); ret[KEY_TORRENT_AMOUNT_UPLOADED_SESSION] = torrent.totalPayloadUpload();
ret[KEY_TORRENT_AMOUNT_LEFT] = torrent.incompletedSize(); ret[KEY_TORRENT_AMOUNT_LEFT] = torrent.incompletedSize();
ret[KEY_TORRENT_AMOUNT_COMPLETED] = torrent.completedSize(); ret[KEY_TORRENT_AMOUNT_COMPLETED] = torrent.completedSize();
ret[KEY_TORRENT_RATIO_LIMIT] = torrent.maxRatio(); ret[KEY_TORRENT_MAX_RATIO] = torrent.maxRatio();
ret[KEY_TORRENT_LAST_SEEN_COMPLETE_TIME] = torrent.lastSeenComplete().toTime_t(); ret[KEY_TORRENT_LAST_SEEN_COMPLETE_TIME] = torrent.lastSeenComplete().toTime_t();
ret[KEY_TORRENT_AUTO_TORRENT_MANAGEMENT] = torrent.isAutoTMMEnabled(); ret[KEY_TORRENT_AUTO_TORRENT_MANAGEMENT] = torrent.isAutoTMMEnabled();
ret[KEY_TORRENT_TIME_ACTIVE] = torrent.activeTime(); ret[KEY_TORRENT_TIME_ACTIVE] = torrent.activeTime();

2
src/webui/api/serialize/serialize_torrent.h

@ -69,7 +69,7 @@ const char KEY_TORRENT_AMOUNT_DOWNLOADED_SESSION[] = "downloaded_session";
const char KEY_TORRENT_AMOUNT_UPLOADED_SESSION[] = "uploaded_session"; const char KEY_TORRENT_AMOUNT_UPLOADED_SESSION[] = "uploaded_session";
const char KEY_TORRENT_AMOUNT_LEFT[] = "amount_left"; const char KEY_TORRENT_AMOUNT_LEFT[] = "amount_left";
const char KEY_TORRENT_AMOUNT_COMPLETED[] = "completed"; const char KEY_TORRENT_AMOUNT_COMPLETED[] = "completed";
const char KEY_TORRENT_RATIO_LIMIT[] = "ratio_limit"; const char KEY_TORRENT_MAX_RATIO[] = "max_ratio";
const char KEY_TORRENT_LAST_SEEN_COMPLETE_TIME[] = "seen_complete"; const char KEY_TORRENT_LAST_SEEN_COMPLETE_TIME[] = "seen_complete";
const char KEY_TORRENT_LAST_ACTIVITY_TIME[] = "last_activity"; const char KEY_TORRENT_LAST_ACTIVITY_TIME[] = "last_activity";
const char KEY_TORRENT_TOTAL_SIZE[] = "total_size"; const char KEY_TORRENT_TOTAL_SIZE[] = "total_size";

2
src/webui/api/synccontroller.cpp

@ -351,7 +351,7 @@ namespace
// - "amount_left": Amount of data left to download // - "amount_left": Amount of data left to download
// - "save_path": Torrent save path // - "save_path": Torrent save path
// - "completed": Amount of data completed // - "completed": Amount of data completed
// - "ratio_limit": Upload share ratio limit // - "max_ratio": Upload max share ratio
// - "seen_complete": Indicates the time when the torrent was last seen complete/whole // - "seen_complete": Indicates the time when the torrent was last seen complete/whole
// - "last_activity": Last time when a chunk was downloaded/uploaded // - "last_activity": Last time when a chunk was downloaded/uploaded
// - "total_size": Size including unwanted data // - "total_size": Size including unwanted data

6
src/webui/www/private/scripts/dynamicTable.js

@ -769,7 +769,7 @@ var TorrentsTable = new Class({
this.newColumn('time_active', '', 'QBT_TR(Time Active)QBT_TR[CONTEXT=TorrentModel]', 100, false); this.newColumn('time_active', '', 'QBT_TR(Time Active)QBT_TR[CONTEXT=TorrentModel]', 100, false);
this.newColumn('save_path', '', 'QBT_TR(Save path)QBT_TR[CONTEXT=TorrentModel]', 100, false); this.newColumn('save_path', '', 'QBT_TR(Save path)QBT_TR[CONTEXT=TorrentModel]', 100, false);
this.newColumn('completed', '', 'QBT_TR(Completed)QBT_TR[CONTEXT=TorrentModel]', 100, false); this.newColumn('completed', '', 'QBT_TR(Completed)QBT_TR[CONTEXT=TorrentModel]', 100, false);
this.newColumn('ratio_limit', '', 'QBT_TR(Ratio Limit)QBT_TR[CONTEXT=TorrentModel]', 100, false); this.newColumn('max_ratio', '', 'QBT_TR(Ratio Limit)QBT_TR[CONTEXT=TorrentModel]', 100, false);
this.newColumn('seen_complete', '', 'QBT_TR(Last Seen Complete)QBT_TR[CONTEXT=TorrentModel]', 100, false); this.newColumn('seen_complete', '', 'QBT_TR(Last Seen Complete)QBT_TR[CONTEXT=TorrentModel]', 100, false);
this.newColumn('last_activity', '', 'QBT_TR(Last Activity)QBT_TR[CONTEXT=TorrentModel]', 100, false); this.newColumn('last_activity', '', 'QBT_TR(Last Activity)QBT_TR[CONTEXT=TorrentModel]', 100, false);
@ -1076,8 +1076,8 @@ var TorrentsTable = new Class({
this.columns['save_path'].updateTd = this.columns['name'].updateTd; this.columns['save_path'].updateTd = this.columns['name'].updateTd;
this.columns['tracker'].updateTd = this.columns['name'].updateTd; this.columns['tracker'].updateTd = this.columns['name'].updateTd;
// ratio_limit // max_ratio
this.columns['ratio_limit'].updateTd = this.columns['ratio'].updateTd; this.columns['max_ratio'].updateTd = this.columns['ratio'].updateTd;
// last_activity // last_activity
this.columns['last_activity'].updateTd = function(td, row) { this.columns['last_activity'].updateTd = function(td, row) {

Loading…
Cancel
Save