Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b8d124a2b2 | |||
| b17d832842 | |||
| fe42f2f908 | |||
| 93a9c327e0 | |||
| 9e6abeef74 | |||
| 9525ee358e | |||
| f3bca1e8ff |
@@ -1,7 +1,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>0.1.3</Version>
|
<Version>0.1.2</Version>
|
||||||
<Authors>Justin Paul</Authors>
|
<Authors>Justin Paul</Authors>
|
||||||
<Company>Justin Paul</Company>
|
<Company>Justin Paul</Company>
|
||||||
<Product>Webhook Server</Product>
|
<Product>Webhook Server</Product>
|
||||||
|
|||||||
@@ -31,11 +31,6 @@
|
|||||||
<MenuItem Header="_Export config…" Command="{Binding ExportConfigCommand}"/>
|
<MenuItem Header="_Export config…" Command="{Binding ExportConfigCommand}"/>
|
||||||
<MenuItem Header="Config _Checkpoints…" Command="{Binding ShowConfigCheckpointsCommand}"/>
|
<MenuItem Header="Config _Checkpoints…" Command="{Binding ShowConfigCheckpointsCommand}"/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<MenuItem Header="_Minimize to tray"
|
|
||||||
IsCheckable="True"
|
|
||||||
IsChecked="{Binding MinimizeToTrayEnabled, Mode=TwoWay}"
|
|
||||||
ToolTip="When ticked, closing or minimizing the window hides it to the tray and keeps the GUI process alive. Untick to make the X button quit the app."/>
|
|
||||||
<Separator/>
|
|
||||||
<MenuItem Header="E_xit" Command="{Binding ExitCommand}"/>
|
<MenuItem Header="E_xit" Command="{Binding ExitCommand}"/>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="_Server">
|
<MenuItem Header="_Server">
|
||||||
@@ -68,26 +63,17 @@
|
|||||||
<DataGrid.RowStyle>
|
<DataGrid.RowStyle>
|
||||||
<Style TargetType="DataGridRow">
|
<Style TargetType="DataGridRow">
|
||||||
<EventSetter Event="MouseDoubleClick" Handler="OnRowDoubleClick"/>
|
<EventSetter Event="MouseDoubleClick" Handler="OnRowDoubleClick"/>
|
||||||
<!-- The ContextMenu lives in its own visual tree (a popup), so
|
|
||||||
AncestorType=Window doesn't resolve from inside menu items.
|
|
||||||
Stash MainViewModel on the row's Tag here (still in the
|
|
||||||
Window's tree), then reach it from the menu via
|
|
||||||
PlacementTarget.Tag. -->
|
|
||||||
<Setter Property="Tag" Value="{Binding DataContext, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
|
||||||
<Setter Property="ContextMenu">
|
<Setter Property="ContextMenu">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ContextMenu>
|
<ContextMenu>
|
||||||
<MenuItem Header="_Edit…"
|
<MenuItem Header="_Edit…" Command="{Binding DataContext.EditEndpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||||
Command="{Binding PlacementTarget.Tag.EditEndpointCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
<MenuItem Header="_Copy URL" Command="{Binding DataContext.CopyEndpointUrlCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||||
<MenuItem Header="_Copy URL"
|
|
||||||
Command="{Binding PlacementTarget.Tag.CopyEndpointUrlCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<MenuItem Header="Toggle _enabled"
|
<MenuItem Header="Toggle _enabled"
|
||||||
Command="{Binding PlacementTarget.Tag.ToggleEnabledCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
Command="{Binding DataContext.ToggleEnabledCommand, RelativeSource={RelativeSource AncestorType=Window}}"
|
||||||
CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
CommandParameter="{Binding}"/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<MenuItem Header="_Delete…"
|
<MenuItem Header="_Delete…" Command="{Binding DataContext.DeleteEndpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||||
Command="{Binding PlacementTarget.Tag.DeleteEndpointCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.ComponentModel;
|
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
@@ -12,56 +11,26 @@ public partial class MainWindow : Window
|
|||||||
private readonly TrayIcon _tray;
|
private readonly TrayIcon _tray;
|
||||||
private readonly MainViewModel _vm;
|
private readonly MainViewModel _vm;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Set to true when the user has explicitly asked to quit (File -> Exit or
|
|
||||||
/// Tray -> Exit). The OnClosing handler reads this to decide whether to
|
|
||||||
/// actually let the window close or hide it to the tray.
|
|
||||||
/// </summary>
|
|
||||||
public bool ExitForReal { get; set; }
|
|
||||||
|
|
||||||
public MainWindow()
|
public MainWindow()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_vm = new MainViewModel(new AdminPipeClient());
|
_vm = new MainViewModel(new AdminPipeClient());
|
||||||
DataContext = _vm;
|
DataContext = _vm;
|
||||||
_vm.RealExitRequested += OnRealExitRequested;
|
|
||||||
|
|
||||||
_tray = new TrayIcon(
|
_tray = new TrayIcon(
|
||||||
resolveMainWindow: () => Application.Current.MainWindow,
|
resolveMainWindow: () => Application.Current.MainWindow,
|
||||||
restartServiceAsync: async () => await new AdminPipeClient().RestartListenerAsync(),
|
restartServiceAsync: async () => await new AdminPipeClient().RestartListenerAsync());
|
||||||
onExit: OnRealExitRequested);
|
|
||||||
|
|
||||||
Loaded += async (_, _) => await _vm.RefreshCommand.ExecuteAsync(null);
|
Loaded += async (_, _) => await _vm.RefreshCommand.ExecuteAsync(null);
|
||||||
StateChanged += OnStateChanged;
|
StateChanged += OnStateChanged;
|
||||||
Closing += OnClosing;
|
Closed += (_, _) => _tray.Dispose();
|
||||||
}
|
|
||||||
|
|
||||||
private void OnClosing(object? sender, CancelEventArgs e)
|
|
||||||
{
|
|
||||||
if (ExitForReal || !_vm.MinimizeToTrayEnabled)
|
|
||||||
{
|
|
||||||
_tray.Dispose();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Treat the X button / Alt+F4 like a minimize: hide to tray, keep the
|
|
||||||
// process alive so the tray icon persists.
|
|
||||||
e.Cancel = true;
|
|
||||||
Hide();
|
|
||||||
ShowInTaskbar = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnRealExitRequested()
|
|
||||||
{
|
|
||||||
ExitForReal = true;
|
|
||||||
Application.Current.Shutdown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnStateChanged(object? sender, EventArgs e)
|
private void OnStateChanged(object? sender, EventArgs e)
|
||||||
{
|
{
|
||||||
// Minimize-to-tray: hide the window when the user minimizes IF they've
|
// Minimize-to-tray: hide the window when the user minimizes; restoring is
|
||||||
// opted in via File -> Minimize to tray. Otherwise behave like a normal
|
// via the tray icon's double-click or context menu.
|
||||||
// Windows minimize.
|
if (WindowState == WindowState.Minimized)
|
||||||
if (WindowState == WindowState.Minimized && _vm.MinimizeToTrayEnabled)
|
|
||||||
{
|
{
|
||||||
Hide();
|
Hide();
|
||||||
ShowInTaskbar = false;
|
ShowInTaskbar = false;
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
using System.IO;
|
|
||||||
using System.Text.Json;
|
|
||||||
|
|
||||||
namespace WebhookServer.Gui.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Per-user GUI preferences that don't belong in the service-side ServerConfig.
|
|
||||||
/// Persisted to %APPDATA%\WebhookServer\gui.json. Best-effort: failures to read
|
|
||||||
/// or write fall back silently to defaults.
|
|
||||||
/// </summary>
|
|
||||||
public sealed class GuiSettings
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// When true, the X / Alt+F4 / minimize buttons hide the window to the tray
|
|
||||||
/// and keep the GUI process alive. When false, X exits the app and minimize
|
|
||||||
/// behaves like a normal Windows minimize.
|
|
||||||
/// </summary>
|
|
||||||
public bool MinimizeToTrayEnabled { get; set; } = true;
|
|
||||||
|
|
||||||
private static string FilePath => Path.Combine(
|
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
|
||||||
"WebhookServer",
|
|
||||||
"gui.json");
|
|
||||||
|
|
||||||
public static GuiSettings Load()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (File.Exists(FilePath))
|
|
||||||
{
|
|
||||||
var json = File.ReadAllText(FilePath);
|
|
||||||
if (!string.IsNullOrWhiteSpace(json))
|
|
||||||
return JsonSerializer.Deserialize<GuiSettings>(json) ?? new GuiSettings();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch { /* fall through to defaults */ }
|
|
||||||
return new GuiSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Save()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var dir = Path.GetDirectoryName(FilePath);
|
|
||||||
if (!string.IsNullOrEmpty(dir)) Directory.CreateDirectory(dir);
|
|
||||||
File.WriteAllText(FilePath, JsonSerializer.Serialize(this, new JsonSerializerOptions { WriteIndented = true }));
|
|
||||||
}
|
|
||||||
catch { /* best effort */ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -16,13 +16,11 @@ public sealed class TrayIcon : IDisposable
|
|||||||
private readonly NotifyIcon _icon;
|
private readonly NotifyIcon _icon;
|
||||||
private readonly Func<Window?> _resolveMainWindow;
|
private readonly Func<Window?> _resolveMainWindow;
|
||||||
private readonly Func<Task> _restartServiceAsync;
|
private readonly Func<Task> _restartServiceAsync;
|
||||||
private readonly Action _onExit;
|
|
||||||
|
|
||||||
public TrayIcon(Func<Window?> resolveMainWindow, Func<Task> restartServiceAsync, Action onExit)
|
public TrayIcon(Func<Window?> resolveMainWindow, Func<Task> restartServiceAsync)
|
||||||
{
|
{
|
||||||
_resolveMainWindow = resolveMainWindow;
|
_resolveMainWindow = resolveMainWindow;
|
||||||
_restartServiceAsync = restartServiceAsync;
|
_restartServiceAsync = restartServiceAsync;
|
||||||
_onExit = onExit;
|
|
||||||
|
|
||||||
_icon = new NotifyIcon
|
_icon = new NotifyIcon
|
||||||
{
|
{
|
||||||
@@ -41,7 +39,7 @@ public sealed class TrayIcon : IDisposable
|
|||||||
menu.Items.Add(new ToolStripSeparator());
|
menu.Items.Add(new ToolStripSeparator());
|
||||||
menu.Items.Add("&Restart service", null, async (_, _) => await _restartServiceAsync().ConfigureAwait(false));
|
menu.Items.Add("&Restart service", null, async (_, _) => await _restartServiceAsync().ConfigureAwait(false));
|
||||||
menu.Items.Add(new ToolStripSeparator());
|
menu.Items.Add(new ToolStripSeparator());
|
||||||
menu.Items.Add("E&xit", null, (_, _) => _onExit());
|
menu.Items.Add("E&xit", null, (_, _) => Application.Current.Shutdown());
|
||||||
return menu;
|
return menu;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,28 +29,17 @@ public sealed partial class MainViewModel : ObservableObject
|
|||||||
[ObservableProperty] private ServerConfig _serverConfig = new();
|
[ObservableProperty] private ServerConfig _serverConfig = new();
|
||||||
[ObservableProperty] private string _httpBaseUrl = "http://localhost:8080";
|
[ObservableProperty] private string _httpBaseUrl = "http://localhost:8080";
|
||||||
[ObservableProperty] private string? _httpsBaseUrl;
|
[ObservableProperty] private string? _httpsBaseUrl;
|
||||||
[ObservableProperty] private bool _minimizeToTrayEnabled;
|
|
||||||
|
|
||||||
private readonly DispatcherTimer _logTimer;
|
private readonly DispatcherTimer _logTimer;
|
||||||
private readonly GuiSettings _settings;
|
|
||||||
|
|
||||||
public MainViewModel(AdminPipeClient client)
|
public MainViewModel(AdminPipeClient client)
|
||||||
{
|
{
|
||||||
_client = client;
|
_client = client;
|
||||||
_settings = GuiSettings.Load();
|
|
||||||
_minimizeToTrayEnabled = _settings.MinimizeToTrayEnabled;
|
|
||||||
|
|
||||||
_logTimer = new DispatcherTimer(DispatcherPriority.Background) { Interval = TimeSpan.FromSeconds(3) };
|
_logTimer = new DispatcherTimer(DispatcherPriority.Background) { Interval = TimeSpan.FromSeconds(3) };
|
||||||
_logTimer.Tick += async (_, _) => await RefreshLogTailAsync();
|
_logTimer.Tick += async (_, _) => await RefreshLogTailAsync();
|
||||||
_logTimer.Start();
|
_logTimer.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
partial void OnMinimizeToTrayEnabledChanged(bool value)
|
|
||||||
{
|
|
||||||
_settings.MinimizeToTrayEnabled = value;
|
|
||||||
_settings.Save();
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
private async Task RefreshAsync()
|
private async Task RefreshAsync()
|
||||||
{
|
{
|
||||||
@@ -297,14 +286,10 @@ public sealed partial class MainViewModel : ObservableObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Raised when the user picks File -> Exit. MainWindow flips its
|
|
||||||
/// ExitForReal flag and shuts down, bypassing the X-hides-to-tray logic.</summary>
|
|
||||||
public event Action? RealExitRequested;
|
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
private void Exit()
|
private void Exit()
|
||||||
{
|
{
|
||||||
RealExitRequested?.Invoke();
|
Application.Current.Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
|
|||||||
Reference in New Issue
Block a user