From a8420a43f9fbaaf15d9a4ea55be3d496c553bab8 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Fri, 23 Feb 2018 14:46:47 -0500 Subject: [PATCH 1/5] Format Read cache hits as percentage --- src/webui/api/synccontroller.cpp | 2 +- src/webui/www/private/scripts/client.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webui/api/synccontroller.cpp b/src/webui/api/synccontroller.cpp index 35704c713..570e721e7 100644 --- a/src/webui/api/synccontroller.cpp +++ b/src/webui/api/synccontroller.cpp @@ -122,7 +122,7 @@ namespace map[KEY_TRANSFER_TOTAL_PEER_CONNECTIONS] = sessionStatus.peersCount; qreal readRatio = cacheStatus.readRatio; - map[KEY_TRANSFER_READ_CACHE_HITS] = (readRatio >= 0) ? Utils::String::fromDouble(100 * readRatio, 2) : "-"; + map[KEY_TRANSFER_READ_CACHE_HITS] = (readRatio > 0) ? Utils::String::fromDouble(100 * readRatio, 2) : "0"; map[KEY_TRANSFER_TOTAL_BUFFERS_SIZE] = cacheStatus.totalUsedBuffers * 16 * 1024; // num_peers is not reliable (adds up peers, which didn't even overcome tcp handshake) diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js index 4d37d387f..cdd3dbe5c 100644 --- a/src/webui/www/private/scripts/client.js +++ b/src/webui/www/private/scripts/client.js @@ -395,7 +395,7 @@ window.addEvent('load', function () { $('TotalWastedSession').set('html', friendlyUnit(serverState.total_wasted_session, false)); $('GlobalRatio').set('html', serverState.global_ratio); $('TotalPeerConnections').set('html', serverState.total_peer_connections); - $('ReadCacheHits').set('html', serverState.read_cache_hits); + $('ReadCacheHits').set('html', serverState.read_cache_hits + "%"); $('TotalBuffersSize').set('html', friendlyUnit(serverState.total_buffers_size, false)); $('WriteCacheOverload').set('html', serverState.write_cache_overload + "%"); $('ReadCacheOverload').set('html', serverState.read_cache_overload + "%"); From 5c74f374af51ee918882189e1d1cf532d1812bdb Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Fri, 23 Feb 2018 14:54:24 -0500 Subject: [PATCH 2/5] Re-order and rename stats --- src/webui/www/private/statistics.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/webui/www/private/statistics.html b/src/webui/www/private/statistics.html index c94763808..580ef495e 100644 --- a/src/webui/www/private/statistics.html +++ b/src/webui/www/private/statistics.html @@ -1,23 +1,23 @@

QBT_TR(User statistics)QBT_TR[CONTEXT=StatsDialog]

- - - - - + - - + + - + - + + + + +
QBT_TR(Alltime download:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Alltime upload:)QBT_TR[CONTEXT=StatsDialog]QBT_TR(All-time upload:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Total wasted (this session):)QBT_TR[CONTEXT=StatsDialog]QBT_TR(All-time download:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Global ratio:)QBT_TR[CONTEXT=StatsDialog]QBT_TR(All-time share ratio:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Total peer connections:)QBT_TR[CONTEXT=StatsDialog]QBT_TR(Session waste:)QBT_TR[CONTEXT=StatsDialog]
QBT_TR(Connected peers:)QBT_TR[CONTEXT=StatsDialog]
@@ -29,7 +29,7 @@ - QBT_TR(Total buffers size:)QBT_TR[CONTEXT=StatsDialog] + QBT_TR(Total buffer size:)QBT_TR[CONTEXT=StatsDialog] From 4110bb874fc149ca40b931db7ea7023ef329126f Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Fri, 23 Feb 2018 14:54:31 -0500 Subject: [PATCH 3/5] Right align stat values --- src/webui/www/private/css/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/webui/www/private/css/style.css b/src/webui/www/private/css/style.css index f8c19ac85..f87fed980 100644 --- a/src/webui/www/private/css/style.css +++ b/src/webui/www/private/css/style.css @@ -479,3 +479,8 @@ td.statusBarSeparator { background-position: center 1px; background-size: 2px 18px; } + +/* Statistics window */ +.statisticsValue { + text-align: right; +} From 1a9b0099516f33299975a86fe42adcb0def2bae4 Mon Sep 17 00:00:00 2001 From: Tom Piccirello Date: Fri, 2 Mar 2018 02:11:45 -0500 Subject: [PATCH 4/5] Enable Statistics window to be scrolled and resized Text may go offscreen due to translations. --- src/webui/www/private/scripts/mocha-init.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js index 615adc45c..3a367f7e3 100644 --- a/src/webui/www/private/scripts/mocha-init.js +++ b/src/webui/www/private/scripts/mocha-init.js @@ -241,8 +241,6 @@ initializeWindows = function() { title: 'QBT_TR(Statistics)QBT_TR[CONTEXT=StatsDialog]', loadMethod: 'xhr', contentURL: 'statistics.html', - scrollbars: false, - resizable: false, maximizable: false, width: 275, height: 370, From c47e4efade868ca4395b0cc9b24e72d37f13e95a Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 5 Mar 2018 01:40:21 -0500 Subject: [PATCH 5/5] Save WebUI Statistics window size --- src/webui/www/private/scripts/mocha-init.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js index 3a367f7e3..54bdcc2bf 100644 --- a/src/webui/www/private/scripts/mocha-init.js +++ b/src/webui/www/private/scripts/mocha-init.js @@ -236,15 +236,19 @@ initializeWindows = function() { }; StatisticsLinkFN = function() { + var id = 'statisticspage'; new MochaUI.Window({ - id: 'statisticspage', + id: id, title: 'QBT_TR(Statistics)QBT_TR[CONTEXT=StatsDialog]', loadMethod: 'xhr', contentURL: 'statistics.html', maximizable: false, - width: 275, - height: 370, padding: 10 + width: loadWindowWidth(id, 275), + height: loadWindowHeight(id, 370), + onResize: function() { + saveWindowSize(id); + } }); };