From ec6cb0abb4b7669895b6e96fd7581c93b5abd691 Mon Sep 17 00:00:00 2001
From: Mary Guillemard <mary@mary.zone>
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 <mary@mary.zone>

* misc: Move Ryujinx.Ava project to Ryujinx

This breaks CI for now, but it's fine.

Signed-off-by: Mary Guillemard <mary@mary.zone>

* 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 <mary@mary.zone>

* Fix missing copy in create_app_bundle.sh

Signed-off-by: Mary Guillemard <mary@mary.zone>

* Fix syntax error

Signed-off-by: Mary Guillemard <mary@mary.zone>

---------

Signed-off-by: Mary Guillemard <mary@mary.zone>
---
 src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs | 103 ---------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs

(limited to 'src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs')

diff --git a/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs b/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs
deleted file mode 100644
index d7bb0b88..00000000
--- a/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using Avalonia.Controls;
-using FluentAvalonia.Core;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.HLE.FileSystem;
-using System;
-
-namespace Ryujinx.Ava.UI.Windows
-{
-    public partial class SettingsWindow : StyleableWindow
-    {
-        internal SettingsViewModel ViewModel { get; set; }
-
-        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
-        {
-            Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance[LocaleKeys.Settings]}";
-
-            ViewModel = new SettingsViewModel(virtualFileSystem, contentManager);
-            DataContext = ViewModel;
-
-            ViewModel.CloseWindow += Close;
-            ViewModel.SaveSettingsEvent += SaveSettings;
-
-            InitializeComponent();
-            Load();
-        }
-
-        public SettingsWindow()
-        {
-            ViewModel = new SettingsViewModel();
-            DataContext = ViewModel;
-
-            InitializeComponent();
-            Load();
-        }
-
-        public void SaveSettings()
-        {
-            InputPage.ControllerSettings?.SaveCurrentProfile();
-
-            if (Owner is MainWindow window && ViewModel.DirectoryChanged)
-            {
-                window.LoadApplications();
-            }
-        }
-
-        private void Load()
-        {
-            Pages.Children.Clear();
-            NavPanel.SelectionChanged += NavPanelOnSelectionChanged;
-            NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
-        }
-
-        private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
-        {
-            if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null)
-            {
-                switch (navItem.Tag.ToString())
-                {
-                    case "UiPage":
-                        UiPage.ViewModel = ViewModel;
-                        NavPanel.Content = UiPage;
-                        break;
-                    case "InputPage":
-                        NavPanel.Content = InputPage;
-                        break;
-                    case "HotkeysPage":
-                        NavPanel.Content = HotkeysPage;
-                        break;
-                    case "SystemPage":
-                        SystemPage.ViewModel = ViewModel;
-                        NavPanel.Content = SystemPage;
-                        break;
-                    case "CpuPage":
-                        NavPanel.Content = CpuPage;
-                        break;
-                    case "GraphicsPage":
-                        NavPanel.Content = GraphicsPage;
-                        break;
-                    case "AudioPage":
-                        NavPanel.Content = AudioPage;
-                        break;
-                    case "NetworkPage":
-                        NavPanel.Content = NetworkPage;
-                        break;
-                    case "LoggingPage":
-                        NavPanel.Content = LoggingPage;
-                        break;
-                    default:
-                        throw new NotImplementedException();
-                }
-            }
-        }
-
-        protected override void OnClosing(WindowClosingEventArgs e)
-        {
-            HotkeysPage.Dispose();
-            InputPage.Dispose();
-            base.OnClosing(e);
-        }
-    }
-}
-- 
cgit v1.2.3