KennethCheng/Windows-Gotify-Client
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: 应用图标 + 浅色/深色主题 + 消息复制 + 详情可选中复制

Browse Source 
实现 4 个用户需求:

1. 应用图标(Gotify Ducker 吉祥物)
   - Assets/gotify-mascot.png:用户提供的 PNG(196x196)
   - Assets/Build-Icon.ps1:用 System.Drawing 高质量缩放生成多分辨率 ICO(16/24/32/48/64/128/196),PNG 数据嵌入 ICO 容器(Win10+ 原生支持)
   - Assets/gotify-mascot.ico:7 个分辨率的 PNG-in-ICO,41KB
   - WindowsGotify.csproj 加 <ApplicationIcon> 让 EXE 资源带这个图标
   - csproj 加 <None Update=Assets\gotify-mascot.ico><CopyToOutputDirectory> 发布时一并拷
   - TrayIconService 加 LoadMascotIcon() 静态方法,优先从 EXE 同目录 Assets\ 下找,找不到回退到 SystemIcons.Application
   - Windows 通知中心的 toast 会自动用 ApplicationIcon(无需单独设)

2. 浅色/深色主题
   - AppConfig 新增 UiConfig { Theme: "Light"|"Dark"|"System" }
   - Themes/Light.xaml + Themes/Dark.xaml:两个 ResourceDictionary,定义 WindowBackground/CardBackground/CardAltBackground/BorderColor/PrimaryText/SecondaryText/MutedText/AccentBrush/SuccessDot/ErrorDot/PendingDot/PriorityUrgent/High/Normal/Low 等
   - Services/ThemeService.cs:静态类,Apply(name) 卸载旧主题字典 + 加载新主题字典到 Application.Resources.MergedDictionaries,Changed 事件,Toggle() 切换
   - MainWindow.xaml 所有颜色全部改用 {DynamicResource Xxx},主题切换时立刻刷新
   - PriorityToBrushConverter 改用 Application.Current.TryFindResource("PriorityXxx") 拿色,跟着主题走
   - 主窗右上角加 ☼/☾ 切换按钮,点一下切主题并自动写回 config.json

3. 消息正文复制按钮
   - 详情面板"消息正文"标签右侧加 [复制] 按钮
   - CopyMessageButton_Click:用 System.Windows.Clipboard.SetText 把全文(应用名/标题/时间/优先级/正文/URL)写进剪贴板
   - 按钮反馈:复制后短暂显示"已复制"1.5 秒再恢复
   - BuildFullMessageText 静态方法统一格式化

4. 详情面板可选中复制
   - DetailMessage 从 TextBlock 改成 TextBox(IsReadOnly=True, BorderThickness=0, Background=Transparent, IsReadOnlyCaretVisible=True)
   - DetailTitle / DetailUrl 也改成 TextBox IsReadOnly,用户能 Ctrl+A 全选、鼠标拉黑
   - DetailUrl 双击打开(之前是单击,TextBlock 没法选中;TextBox 单击会进入文字选择模式影响双击识别,所以改成双击)

WPF+WinForms 双开:Application/Brush/Color/Clipboard/Button 多个类型两个命名空间都有,ThemeService/ValueConverters/MainWindow.xaml.cs 都加 using alias 固定走 WPF 的;TrayIconService 加 using System.IO 补 Path/File。

