Merge branch 'master' into 'Master_PR'

# Conflicts: # src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
2025-07-21 11:17:11 +02:00 · 2025-03-15 10:13:00 +00:00 · 2025-03-15 10:13:00 +00:00 · 5f4ef9f9c8
commit 5f4ef9f9c8
parent 7266f1812f 57118e00fb
870 changed files with 59 additions and 48426 deletions
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs
@ -659,7 +659,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati

                if (string.IsNullOrWhiteSpace(filePath))
                {
-                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/Ryubing/Ryujinx#requirements for more information)");
+                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error.");
                }

                context.Device.LoadNca(filePath);
--- a/src/Ryujinx.HLE/HOS/Services/Sdb/Pl/SharedFontManager.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Sdb/Pl/SharedFontManager.cs
@ -105,7 +105,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl
                                titleName = "Unknown";
                            }

-                            throw new InvalidSystemResourceException($"{titleName} ({fontTitle:x8}) system title not found! This font will not work, provide the system archive to fix this error. (See https://github.com/Ryubing/Ryujinx#requirements for more information)");
+                            throw new InvalidSystemResourceException($"{titleName} ({fontTitle:x8}) system title not found! This font will not work, provide the system archive to fix this error.");
                        }
                    }
                    else
--- a/src/Ryujinx/Assets/UIImages/Logo_GitHub_Dark.png
+++ b/src/Ryujinx/Assets/UIImages/Logo_GitHub_Dark.png
--- a/src/Ryujinx/Assets/UIImages/Logo_GitHub_Light.png
+++ b/src/Ryujinx/Assets/UIImages/Logo_GitHub_Light.png
--- a/src/Ryujinx/Assets/UIImages/Logo_GitLab.png
+++ b/src/Ryujinx/Assets/UIImages/Logo_GitLab.png
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@ -15323,28 +15323,28 @@
      }
    },
    {
-      "ID": "AboutGithubUrlTooltipMessage",
+      "ID": "AboutGitLabUrlTooltipMessage",
      "Translations": {
        "ar_SA": "انقر لفتح صفحة ريوجينكس في غيت هاب في متصفحك الافتراضي.",
-        "de_DE": "Klicke hier, um die Ryujinx GitHub Seite im Standardbrowser zu öffnen.",
-        "el_GR": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx GitHub στο προεπιλεγμένο πρόγραμμα περιήγησης.",
-        "en_US": "Click to open the Ryujinx GitHub page in your default browser.",
-        "es_ES": "Haz clic para abrir el GitHub de Ryujinx en tu navegador predeterminado.",
-        "fr_FR": "Cliquez pour ouvrir la page GitHub de Ryujinx dans votre navigateur par défaut.",
+        "de_DE": "Klicke hier, um die Ryujinx GitLab Seite im Standardbrowser zu öffnen.",
+        "el_GR": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx GitLab στο προεπιλεγμένο πρόγραμμα περιήγησης.",
+        "en_US": "Click to open the Ryujinx GitLab page in your default browser.",
+        "es_ES": "Haz clic para abrir el GitLab de Ryujinx en tu navegador predeterminado.",
+        "fr_FR": "Cliquez pour ouvrir la page GitLab de Ryujinx dans votre navigateur par défaut.",
        "he_IL": "לחץ כדי לפתוח את דף הגיטהב של ריוג'ינקס בדפדפן ברירת המחדל שלך.",
-        "it_IT": "Clicca per aprire la pagina GitHub di Ryujinx nel tuo browser predefinito.",
-        "ja_JP": "クリックするとデフォルトのブラウザで Ryujinx の Github ページを開きます.",
-        "ko_KR": "클릭하면 기본 브라우저에서 Ryujinx GitHub 페이지가 열립니다.",
-        "no_NO": "Klikk for å åpne Ryujinx GitHub siden i din standardnettleser.",
-        "pl_PL": "Kliknij, aby otworzyć stronę GitHub Ryujinx w domyślnej przeglądarce.",
-        "pt_BR": "Clique para abrir a página do GitHub do Ryujinx no seu navegador padrão.",
-        "ru_RU": "Нажмите, чтобы открыть страницу Ryujinx на GitHub",
-        "sv_SE": "Klicka för att öppna Ryujinx GitHub-sida i din webbläsare.",
-        "th_TH": "คลิกเพื่อเปิดหน้า Github ของ Ryujinx  บนเบราว์เซอร์เริ่มต้นของคุณ",
-        "tr_TR": "Ryujinx'in GitHub sayfasını varsayılan tarayıcınızda açmak için tıklayın.",
-        "uk_UA": "Натисніть, щоб відкрити сторінку GitHub Ryujinx у браузері.",
-        "zh_CN": "在浏览器中打开 Ryujinx 的 GitHub 代码库。",
-        "zh_TW": "在預設瀏覽器中開啟 Ryujinx 的 GitHub 網頁。"
+        "it_IT": "Clicca per aprire la pagina GitLab di Ryujinx nel tuo browser predefinito.",
+        "ja_JP": "クリックするとデフォルトのブラウザで Ryujinx の GitLab ページを開きます.",
+        "ko_KR": "클릭하면 기본 브라우저에서 Ryujinx GitLab 페이지가 열립니다.",
+        "no_NO": "Klikk for å åpne Ryujinx GitLab siden i din standardnettleser.",
+        "pl_PL": "Kliknij, aby otworzyć stronę GitLab Ryujinx w domyślnej przeglądarce.",
+        "pt_BR": "Clique para abrir a página do GitLab do Ryujinx no seu navegador padrão.",
+        "ru_RU": "Нажмите, чтобы открыть страницу Ryujinx на GitLab",
+        "sv_SE": "Klicka för att öppna Ryujinx GitLab-sida i din webbläsare.",
+        "th_TH": "คลิกเพื่อเปิดหน้า GitLab ของ Ryujinx  บนเบราว์เซอร์เริ่มต้นของคุณ",
+        "tr_TR": "Ryujinx'in GitLab sayfasını varsayılan tarayıcınızda açmak için tıklayın.",
+        "uk_UA": "Натисніть, щоб відкрити сторінку GitLab Ryujinx у браузері.",
+        "zh_CN": "在浏览器中打开 Ryujinx 的 GitLab 代码库。",
+        "zh_TW": "在預設瀏覽器中開啟 Ryujinx 的 GitLab 網頁。"
      }
    },
    {
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@ -168,8 +168,7 @@
    <EmbeddedResource Include="Assets\UIImages\Logo_Amiibo.png" />
    <EmbeddedResource Include="Assets\UIImages\Logo_Discord_Dark.png" />
    <EmbeddedResource Include="Assets\UIImages\Logo_Discord_Light.png" />
-    <EmbeddedResource Include="Assets\UIImages\Logo_GitHub_Dark.png" />
-    <EmbeddedResource Include="Assets\UIImages\Logo_GitHub_Light.png" />
+    <EmbeddedResource Include="Assets\UIImages\Logo_GitLab.png" />
    <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx.png" />
    <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
  </ItemGroup>
--- a/src/Ryujinx/Systems/Updater.cs
+++ b/src/Ryujinx/Systems/Updater.cs
@ -94,10 +94,10 @@ namespace Ryujinx.Ava.Systems
                                    LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage],
                                    string.Empty);

