Compare commits
3 Commits
v0.1.3
...
9e6abeef74
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e6abeef74 | |||
| 9525ee358e | |||
| f3bca1e8ff |
@@ -0,0 +1,27 @@
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
|
||||
- name: Restore
|
||||
run: dotnet restore WebhookServer.sln
|
||||
|
||||
- name: Build
|
||||
run: dotnet build WebhookServer.sln -c Release --no-restore
|
||||
|
||||
- name: Test
|
||||
run: dotnet test WebhookServer.sln -c Release --no-build --verbosity normal
|
||||
@@ -0,0 +1,71 @@
|
||||
name: Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version to build (e.g. 0.1.0). Defaults to Directory.Build.props.'
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
build-installer:
|
||||
runs-on: windows-latest
|
||||
permissions:
|
||||
contents: write # needed to create releases / upload assets
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
|
||||
- name: Resolve version
|
||||
id: ver
|
||||
shell: pwsh
|
||||
run: |
|
||||
if ('${{ github.event_name }}' -eq 'push') {
|
||||
$v = '${{ github.ref_name }}'.TrimStart('v')
|
||||
} elseif ('${{ inputs.version }}') {
|
||||
$v = '${{ inputs.version }}'
|
||||
} else {
|
||||
[xml]$p = Get-Content Directory.Build.props
|
||||
$v = $p.Project.PropertyGroup.Version
|
||||
}
|
||||
"version=$v" | Out-File $env:GITHUB_OUTPUT -Append
|
||||
Write-Host "Building version $v"
|
||||
|
||||
- name: Restore + test
|
||||
run: |
|
||||
dotnet restore WebhookServer.sln
|
||||
dotnet test WebhookServer.sln -c Release
|
||||
|
||||
- name: Install Inno Setup
|
||||
shell: pwsh
|
||||
run: |
|
||||
choco install innosetup --no-progress -y
|
||||
Write-Host "ISCC at: $((Get-Command iscc).Path)"
|
||||
|
||||
- name: Build installer
|
||||
shell: pwsh
|
||||
run: ./scripts/build-installer.ps1 -VersionOverride ${{ steps.ver.outputs.version }}
|
||||
|
||||
- name: Upload installer artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: WebhookServer-Setup-${{ steps.ver.outputs.version }}
|
||||
path: dist/WebhookServer-Setup-*.exe
|
||||
|
||||
- name: Create GitHub Release
|
||||
if: startsWith(github.ref, 'refs/tags/v')
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
name: Webhook Server ${{ steps.ver.outputs.version }}
|
||||
tag_name: ${{ github.ref_name }}
|
||||
draft: false
|
||||
prerelease: ${{ startsWith(steps.ver.outputs.version, '0.') }}
|
||||
files: dist/WebhookServer-Setup-*.exe
|
||||
generate_release_notes: true
|
||||
@@ -0,0 +1,79 @@
|
||||
; Inno Setup script for Webhook Server.
|
||||
;
|
||||
; Build: iscc /DAppVersion=0.1.0 webhook-server.iss
|
||||
; Output: ..\dist\WebhookServer-Setup-{AppVersion}.exe
|
||||
;
|
||||
; The installer copies published binaries to {pf}\WebhookServer, installs the
|
||||
; Windows Service via install-service.ps1 post-install, and removes the service
|
||||
; via uninstall-service.ps1 pre-uninstall. Start Menu gets a single GUI shortcut.
|
||||
|
||||
#ifndef AppVersion
|
||||
#define AppVersion "0.1.0"
|
||||
#endif
|
||||
|
||||
#define AppName "Webhook Server"
|
||||
#define AppPublisher "Justin Paul"
|
||||
#define AppURL "https://jpaul.me"
|
||||
#define AppExeName "WebhookServer.Gui.exe"
|
||||
#define ServiceExeName "WebhookServer.Service.exe"
|
||||
#define ServiceName "WebhookServer"
|
||||
#define RepoRoot "..\"
|
||||
|
||||
[Setup]
|
||||
AppId={{6E3B3C1A-9C20-4F50-B6A8-2B6D6D7E2F11}
|
||||
AppName={#AppName}
|
||||
AppVersion={#AppVersion}
|
||||
AppPublisher={#AppPublisher}
|
||||
AppPublisherURL={#AppURL}
|
||||
AppSupportURL=https://github.com/recklessop/webhook-server
|
||||
AppUpdatesURL=https://github.com/recklessop/webhook-server/releases
|
||||
DefaultDirName={autopf}\WebhookServer
|
||||
DefaultGroupName={#AppName}
|
||||
DisableProgramGroupPage=yes
|
||||
OutputBaseFilename=WebhookServer-Setup-{#AppVersion}
|
||||
OutputDir={#RepoRoot}dist
|
||||
SetupIconFile={#RepoRoot}resources\webhook-server.ico
|
||||
UninstallDisplayIcon={app}\{#AppExeName}
|
||||
PrivilegesRequired=admin
|
||||
ArchitecturesAllowed=x64compatible
|
||||
ArchitecturesInstallIn64BitMode=x64compatible
|
||||
Compression=lzma2/max
|
||||
SolidCompression=yes
|
||||
WizardStyle=modern
|
||||
VersionInfoVersion={#AppVersion}.0
|
||||
VersionInfoCompany={#AppPublisher}
|
||||
VersionInfoProductName={#AppName}
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
|
||||
[Tasks]
|
||||
Name: "desktopicon"; Description: "Create a &desktop shortcut"; GroupDescription: "Additional shortcuts:"; Flags: unchecked
|
||||
|
||||
[Files]
|
||||
Source: "{#RepoRoot}publish\service\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
Source: "{#RepoRoot}publish\gui\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
Source: "{#RepoRoot}scripts\install-service.ps1"; DestDir: "{app}\scripts"; Flags: ignoreversion
|
||||
Source: "{#RepoRoot}scripts\uninstall-service.ps1"; DestDir: "{app}\scripts"; Flags: ignoreversion
|
||||
Source: "{#RepoRoot}README.md"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#RepoRoot}resources\webhook-server.ico"; DestDir: "{app}"; Flags: ignoreversion
|
||||
|
||||
[Icons]
|
||||
Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; IconFilename: "{app}\webhook-server.ico"
|
||||
Name: "{group}\Uninstall {#AppName}"; Filename: "{uninstallexe}"
|
||||
Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; IconFilename: "{app}\webhook-server.ico"; Tasks: desktopicon
|
||||
|
||||
[Run]
|
||||
Filename: "powershell.exe"; \
|
||||
Parameters: "-NoProfile -ExecutionPolicy Bypass -File ""{app}\scripts\install-service.ps1"" -BinaryPath ""{app}\{#ServiceExeName}"""; \
|
||||
StatusMsg: "Installing Windows Service..."; \
|
||||
Flags: runhidden
|
||||
Filename: "{app}\{#AppExeName}"; \
|
||||
Description: "Launch {#AppName}"; \
|
||||
Flags: postinstall nowait skipifsilent
|
||||
|
||||
[UninstallRun]
|
||||
Filename: "powershell.exe"; \
|
||||
Parameters: "-NoProfile -ExecutionPolicy Bypass -File ""{app}\scripts\uninstall-service.ps1"""; \
|
||||
Flags: runhidden; \
|
||||
RunOnceId: "RemoveWebhookService"
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 9.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
@@ -0,0 +1,68 @@
|
||||
<#
|
||||
.SYNOPSIS
|
||||
End-to-end installer build: publish service + GUI, then run Inno Setup
|
||||
to produce dist/WebhookServer-Setup-{version}.exe.
|
||||
|
||||
.DESCRIPTION
|
||||
Reads the version from Directory.Build.props. Requires Inno Setup 6 (ISCC.exe)
|
||||
on PATH or in the standard install location. CI runs this same script after
|
||||
setup-dotnet + winget install Inno Setup.
|
||||
#>
|
||||
[CmdletBinding()]
|
||||
param(
|
||||
[string]$Configuration = 'Release',
|
||||
[string]$VersionOverride
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$repoRoot = Split-Path -Parent $PSScriptRoot
|
||||
|
||||
function Get-RepoVersion {
|
||||
$propsPath = Join-Path $repoRoot 'Directory.Build.props'
|
||||
[xml]$props = Get-Content $propsPath
|
||||
return $props.Project.PropertyGroup.Version
|
||||
}
|
||||
|
||||
function Find-InnoCompiler {
|
||||
$candidates = @(
|
||||
'ISCC.exe', # on PATH
|
||||
'C:\Program Files (x86)\Inno Setup 6\ISCC.exe',
|
||||
'C:\Program Files\Inno Setup 6\ISCC.exe'
|
||||
)
|
||||
foreach ($c in $candidates) {
|
||||
$cmd = Get-Command $c -ErrorAction SilentlyContinue
|
||||
if ($cmd) { return $cmd.Path }
|
||||
if (Test-Path $c) { return $c }
|
||||
}
|
||||
throw "Inno Setup compiler not found. Install with: winget install JRSoftware.InnoSetup"
|
||||
}
|
||||
|
||||
$version = if ($VersionOverride) { $VersionOverride } else { Get-RepoVersion }
|
||||
Write-Host "Building Webhook Server installer v$version" -ForegroundColor Cyan
|
||||
|
||||
# 1. Publish both projects.
|
||||
$publishSvc = Join-Path $repoRoot 'publish\service'
|
||||
$publishGui = Join-Path $repoRoot 'publish\gui'
|
||||
Remove-Item -Recurse -Force $publishSvc, $publishGui -ErrorAction SilentlyContinue
|
||||
|
||||
& dotnet publish (Join-Path $repoRoot 'src\WebhookServer.Service\WebhookServer.Service.csproj') `
|
||||
-c $Configuration -r win-x64 --self-contained false -o $publishSvc | Out-Host
|
||||
if ($LASTEXITCODE -ne 0) { throw 'service publish failed' }
|
||||
|
||||
& dotnet publish (Join-Path $repoRoot 'src\WebhookServer.Gui\WebhookServer.Gui.csproj') `
|
||||
-c $Configuration -r win-x64 --self-contained false -o $publishGui | Out-Host
|
||||
if ($LASTEXITCODE -ne 0) { throw 'GUI publish failed' }
|
||||
|
||||
# 2. Compile installer.
|
||||
$iscc = Find-InnoCompiler
|
||||
$iss = Join-Path $repoRoot 'installer\webhook-server.iss'
|
||||
$dist = Join-Path $repoRoot 'dist'
|
||||
New-Item -ItemType Directory -Path $dist -Force | Out-Null
|
||||
|
||||
Write-Host "Compiling installer with $iscc"
|
||||
& $iscc "/DAppVersion=$version" $iss
|
||||
if ($LASTEXITCODE -ne 0) { throw 'Inno Setup compile failed' }
|
||||
|
||||
$out = Get-Item (Join-Path $dist "WebhookServer-Setup-$version.exe")
|
||||
Write-Host ""
|
||||
Write-Host ("Built: {0} ({1:n0} bytes)" -f $out.FullName, $out.Length) -ForegroundColor Green
|
||||
@@ -0,0 +1,138 @@
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Generates webhook-server.ico (multi-resolution) and webhook-server.png from
|
||||
a programmatic design. Re-run after changing Draw-Icon to refresh assets.
|
||||
|
||||
.DESCRIPTION
|
||||
Renders the icon at 16/24/32/48/64/128/256 px using System.Drawing, then
|
||||
assembles a Microsoft-format ICO file with each size embedded as PNG. No
|
||||
external tools required.
|
||||
|
||||
Design: a rounded-square teal background (#0E7C66) with a stylized white
|
||||
hook shape (a "J"-like curve with an arrow tip).
|
||||
#>
|
||||
[CmdletBinding()]
|
||||
param(
|
||||
[string]$OutputDir = (Join-Path $PSScriptRoot '..\resources')
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
Add-Type -AssemblyName System.Drawing
|
||||
|
||||
New-Item -ItemType Directory -Path $OutputDir -Force | Out-Null
|
||||
|
||||
function New-IconBitmap([int]$size) {
|
||||
$bmp = New-Object System.Drawing.Bitmap $size, $size, ([System.Drawing.Imaging.PixelFormat]::Format32bppArgb)
|
||||
$g = [System.Drawing.Graphics]::FromImage($bmp)
|
||||
$g.SmoothingMode = [System.Drawing.Drawing2D.SmoothingMode]::AntiAlias
|
||||
$g.InterpolationMode = [System.Drawing.Drawing2D.InterpolationMode]::HighQualityBicubic
|
||||
$g.PixelOffsetMode = [System.Drawing.Drawing2D.PixelOffsetMode]::HighQuality
|
||||
|
||||
# Background: rounded square in brand teal.
|
||||
$bgColor = [System.Drawing.Color]::FromArgb(0xFF, 0x0E, 0x7C, 0x66)
|
||||
$bgBrush = New-Object System.Drawing.SolidBrush $bgColor
|
||||
$radius = [int]($size * 0.22)
|
||||
$rect = New-Object System.Drawing.RectangleF 0, 0, $size, $size
|
||||
|
||||
$path = New-Object System.Drawing.Drawing2D.GraphicsPath
|
||||
$d = $radius * 2
|
||||
$path.AddArc($rect.X, $rect.Y, $d, $d, 180, 90)
|
||||
$path.AddArc($rect.Right - $d, $rect.Y, $d, $d, 270, 90)
|
||||
$path.AddArc($rect.Right - $d, $rect.Bottom - $d, $d, $d, 0, 90)
|
||||
$path.AddArc($rect.X, $rect.Bottom - $d, $d, $d, 90, 90)
|
||||
$path.CloseFigure()
|
||||
$g.FillPath($bgBrush, $path)
|
||||
|
||||
# Foreground: white hook shape - a thick curved stroke shaped like a "J"
|
||||
# tipped with an arrowhead, sized relative to the canvas.
|
||||
$fgColor = [System.Drawing.Color]::White
|
||||
$stroke = [Math]::Max(2, [int]($size * 0.12))
|
||||
$pen = New-Object System.Drawing.Pen $fgColor, $stroke
|
||||
$pen.StartCap = [System.Drawing.Drawing2D.LineCap]::Round
|
||||
$pen.EndCap = [System.Drawing.Drawing2D.LineCap]::Round
|
||||
$pen.LineJoin = [System.Drawing.Drawing2D.LineJoin]::Round
|
||||
|
||||
# Hook curve: vertical down-stroke on the right, then a half-circle arc
|
||||
# curling to the left and ending in a small filled dot for the hook tip.
|
||||
$cx = [single]($size * 0.62)
|
||||
$top = [single]($size * 0.22)
|
||||
$bottom = [single]($size * 0.58)
|
||||
$arcD = [single]($size * 0.34) # arc diameter
|
||||
$arcLeft = [single]($cx - $arcD) # left edge of arc circle
|
||||
|
||||
# Vertical stroke from (cx, top) to (cx, bottom).
|
||||
$g.DrawLine($pen, $cx, $top, $cx, $bottom)
|
||||
|
||||
# Half-circle arc beneath: starts at (cx, bottom), curls to (cx - arcD, bottom).
|
||||
$arcRect = New-Object System.Drawing.RectangleF $arcLeft, ([single]($bottom - $arcD / 2)), $arcD, $arcD
|
||||
$g.DrawArc($pen, $arcRect, 0, 180)
|
||||
|
||||
# Filled circle at the tip end of the arc.
|
||||
$tipR = [single]($stroke * 0.6)
|
||||
$tipX = $arcLeft
|
||||
$tipY = [single]($bottom)
|
||||
$brushFg = New-Object System.Drawing.SolidBrush $fgColor
|
||||
$g.FillEllipse($brushFg, [single]($tipX - $tipR), [single]($tipY - $tipR), [single]($tipR * 2), [single]($tipR * 2))
|
||||
|
||||
$brushFg.Dispose(); $pen.Dispose(); $bgBrush.Dispose(); $path.Dispose()
|
||||
$g.Dispose()
|
||||
return $bmp
|
||||
}
|
||||
|
||||
# Generate each size as PNG bytes. Hashtable keys are prefixed with "s" because
|
||||
# PowerShell hashtable lookups by integer key behave inconsistently with PSObject
|
||||
# wrapping; string keys round-trip cleanly.
|
||||
$sizes = @(16, 24, 32, 48, 64, 128, 256)
|
||||
$pngs = @{}
|
||||
foreach ($s in $sizes) {
|
||||
$bmp = New-IconBitmap $s
|
||||
$ms = New-Object System.IO.MemoryStream
|
||||
$bmp.Save($ms, [System.Drawing.Imaging.ImageFormat]::Png)
|
||||
$pngs["s$s"] = $ms.ToArray()
|
||||
$ms.Dispose()
|
||||
$bmp.Dispose()
|
||||
}
|
||||
|
||||
# Save the master 256 PNG separately for places that need a transparent PNG.
|
||||
$pngPath = Join-Path $OutputDir 'webhook-server.png'
|
||||
[System.IO.File]::WriteAllBytes($pngPath, [byte[]]$pngs['s256'])
|
||||
|
||||
# Assemble multi-resolution ICO.
|
||||
$icoPath = Join-Path $OutputDir 'webhook-server.ico'
|
||||
$ms = New-Object System.IO.MemoryStream
|
||||
$bw = New-Object System.IO.BinaryWriter $ms
|
||||
try {
|
||||
$count = $sizes.Count
|
||||
$bw.Write([UInt16]0) # idReserved
|
||||
$bw.Write([UInt16]1) # idType: 1 = ICO
|
||||
$bw.Write([UInt16]$count) # idCount
|
||||
|
||||
# Directory entries (16 bytes each).
|
||||
$offset = 6 + 16 * $count
|
||||
foreach ($s in $sizes) {
|
||||
$bytes = $pngs["s$s"]
|
||||
$w = if ($s -ge 256) { 0 } else { $s }
|
||||
$h = if ($s -ge 256) { 0 } else { $s }
|
||||
$bw.Write([byte]$w) # width
|
||||
$bw.Write([byte]$h) # height
|
||||
$bw.Write([byte]0) # colorCount
|
||||
$bw.Write([byte]0) # reserved
|
||||
$bw.Write([UInt16]1) # planes
|
||||
$bw.Write([UInt16]32) # bitCount
|
||||
$bw.Write([UInt32]$bytes.Length)
|
||||
$bw.Write([UInt32]$offset)
|
||||
$offset += $bytes.Length
|
||||
}
|
||||
|
||||
# Image data.
|
||||
foreach ($s in $sizes) { $bw.Write($pngs["s$s"]) }
|
||||
|
||||
$bw.Flush()
|
||||
[System.IO.File]::WriteAllBytes($icoPath, $ms.ToArray())
|
||||
}
|
||||
finally {
|
||||
$bw.Dispose(); $ms.Dispose()
|
||||
}
|
||||
|
||||
Write-Host "Wrote $icoPath ($((Get-Item $icoPath).Length) bytes)"
|
||||
Write-Host "Wrote $pngPath ($((Get-Item $pngPath).Length) bytes)"
|
||||
@@ -1,13 +1,5 @@
|
||||
using System.Configuration;
|
||||
using System.Data;
|
||||
using System.Windows;
|
||||
|
||||
namespace WebhookServer.Gui;
|
||||
|
||||
/// <summary>
|
||||
/// Interaction logic for App.xaml
|
||||
/// </summary>
|
||||
public partial class App : Application
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System.Globalization;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Media;
|
||||
using Brush = System.Windows.Media.Brush;
|
||||
using Brushes = System.Windows.Media.Brushes;
|
||||
|
||||
namespace WebhookServer.Gui.Converters;
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
// Enabling UseWindowsForms (for the system tray NotifyIcon) brings the WinForms
|
||||
// namespace into scope, which conflicts with WPF for several common type names.
|
||||
// Alias the most-used types to their WPF variants project-wide so existing code
|
||||
// keeps compiling. Files that genuinely need a WinForms type import it explicitly
|
||||
// (System.Windows.Forms.NotifyIcon etc. in Services/TrayIcon.cs).
|
||||
|
||||
global using Application = System.Windows.Application;
|
||||
global using MessageBox = System.Windows.MessageBox;
|
||||
global using Clipboard = System.Windows.Clipboard;
|
||||
global using TextBox = System.Windows.Controls.TextBox;
|
||||
global using RadioButton = System.Windows.Controls.RadioButton;
|
||||
global using MessageBoxButton = System.Windows.MessageBoxButton;
|
||||
global using MessageBoxImage = System.Windows.MessageBoxImage;
|
||||
global using MessageBoxResult = System.Windows.MessageBoxResult;
|
||||
global using Binding = System.Windows.Data.Binding;
|
||||
@@ -7,6 +7,7 @@
|
||||
xmlns:models="clr-namespace:WebhookServer.Core.Models;assembly=WebhookServer.Core"
|
||||
mc:Ignorable="d"
|
||||
Title="Webhook Server" Height="600" Width="1000"
|
||||
Icon="/webhook-server.ico"
|
||||
d:DataContext="{d:DesignInstance Type=vm:MainViewModel}">
|
||||
<Window.InputBindings>
|
||||
<KeyBinding Key="N" Modifiers="Control" Command="{Binding AddEndpointCommand}"/>
|
||||
|
||||
@@ -8,12 +8,37 @@ namespace WebhookServer.Gui;
|
||||
|
||||
public partial class MainWindow : Window
|
||||
{
|
||||
private readonly TrayIcon _tray;
|
||||
private readonly MainViewModel _vm;
|
||||
|
||||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
var vm = new MainViewModel(new AdminPipeClient());
|
||||
DataContext = vm;
|
||||
Loaded += async (_, _) => await vm.RefreshCommand.ExecuteAsync(null);
|
||||
_vm = new MainViewModel(new AdminPipeClient());
|
||||
DataContext = _vm;
|
||||
|
||||
_tray = new TrayIcon(
|
||||
resolveMainWindow: () => Application.Current.MainWindow,
|
||||
restartServiceAsync: async () => await new AdminPipeClient().RestartListenerAsync());
|
||||
|
||||
Loaded += async (_, _) => await _vm.RefreshCommand.ExecuteAsync(null);
|
||||
StateChanged += OnStateChanged;
|
||||
Closed += (_, _) => _tray.Dispose();
|
||||
}
|
||||
|
||||
private void OnStateChanged(object? sender, EventArgs e)
|
||||
{
|
||||
// Minimize-to-tray: hide the window when the user minimizes; restoring is
|
||||
// via the tray icon's double-click or context menu.
|
||||
if (WindowState == WindowState.Minimized)
|
||||
{
|
||||
Hide();
|
||||
ShowInTaskbar = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowInTaskbar = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnLogTailChanged(object sender, TextChangedEventArgs e)
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
using System.Drawing;
|
||||
using System.Runtime.Versioning;
|
||||
using System.Windows;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace WebhookServer.Gui.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Minimal system tray icon using Windows Forms NotifyIcon. Owns a context menu
|
||||
/// (Open / Restart service / Exit) and toggles the main window visibility on
|
||||
/// double-click. Hide-to-tray on minimize is wired in MainWindow.xaml.cs.
|
||||
/// </summary>
|
||||
[SupportedOSPlatform("windows")]
|
||||
public sealed class TrayIcon : IDisposable
|
||||
{
|
||||
private readonly NotifyIcon _icon;
|
||||
private readonly Func<Window?> _resolveMainWindow;
|
||||
private readonly Func<Task> _restartServiceAsync;
|
||||
|
||||
public TrayIcon(Func<Window?> resolveMainWindow, Func<Task> restartServiceAsync)
|
||||
{
|
||||
_resolveMainWindow = resolveMainWindow;
|
||||
_restartServiceAsync = restartServiceAsync;
|
||||
|
||||
_icon = new NotifyIcon
|
||||
{
|
||||
Icon = LoadEmbeddedIcon(),
|
||||
Text = "Webhook Server",
|
||||
Visible = true,
|
||||
};
|
||||
_icon.DoubleClick += (_, _) => ShowMainWindow();
|
||||
_icon.ContextMenuStrip = BuildMenu();
|
||||
}
|
||||
|
||||
private ContextMenuStrip BuildMenu()
|
||||
{
|
||||
var menu = new ContextMenuStrip();
|
||||
menu.Items.Add("&Open Webhook Server", null, (_, _) => ShowMainWindow());
|
||||
menu.Items.Add(new ToolStripSeparator());
|
||||
menu.Items.Add("&Restart service", null, async (_, _) => await _restartServiceAsync().ConfigureAwait(false));
|
||||
menu.Items.Add(new ToolStripSeparator());
|
||||
menu.Items.Add("E&xit", null, (_, _) => Application.Current.Shutdown());
|
||||
return menu;
|
||||
}
|
||||
|
||||
private void ShowMainWindow()
|
||||
{
|
||||
var w = _resolveMainWindow();
|
||||
if (w is null) return;
|
||||
if (w.WindowState == WindowState.Minimized) w.WindowState = WindowState.Normal;
|
||||
w.Show();
|
||||
w.Activate();
|
||||
w.Topmost = true;
|
||||
w.Topmost = false;
|
||||
}
|
||||
|
||||
private static Icon LoadEmbeddedIcon()
|
||||
{
|
||||
// Pulled from the WPF Resource items in the csproj via the application
|
||||
// pack URI. Falling back to SystemIcons keeps the tray usable if the
|
||||
// resource is somehow missing.
|
||||
try
|
||||
{
|
||||
var uri = new Uri("pack://application:,,,/webhook-server.ico", UriKind.Absolute);
|
||||
using var stream = Application.GetResourceStream(uri).Stream;
|
||||
return new Icon(stream);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return SystemIcons.Application;
|
||||
}
|
||||
}
|
||||
|
||||
public void ShowBalloon(string title, string message)
|
||||
{
|
||||
_icon.BalloonTipTitle = title;
|
||||
_icon.BalloonTipText = message;
|
||||
_icon.ShowBalloonTip(3000);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_icon.Visible = false;
|
||||
_icon.Dispose();
|
||||
}
|
||||
}
|
||||
@@ -2,9 +2,10 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Title="About Webhook Server"
|
||||
Height="320" Width="420"
|
||||
Height="360" Width="440"
|
||||
ResizeMode="NoResize"
|
||||
WindowStartupLocation="CenterOwner"
|
||||
Icon="/webhook-server.ico"
|
||||
ShowInTaskbar="False">
|
||||
<Grid Margin="20">
|
||||
<Grid.RowDefinitions>
|
||||
|
||||
@@ -14,6 +14,14 @@
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<UseWPF>true</UseWPF>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<ApplicationIcon>..\..\resources\webhook-server.ico</ApplicationIcon>
|
||||
<AssemblyTitle>Webhook Server</AssemblyTitle>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Resource Include="..\..\resources\webhook-server.ico" Link="webhook-server.ico" />
|
||||
<Resource Include="..\..\resources\webhook-server.png" Link="webhook-server.png" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
Reference in New Issue
Block a user