DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

UI - Use AssemblyTitle instead of AssemblyName

Browse Source
This commit is contained in:
Robert 2022-08-07 20:20:44 +02:00
parent 87e87ae15d
commit 39a52591b6
7 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
View File

@ -6,8 +6,8 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<OutputPath>bin</OutputPath> <OutputPath>bin</OutputPath>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath> <AssemblyTitle>Artemis 2</AssemblyTitle>
<AssemblyName>Artemis 2</AssemblyName> <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AvaloniaResource Include="Assets\**" /> <AvaloniaResource Include="Assets\**" />

2
src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
View File

@ -6,8 +6,8 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<OutputPath>bin</OutputPath> <OutputPath>bin</OutputPath>
<AssemblyTitle>Artemis 2</AssemblyTitle>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<AssemblyName>Artemis 2</AssemblyName>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AvaloniaResource Include="Assets\**" /> <AvaloniaResource Include="Assets\**" />

13
src/Artemis.UI.Windows/App.axaml.cs
View File

@ -1,6 +1,5 @@
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.Windows.Ninject; using Artemis.UI.Windows.Ninject;
using Artemis.UI.Windows.Providers;
using Artemis.UI.Windows.Providers.Input; using Artemis.UI.Windows.Providers.Input;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
@ -14,6 +13,12 @@ namespace Artemis.UI.Windows
{ {
public class App : Application public class App : Application
{ {
// ReSharper disable NotAccessedField.Local
private ApplicationStateManager? _applicationStateManager;
// ReSharper restore NotAccessedField.Local
private StandardKernel? _kernel;
public override void Initialize() public override void Initialize()
{ {
_kernel = ArtemisBootstrapper.Bootstrap(this, new WindowsModule()); _kernel = ArtemisBootstrapper.Bootstrap(this, new WindowsModule());
@ -37,11 +42,5 @@ namespace Artemis.UI.Windows
IInputService inputService = standardKernel.Get<IInputService>(); IInputService inputService = standardKernel.Get<IInputService>();
inputService.AddInputProvider(standardKernel.Get<WindowsInputProvider>()); inputService.AddInputProvider(standardKernel.Get<WindowsInputProvider>());
} }
private StandardKernel? _kernel;
// ReSharper disable NotAccessedField.Local
private ApplicationStateManager? _applicationStateManager;
// ReSharper restore NotAccessedField.Local
} }
} }

6
src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
View File

@ -7,10 +7,8 @@
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<OutputPath>bin</OutputPath> <OutputPath>bin</OutputPath>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<Company>Artemis RGB</Company> <AssemblyTitle>Artemis 2</AssemblyTitle>
<Product>Artemis 2.0</Product> <ApplicationIcon>..\Artemis.UI\Assets\Images\Logo\application.ico</ApplicationIcon>
<ApplicationIcon>..\Artemis.UI\Assets\Images\Logo\application.ico</ApplicationIcon>
<AssemblyName>Artemis 2</AssemblyName>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AvaloniaResource Include="Assets\**" /> <AvaloniaResource Include="Assets\**" />

2
src/Artemis.UI.Windows/Providers/AutoRunProvider.cs
View File

@ -41,7 +41,7 @@ public class AutoRunProvider : IAutoRunProvider
private async Task CreateAutoRunTask(TimeSpan autoRunDelay) private async Task CreateAutoRunTask(TimeSpan autoRunDelay)
{ {
await using Stream taskFile = _assetLoader.Open(new Uri("avares://Artemis 2/Assets/autorun.xml")); await using Stream taskFile = _assetLoader.Open(new Uri("avares://Artemis.UI.Windows/Assets/autorun.xml"));
XDocument document = await XDocument.LoadAsync(taskFile, LoadOptions.None, CancellationToken.None); XDocument document = await XDocument.LoadAsync(taskFile, LoadOptions.None, CancellationToken.None);
XElement task = document.Descendants().First(); XElement task = document.Descendants().First();

6
src/Artemis.UI.Windows/Providers/CursorProvider.cs
View File

@ -11,9 +11,9 @@ public class CursorProvider : ICursorProvider
{ {
public CursorProvider(IAssetLoader assetLoader) public CursorProvider(IAssetLoader assetLoader)
{ {
Rotate = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis 2/Assets/Cursors/aero_rotate.png"))), new PixelPoint(21, 10)); Rotate = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis.UI.Windows/Assets/Cursors/aero_rotate.png"))), new PixelPoint(21, 10));
Drag = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis 2/Assets/Cursors/aero_drag.png"))), new PixelPoint(11, 3)); Drag = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis.UI.Windows/Assets/Cursors/aero_drag.png"))), new PixelPoint(11, 3));
DragHorizontal = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis 2/Assets/Cursors/aero_drag_horizontal.png"))), new PixelPoint(16, 5)); DragHorizontal = new Cursor(new Bitmap(assetLoader.Open(new Uri("avares://Artemis.UI.Windows/Assets/Cursors/aero_drag_horizontal.png"))), new PixelPoint(16, 5));
} }
public Cursor Rotate { get; } public Cursor Rotate { get; }

1
src/Artemis.UI.Windows/Providers/UpdateProvider.cs
View File

@ -158,7 +158,6 @@ public class UpdateProvider : IUpdateProvider, IDisposable
.AddText("An update is available") .AddText("An update is available")
.AddButton(new ToastButton().SetContent("Install").AddArgument("action", "install").SetBackgroundActivation()) .AddButton(new ToastButton().SetContent("Install").AddArgument("action", "install").SetBackgroundActivation())
.AddButton(new ToastButton().SetContent("View changes").AddArgument("action", "view-changes")) .AddButton(new ToastButton().SetContent("View changes").AddArgument("action", "view-changes"))
.AddHeroImage(new Uri(@"C:\Repos\Artemis\src\Artemis.UI\Assets\Images\home-banner.png"))
.Show(); .Show();
} }