-                                if (userResult is UserResult.Ok)
+                                /*if (userResult is UserResult.Ok)
                                {
                                    OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
-                                }
+                                }*/
                            }
                            
                            Logger.Info?.Print(LogClass.Application, "Up to date.");
@ -184,10 +184,10 @@ namespace Ryujinx.Ava.Systems
                        LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage],
                        string.Empty);

-                    if (userResult is UserResult.Ok)
+                    /*if (userResult is UserResult.Ok)
                    {
                        OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
-                    }
+                    }*/
                }
                
                Logger.Info?.Print(LogClass.Application, "Up to date.");
@ -223,7 +223,7 @@ namespace Ryujinx.Ava.Systems
                
                Logger.Info?.Print(LogClass.Application, $"Version found: {newVersionString}");
                
-            RequestUserToUpdate:
+            //RequestUserToUpdate:
                // Show a message asking the user if they want to update
                UserResult shouldUpdate = await ContentDialogHelper.CreateUpdaterChoiceDialog(
                    LocaleManager.Instance[LocaleKeys.RyujinxUpdater],
@ -236,9 +236,9 @@ namespace Ryujinx.Ava.Systems
                        await UpdateRyujinx(_buildUrl);
                        break;
                    // Secondary button maps to no, which in this case is the show changelog button.
-                    case UserResult.No:
+                    /*case UserResult.No:
                        OpenHelper.OpenUrl(ReleaseInformation.GetChangelogUrl(currentVersion, newVersion));
-                        goto RequestUserToUpdate;
+                        goto RequestUserToUpdate;*/
                    default:
                        _running = false;
                        break;
--- a/src/Ryujinx/UI/Helpers/ButtonKeyAssigner.cs
+++ b/src/Ryujinx/UI/Helpers/ButtonKeyAssigner.cs
@ -83,8 +83,13 @@ namespace Ryujinx.Ava.UI.Helpers

                ToggledButton.IsChecked = false;

-                ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
+                if (pressedButton.HasValue && pressedButton.Value.AsHidType<Key>() == Key.BackSpace)
+                {
+                    ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, new Button(Key.Unbound)));
+                    return;
+                }

+                ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
            });
        }

--- a/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
+++ b/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
@ -354,7 +354,7 @@ namespace Ryujinx.Ava.UI.Helpers
                primary,
                secondaryText,
                LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
