GithubStar/SteamTools
1
0
Fork 0
mirror of https://github.com/BeyondDimension/SteamTools.git synced 2026-10-27 04:41:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc

Browse Source
This commit is contained in:
Aigio Liu
2023-03-22 13:40:55 +08:00
parent eb68cd60ad
commit f6056bf4e9
12 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -574,6 +574,9 @@ iOSInjectionProject/
*.out
*.app
# macOS
.DS_Store
# WTTS
.idea
/pkg
src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>BD.WTTS</RootNamespace>
<DefineConstants>AVALONIA;$(DefineConstants)</DefineConstants>
<ApplicationId>net.steampp.app.v3</ApplicationId>
<ApplicationId>net.steampp.app</ApplicationId>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net3')) OR $(TargetFramework.StartsWith('net4')) OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
src/BD.WTTS.Client.Avalonia.App/Info.plist
+1 -1
View File
@@ -25,6 +25,6 @@
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
<key>CFBundleIdentifier</key>
<string>net.steampp.app.v3</string>
<string>net.steampp.app</string>
</dict>
</plist>
src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs
+2 -2
View File
@@ -1,11 +1,11 @@
//steampp
// steampp
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views")]
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Styling")]
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Controls")]
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Pages")]
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Windows")]
//FluentAvaloniaUI
// FluentAvaloniaUI
[assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Controls")]
[assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Windowing")]
[assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Controls.Primitives")]
src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs
+8 -1
View File
@@ -8,7 +8,14 @@ public sealed partial class App : Application
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
try
{
AvaloniaXamlLoader.Load(this);
}
catch (Exception ex)
{
Log.Error(TAG, ex, "load Xaml fail.");
}
}
public override void RegisterServices()
src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs
-4
View File
@@ -1,7 +1,3 @@
using Avalonia.Markup.Xaml.Styling;
using FluentAvalonia.Interop;
using FluentAvalonia.Styling;
namespace BD.WTTS.UI.Styling;
/// <summary>
src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs
+10 -4
View File
@@ -1,10 +1,9 @@
using Avalonia.Controls;
using FluentAvalonia.UI.Controls;
namespace BD.WTTS.UI.Views.Pages;
public partial class MainView : UserControl
{
const string TAG = "MainView";
public MainView()
{
InitializeComponent();
@@ -12,7 +11,14 @@ public partial class MainView : UserControl
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
try
{
AvaloniaXamlLoader.Load(this);
}
catch (Exception ex)
{
Log.Error(TAG, ex, "load Xaml fail.");
}
var debug = this.FindControl<Button>("DebugButton");
src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/CoreWindow.props.cs
-2
View File
@@ -1,5 +1,3 @@
using FluentAvalonia.UI.Windowing;
namespace BD.WTTS.UI.Views.Windows;
public partial class CoreWindow : Window, IStyleable
src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/MainWindow.axaml.cs
+10 -6
View File
@@ -1,12 +1,9 @@
using FluentAvalonia.Styling;
using FluentAvalonia.UI;
using FluentAvalonia.UI.Media;
using FluentAvalonia.UI.Windowing;
namespace BD.WTTS.UI.Views.Windows;
public sealed partial class MainWindow : AppWindow
{
const string TAG = "MainWindow";
public MainWindow()
{
InitializeComponent();
@@ -30,6 +27,13 @@ public sealed partial class MainWindow : AppWindow
void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
try
{
AvaloniaXamlLoader.Load(this);
}
catch (Exception ex)
{
Log.Error(TAG, ex, "load Xaml fail.");
}
}
}
src/BD.WTTS.Client/App/IApplication.Log.cs
+9 -2
View File
@@ -78,9 +78,16 @@ partial interface IApplication
builder.SetMinimumLevel(minLevel);
SetNLoggerMinLevel(minLevel);
// 可以多个日志提供同时用，比如还可以在 Win 平台再添加一个 Windows 事件日志
builder.AddNLog(NLogManager.Configuration); // 添加 NLog 日志
#if (WINDOWS || MACCATALYST || MACOS || LINUX) && !(IOS || ANDROID)
builder.AddConsole(); // 添加控制台日志
#endif
#if WINDOWS
builder.AddEventLog(new Microsoft.Extensions.Logging.EventLog.EventLogSettings()
{
SourceName = Constants.HARDCODED_APP_NAME,
}); // 添加 Windows 事件日志
#endif
}
return (minLevel, _);
src/BD.WTTS.Client/BD.WTTS.Client.csproj
+2
View File
@@ -124,6 +124,7 @@
<PackageReference Include="System.Management" />
<PackageReference Include="Aigio.WinDivertSharp" />
<PackageReference Include="BD.Common.Pinyin.TinyPinyin" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
@@ -144,6 +145,7 @@
<PackageReference Include="Avalonia.Xaml.Behaviors" />
<PackageReference Include="Avalonia.AvaloniaEdit" />
<PackageReference Include="FluentAvaloniaUI" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
src/ImplicitUsings.Avalonia.cs
+10 -1
View File
@@ -20,6 +20,7 @@ global using Avalonia.Data.Converters;
global using Avalonia.Metadata;
global using Avalonia.Markup;
global using Avalonia.Markup.Xaml;
global using Avalonia.Markup.Xaml.Styling;
global using Avalonia.Platform;
global using Avalonia.Media;
global using Avalonia.Media.Imaging;
@@ -41,4 +42,12 @@ global using Avalonia.Layout;
global using Avalonia.LogicalTree;
global using Avalonia.Rendering;
global using Avalonia.ReactiveUI;
global using Avalonia.Platform.Storage;
global using Avalonia.Platform.Storage;
// FluentAvaloniaUI
global using FluentAvalonia.Interop;
global using FluentAvalonia.Styling;
global using FluentAvalonia.UI.Controls;
global using FluentAvalonia.UI.Windowing;
global using FluentAvalonia.UI;
global using FluentAvalonia.UI.Media;