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/UI/Helpers/UserErrorDialog.cs | 90 +++++++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
create mode 100644 src/Ryujinx/UI/Helpers/UserErrorDialog.cs
(limited to 'src/Ryujinx/UI/Helpers/UserErrorDialog.cs')
diff --git a/src/Ryujinx/UI/Helpers/UserErrorDialog.cs b/src/Ryujinx/UI/Helpers/UserErrorDialog.cs
new file mode 100644
index 00000000..9a44b862
--- /dev/null
+++ b/src/Ryujinx/UI/Helpers/UserErrorDialog.cs
@@ -0,0 +1,90 @@
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.UI.Common;
+using Ryujinx.UI.Common.Helper;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+ internal class UserErrorDialog
+ {
+ private const string SetupGuideUrl = "https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide";
+
+ private static string GetErrorCode(UserError error)
+ {
+ return $"RYU-{(uint)error:X4}";
+ }
+
+ private static string GetErrorTitle(UserError error)
+ {
+ return error switch
+ {
+ UserError.NoKeys => LocaleManager.Instance[LocaleKeys.UserErrorNoKeys],
+ UserError.NoFirmware => LocaleManager.Instance[LocaleKeys.UserErrorNoFirmware],
+ UserError.FirmwareParsingFailed => LocaleManager.Instance[LocaleKeys.UserErrorFirmwareParsingFailed],
+ UserError.ApplicationNotFound => LocaleManager.Instance[LocaleKeys.UserErrorApplicationNotFound],
+ UserError.Unknown => LocaleManager.Instance[LocaleKeys.UserErrorUnknown],
+ _ => LocaleManager.Instance[LocaleKeys.UserErrorUndefined],
+ };
+ }
+
+ private static string GetErrorDescription(UserError error)
+ {
+ return error switch
+ {
+ UserError.NoKeys => LocaleManager.Instance[LocaleKeys.UserErrorNoKeysDescription],
+ UserError.NoFirmware => LocaleManager.Instance[LocaleKeys.UserErrorNoFirmwareDescription],
+ UserError.FirmwareParsingFailed => LocaleManager.Instance[LocaleKeys.UserErrorFirmwareParsingFailedDescription],
+ UserError.ApplicationNotFound => LocaleManager.Instance[LocaleKeys.UserErrorApplicationNotFoundDescription],
+ UserError.Unknown => LocaleManager.Instance[LocaleKeys.UserErrorUnknownDescription],
+ _ => LocaleManager.Instance[LocaleKeys.UserErrorUndefinedDescription],
+ };
+ }
+
+ private static bool IsCoveredBySetupGuide(UserError error)
+ {
+ return error switch
+ {
+ UserError.NoKeys or
+ UserError.NoFirmware or
+ UserError.FirmwareParsingFailed => true,
+ _ => false,
+ };
+ }
+
+ private static string GetSetupGuideUrl(UserError error)
+ {
+ if (!IsCoveredBySetupGuide(error))
+ {
+ return null;
+ }
+
+ return error switch
+ {
+ UserError.NoKeys => SetupGuideUrl + "#initial-setup---placement-of-prodkeys",
+ UserError.NoFirmware => SetupGuideUrl + "#initial-setup-continued---installation-of-firmware",
+ _ => SetupGuideUrl,
+ };
+ }
+
+ public static async Task ShowUserErrorDialog(UserError error)
+ {
+ string errorCode = GetErrorCode(error);
+
+ bool isInSetupGuide = IsCoveredBySetupGuide(error);
+
+ string setupButtonLabel = isInSetupGuide ? LocaleManager.Instance[LocaleKeys.OpenSetupGuideMessage] : "";
+
+ var result = await ContentDialogHelper.CreateInfoDialog(
+ LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogUserErrorDialogMessage, errorCode, GetErrorTitle(error)),
+ GetErrorDescription(error) + (isInSetupGuide
+ ? LocaleManager.Instance[LocaleKeys.DialogUserErrorDialogInfoMessage]
+ : ""), setupButtonLabel, LocaleManager.Instance[LocaleKeys.InputDialogOk],
+ LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogUserErrorDialogTitle, errorCode));
+
+ if (result == UserResult.Ok)
+ {
+ OpenHelper.OpenUrl(GetSetupGuideUrl(error));
+ }
+ }
+ }
+}
--
cgit v1.2.3-70-g09d2