Skip to content
This repository was archived by the owner on Mar 6, 2023. It is now read-only.

Commit 9632caa

Browse files
AigioLAigioL
committed
Update TrayIcon.Icons
1 parent 9f0e9cc commit 9632caa

File tree

9 files changed

+87
-14
lines changed

9 files changed

+87
-14
lines changed

‎Directory.Packages.props‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@
88
<PackageVersion Include="System.Drawing.Common" Version="5.0.3" Condition=" $(TargetFramework.StartsWith('net5')) " />
99
<PackageVersion Include="System.Drawing.Common" Version="4.6.0" Condition=" $(TargetFramework.StartsWith('netstandard2')) " />
1010
<PackageVersion Include="Microsoft.Win32.Primitives" Version="4.3.0" />
11-
<PackageVersion Include="ReactiveUI" Version="18.0.10" />
12-
<PackageVersion Include="Avalonia" Version="0.10.14" />
13-
<PackageVersion Include="Avalonia.Desktop" Version="0.10.14" />
14-
<PackageVersion Include="Avalonia.Diagnostics" Version="0.10.14" />
11+
<PackageVersion Include="ReactiveUI" Version="18.1.8" />
12+
<PackageVersion Include="Avalonia" Version="0.10.15" />
13+
<PackageVersion Include="Avalonia.Desktop" Version="0.10.15" />
14+
<PackageVersion Include="Avalonia.Diagnostics" Version="0.10.15" />
15+
<PackageVersion Include="Avalonia.ReactiveUI" Version="0.10.15" />
1516
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
1617
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
17-
<PackageVersion Include="HarfBuzzSharp" Version="2.8.2" />
18-
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2" />
19-
<PackageVersion Include="SkiaSharp" Version="2.88.0" />
20-
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0" />
18+
<PackageVersion Include="HarfBuzzSharp" Version="2.8.2.1-preview.63" />
19+
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2.1-preview.63" />
20+
<PackageVersion Include="SkiaSharp" Version="2.88.1-preview.63" />
21+
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.63" />
2122
<PackageVersion Include="NotifyIcon.Base" Version="1.1.0" />
2223
<PackageVersion Include="NotifyIcon" Version="1.1.0" />
2324
<PackageVersion Include="NotifyIcon.Windows" Version="1.1.0" />

‎Samples.AvaloniaApp1/App.axaml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,29 @@
11
<Application xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:vm="using:Samples.AvaloniaApp1.ViewModels"
4+
x:DataType="vm:ApplicationViewModel"
35
x:Class="Samples.AvaloniaApp1.App">
4-
<Application.Styles>
5-
<FluentTheme Mode="Light"/>
6-
</Application.Styles>
6+
<Application.Styles>
7+
<FluentTheme Mode="Light"/>
8+
</Application.Styles>
9+
<TrayIcon.Icons>
10+
<TrayIcons>
11+
<TrayIcon Icon="/Assets/test_icon.ico" ToolTipText="Avalonia Tray Icon ToolTip">
12+
<TrayIcon.Menu>
13+
<NativeMenu>
14+
<NativeMenuItem Header="Settings">
15+
<NativeMenu>
16+
<NativeMenuItem Header="Option 1" ToggleType="Radio" IsChecked="True" Command="{Binding ToggleCommand}" />
17+
<NativeMenuItem Header="Option 2" ToggleType="Radio" IsChecked="True" Command="{Binding ToggleCommand}" />
18+
<NativeMenuItemSeparator />
19+
<NativeMenuItem Header="Option 3" ToggleType="CheckBox" IsChecked="True" Command="{Binding ToggleCommand}" />
20+
<NativeMenuItem Icon="/Assets/test_icon.ico" Header="Restore Defaults" Command="{Binding ToggleCommand}" />
21+
</NativeMenu>
22+
</NativeMenuItem>
23+
<NativeMenuItem Header="Exit" Command="{Binding ExitCommand}" />
24+
</NativeMenu>
25+
</TrayIcon.Menu>
26+
</TrayIcon>
27+
</TrayIcons>
28+
</TrayIcon.Icons>
729
</Application>

