Skip to content

Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic

#14 WIP - Added Closing to Windows Tray

Sourav Kalalb08fd7c9da78
diff --git a/gui/App.axaml b/gui/App.axaml
index adcd980..089c559 100644
--- a/gui/App.axaml
+++ b/gui/App.axaml
@@ -5,4 +5,19 @@
<Application.Styles>
<FluentTheme />
</Application.Styles>
+
+ <TrayIcon.Icons>
+ <TrayIcons>
+ <TrayIcon Icon="/Assets/logo.ico"
+ ToolTipText="ProxyBridge">
+ <TrayIcon.Menu>
+ <NativeMenu>
+ <NativeMenuItem Header="Open" Click="TrayIcon_Show" />
+ <NativeMenuItemSeparator />
+ <NativeMenuItem Header="Exit" Click="TrayIcon_Exit" />
+ </NativeMenu>
+ </TrayIcon.Menu>
+ </TrayIcon>
+ </TrayIcons>
+ </TrayIcon.Icons>
</Application>
diff --git a/gui/App.axaml.cs b/gui/App.axaml.cs
index e80f6d3..5fd7848 100644
--- a/gui/App.axaml.cs
+++ b/gui/App.axaml.cs
@@ -1,8 +1,10 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
+using Avalonia.Controls;
using ProxyBridge.GUI.ViewModels;
using ProxyBridge.GUI.Views;
+using System;
namespace ProxyBridge.GUI;
@@ -25,4 +27,26 @@ public class App : Application
base.OnFrameworkInitializationCompleted();
}
+ // https://docs.avaloniaui.net/docs/reference/controls/tray-icon
+ public void TrayIcon_Show(object? sender, EventArgs e)
+ {
+ if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ {
+ var mainWindow = desktop.MainWindow;
+ if (mainWindow != null)
+ {
+ mainWindow.Show();
+ mainWindow.WindowState = WindowState.Normal;
+ mainWindow.Activate();
+ }
+ }
+ }
+
+ public void TrayIcon_Exit(object? sender, EventArgs e)
+ {
+ if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ {
+ desktop.Shutdown();
+ }
+ }
}
diff --git a/gui/Views/MainWindow.axaml.cs b/gui/Views/MainWindow.axaml.cs
index e8c33aa..0bae2fa 100644
--- a/gui/Views/MainWindow.axaml.cs
+++ b/gui/Views/MainWindow.axaml.cs
@@ -1,6 +1,7 @@
using Avalonia.Controls;
using ProxyBridge.GUI.ViewModels;
using System;
+using System.ComponentModel;
namespace ProxyBridge.GUI.Views;
@@ -19,13 +20,26 @@ public partial class MainWindow : Window
}
};
- // Cleanup on close
+ // ,inimize to tray
this.Closing += (s, e) =>
+ {
+ e.Cancel = true;
+ this.Hide();
+ };
+ }
+
+ protected override void OnClosing(WindowClosingEventArgs e)
+ {
+ if (e.CloseReason == WindowCloseReason.ApplicationShutdown)
{
if (DataContext is MainWindowViewModel vm)
{
vm.Cleanup();
}
- };
+ base.OnClosing(e);
+ return;
+ }
+ e.Cancel = true;
+ this.Hide();
}
}