Tray icon implementation.
This commit is contained in:
@@ -51,6 +51,7 @@
|
|||||||
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
|
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
|
||||||
<PackageVersion Include="System.Text.Json" Version="9.0.4" />
|
<PackageVersion Include="System.Text.Json" Version="9.0.4" />
|
||||||
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
|
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
|
||||||
|
<PackageVersion Include="H.NotifyIcon.WinUI" Version="2.3.0" />
|
||||||
<PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
|
<PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
|
||||||
<PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
|
<PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
|
||||||
<PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
|
<PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Wino.Core.Domain.Interfaces;
|
||||||
|
|
||||||
|
public interface ISystemTrayService
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes the system tray icon.
|
||||||
|
/// </summary>
|
||||||
|
void Initialize();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Shows the system tray icon.
|
||||||
|
/// </summary>
|
||||||
|
void Show();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Hides the system tray icon.
|
||||||
|
/// </summary>
|
||||||
|
void Hide();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Event fired when the tray icon is double-clicked.
|
||||||
|
/// </summary>
|
||||||
|
event EventHandler? TrayIconDoubleClicked;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets whether the tray icon is currently minimized.
|
||||||
|
/// </summary>
|
||||||
|
bool IsMinimizedToTray { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Disposes of the system tray resources.
|
||||||
|
/// </summary>
|
||||||
|
void Dispose();
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ using Wino.Core.WinUI;
|
|||||||
using Wino.Core.WinUI.Interfaces;
|
using Wino.Core.WinUI.Interfaces;
|
||||||
using Wino.Mail.Services;
|
using Wino.Mail.Services;
|
||||||
using Wino.Mail.ViewModels;
|
using Wino.Mail.ViewModels;
|
||||||
|
using Wino.Mail.WinUI.Services;
|
||||||
using Wino.Messaging.Server;
|
using Wino.Messaging.Server;
|
||||||
using Wino.Services;
|
using Wino.Services;
|
||||||
namespace Wino.Mail.WinUI;
|
namespace Wino.Mail.WinUI;
|
||||||
@@ -33,6 +34,7 @@ public partial class App : WinoApplication, IRecipient<NewMailSynchronizationReq
|
|||||||
services.AddTransient<ISettingsBuilderService, SettingsBuilderService>();
|
services.AddTransient<ISettingsBuilderService, SettingsBuilderService>();
|
||||||
services.AddTransient<IProviderService, ProviderService>();
|
services.AddTransient<IProviderService, ProviderService>();
|
||||||
services.AddSingleton<IAuthenticatorConfig, MailAuthenticatorConfiguration>();
|
services.AddSingleton<IAuthenticatorConfig, MailAuthenticatorConfiguration>();
|
||||||
|
services.AddSingleton<ISystemTrayService, SystemTrayService>();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RegisterViewModels(IServiceCollection services)
|
private void RegisterViewModels(IServiceCollection services)
|
||||||
@@ -91,6 +93,14 @@ public partial class App : WinoApplication, IRecipient<NewMailSynchronizationReq
|
|||||||
|
|
||||||
await InitializeServicesAsync();
|
await InitializeServicesAsync();
|
||||||
|
|
||||||
|
// Initialize system tray
|
||||||
|
var systemTrayService = Services.GetService<ISystemTrayService>();
|
||||||
|
if (systemTrayService != null)
|
||||||
|
{
|
||||||
|
systemTrayService.Initialize();
|
||||||
|
systemTrayService.Show(); // Explicitly show the tray icon
|
||||||
|
}
|
||||||
|
|
||||||
if (MainWindow is not IWinoShellWindow shellWindow) throw new ArgumentException("MainWindow must implement IWinoShellWindow");
|
if (MainWindow is not IWinoShellWindow shellWindow) throw new ArgumentException("MainWindow must implement IWinoShellWindow");
|
||||||
|
|
||||||
shellWindow.HandleAppActivation(args);
|
shellWindow.HandleAppActivation(args);
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 124 KiB |
@@ -0,0 +1,196 @@
|
|||||||
|
using System;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using H.NotifyIcon;
|
||||||
|
using Microsoft.UI.Xaml;
|
||||||
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
using Microsoft.UI.Xaml.Media.Imaging;
|
||||||
|
using Wino.Core.Domain.Interfaces;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Wino.Core.WinUI;
|
||||||
|
|
||||||
|
namespace Wino.Mail.WinUI.Services;
|
||||||
|
|
||||||
|
public class SystemTrayService : ISystemTrayService
|
||||||
|
{
|
||||||
|
private TaskbarIcon? _taskbarIcon;
|
||||||
|
private bool _isDisposed;
|
||||||
|
private bool _isMinimizedToTray;
|
||||||
|
|
||||||
|
public bool IsMinimizedToTray => _isMinimizedToTray;
|
||||||
|
|
||||||
|
public event EventHandler? TrayIconDoubleClicked;
|
||||||
|
|
||||||
|
public void Initialize()
|
||||||
|
{
|
||||||
|
if (_taskbarIcon != null) return;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine("Starting system tray initialization...");
|
||||||
|
|
||||||
|
// Create TaskbarIcon first
|
||||||
|
_taskbarIcon = new TaskbarIcon();
|
||||||
|
|
||||||
|
// Set basic properties first
|
||||||
|
_taskbarIcon.ToolTipText = "Wino Mail";
|
||||||
|
|
||||||
|
// Configure the taskbar icon with icon loading
|
||||||
|
var iconUri = new Uri("ms-appx:///Assets/Wino_Icon.ico");
|
||||||
|
var bitmapImage = new BitmapImage(iconUri);
|
||||||
|
_taskbarIcon.IconSource = bitmapImage;
|
||||||
|
System.Diagnostics.Debug.WriteLine("Icon source set");
|
||||||
|
|
||||||
|
// Create context menu
|
||||||
|
var contextMenu = new MenuFlyout();
|
||||||
|
|
||||||
|
// Show Window menu item
|
||||||
|
var showMenuItem = new MenuFlyoutItem
|
||||||
|
{
|
||||||
|
Text = "Show Wino Mail",
|
||||||
|
Icon = new SymbolIcon(Symbol.Home)
|
||||||
|
};
|
||||||
|
showMenuItem.Click += ShowMenuItem_Click;
|
||||||
|
contextMenu.Items.Add(showMenuItem);
|
||||||
|
System.Diagnostics.Debug.WriteLine("Show menu item added");
|
||||||
|
|
||||||
|
// Separator
|
||||||
|
contextMenu.Items.Add(new MenuFlyoutSeparator());
|
||||||
|
|
||||||
|
// Exit menu item
|
||||||
|
var exitMenuItem = new MenuFlyoutItem
|
||||||
|
{
|
||||||
|
Text = "Exit",
|
||||||
|
Icon = new SymbolIcon(Symbol.Cancel)
|
||||||
|
};
|
||||||
|
exitMenuItem.Click += ExitMenuItem_Click;
|
||||||
|
contextMenu.Items.Add(exitMenuItem);
|
||||||
|
System.Diagnostics.Debug.WriteLine("Exit menu item added");
|
||||||
|
|
||||||
|
// Set context menu
|
||||||
|
_taskbarIcon.ContextFlyout = contextMenu;
|
||||||
|
|
||||||
|
// Handle double-click using the proper event
|
||||||
|
_taskbarIcon.LeftClickCommand = new RelayCommand(OnTrayIconLeftClick);
|
||||||
|
|
||||||
|
// Set visibility and create explicitly
|
||||||
|
_taskbarIcon.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
// Try ForceCreate to ensure the icon is properly created in the system tray
|
||||||
|
_taskbarIcon.ForceCreate();
|
||||||
|
System.Diagnostics.Debug.WriteLine("System tray icon created and visible");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine($"Failed to initialize system tray: {ex.Message}");
|
||||||
|
System.Diagnostics.Debug.WriteLine($"Stack trace: {ex.StackTrace}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ShowMenuItem_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine("Show menu item clicked");
|
||||||
|
TrayIconDoubleClicked?.Invoke(this, EventArgs.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ExitMenuItem_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine("Exit menu item clicked");
|
||||||
|
ExitApplication();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTrayIconLeftClick()
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine("Tray icon left clicked");
|
||||||
|
TrayIconDoubleClicked?.Invoke(this, EventArgs.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Show()
|
||||||
|
{
|
||||||
|
if (_taskbarIcon != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_taskbarIcon.Visibility = Visibility.Visible;
|
||||||
|
_taskbarIcon.ForceCreate(); // Ensure the icon is properly created and visible
|
||||||
|
_isMinimizedToTray = true;
|
||||||
|
System.Diagnostics.Debug.WriteLine("System tray icon set to visible and force created");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine($"Failed to show system tray icon: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine("TaskbarIcon is null when trying to show");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Hide()
|
||||||
|
{
|
||||||
|
if (_taskbarIcon != null)
|
||||||
|
{
|
||||||
|
_taskbarIcon.Visibility = Visibility.Collapsed;
|
||||||
|
_isMinimizedToTray = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ExitApplication()
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine("Attempting to exit application...");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Clean up the tray icon first
|
||||||
|
Dispose();
|
||||||
|
|
||||||
|
// Get the main window and close it properly
|
||||||
|
if (WinoApplication.MainWindow is ShellWindow shellWindow)
|
||||||
|
{
|
||||||
|
// Force close the window without minimizing to tray
|
||||||
|
shellWindow.ForceClose();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Fallback to application exit
|
||||||
|
Application.Current.Exit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine($"Error during application exit: {ex.Message}");
|
||||||
|
// Force exit if normal exit fails
|
||||||
|
Environment.Exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_isDisposed) return;
|
||||||
|
|
||||||
|
_taskbarIcon?.Dispose();
|
||||||
|
_taskbarIcon = null;
|
||||||
|
_isDisposed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simple RelayCommand implementation for the tray icon
|
||||||
|
public class RelayCommand : ICommand
|
||||||
|
{
|
||||||
|
private readonly Action _execute;
|
||||||
|
private readonly Func<bool>? _canExecute;
|
||||||
|
|
||||||
|
public RelayCommand(Action execute, Func<bool>? canExecute = null)
|
||||||
|
{
|
||||||
|
_execute = execute ?? throw new ArgumentNullException(nameof(execute));
|
||||||
|
_canExecute = canExecute;
|
||||||
|
}
|
||||||
|
|
||||||
|
public event EventHandler? CanExecuteChanged;
|
||||||
|
|
||||||
|
public bool CanExecute(object? parameter) => _canExecute?.Invoke() ?? true;
|
||||||
|
|
||||||
|
public void Execute(object? parameter) => _execute();
|
||||||
|
|
||||||
|
public void RaiseCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
|
||||||
|
}
|
||||||
@@ -19,6 +19,7 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow, IRecipient
|
|||||||
{
|
{
|
||||||
public IStatePersistanceService StatePersistanceService { get; } = WinoApplication.Current.Services.GetService<IStatePersistanceService>() ?? throw new Exception("StatePersistanceService not registered in DI container.");
|
public IStatePersistanceService StatePersistanceService { get; } = WinoApplication.Current.Services.GetService<IStatePersistanceService>() ?? throw new Exception("StatePersistanceService not registered in DI container.");
|
||||||
public IPreferencesService PreferencesService { get; } = WinoApplication.Current.Services.GetService<IPreferencesService>() ?? throw new Exception("PreferencesService not registered in DI container.");
|
public IPreferencesService PreferencesService { get; } = WinoApplication.Current.Services.GetService<IPreferencesService>() ?? throw new Exception("PreferencesService not registered in DI container.");
|
||||||
|
private readonly ISystemTrayService _systemTrayService;
|
||||||
|
|
||||||
public ShellWindow()
|
public ShellWindow()
|
||||||
{
|
{
|
||||||
@@ -30,6 +31,17 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow, IRecipient
|
|||||||
MinWidth = 420;
|
MinWidth = 420;
|
||||||
MinHeight = 420;
|
MinHeight = 420;
|
||||||
ConfigureTitleBar();
|
ConfigureTitleBar();
|
||||||
|
|
||||||
|
// Initialize system tray service
|
||||||
|
_systemTrayService = WinoApplication.Current.Services.GetService<ISystemTrayService>() ?? throw new Exception("SystemTrayService not registered in DI container.");
|
||||||
|
_systemTrayService.Initialize();
|
||||||
|
_systemTrayService.TrayIconDoubleClicked += OnTrayIconDoubleClicked;
|
||||||
|
|
||||||
|
// Handle window closing event to minimize to tray instead of closing
|
||||||
|
Closed += OnWindowClosed;
|
||||||
|
|
||||||
|
// Use the AppWindow.Closing event to handle the close request
|
||||||
|
AppWindow.Closing += OnAppWindowClosing;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ConfigureTitleBar()
|
private void ConfigureTitleBar()
|
||||||
@@ -119,4 +131,56 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow, IRecipient
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnAppWindowClosing(object sender, Microsoft.UI.Windowing.AppWindowClosingEventArgs e)
|
||||||
|
{
|
||||||
|
// Cancel the close and minimize to tray instead
|
||||||
|
e.Cancel = true;
|
||||||
|
MinimizeToTray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnWindowClosed(object sender, WindowEventArgs e)
|
||||||
|
{
|
||||||
|
// Clean up tray icon when window is actually closed
|
||||||
|
_systemTrayService?.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void MinimizeToTray()
|
||||||
|
{
|
||||||
|
// Hide the window and show tray icon
|
||||||
|
this.Hide();
|
||||||
|
_systemTrayService.Show();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTrayIconDoubleClicked(object? sender, EventArgs e)
|
||||||
|
{
|
||||||
|
// Restore the window from tray
|
||||||
|
RestoreFromTray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RestoreFromTray()
|
||||||
|
{
|
||||||
|
if (_systemTrayService.IsMinimizedToTray)
|
||||||
|
{
|
||||||
|
// Show the window and hide tray icon
|
||||||
|
this.Show();
|
||||||
|
this.Activate();
|
||||||
|
_systemTrayService.Hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ForceClose()
|
||||||
|
{
|
||||||
|
// Unsubscribe from the closing event to avoid infinite loop
|
||||||
|
AppWindow.Closing -= OnAppWindowClosing;
|
||||||
|
|
||||||
|
// Clean up system tray
|
||||||
|
_systemTrayService?.Dispose();
|
||||||
|
|
||||||
|
// Close the window
|
||||||
|
this.Close();
|
||||||
|
|
||||||
|
// Exit the application
|
||||||
|
Application.Current.Exit();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,6 +72,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="Assets\LockScreenLogo.scale-200.png" />
|
<Content Include="Assets\LockScreenLogo.scale-200.png" />
|
||||||
<Content Include="Assets\StoreLogo.png" />
|
<Content Include="Assets\StoreLogo.png" />
|
||||||
|
<Content Include="Assets\Wino_Icon.ico" />
|
||||||
<Content Include="JS\editor.html" />
|
<Content Include="JS\editor.html" />
|
||||||
<Content Include="JS\editor.js" />
|
<Content Include="JS\editor.js" />
|
||||||
<Content Include="JS\global.css" />
|
<Content Include="JS\global.css" />
|
||||||
@@ -112,6 +113,7 @@
|
|||||||
<PackageReference Include="sqlite-net-pcl" />
|
<PackageReference Include="sqlite-net-pcl" />
|
||||||
<PackageReference Include="EmailValidation" />
|
<PackageReference Include="EmailValidation" />
|
||||||
<PackageReference Include="WinUIEx" />
|
<PackageReference Include="WinUIEx" />
|
||||||
|
<PackageReference Include="H.NotifyIcon.WinUI" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Wino.Core.WinUI\Wino.Core.WinUI.csproj" />
|
<ProjectReference Include="..\Wino.Core.WinUI\Wino.Core.WinUI.csproj" />
|
||||||
|
|||||||
Reference in New Issue
Block a user