feat: 应用图标 + 浅色/深色主题 + 消息复制 + 详情可选中复制
实现 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:
@@ -0,0 +1,54 @@
|
||||
using System.Windows;
|
||||
|
||||
// 双开 WPF + WinForms 时,Application 在两个命名空间都有,固定走 WPF 的。
|
||||
using Application = System.Windows.Application;
|
||||
|
||||
namespace WindowsGotify.Services;
|
||||
|
||||
public static class ThemeService
|
||||
{
|
||||
public const string Light = "Light";
|
||||
public const string Dark = "Dark";
|
||||
public const string System = "System";
|
||||
|
||||
public static event EventHandler? Changed;
|
||||
|
||||
private static string _current = Light;
|
||||
|
||||
public static string Current => _current;
|
||||
|
||||
/// <summary>
|
||||
/// 切换到指定主题。currentTheme = "Light" / "Dark" / "System"(System 暂时等同 Light,V1 简化)。
|
||||
/// </summary>
|
||||
public static void Apply(string themeName)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(themeName)) themeName = Light;
|
||||
// "System" 在 V1 简化:用 Light(后续可接 Windows 主题 API)
|
||||
if (themeName == System) themeName = Light;
|
||||
|
||||
_current = themeName;
|
||||
var merged = Application.Current.Resources.MergedDictionaries;
|
||||
|
||||
// 移除已有的 Themes/* 字典
|
||||
for (int i = merged.Count - 1; i >= 0; i--)
|
||||
{
|
||||
var src = merged[i].Source?.ToString();
|
||||
if (src != null && src.Contains("/Themes/", StringComparison.OrdinalIgnoreCase))
|
||||
merged.RemoveAt(i);
|
||||
}
|
||||
|
||||
// 加载新主题
|
||||
var newDict = new ResourceDictionary
|
||||
{
|
||||
Source = new Uri($"/Themes/{themeName}.xaml", UriKind.Relative)
|
||||
};
|
||||
merged.Add(newDict);
|
||||
|
||||
Changed?.Invoke(null, EventArgs.Empty);
|
||||
}
|
||||
|
||||
public static void Toggle()
|
||||
{
|
||||
Apply(_current == Dark ? Light : Dark);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user