2009Scape/Saradomin-Launcher
1
0
Fork 0
mirror of https://gitlab.com/2009scape/Saradomin-Launcher.git synced 2026-08-01 14:19:14 -06:00
Code Issues Projects Releases Packages Wiki Activity

Update Glitonea Framework to latest version.

Browse source
This commit is contained in:
vddCore 2024-04-28 22:02:28 +02:00
parent ec6d05f098
commit 7a5aea1701
13 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glitonea

@ -1 +1 @@
Subproject commit 9fb6de8da53dbdde9d782ce4ab1c36c61d98ff71
Subproject commit 9a74670a63f98f5e9ea4bbeefb893400015b382a

7
Saradomin/App.axaml
View file

@ -1,7 +1,10 @@
<Application x:Class="Saradomin.App"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:glitonea="clr-namespace:Glitonea;assembly=Glitonea">
<Application.Resources>
<glitonea:Glitonea />
<Color x:Key="DarkBackgroundColor">#3E3529</Color>
<Color x:Key="DarkTranslucentBackgroundColor">#CC3E3529</Color>
<Color x:Key="DarkForegroundColor">#3E3529</Color>
@ -109,7 +112,5 @@
<StyleInclude Source="avares://Saradomin/Resources/Styles/RadioButton.axaml" />
<StyleInclude Source="avares://Saradomin/Resources/Styles/ListBox.axaml" />
<StyleInclude Source="avares://Saradomin/Resources/Styles/ListBoxItem.axaml" />
<StyleInclude Source="avares://Glitonea/Glitonea.axaml" />
</Application.Styles>
</Application>

1
Saradomin/App.axaml.cs
View file

@ -14,7 +14,6 @@ namespace Saradomin
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
GlitoneaCore.Initialize();
}
public override void OnFrameworkInitializationCompleted()

7
Saradomin/Infrastructure/Services/ClientLaunchService.cs
View file

@ -1,12 +1,7 @@
using System;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Net.Http;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Avalonia;
using Glitonea.Extensions;
using Glitonea;
using Saradomin.Utilities;
namespace Saradomin.Infrastructure.Services

3
Saradomin/Program.cs
View file

@ -1,5 +1,7 @@
using System;
using System.Reflection;
using Avalonia;
using Glitonea;
namespace Saradomin
{
@ -13,6 +15,7 @@ namespace Saradomin
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UseGlitoneaFramework(Assembly.GetExecutingAssembly())
.UsePlatformDetect()
.LogToTrace();
}

2
Saradomin/Saradomin.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Version>1.6.1</Version>
<Version>1.7.0</Version>
<NoWarn>IL2026;CS0067</NoWarn>
<ApplicationIcon>Resources\Icons\saradomin.ico</ApplicationIcon>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>

4
Saradomin/View/Windows/MainWindow.axaml
View file

@ -1,4 +1,4 @@
<glitonea:WindowEx x:Class="Saradomin.View.Windows.MainWindow"
<Window x:Class="Saradomin.View.Windows.MainWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Saradomin.View.Controls"
@ -167,4 +167,4 @@
</Grid>
</Border>
</Grid>
</glitonea:WindowEx>
</Window>

5
Saradomin/View/Windows/NotificationBox.axaml
View file

@ -1,7 +1,6 @@
<glitonea:WindowEx x:Class="Saradomin.View.Windows.NotificationBox"
<Window x:Class="Saradomin.View.Windows.NotificationBox"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:glitonea="clr-namespace:Glitonea.Controls;assembly=Glitonea"
xmlns:mvvm="clr-namespace:Glitonea.Mvvm;assembly=Glitonea"
xmlns:windows="clr-namespace:Saradomin.ViewModel.Windows"
Title="{Binding Title}"
@ -53,4 +52,4 @@
</Border>
</Grid>
</Border>
</glitonea:WindowEx>
</Window>

5
Saradomin/View/Windows/NotificationBox.axaml.cs
View file

@ -2,15 +2,14 @@ using System.Collections.Generic;
using System.Linq;
using Avalonia;
using Avalonia.Controls;
using Glitonea.Controls;
using Glitonea.Extensions;
using Glitonea;
using PropertyChanged;
using Saradomin.Infrastructure;
namespace Saradomin.View.Windows
{
[DoNotNotify]
public partial class NotificationBox : WindowEx
public partial class NotificationBox : Window
{
private static Queue<NotificationBox> _notificationQueue = new();

2
Saradomin/ViewModel/Controls/PluginManagerViewModel.cs
View file

@ -28,7 +28,7 @@ namespace Saradomin.ViewModel.Controls
_pluginManagementService = pluginManagementService;
_pluginDownloadService = pluginDownloadService;
Message.Subscribe<MainViewLoadedMessage>(this, MainViewLoaded);
Subscribe<MainViewLoadedMessage>(MainViewLoaded);
PropertyChanged += ViewModelPropertyChanged;
}

6
Saradomin/ViewModel/Controls/SettingsViewModel.cs
View file

@ -4,7 +4,7 @@ using System.Reflection;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Platform.Storage;
using Glitonea.Extensions;
using Glitonea;
using Glitonea.Mvvm;
using Glitonea.Mvvm.Messaging;
using Glitonea.Utilities;
@ -72,7 +72,7 @@ namespace Saradomin.ViewModel.Controls
{
_settingsService = settingsService;
Message.Subscribe<MainViewLoadedMessage>(this, OnMainViewLoaded);
Subscribe<MainViewLoadedMessage>(OnMainViewLoaded);
}
public void LaunchScapeWebsite()
@ -106,7 +106,7 @@ namespace Saradomin.ViewModel.Controls
private void OnMainViewLoaded(MainViewLoadedMessage _)
{
Message.Subscribe<SettingsModifiedMessage>(this, OnSettingsModified);
Subscribe<SettingsModifiedMessage>(OnSettingsModified);
}
private void OnSettingsModified(SettingsModifiedMessage _)

2
Saradomin/ViewModel/Controls/SingleplayerViewModel.cs
View file

@ -60,7 +60,7 @@ namespace Saradomin.ViewModel.Controls
TextWrapping = TextWrapping.Wrap,
};
Message.Subscribe<ClientClosedMessage>(this, OnClientClosed);
Subscribe<ClientClosedMessage>(OnClientClosed);
}
private void OnClientClosed(ClientClosedMessage _)

6
Saradomin/ViewModel/Windows/MainWindowViewModel.cs
View file

@ -52,9 +52,9 @@ namespace Saradomin.ViewModel.Windows
_settingsService = settingsService;
Launcher = _settingsService.Launcher;
Message.Subscribe<MainViewLoadedMessage>(this, MainViewLoaded);
Message.Subscribe<NotificationBoxStateChangedMessage>(this, NotificatationBoxStateChanged);
Message.Subscribe<ClientLaunchRequestedMessage>(this, ClientLaunchRequested);
Subscribe<MainViewLoadedMessage>(MainViewLoaded);
Subscribe<NotificationBoxStateChangedMessage>(NotificatationBoxStateChanged);
Subscribe<ClientLaunchRequestedMessage>(ClientLaunchRequested);
_settingsService.Launcher.JavaExecutableLocation ??= CrossPlatform.LocateJavaExecutable();
}