From f6dd38685ad49a60d45d8788cf6b2a7e90e2302e Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Wed, 27 Nov 2019 15:38:51 +0000 Subject: [PATCH] display country and strictness in I2P status --- .../controllers/com/muwire/gui/I2PStatusController.groovy | 2 ++ gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy | 2 ++ gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy b/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy index 44b6db0f..9dcd001a 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/I2PStatusController.groovy @@ -23,6 +23,8 @@ class I2PStatusController { Router router = core.router model.networkStatus = router._context.commSystem().status.toStatusString() model.floodfill = router._context.netDb().floodfillEnabled() + model.myCountry = router._context.commSystem().getOurCountry() + model.strictCountry = router._context.commSystem().isInStrictCountry() 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 3124337e..31162bdb 100644 --- a/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy +++ b/gui/griffon-app/models/com/muwire/gui/I2PStatusModel.groovy @@ -16,6 +16,8 @@ class I2PStatusModel { @Observable int ssuConnections @Observable String networkStatus @Observable boolean floodfill + @Observable String myCountry + @Observable boolean strictCountry @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 bfe260f8..a0c3f067 100644 --- a/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy @@ -45,6 +45,10 @@ class I2PStatusView { label(text : bind {model.floodfill}, constraints : gbc(gridx:1, gridy:1, anchor : GridBagConstraints.LINE_END)) label(text : "Active Peers", constraints : gbc(gridx:0, gridy:2, anchor : GridBagConstraints.LINE_START, weightx: 100)) label(text : bind {model.activePeers}, constraints : gbc(gridx: 1, gridy:2, anchor : GridBagConstraints.LINE_END)) + label(text : "Our Country", constraints : gbc(gridx: 0, gridy: 3, anchor : GridBagConstraints.LINE_START, weightx : 100)) + label(text : bind {model.myCountry}, constraints : gbc(gridx : 1, gridy: 3, anchor : GridBagConstraints.LINE_END)) + label(text : "Strict Country", constraints : gbc(gridx:0, gridy:4, anchor : GridBagConstraints.LINE_START, weightx : 100)) + label(text : bind {model.strictCountry}, constraints : gbc(gridx : 1, gridy : 4, anchor : GridBagConstraints.LINE_END)) } panel(border : titledBorder(title : "Connections", border : etchedBorder(), titlePosition : TitledBorder.TOP), constraints : gbc(gridx: 0, gridy: 1, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) {