diff --git a/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy b/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy index c6e7b0fe..af948de7 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy @@ -24,6 +24,12 @@ class I2PStatusController { model.networkStatus = router._context.commSystem().status.toStatusString() model.ntcpConnections = router._context.commSystem().getTransports()["NTCP"].countPeers() model.ssuConnections = router._context.commSystem().getTransports()["SSU"].countPeers() + model.participatingTunnels = router._context.tunnelManager().getParticipatingCount() + model.activePeers = router._context.profileOrganizer().countActivePeers() + model.receiveBps = router._context.bandwidthLimiter().getReceiveBps15s() + model.sendBps = router._context.bandwidthLimiter().getSendBps15s() + model.participatingBW = router._context.bandwidthLimiter().getCurrentParticipatingBandwidth() + } @ControllerAction diff --git a/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy b/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy index 37322afc..480b2fc3 100644 --- a/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy +++ b/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy @@ -15,6 +15,11 @@ class I2PStatusModel { @Observable int ntcpConnections @Observable int ssuConnections @Observable String networkStatus + @Observable int participatingTunnels + @Observable int activePeers + @Observable int receiveBps + @Observable int sendBps + @Observable int participatingBW void mvcGroupInit(Map args) { controller.refresh() diff --git a/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy b/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy index f96ba6d6..ee4e94e9 100644 --- a/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy @@ -39,6 +39,16 @@ class I2PStatusView { label(text : bind {model.ntcpConnections}, constraints : gbc(gridx: 1, gridy:1)) label(text : "SSU Connections", constraints : gbc(gridx:0, gridy:2)) label(text : bind {model.ssuConnections}, constraints : gbc(gridx: 1, gridy:2)) + label(text : "Participating Tunnels", constraints : gbc(gridx:0, gridy:3)) + label(text : bind {model.participatingTunnels}, constraints : gbc(gridx: 1, gridy:3)) + label(text : "Participating Bandwidth", constraints : gbc(gridx:0, gridy:4)) + label(text : bind {model.participatingBW}, constraints : gbc(gridx: 1, gridy:4)) + label(text : "Active Peers", constraints : gbc(gridx:0, gridy:5)) + label(text : bind {model.activePeers}, constraints : gbc(gridx: 1, gridy:5)) + label(text : "Receive Bps (15 seconds)", constraints : gbc(gridx:0, gridy:6)) + label(text : bind {model.receiveBps}, constraints : gbc(gridx: 1, gridy:6)) + label(text : "Send Bps (15 seconds)", constraints : gbc(gridx:0, gridy:7)) + label(text : bind {model.sendBps}, constraints : gbc(gridx: 1, gridy:7)) } buttonsPanel = builder.panel {