From 46c8129bf57a3df3e0a2db27e6611ca4210614be Mon Sep 17 00:00:00 2001
From: Ac_K <Acoustik666@gmail.com>
Date: Fri, 29 Jul 2022 00:41:34 +0200
Subject: Avalonia: Another Cleanup (#3494)

* Avalonia: Another Cleanup

This PR is a cleanup to the avalonia code recently added:

- Some XAML file are autoformatted like a previous PR.
- Dlc is renamed to DownloadableContent (Locale exclude).
- DownloadableContentManagerWindow is a bit improved (Fixes #3491).
- Some nits here and there.

* Fix GTK

* Remove AttachDebugDevTools

* Fix last warning

* Fix JSON fields
---
 Ryujinx.Common/Configuration/DlcContainer.cs               | 10 ----------
 Ryujinx.Common/Configuration/DlcNca.cs                     |  9 ---------
 .../Configuration/DownloadableContentContainer.cs          | 13 +++++++++++++
 Ryujinx.Common/Configuration/DownloadableContentNca.cs     | 14 ++++++++++++++
 4 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 Ryujinx.Common/Configuration/DlcContainer.cs
 delete mode 100644 Ryujinx.Common/Configuration/DlcNca.cs
 create mode 100644 Ryujinx.Common/Configuration/DownloadableContentContainer.cs
 create mode 100644 Ryujinx.Common/Configuration/DownloadableContentNca.cs

(limited to 'Ryujinx.Common/Configuration')

diff --git a/Ryujinx.Common/Configuration/DlcContainer.cs b/Ryujinx.Common/Configuration/DlcContainer.cs
deleted file mode 100644
index c056ac1e..00000000
--- a/Ryujinx.Common/Configuration/DlcContainer.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace Ryujinx.Common.Configuration
-{
-    public struct DlcContainer
-    {
-        public string Path { get; set; }
-        public List<DlcNca> DlcNcaList { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Common/Configuration/DlcNca.cs b/Ryujinx.Common/Configuration/DlcNca.cs
deleted file mode 100644
index df6a4532..00000000
--- a/Ryujinx.Common/Configuration/DlcNca.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Ryujinx.Common.Configuration
-{
-    public struct DlcNca
-    {
-        public string Path    { get; set; }
-        public ulong  TitleId { get; set; }
-        public bool   Enabled { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Common/Configuration/DownloadableContentContainer.cs b/Ryujinx.Common/Configuration/DownloadableContentContainer.cs
new file mode 100644
index 00000000..b6ae2f3f
--- /dev/null
+++ b/Ryujinx.Common/Configuration/DownloadableContentContainer.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Common.Configuration
+{
+    public struct DownloadableContentContainer
+    {
+        [JsonPropertyName("path")]
+        public string ContainerPath { get; set; }
+        [JsonPropertyName("dlc_nca_list")]
+        public List<DownloadableContentNca> DownloadableContentNcaList { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Ryujinx.Common/Configuration/DownloadableContentNca.cs b/Ryujinx.Common/Configuration/DownloadableContentNca.cs
new file mode 100644
index 00000000..80b67300
--- /dev/null
+++ b/Ryujinx.Common/Configuration/DownloadableContentNca.cs
@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Common.Configuration
+{
+    public struct DownloadableContentNca
+    {
+        [JsonPropertyName("path")]
+        public string FullPath { get; set; }
+        [JsonPropertyName("title_id")]
+        public ulong  TitleId  { get; set; }
+        [JsonPropertyName("is_enabled")]
+        public bool   Enabled  { get; set; }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3