gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-14 00:29:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Um maybe latest but this looks unfamiliar for clint

Browse Source
This commit is contained in:
Jeremy Tellier - ROG
2020-05-08 20:49:10 +01:00
parent cbe2aedb11
commit ea321179bc
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZitiTunneler/MainWindow.xaml.cs
+6 -16
View File
@@ -44,6 +44,7 @@ namespace ZitiTunneler {
notifyIcon.Visible = true;
notifyIcon.ShowBalloonTip(5000, "Test", "Testing", System.Windows.Forms.ToolTipIcon.Info);
ServiceController ctl = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName=="ziti");
if (ctl==null) {
ProcessStartInfo installService = new ProcessStartInfo();
@@ -77,6 +78,7 @@ namespace ZitiTunneler {
}
}
}
SetNotifyIcon("white");
InitializeComponent();
@@ -132,22 +134,11 @@ namespace ZitiTunneler {
IdentityMenu.OnForgot += IdentityForgotten;
}
<<<<<<< HEAD
private void ServiceClient_OnMetricsUpdate(object sender, Metrics e) {
this.Dispatcher.Invoke(() => {
DownloadSpeed.Content = (e.Down / 1000).ToString();
UploadSpeed.Content = (e.Up / 1000).ToString();
});
}
private void ServiceClient_OnTunnelStatusUpdated(object sender, TunnelStatus e) {
=======
private void ServiceClient_OnMetricsUpdate(object sender, Metrics e)
{
if (e != null) {
this.Dispatcher.Invoke(() =>
{
DownloadSpeed.Content = (e.Down / 1000).ToString();
UploadSpeed.Content = (e.Up / 1000).ToString();
if (e!=null) {
this.Dispatcher.Invoke(() => {
DownloadSpeed.Content=(e.Down/1000).ToString();
UploadSpeed.Content=(e.Up/1000).ToString();
});
}
}
@@ -174,7 +165,6 @@ namespace ZitiTunneler {
UploadSpeed.Content = (totalUp / 1000).ToString();
});
}
>>>>>>> origin/bug-fixing
}
private void IdentityForgotten(ZitiIdentity forgotten) {
ZitiTunneler/ZitiTunneler.csproj
+5 -5
View File
@@ -265,19 +265,19 @@
</ItemGroup>
<ItemGroup>
<Content Include="Service\libgcc_s_seh-1.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Service\libuv.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Service\libwinpthread-1.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Service\ziti-tunnel.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Service\ziti.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />