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

Fix to be compliant with Glitonea 1.4

Browse source
This commit is contained in:
vddCore 2024-03-28 09:01:49 +01:00
parent 895fdc7593
commit 806e831a18
12 changed files with 19 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Saradomin/Infrastructure/Messages.cs Normal file
View file

@ -0,0 +1,8 @@
using Glitonea.Mvvm.Messaging;
namespace Saradomin.Infrastructure
{
public record MainViewLoadedMessage : Message;
public record NotificationBoxStateChangedMessage(bool WasOpened) : Message;
public record SettingsModifiedMessage(string SettingName) : Message;
}

8
Saradomin/Infrastructure/Messaging/MainViewLoadedMessage.cs
View file

@ -1,8 +0,0 @@
using Glitonea.Mvvm.Messaging;
namespace Saradomin.Infrastructure.Messaging
{
public class MainViewLoadedMessage : Message
{
}
}

14
Saradomin/Infrastructure/Messaging/NotificationBoxStateChangedMessage.cs
View file

@ -1,14 +0,0 @@
using Glitonea.Mvvm.Messaging;
namespace Saradomin.Infrastructure.Messaging
{
public class NotificationBoxStateChangedMessage : Message
{
public bool WasOpened { get; }
public NotificationBoxStateChangedMessage(bool wasOpened)
{
WasOpened = wasOpened;
}
}
}

14
Saradomin/Infrastructure/Messaging/SettingsModifiedMessage.cs
View file

@ -1,14 +0,0 @@
using Glitonea.Mvvm.Messaging;
namespace Saradomin.Infrastructure.Messaging
{
public class SettingsModifiedMessage : Message
{
public string SettingName { get; }
public SettingsModifiedMessage(string settingName)
{
SettingName = settingName;
}
}
}

2
Saradomin/Model/Settings/SettingsComponent.cs
View file

@ -1,5 +1,5 @@
using System.ComponentModel;
using Saradomin.Infrastructure.Messaging;
using Saradomin.Infrastructure;
namespace Saradomin.Model.Settings
{

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

@ -2,7 +2,7 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Saradomin.View.Controls"
xmlns:glitonea="clr-namespace:Glitonea;assembly=Glitonea"
xmlns:glitonea="clr-namespace:Glitonea.Controls;assembly=Glitonea"
xmlns:mvvm="clr-namespace:Glitonea.Mvvm;assembly=Glitonea"
xmlns:vm="clr-namespace:Saradomin.ViewModel.Windows"
DataContext="{mvvm:DataContextSource vm:MainWindowViewModel}"

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

@ -1,11 +1,8 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Markup.Xaml;
using Glitonea.Mvvm.Messaging;
using PropertyChanged;
using Saradomin.Infrastructure.Messaging;
using Saradomin.Infrastructure;
namespace Saradomin.View.Windows
{

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

@ -1,7 +1,7 @@
<glitonea:WindowEx 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;assembly=Glitonea"
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}"

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

@ -2,10 +2,10 @@ using System.Collections.Generic;
using System.Linq;
using Avalonia;
using Avalonia.Controls;
using Glitonea;
using Glitonea.Controls;
using Glitonea.Extensions;
using PropertyChanged;
using Saradomin.Infrastructure.Messaging;
using Saradomin.Infrastructure;
namespace Saradomin.View.Windows
{

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

@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Glitonea.Mvvm;
using Glitonea.Mvvm.Messaging;
using Saradomin.Infrastructure.Messaging;
using Saradomin.Infrastructure;
using Saradomin.Infrastructure.Services;
using Saradomin.Model;
using Saradomin.View.Windows;

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

@ -3,18 +3,16 @@ using System.Collections.ObjectModel;
using System.Reflection;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Platform.Storage;
using Glitonea.Extensions;
using Glitonea.Mvvm;
using Glitonea.Mvvm.Messaging;
using Glitonea.Utilities;
using Saradomin.Infrastructure.Messaging;
using Saradomin.Infrastructure;
using Saradomin.Infrastructure.Services;
using Saradomin.Model.Settings.Client;
using Saradomin.Model.Settings.Launcher;
using Saradomin.Utilities;
using Saradomin.View.Windows;
namespace Saradomin.ViewModel.Controls
{
@ -79,12 +77,12 @@ namespace Saradomin.ViewModel.Controls
public async Task BrowseForJavaExecutable()
{
var window = Application.Current.GetMainWindow();
var window = Application.Current!.GetMainWindow();
var pickerOptions = new FilePickerOpenOptions
{
Title = "Browse for Java...",
AllowMultiple = false,
SuggestedStartLocation =await window.StorageProvider.TryGetFolderFromPathAsync(
SuggestedStartLocation =await window!.StorageProvider.TryGetFolderFromPathAsync(
Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
)
};

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

@ -9,7 +9,7 @@ using Avalonia.Metadata;
using Glitonea.Mvvm;
using Glitonea.Mvvm.Messaging;
using HtmlAgilityPack;
using Saradomin.Infrastructure.Messaging;
using Saradomin.Infrastructure;
using Saradomin.Infrastructure.Services;
using Saradomin.Model.Settings.Launcher;
using Saradomin.Utilities;