From 8caf6e99b06a3877b39213dd7951eae9441e1a78 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Mon, 1 Jul 2019 13:18:31 +0100 Subject: [PATCH] show floodfill status --- .../com/muwire/gui/I2PStatusController.groovy | 1 + .../com/muwire/gui/I2PStatusModel.groovy | 1 + .../views/com/muwire/gui/I2PStatusView.groovy | 30 ++++++++++--------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy b/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy index af948de7..896d714f 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy @@ -22,6 +22,7 @@ class I2PStatusController { Core core = application.context.get("core") Router router = core.router model.networkStatus = router._context.commSystem().status.toStatusString() + model.floodfill = router._context.netDb().floodfillEnabled() model.ntcpConnections = router._context.commSystem().getTransports()["NTCP"].countPeers() model.ssuConnections = router._context.commSystem().getTransports()["SSU"].countPeers() model.participatingTunnels = router._context.tunnelManager().getParticipatingCount() diff --git a/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy b/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy index 480b2fc3..cb61a34b 100644 --- a/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy +++ b/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy @@ -15,6 +15,7 @@ class I2PStatusModel { @Observable int ntcpConnections @Observable int ssuConnections @Observable String networkStatus + @Observable boolean floodfill @Observable int participatingTunnels @Observable int activePeers @Observable int receiveBps diff --git a/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy b/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy index ee4e94e9..96dd50b9 100644 --- a/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy @@ -35,20 +35,22 @@ class I2PStatusView { gridBagLayout() label(text : "Network status", constraints : gbc(gridx:0, gridy:0)) label(text : bind {model.networkStatus}, constraints : gbc(gridx: 1, gridy:0)) - label(text : "NTCP Connections", constraints : gbc(gridx:0, gridy:1)) - 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)) + label(text: "Floodfill", constraints : gbc(gridx: 0, gridy : 1)) + label(text : bind {model.floodfill}, constraints : gbc(gridx:1, gridy:1)) + label(text : "NTCP Connections", constraints : gbc(gridx:0, gridy:2)) + label(text : bind {model.ntcpConnections}, constraints : gbc(gridx: 1, gridy:2)) + label(text : "SSU Connections", constraints : gbc(gridx:0, gridy:3)) + label(text : bind {model.ssuConnections}, constraints : gbc(gridx: 1, gridy:3)) + label(text : "Participating Tunnels", constraints : gbc(gridx:0, gridy:4)) + label(text : bind {model.participatingTunnels}, constraints : gbc(gridx: 1, gridy:4)) + label(text : "Participating Bandwidth", constraints : gbc(gridx:0, gridy:5)) + label(text : bind {model.participatingBW}, constraints : gbc(gridx: 1, gridy:6)) + label(text : "Active Peers", constraints : gbc(gridx:0, gridy:6)) + label(text : bind {model.activePeers}, constraints : gbc(gridx: 1, gridy:6)) + label(text : "Receive Bps (15 seconds)", constraints : gbc(gridx:0, gridy:7)) + label(text : bind {model.receiveBps}, constraints : gbc(gridx: 1, gridy:7)) + label(text : "Send Bps (15 seconds)", constraints : gbc(gridx:0, gridy:8)) + label(text : bind {model.sendBps}, constraints : gbc(gridx: 1, gridy:8)) } buttonsPanel = builder.panel {