‎Samples.AvaloniaApp1/App.axaml.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Avalonia.Markup.Xaml;
44
using Avalonia.Threading;
55
using Microsoft.Extensions.DependencyInjection;
6+
using Samples.AvaloniaApp1.ViewModels;
67
using System;
78
using System.Windows;
89

@@ -17,6 +18,11 @@ public class App : Application
1718

1819
public static new App? Current => Application.Current is App app ? app : null;
1920

21+
public App()
22+
{
23+
DataContext = new ApplicationViewModel();
24+
}
25+
2026
/// <summary>
2127
///
2228
/// </summary>

‎Samples.AvaloniaApp1/Assets/test_icon.ico‎

172 KB
Binary file not shown.

‎Samples.AvaloniaApp1/Program.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Avalonia;
22
using Avalonia.Controls.ApplicationLifetimes;
33
using Avalonia.Threading;
4+
using Avalonia.ReactiveUI;
45
using Microsoft.Extensions.DependencyInjection;
56
using System;
67
using System.Runtime.Versioning;
@@ -92,8 +93,9 @@ static void Main(string[] args)
9293
// Avalonia configuration, don't remove; also used by visual designer.
9394
static AppBuilder BuildAvaloniaApp()
9495
=> AppBuilder.Configure<App>()
95-
.UsePlatformDetect()
96-
.LogToTrace();
96+
.UseReactiveUI()
97+
.UsePlatformDetect()
98+
.LogToTrace();
9799

98100
/// <summary>
99101
///

‎Samples.AvaloniaApp1/Samples.AvaloniaApp1.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
<DefineConstants>MONO_MAC;$(DefineConstants)</DefineConstants>
2727
</PropertyGroup>
2828

29+
<ItemGroup>
30+
<None Remove="Assets\**\*" />
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<AvaloniaResource Include="Assets\**\*" />
35+
</ItemGroup>
36+
2937
<ItemGroup>
3038
<Compile Include="..\Samples.ConsoleApp1\AppDelegate.cs" />
3139
</ItemGroup>
@@ -34,6 +42,7 @@
3442
<PackageReference Include="Avalonia" />
3543
<PackageReference Include="Avalonia.Desktop" />
3644
<PackageReference Include="Avalonia.Diagnostics" />
45+
<PackageReference Include="Avalonia.ReactiveUI" />
3746
<PackageReference Include="OperatingSystem2" />
3847
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
3948
<PackageReference Include="MonoMac.NetStandard" />

‎Samples.AvaloniaApp1/ViewModels/ApplicationViewModel.cs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using Avalonia;
2+
using Avalonia.Controls.ApplicationLifetimes;
3+
using ReactiveUI;
4+
using System.Windows.Input;
5+
6+
namespace Samples.AvaloniaApp1.ViewModels;
7+
8+
public sealed class ApplicationViewModel : ReactiveObject
9+
{
10+
public ApplicationViewModel()
11+
{
12+
ExitCommand = ReactiveCommand.Create(() =>
13+
{
14+
if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
15+
{
16+
lifetime.Shutdown();
17+
}
18+
});
19+
20+
ToggleCommand = ReactiveCommand.Create(() =>
21+
{
22+
23+
});
24+
}
25+
26+
public ICommand ExitCommand { get; }
27+
28+
public ICommand ToggleCommand { get; }
29+
}

‎Samples.MauiApp1/Properties/launchSettings.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"profiles": {
3-
"Windows Machine": {
3+
"Windows Machine (Package)": {
44
"commandName": "MsixPackage",
55
"nativeDebugging": false
6+
},
7+
"Windows Machine (Unpackaged)": {
8+
"commandName": "Project"
69
}
710
}
811
}

‎Samples.MauiApp1/Samples.MauiApp1.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
3333
<!-- Samples.MauiApp1.csproj : error NU1009: 已隐式引用包 Microsoft.Windows.SDK.BuildTools 。通常无需从项目或中央包版本管理文件中引用它们。有关详细信息，请参 阅 https://aka.ms/sdkimplicitrefs -->
34+
<WindowsPackageType>None</WindowsPackageType>
3435
</PropertyGroup>
3536

3637
<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">

0 commit comments

Comments
 (0)