quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 01:29:38 -04:00
Code Actions

Update to avalonia 11 preview

Browse Source
This commit is contained in:
Xjph 2022-12-21 11:00:42 -03:30
parent ff784b31d1
commit 523710ce25
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ObservatoryCore/ObservatoryCore.csproj
View File

@ -23,15 +23,17 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.15" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.15" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.15" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.15" />
<PackageReference Include="Egorozh.ColorPicker.Avalonia.Dialog" Version="0.10.7" />
<PackageReference Include="MessageBox.Avalonia" Version="2.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
<PackageReference Include="System.Speech" Version="5.0.0" />
<PackageReference Include="Avalonia" Version="11.0.0-preview4" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0-preview4" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview4" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview4" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview4" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview4" />
<PackageReference Include="Egorozh.ColorPicker.Avalonia.Dialog" Version="11.0.0-preview1" />
<PackageReference Include="MessageBox.Avalonia" Version="2.3.1-prev2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageReference Include="System.Speech" Version="7.0.0" />
</ItemGroup>
<ItemGroup>

7
ObservatoryCore/UI/MainApplication.axaml
View File

@ -7,10 +7,9 @@
<local:ViewLocator/>
</Application.DataTemplates>
<Application.Styles>
<FluentTheme Mode="Dark"/>
<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default"/>
<FluentTheme Mode="Light"/>
<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
<StyleInclude Source="avares://Egorozh.ColorPicker.Avalonia.Dialog/Themes/Default.axaml" />
<dialog:FluentColorPickerTheme Mode="Dark" />
<dialog:FluentColorPickerTheme Mode="Light" />
</Application.Styles>
</Application>

6
ObservatoryCore/UI/Views/BasicUIView.axaml.cs
View File

@ -992,9 +992,9 @@ namespace Observatory.UI.Views
NumericUpDown numericUpDown = new() { Value = intSetting, AllowSpin = true };
if (bounds != null)
{
numericUpDown.Minimum = bounds.Minimum;
numericUpDown.Maximum = bounds.Maximum;
numericUpDown.Increment = bounds.Increment;
numericUpDown.Minimum = (decimal)bounds.Minimum;
numericUpDown.Maximum = (decimal)bounds.Maximum;
numericUpDown.Increment = (decimal)bounds.Increment;
}
numericUpDown.ValueChanged += (object sender, NumericUpDownValueChangedEventArgs e) =>
{

2
ObservatoryExplorer/ObservatoryExplorer.csproj
View File

@ -32,7 +32,7 @@
</Target>
<ItemGroup>
<PackageReference Include="NLua" Version="1.5.9" />
<PackageReference Include="NLua" Version="1.6.0" />
</ItemGroup>
<ItemGroup>