fixed labels

main/ui/src/main/resources/fxml/stats.fxml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.DataLabel?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.ThrougputLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.chart.AreaChart?>
 <?import javafx.scene.chart.NumberAxis?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.Cursor?>
+<?import javafx.scene.Group?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Arc?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.ThrougputLabel?>
-<?import javafx.scene.Group?>
-<?import org.cryptomator.ui.controls.DataLabel?>
 <HBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.stats.VaultStatisticsController"
@@ -36,12 +36,8 @@
 	</VBox>
 
 	<!-- Read -->
-	<VBox prefWidth="300" prefHeight="300">
-		<HBox spacing="12" alignment="CENTER">
-			<Label styleClass="label-large" text="%stats.readDataLabel"/>
-			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-							mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
-		</HBox>
+	<VBox prefWidth="300" prefHeight="300" spacing="6" alignment="CENTER">
+		<ThrougputLabel styleClass="label-large" idleFormat="%stats.read.throughput.idle" kibsFormat="%stats.read.throughput.kibs" mibsFormat="%stats.read.throughput.mibs" bytesPerSecond="${controller.bpsRead}"/>
 		<AreaChart fx:id="readChart" styleClass="io-stats" createSymbols="false" animated="false">
 			<xAxis>
 				<NumberAxis fx:id="readChartXAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="false" side="BOTTOM"/>
@@ -53,30 +49,14 @@
 				<Cursor fx:constant="DEFAULT"/>
 			</cursor>
 		</AreaChart>
-		<VBox spacing="12" alignment="CENTER">
-			<HBox alignment="CENTER">
-				<Label styleClass="label-large" text="%stats.totalMiBRead"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
-						   dataInBytes="${controller.totalBytesRead}"/>
-			</HBox>
-			<HBox alignment="CENTER">
-				<Label styleClass="label-large" text="%stats.totalMiBDecrypted"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
-						   dataInBytes="${controller.totalBytesDecrypted}"/>
-			</HBox>
-			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalReads" arg1="${controller.filesRead}"/>
-
-		</VBox>
-
+		<DataLabel byteFormat="%stats.read.total.data.none" kibFormat="%stats.read.total.data.kib" mibFormat="%stats.read.total.data.mib" gibFormat="%stats.read.total.data.gib" dataInBytes="${controller.totalBytesRead}"/>
+		<DataLabel byteFormat="%stats.decr.total.data.none" kibFormat="%stats.decr.total.data.kib" mibFormat="%stats.decr.total.data.mib" gibFormat="%stats.decr.total.data.gib" dataInBytes="${controller.totalBytesDecrypted}"/>
+		<FormattedLabel format="%stats.read.accessCount" arg1="${controller.filesRead}"/>
 	</VBox>
 
 	<!-- Write -->
-	<VBox prefWidth="300" prefHeight="300">
-		<HBox alignment="CENTER">
-			<Label styleClass="label-large" text="%stats.writtenDataLabel"/>
-			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-							mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsWritten}"/>
-		</HBox>
+	<VBox prefWidth="300" prefHeight="300" spacing="6" alignment="CENTER">
+		<ThrougputLabel styleClass="label-large" idleFormat="%stats.write.throughput.idle" kibsFormat="%stats.write.throughput.kibs" mibsFormat="%stats.write.throughput.mibs" bytesPerSecond="${controller.bpsWritten}"/>
 		<AreaChart fx:id="writeChart" styleClass="io-stats" createSymbols="false" animated="false">
 			<xAxis>
 				<NumberAxis fx:id="writeChartXAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="false" side="BOTTOM"/>
@@ -88,20 +68,8 @@
 				<Cursor fx:constant="DEFAULT"/>
 			</cursor>
 		</AreaChart>
-		<VBox spacing="12" alignment="CENTER">
-			<HBox alignment="CENTER">
-				<Label styleClass="label-large" text="%stats.totalMiBWritten"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
-						   dataInBytes="${controller.totalBytesWritten}"/>
-			</HBox>
-			<HBox alignment="CENTER">
-				<Label styleClass="label-large" text="%stats.totalMiBEncrypted"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
-						   dataInBytes="${controller.totalBytesEncrypted}"/>
-			</HBox>
-			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalWrites" arg1="${controller.filesWritten}"/>
-
-		</VBox>
-
+		<DataLabel byteFormat="%stats.write.total.data.none" kibFormat="%stats.write.total.data.kib" mibFormat="%stats.write.total.data.mib" gibFormat="%stats.write.total.data.gib" dataInBytes="${controller.totalBytesWritten}"/>
+		<DataLabel byteFormat="%stats.encr.total.data.none" kibFormat="%stats.encr.total.data.kib" mibFormat="%stats.encr.total.data.mib" gibFormat="%stats.encr.total.data.gib" dataInBytes="${controller.totalBytesEncrypted}"/>
+		<FormattedLabel format="%stats.write.accessCount" arg1="${controller.filesWritten}"/>
 	</VBox>
 </HBox>

main/ui/src/main/resources/i18n/strings.properties

@@ -172,20 +172,33 @@ preferences.about=About
 
 # Vault Statistics
 stats.title=Statistics for %s
-stats.readDataLabel=Read Data
-stats.writtenDataLabel=Written Data
 stats.cacheHitRate=Cache Hit Rate
-stats.totalMiBRead=Total Read: 
-stats.totalMiBWritten=Total Written: 
-stats.totalMiBEncrypted=Total Encypted: 
-stats.totalMiBDecrypted=Total Decrypted: 
-stats.totalReads=%s Number of Reads
-stats.totalWrites=%s Number of Writes
-stats.data.bytes=%s Bytes
-stats.data.kiB=%.1f KiB
-stats.data.miB=%.1f MiB
-stats.data.giB=%.1f GiB
-
+## Read
+stats.read.throughput.idle=Read: idle
+stats.read.throughput.kibs=Read: %.2f kiB/s
+stats.read.throughput.mibs=Read: %.2f MiB/s
+stats.read.total.data.none=Data read: -
+stats.read.total.data.kib=Data read: %.1f kiB
+stats.read.total.data.mib=Data read: %.1f MiB
+stats.read.total.data.gib=Data read: %.1f GiB
+stats.decr.total.data.none=Data decrypted: -
+stats.decr.total.data.kib=Data decrypted: %.1f kiB
+stats.decr.total.data.mib=Data decrypted: %.1f MiB
+stats.decr.total.data.gib=Data decrypted: %.1f GiB
+stats.read.accessCount=Total reads: %d
+## Write
+stats.write.throughput.idle=Write: idle
+stats.write.throughput.kibs=Write: %.2f kiB/s
+stats.write.throughput.mibs=Write: %.2f MiB/s
+stats.write.total.data.none=Data read: -
+stats.write.total.data.kib=Data written: %.1f kiB
+stats.write.total.data.mib=Data written: %.1f MiB
+stats.write.total.data.gib=Data written: %.1f GiB
+stats.encr.total.data.none=Data encrypted: -
+stats.encr.total.data.kib=Data encrypted: %.1f kiB
+stats.encr.total.data.mib=Data encrypted: %.1f MiB
+stats.encr.total.data.gib=Data encrypted: %.1f GiB
+stats.write.accessCount=Total writes: %d
 
 # Main Window
 main.closeBtn.tooltip=Close