+                string.Empty, // LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
                LocaleManager.Instance[LocaleKeys.InputDialogNo],
                (int)Symbol.Help,
                UserResult.Yes);
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@ -11,7 +11,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 {
    public partial class AboutWindowViewModel : BaseModel, IDisposable
    {
-        [ObservableProperty] private Bitmap _githubLogo;
+        [ObservableProperty] private Bitmap _gitLabLogo;
        [ObservableProperty] private Bitmap _discordLogo;
        [ObservableProperty] private string _version;

@ -24,6 +24,8 @@ namespace Ryujinx.Ava.UI.ViewModels
            Version = RyujinxApp.FullAppName + "\n" + Program.Version;
            UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);

+            GitLabLogo = LoadBitmap("resm:Ryujinx.Assets.UIImages.Logo_GitLab.png?assembly=Ryujinx");
+
            RyujinxApp.ThemeChanged += Ryujinx_ThemeChanged;
        }

@ -39,8 +41,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            bool isDarkTheme = theme == "Dark" || (theme == "Auto" && RyujinxApp.DetectSystemTheme() == ThemeVariant.Dark);
            
            string themeName = isDarkTheme ? "Dark" : "Light";
-
-            GithubLogo = LoadBitmap(LogoPathFormat.Format("GitHub", themeName));
+            
            DiscordLogo = LoadBitmap(LogoPathFormat.Format("Discord", themeName));
        }

@ -50,7 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            RyujinxApp.ThemeChanged -= Ryujinx_ThemeChanged;
            
-            GithubLogo.Dispose();
+            GitLabLogo.Dispose();
            DiscordLogo.Dispose();
            
            GC.SuppressFinalize(this);
--- a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml
+++ b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml
@ -104,7 +104,7 @@
                    HorizontalAlignment="Center"
                    Orientation="Horizontal"
                    Spacing="10">
-                    <Button Name="GitHubRepoButton"
+                    <Button Name="GitRepoButton"
                        MinWidth="30"
                        MinHeight="30"
                        MaxWidth="30"
@ -113,8 +113,8 @@
                        Background="Transparent"
                        Click="Button_OnClick"
                        CornerRadius="15"
-                        ToolTip.Tip="{ext:Locale AboutGithubUrlTooltipMessage}">
-                        <Image Source="{Binding GithubLogo}" />
+                        ToolTip.Tip="{ext:Locale AboutGitLabUrlTooltipMessage}">
+                        <Image Source="{Binding GitLabLogo}" />
                    </Button>
                    <Button
                        MinWidth="30"
@ -174,19 +174,6 @@
                    FontSize="11"
                    Text="{Binding FormerDevelopers}"
                    TextWrapping="Wrap" />
-                <Button
-                    Margin="0, 5, 0, 0"
-                    Padding="5"
-                    HorizontalAlignment="Left"
-                    Background="Transparent"
-                    Click="Button_OnClick"
-                    Tag="https://github.com/Ryubing/Ryujinx/graphs/contributors?type=a">
-                    <TextBlock
-                        FontSize="10"
-                        Text="{ext:Locale AboutRyujinxContributorsButtonHeader}"
-                        TextAlignment="End"
-                        ToolTip.Tip="{ext:Locale AboutRyujinxMaintainersContentTooltipMessage}" />
-                </Button>
            </StackPanel>
        </Grid>
    </Grid>
--- a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml.cs
@ -19,8 +19,8 @@ namespace Ryujinx.Ava.UI.Views.Dialog
        {
            InitializeComponent();

-            GitHubRepoButton.Tag =
-                $"https://github.com/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}";
+            GitRepoButton.Tag =
+                $"https://git.ryujinx.app/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}";
        }

        public static async Task Show()
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@ -266,19 +266,19 @@
                        Name="FaqMenuItem"
                        Header="{ext:Locale MenuBarHelpFaq}"
                        Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/FAQ-and-Troubleshooting"
+                        CommandParameter="https://git.ryujinx.app/ryubing/ryujinx/-/wikis/FAQ-&amp;-Troubleshooting"
                        ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
                    <MenuItem
                        Name="SetupGuideMenuItem"
                        Header="{ext:Locale MenuBarHelpSetup}"
                        Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
+                        CommandParameter="https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Setup-&amp;-Configuration-Guide"
                        ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
                    <MenuItem
                        Name="LdnGuideMenuItem"
                        Header="{ext:Locale MenuBarHelpMultiplayer}"
                        Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
+                        CommandParameter="https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Multiplayer-(LDN-Local-Wireless)-Guide"
                        ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
                </MenuItem>
            </MenuItem>
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@ -108,8 +108,6 @@ namespace Ryujinx.Ava.UI.Views.Settings

                        this.Focus(NavigationMethod.Pointer);

-                        PointerPressed += MouseClick;
-
                        IKeyboard keyboard = (IKeyboard)_avaloniaKeyboardDriver.GetGamepad("0");
                        IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard);