From 398d083aff8a51d6c9abf58d104aee226d119739 Mon Sep 17 00:00:00 2001
From: Jeremy Tellier - ROG <JeremyTellier@gmail.com>
Date: Thu, 11 Jun 2020 01:57:12 +0100
Subject: [PATCH] Minor UI Tweaks

---
 ZitiTunneler/IdentityDetails.xaml    | 2 +-
 ZitiTunneler/IdentityDetails.xaml.cs | 1 -
 ZitiTunneler/IdentityItem.xaml       | 4 ++--
 ZitiTunneler/MainWindow.xaml.cs      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ZitiTunneler/IdentityDetails.xaml b/ZitiTunneler/IdentityDetails.xaml
index 1f6f37a3..e7d0251b 100644
--- a/ZitiTunneler/IdentityDetails.xaml
+++ b/ZitiTunneler/IdentityDetails.xaml
@@ -28,7 +28,7 @@
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="70"/>
                     </Grid.ColumnDefinitions>
-                    <local:Toggler x:Name="IdDetailToggle" Grid.Column="0" HorizontalAlignment="Left"></local:Toggler>
+                    <local:Toggler x:Name="IdDetailToggle" Grid.Column="0" HorizontalAlignment="Left" OnToggled="IdToggle"></local:Toggler>
                     <Label Name="IdDetailName" Grid.Column="1" HorizontalAlignment="Center" MaxWidth="160" FontSize="14" FontWeight="SemiBold" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="#0F0F23">
                         <TextBlock TextTrimming="CharacterEllipsis">Identity Name</TextBlock>
                     </Label>
diff --git a/ZitiTunneler/IdentityDetails.xaml.cs b/ZitiTunneler/IdentityDetails.xaml.cs
index 3b4bf73b..fcf8f4c2 100644
--- a/ZitiTunneler/IdentityDetails.xaml.cs
+++ b/ZitiTunneler/IdentityDetails.xaml.cs
@@ -76,7 +76,6 @@ namespace ZitiTunneler {
 		}
 
 		private void IdToggle(bool on) {
-			// Jeremy - on and off but it's not wired in yet!
 			ServiceClient.Client client = (ServiceClient.Client)Application.Current.Properties["ServiceClient"];
 			client.IdentityOnOff(_identity.Fingerprint, on);
 		}
diff --git a/ZitiTunneler/IdentityItem.xaml b/ZitiTunneler/IdentityItem.xaml
index 54f94520..a042d4b9 100644
--- a/ZitiTunneler/IdentityItem.xaml
+++ b/ZitiTunneler/IdentityItem.xaml
@@ -26,10 +26,10 @@
                 </Grid.RowDefinitions>
                 <local:Toggler x:Name="ToggleSwitch" Grid.Column="0" Grid.Row="0" Margin="0,10,0,0"></local:Toggler>
                 <Label Name="ToggleStatus" Grid.Column="0" Grid.Row="1" Margin="0,-5,0,0" Content="Enabled" Foreground="White" FontSize="11" Typography.Capitals="AllSmallCaps" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"></Label>
-                <Label Name="IdName" MouseDown="OpenDetails" MaxWidth="200" Grid.Column="1" Margin="0,6,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" FontSize="18" Foreground="White" HorizontalAlignment="Left">
+                <Label Name="IdName" MouseDown="OpenDetails" MaxWidth="180" Grid.Column="1" Margin="0,6,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" FontSize="18" Foreground="White" HorizontalAlignment="Left">
                     <TextBlock TextTrimming="CharacterEllipsis">Identity Name</TextBlock>
                 </Label>
-                <Label Name="IdUrl" MouseDown="OpenDetails" MaxWidth="200" Grid.Column="1" Grid.Row="1" FontSize="11" Margin="0,-5,0,0" Typography.Capitals="AllSmallCaps" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="White" HorizontalAlignment="Left">
+                <Label Name="IdUrl" MouseDown="OpenDetails" MaxWidth="180" Grid.Column="1" Grid.Row="1" FontSize="11" Margin="0,-5,0,0" Typography.Capitals="AllSmallCaps" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="White" HorizontalAlignment="Left">
                     <TextBlock TextTrimming="CharacterEllipsis">https://serverUrlThisShouldTrimIfItsLong:8080</TextBlock>
                 </Label>
                 <Canvas Grid.Column="2" Grid.Row="0" Width="50" Height="40" MouseDown="OpenDetails">
diff --git a/ZitiTunneler/MainWindow.xaml.cs b/ZitiTunneler/MainWindow.xaml.cs
index ccb60457..5f5d484a 100644
--- a/ZitiTunneler/MainWindow.xaml.cs
+++ b/ZitiTunneler/MainWindow.xaml.cs
@@ -189,7 +189,7 @@ namespace ZitiTunneler {
 				bytes = bytes / 1024;
 				counter++;
 			}
-			speed.Content = bytes;
+			speed.Content = bytes.ToString("0.0");
 			speedLabel.Content = suffixes[counter];
 		}