From cbe8c43414bdb697c10a8e2c24af3d418e7dbb47 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Wed, 6 Mar 2024 22:18:03 +0100 Subject: [PATCH] Minor updates to tray icon --- .../GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs index ec2551af0..1bdd895ea 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs @@ -73,6 +73,7 @@ namespace Duplicati.GUI.TrayIcon application = builder.Instance as AvaloniaApp; application.SetMenu(menuItems); + application.Configure(); lifetime.Start(args); } @@ -121,7 +122,6 @@ namespace Duplicati.GUI.TrayIcon public override void Dispose() { - GC.SuppressFinalize(this); } #endregion @@ -154,7 +154,7 @@ namespace Duplicati.GUI.TrayIcon public bool Enabled { get; private set; } public MenuIcons Icon { get; private set; } public bool IsDefault { get; private set; } - private NativeMenuItem? nativeMenuItem; + private NativeMenuItem nativeMenuItem; public AvaloniaMenuItem(string text, MenuIcons icon, Action callback, IList subitems) { @@ -242,7 +242,6 @@ namespace Duplicati.GUI.TrayIcon public override void Initialize() { - //AvaloniaXamlLoader.Load(this); } public void SetIcon(TrayIcons icon) @@ -271,6 +270,12 @@ namespace Duplicati.GUI.TrayIcon } } + public void Configure() + { + this.Name = Duplicati.Library.AutoUpdater.AutoUpdateSettings.AppName; + this.trayIcon.ToolTipText = this.Name; + } + public void SetMenu(IEnumerable menuItems) { this.menuItems = menuItems.ToList();