Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed imgs/GeneralUpdate_h.png
Binary file not shown.
25 changes: 11 additions & 14 deletions src/App.axaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
<Application xmlns="https://github.com/avaloniaui"
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="GeneralUpdate.Tool.Avalonia.App"
xmlns:local="using:GeneralUpdate.Tool.Avalonia"
x:Class="GeneralUpdate.Tools.App"
xmlns:local="using:GeneralUpdate.Tools"
xmlns:semi="https://irihi.tech/semi"
xmlns:u-semi="https://irihi.tech/ursa/themes/semi"
RequestedThemeVariant="Default">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="avares://Nlnet.Avalonia.MessageBox/Assets/Themes.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>

<Application.DataTemplates>
<local:ViewLocator/>
</Application.DataTemplates>

<Application.Styles>
<semi:SemiTheme Locale="en" />
<u-semi:SemiTheme Locale="en"/>
<FluentTheme />
<semi:SemiTheme Locale="zh-CN" />
</Application.Styles>
</Application>
</Application>
21 changes: 7 additions & 14 deletions src/App.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
using Avalonia;
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using GeneralUpdate.Tool.Avalonia.ViewModels;
using GeneralUpdate.Tool.Avalonia.Views;
using GeneralUpdate.Tools.ViewModels;
using GeneralUpdate.Tools.Views;

namespace GeneralUpdate.Tool.Avalonia;
namespace GeneralUpdate.Tools;

public partial class App : Application
{
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
}

public override void Initialize() { AvaloniaXamlLoader.Load(this); }
public override void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
desktop.MainWindow = new MainWindow();
}

desktop.MainWindow = new MainWindow { DataContext = new MainWindowViewModel() };
base.OnFrameworkInitializationCompleted();
}
}
}
Binary file modified src/Assets/avalonia-logo.ico
Binary file not shown.
200 changes: 0 additions & 200 deletions src/Common/CsprojReader.cs

This file was deleted.

Loading
Loading