实测:新进程跑起来后 ApplicationCache refreshed count=6(用户新建了一个 app),WebSocket connected,真实消息流处理正常(短信号码 19999999999/15889931832),通知弹出。
This commit is contained in:
KennethCheng
2026-09-06 23:02:03 +08:00
parent 60ae4eb43a
commit 021a45465d
13 changed files with 496 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.xaml.cs
+96 -8
View File
@@ -13,6 +13,8 @@ using MessageBox = System.Windows.MessageBox;
using Color = System.Windows.Media.Color;
using Brush = System.Windows.Media.Brush;
using Brushes = System.Windows.Media.Brushes;
using Clipboard = System.Windows.Clipboard;
using Button = System.Windows.Controls.Button;
namespace WindowsGotify;
@@ -64,6 +66,7 @@ public partial class MainWindow : Window
UpdateAppCount();
SetStatus("等待连接", StatusKind.Pending);
UpdateHistoryCount();
UpdateThemeButtonLabel();
// 实时消息追加到历史
_webSocket.MessageReceived += OnLiveMessage;
@@ -259,17 +262,102 @@ public partial class MainWindow : Window
{
if (DetailUrl.Tag is string url && !string.IsNullOrWhiteSpace(url))
{
try
OpenUrl(url);
}
}
private void DetailUrl_DoubleClick(object sender, MouseButtonEventArgs e)
{
if (DetailUrl.Text is string url && !string.IsNullOrWhiteSpace(url))
{
OpenUrl(url);
}
}
private void OpenUrl(string url)
{
try
{
Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
}
catch (Exception ex)
{
_logger?.Error("Failed to open click url.", ex);
MessageBox.Show($"无法打开链接:{ex.Message}", "Windows Gotify",
MessageBoxButton.OK, MessageBoxImage.Warning);
}
}
private void CopyMessageButton_Click(object sender, RoutedEventArgs e)
{
if (HistoryList.SelectedItem is not GotifyMessage msg) return;
var text = BuildFullMessageText(msg);
try
{
Clipboard.SetText(text);
_logger?.Info($"Copied message to clipboard. id={msg.Id}");
// 按钮反馈:短暂显示「已复制 ✓」
if (sender is Button btn)
{
Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
}
catch (Exception ex)
{
_logger?.Error("Failed to open click url.", ex);
MessageBox.Show($"无法打开链接:{ex.Message}", "Windows Gotify",
MessageBoxButton.OK, MessageBoxImage.Warning);
var origContent = btn.Content;
btn.Content = "已复制";
var timer = new System.Windows.Threading.DispatcherTimer
{
Interval = TimeSpan.FromSeconds(1.5)
};
timer.Tick += (_, _) =>
{
btn.Content = origContent;
timer.Stop();
};
timer.Start();
}
}
catch (Exception ex)
{
_logger?.Error("Copy to clipboard failed.", ex);
MessageBox.Show($"复制失败:{ex.Message}", "Windows Gotify",
MessageBoxButton.OK, MessageBoxImage.Warning);
}
}
private static string BuildFullMessageText(GotifyMessage msg)
{
var sb = new System.Text.StringBuilder();
sb.Append("[");
sb.Append(string.IsNullOrWhiteSpace(msg.AppName) ? $"App {msg.AppId}" : msg.AppName);
sb.Append("] ");
sb.Append(string.IsNullOrWhiteSpace(msg.Title) ? "(无标题)" : msg.Title);
sb.AppendLine();
sb.Append("时间: ");
sb.AppendLine(msg.Date.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"));
sb.Append("优先级: P");
sb.AppendLine(msg.Priority.ToString());
sb.AppendLine();
sb.AppendLine(msg.Message ?? "");
if (!string.IsNullOrWhiteSpace(msg.ClickUrl))
{
sb.AppendLine();
sb.AppendLine(msg.ClickUrl);
}
return sb.ToString();
}
private void ThemeToggleButton_Click(object sender, RoutedEventArgs e)
{
ThemeService.Toggle();
UpdateThemeButtonLabel();
// 持久化
if (_config != null && _configService != null)
{
_config.Ui.Theme = ThemeService.Current;
_ = _configService.SaveAsync(_config);
}
}
private void UpdateThemeButtonLabel()
{
ThemeToggleButton.Content = ThemeService.Current == ThemeService.Dark ? "☾ 深色" : "☼ 浅色";
}
private async void SaveButton_Click(object sender, RoutedEventArgs e)