github-wownero/i2p-zero
1
0
Fork 0
mirror of https://github.com/wownero/i2p-zero.git synced 2026-10-19 16:18:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

1.14 version bump, display transfer amount in MB/GB/TB/PB

Browse Source
This commit is contained in:
knaccc
2019-10-29 20:05:56 +00:00
parent 403c1a9213
commit 38a3ddfef0
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.getmonero.i2p.zero.gui/org.getmonero.i2p.zero.gui.iml
+8 -8
View File
@@ -11,7 +11,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx-swt.jar!/" />
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-13/lib/javafx-swt.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -20,7 +20,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.base.jar!/" />
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-13/lib/javafx.base.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -29,7 +29,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.controls.jar!/" />
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-13/lib/javafx.controls.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -38,7 +38,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.fxml.jar!/" />
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-13/lib/javafx.fxml.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -47,7 +47,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.graphics.jar!/" />
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-13/lib/javafx.graphics.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -56,7 +56,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.media.jar!/" />
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-13/lib/javafx.media.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -65,7 +65,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.swing.jar!/" />
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-13/lib/javafx.swing.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -74,7 +74,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.web.jar!/" />
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-13/lib/javafx.web.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java
+10 -2
View File
@@ -285,11 +285,11 @@ public class Controller {
bandwidthIn1s.setText(format2dp.format(routerWrapper.get1sRateInKBps()) + " KBps");
bandwidthIn5m.setText(format2dp.format(routerWrapper.get5mRateInKBps()) + " KBps");
bandwidthInAll.setText(format2dp.format(routerWrapper.getAvgRateInKBps()) + " KBps");
totalTransferredIn.setText(format2dp.format(routerWrapper.getTotalInMB()) + " MB ");
totalTransferredIn.setText(formatTransferAmount(routerWrapper.getTotalInMB())+" ");
bandwidthOut1s.setText(format2dp.format(routerWrapper.get1sRateOutKBps()) + " KBps");
bandwidthOut5m.setText(format2dp.format(routerWrapper.get5mRateOutKBps()) + " KBps");
bandwidthOutAll.setText(format2dp.format(routerWrapper.getAvgRateOutKBps()) + " KBps");
totalTransferredOut.setText(format2dp.format(routerWrapper.getTotalOutMB()) + " MB ");
totalTransferredOut.setText(formatTransferAmount(routerWrapper.getTotalOutMB())+" ");
statusLabel.setText("Status: " + routerWrapper.getReachability().getMessage());
@@ -304,6 +304,14 @@ public class Controller {
}
private String formatTransferAmount(double amt) {
String unit = "MB";
if(amt>=1000) { amt/= 1000d; unit = "GB"; }
if(amt>=1000) { amt/= 1000d; unit = "TB"; }
if(amt>=1000) { amt/= 1000d; unit = "PB"; }
return format2dp.format(amt) + " " + unit;
}
private void listenForTunnelChanges() {
new Thread(()->{
while(getRouterWrapper()==null || getRouterWrapper().getTunnelControl()==null) {
org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/VERSION
+1 -1
View File
@@ -1 +1 @@
1.13
1.14
org.getmonero.util.normalizeZip/org.getmonero.util.normalizeZip.iml
+1 -1
View File
@@ -10,7 +10,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../import/commons-compress-1.18/commons-compress-1.18.jar!/" />
<root url="jar://$MODULE_DIR$/../import/commons-compress-1.19/commons-compress-1.19.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />