From ec6cb0abb4b7669895b6e96fd7581c93b5abd691 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Sat, 2 Mar 2024 12:51:05 +0100 Subject: infra: Make Avalonia the default UI (#6375) * misc: Move Ryujinx project to Ryujinx.Gtk3 This breaks release CI for now but that's fine. Signed-off-by: Mary Guillemard * misc: Move Ryujinx.Ava project to Ryujinx This breaks CI for now, but it's fine. Signed-off-by: Mary Guillemard * infra: Make Avalonia the default UI Should fix CI after the previous changes. GTK3 isn't build by the release job anymore, only by PR CI. This also ensure that the test-ava update package is still generated to allow update from the old testing channel. Signed-off-by: Mary Guillemard * Fix missing copy in create_app_bundle.sh Signed-off-by: Mary Guillemard * Fix syntax error Signed-off-by: Mary Guillemard --------- Signed-off-by: Mary Guillemard --- .../UI/Applet/ErrorAppletWindow.axaml.cs | 74 ---------------------- 1 file changed, 74 deletions(-) delete mode 100644 src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs (limited to 'src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs') diff --git a/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs b/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs deleted file mode 100644 index ec6f7682..00000000 --- a/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs +++ /dev/null @@ -1,74 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.Threading; -using Ryujinx.Ava.Common.Locale; -using Ryujinx.Ava.UI.Windows; -using System.Threading.Tasks; - -namespace Ryujinx.Ava.UI.Applet -{ - internal partial class ErrorAppletWindow : StyleableWindow - { - private readonly Window _owner; - private object _buttonResponse; - - public ErrorAppletWindow(Window owner, string[] buttons, string message) - { - _owner = owner; - Message = message; - DataContext = this; - InitializeComponent(); - - int responseId = 0; - - if (buttons != null) - { - foreach (string buttonText in buttons) - { - AddButton(buttonText, responseId); - responseId++; - } - } - else - { - AddButton(LocaleManager.Instance[LocaleKeys.InputDialogOk], 0); - } - } - - public ErrorAppletWindow() - { - DataContext = this; - InitializeComponent(); - } - - public string Message { get; set; } - - private void AddButton(string label, object tag) - { - Dispatcher.UIThread.InvokeAsync(() => - { - Button button = new() { Content = label, Tag = tag }; - - button.Click += Button_Click; - ButtonStack.Children.Add(button); - }); - } - - private void Button_Click(object sender, RoutedEventArgs e) - { - if (sender is Button button) - { - _buttonResponse = button.Tag; - } - - Close(); - } - - public async Task Run() - { - await ShowDialog(_owner); - - return _buttonResponse; - } - } -} -- cgit v1.2.3