Compare commits
3 Commits
2aa14642a0
...
v0.1.3
| Author | SHA1 | Date | |
|---|---|---|---|
| 9bbb3b7449 | |||
| 32e07489ff | |||
| 3cd8c94a94 |
@@ -1,7 +1,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>0.1.2</Version>
|
<Version>0.1.3</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,6 +31,11 @@
|
|||||||
<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">
|
||||||
@@ -63,17 +68,26 @@
|
|||||||
<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…" Command="{Binding DataContext.EditEndpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
<MenuItem Header="_Edit…"
|
||||||
<MenuItem Header="_Copy URL" Command="{Binding DataContext.CopyEndpointUrlCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
Command="{Binding PlacementTarget.Tag.EditEndpointCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
||||||
|
<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 DataContext.ToggleEnabledCommand, RelativeSource={RelativeSource AncestorType=Window}}"
|
Command="{Binding PlacementTarget.Tag.ToggleEnabledCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
||||||
CommandParameter="{Binding}"/>
|
CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<MenuItem Header="_Delete…" Command="{Binding DataContext.DeleteEndpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
<MenuItem Header="_Delete…"
|
||||||
|
Command="{Binding PlacementTarget.Tag.DeleteEndpointCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private void OnClosing(object? sender, CancelEventArgs e)
|
private void OnClosing(object? sender, CancelEventArgs e)
|
||||||
{
|
{
|
||||||
if (ExitForReal)
|
if (ExitForReal || !_vm.MinimizeToTrayEnabled)
|
||||||
{
|
{
|
||||||
_tray.Dispose();
|
_tray.Dispose();
|
||||||
return;
|
return;
|
||||||
@@ -58,9 +58,10 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private void OnStateChanged(object? sender, EventArgs e)
|
private void OnStateChanged(object? sender, EventArgs e)
|
||||||
{
|
{
|
||||||
// Minimize-to-tray: hide the window when the user minimizes; restoring is
|
// Minimize-to-tray: hide the window when the user minimizes IF they've
|
||||||
// via the tray icon's double-click or context menu.
|
// opted in via File -> Minimize to tray. Otherwise behave like a normal
|
||||||
if (WindowState == WindowState.Minimized)
|
// Windows minimize.
|
||||||
|
if (WindowState == WindowState.Minimized && _vm.MinimizeToTrayEnabled)
|
||||||
{
|
{
|
||||||
Hide();
|
Hide();
|
||||||
ShowInTaskbar = false;
|
ShowInTaskbar = false;
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
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 */ }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,17 +29,28 @@ 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()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user