From 4d1ebaf9ba0accd7df7d6944b888c7a25966ca89 Mon Sep 17 00:00:00 2001 From: MaxLastBreath <136052075+MaxLastBreath@users.noreply.github.com> Date: Wed, 23 Oct 2024 14:56:58 +0300 Subject: [PATCH 1/8] Ava UI : Set the Default Controller to Pro Controller. (#37) * Set the Default Controller to Pro Controller. - Let's be honest nobody is using JoyCon pair on their PC. - It looks nicer and more accurate to more traditional controllers. - Fixes issues with UltraCam mods and other such mods with lack of proper Dual Joycon support. * Change standard configuration too. --- src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs index 3c3bc458c..b1f1f2052 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs @@ -898,7 +898,7 @@ namespace Ryujinx.UI.Common.Configuration Backend = InputBackendType.WindowKeyboard, Id = "0", PlayerIndex = PlayerIndex.Player1, - ControllerType = ControllerType.JoyconPair, + ControllerType = ControllerType.ProController, LeftJoycon = new LeftJoyconCommonConfig { DpadUp = Key.Up, @@ -1128,7 +1128,7 @@ namespace Ryujinx.UI.Common.Configuration Backend = InputBackendType.WindowKeyboard, Id = "0", PlayerIndex = PlayerIndex.Player1, - ControllerType = ControllerType.JoyconPair, + ControllerType = ControllerType.ProController, LeftJoycon = new LeftJoyconCommonConfig { DpadUp = Key.Up, From 1040ec4e53c539e798ae66b9a292cdc0629e55bb Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Wed, 23 Oct 2024 09:38:41 -0500 Subject: [PATCH 2/8] Update dependabot.yml Stop trying to bother berry --- .github/dependabot.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 20bdc19d1..441d4f83c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,8 +6,6 @@ updates: interval: weekly labels: - "infra" - reviewers: - - TSRBerry commit-message: prefix: "ci" @@ -18,8 +16,6 @@ updates: interval: daily labels: - "infra" - reviewers: - - TSRBerry commit-message: prefix: nuget groups: From b883de5d67d0415293d51e1a13c38e11f3b4c5d0 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Wed, 23 Oct 2024 09:47:56 -0500 Subject: [PATCH 3/8] Update dependabot.yml STOP OPENING THE DAMN AVALONIA PRS --- .github/dependabot.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 441d4f83c..c07345f88 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,9 +19,9 @@ updates: commit-message: prefix: nuget groups: - Avalonia: - patterns: - - "*Avalonia*" + #Avalonia: + #patterns: + #- "*Avalonia*" Silk.NET: patterns: - "Silk.NET*" From 8e8ad0f37e6e8f48b8fcb505a4125a46d48c342a Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Wed, 23 Oct 2024 09:54:39 -0500 Subject: [PATCH 4/8] go away dependabot --- .github/dependabot.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index c07345f88..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: weekly - labels: - - "infra" - commit-message: - prefix: "ci" - - - package-ecosystem: nuget - directory: / - open-pull-requests-limit: 10 - schedule: - interval: daily - labels: - - "infra" - commit-message: - prefix: nuget - groups: - #Avalonia: - #patterns: - #- "*Avalonia*" - Silk.NET: - patterns: - - "Silk.NET*" - OpenTK: - patterns: - - "OpenTK*" - SixLabors: - patterns: - - "SixLabors*" - NUnit: - patterns: - - "NUnit*" From 59277e49c56d126aa65ff3bba6df3d1094ff5b38 Mon Sep 17 00:00:00 2001 From: ssc19940105 Date: Thu, 24 Oct 2024 00:20:22 +0800 Subject: [PATCH 5/8] Update Simplified Chinese Translation (#51) --- src/Ryujinx/Assets/Locales/zh_CN.json | 28 +++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/Ryujinx/Assets/Locales/zh_CN.json b/src/Ryujinx/Assets/Locales/zh_CN.json index a7d92354d..2eeb5717e 100644 --- a/src/Ryujinx/Assets/Locales/zh_CN.json +++ b/src/Ryujinx/Assets/Locales/zh_CN.json @@ -10,7 +10,10 @@ "SettingsTabSystemUseHypervisor": "使用 Hypervisor 虚拟化", "MenuBarFile": "文件(_F)", "MenuBarFileOpenFromFile": "加载游戏文件(_L)", + "MenuBarFileOpenFromFileError": "未发现应用", "MenuBarFileOpenUnpacked": "加载解包后的游戏(_U)", + "MenuBarFileLoadDlcFromFolder": "从文件夹加载DLC", + "MenuBarFileLoadTitleUpdatesFromFolder": "从文件夹加载游戏更新", "MenuBarFileOpenEmuFolder": "打开 Ryujinx 系统目录", "MenuBarFileOpenLogsFolder": "打开日志目录", "MenuBarFileExit": "退出(_E)", @@ -102,8 +105,9 @@ "SettingsTabGeneralHideCursorOnIdle": "自动隐藏", "SettingsTabGeneralHideCursorAlways": "始终隐藏", "SettingsTabGeneralGameDirectories": "游戏目录", + "SettingsTabGeneralAutoloadDirectories": "自动加载DLC/游戏更新目录", "SettingsTabGeneralAdd": "添加", - "SettingsTabGeneralRemove": "删除", + "SettingsTabGeneralRemove": "删除", "SettingsTabSystem": "系统", "SettingsTabSystemCore": "核心", "SettingsTabSystemSystemRegion": "系统区域：", @@ -409,6 +413,7 @@ "GameListContextMenuToggleFavorite": "收藏", "GameListContextMenuToggleFavoriteToolTip": "切换游戏的收藏状态", "SettingsTabGeneralTheme": "主题：", + "SettingsTabGeneralThemeAuto": "自动", "SettingsTabGeneralThemeDark": "深色(暗黑)", "SettingsTabGeneralThemeLight": "浅色(亮色)", "ControllerSettingsConfigureGeneral": "配置", @@ -559,6 +564,9 @@ "AddGameDirBoxTooltip": "输入要添加的游戏目录", "AddGameDirTooltip": "添加游戏目录到列表中", "RemoveGameDirTooltip": "移除选中的目录", + "AddAutoloadDirBoxTooltip": "输入需要添加到列表中的自动加载目录", + "AddAutoloadDirTooltip": "添加一个自动加载目录到列表中", + "RemoveAutoloadDirTooltip": "移除被选中的自动加载目录", "CustomThemeCheckTooltip": "使用自定义的 Avalonia 主题作为模拟器菜单的外观", "CustomThemePathTooltip": "自定义主题的目录", "CustomThemeBrowseTooltip": "查找自定义主题", @@ -571,7 +579,7 @@ "TimeTooltip": "更改系统时间", "VSyncToggleTooltip": "模拟控制台的垂直同步，开启后会降低大部分游戏的帧率。关闭后，可以获得更高的帧率，但也可能导致游戏画面加载耗时更长或卡住。\n\n在游戏中可以使用热键进行切换（默认为 F1 键）。\n\n如果不确定，请保持开启状态。", "PptcToggleTooltip": "缓存已编译的游戏指令，这样每次游戏加载时就无需重新编译。\n\n可以减少卡顿和启动时间，提高游戏响应速度。\n\n如果不确定，请保持开启状态。", - "LowPowerPptcToggleTooltip": "Load the PPTC using a third of the amount of cores.", + "LowPowerPptcToggleTooltip": "使用三分之一的核心数加载PPTC.", "FsIntegrityToggleTooltip": "启动游戏时检查游戏文件的完整性，并在日志中记录损坏的文件。\n\n对性能没有影响，用于排查故障。\n\n如果不确定，请保持开启状态。", "AudioBackendTooltip": "更改音频处理引擎。\n\n推荐选择“SDL2”，另外“OpenAL”和“SoundIO”可以作为备选，选择“无”将没有声音。\n\n如果不确定，请设置为“SDL2”。", "MemoryManagerTooltip": "更改模拟器内存映射和访问的方式，对模拟器 CPU 的性能影响很大。\n\n如果不确定，请设置为“跳过检查的本机映射”。", @@ -603,6 +611,8 @@ "DebugLogTooltip": "在控制台中显示调试日志。\n\n仅在特别需要时使用此功能，因为它会导致日志信息难以阅读，并降低模拟器性能。", "LoadApplicationFileTooltip": "选择 Switch 游戏文件并加载", "LoadApplicationFolderTooltip": "选择解包后的 Switch 游戏目录并加载", + "LoadDlcFromFolderTooltip": "打开文件资源管理器以选择一个或多个文件夹来批量加载DLC。", + "LoadTitleUpdatesFromFolderTooltip": "打开文件资源管理器以选择一个或多个文件夹来批量加载游戏更新。", "OpenRyujinxFolderTooltip": "打开 Ryujinx 模拟器系统目录", "OpenRyujinxLogsTooltip": "打开日志存放的目录", "ExitTooltip": "退出 Ryujinx 模拟器", @@ -654,6 +664,8 @@ "OpenSetupGuideMessage": "打开安装指南", "NoUpdate": "无更新（或不加载游戏更新）", "TitleUpdateVersionLabel": "游戏更新的版本 {0}", + "TitleBundledUpdateVersionLabel": "捆绑：版本 {0}", + "TitleBundledDlcLabel": "捆绑：", "RyujinxInfo": "Ryujinx - 信息", "RyujinxConfirm": "Ryujinx - 确认", "FileDialogAllTypes": "全部类型", @@ -711,10 +723,17 @@ "DlcWindowTitle": "管理 {0} ({1}) 的 DLC", "ModWindowTitle": "管理 {0} ({1}) 的 MOD", "UpdateWindowTitle": "游戏更新管理器", + "UpdateWindowUpdateAddedMessage": "{0} 个更新被添加", + "UpdateWindowBundledContentNotice": "捆绑的更新无法被移除，只可被禁用。", "CheatWindowHeading": "适用于 {0} [{1}] 的金手指", "BuildId": "游戏版本 ID：", + "DlcWindowBundledContentNotice": "捆绑的DLC无法被移除，只可被禁用。", "DlcWindowHeading": "{0} 个 DLC", - "ModWindowHeading": "{0} 个 MOD", + "DlcWindowDlcAddedMessage": "{0} 个DLC被添加", + "AutoloadDlcAddedMessage": "{0} 个DLC被添加", + "AutoloadUpdateAddedMessage": "{0} 个游戏更新被添加", + "AutoloadDlcAndUpdateAddedMessage": "{0} 个DLC和{1} 个游戏更新被添加", + "ModWindowHeading": "{0} Mod(s)", "UserProfilesEditProfile": "编辑所选", "Cancel": "取消", "Save": "保存", @@ -760,10 +779,11 @@ "GraphicsAATooltip": "抗锯齿是一种图形处理技术，用于减少图像边缘的锯齿状现象，使图像更加平滑。\n\nFXAA（快速近似抗锯齿）是一种性能开销相对较小的抗锯齿方法，但可能会使得整体图像看起来有些模糊。\n\nSMAA（增强型子像素抗锯齿）则更加精细，它会尝试找到锯齿边缘并平滑它们，相比 FXAA 有更好的图像质量，但性能开销可能会稍大一些。\n\n如果开启了 FSR（FidelityFX Super Resolution，超级分辨率锐画技术）来提高性能或图像质量，不建议再启用抗锯齿，因为它们会产生不必要的图形处理开销，或者相互之间效果不协调。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“无”。", "GraphicsAALabel": "抗锯齿：", "GraphicsScalingFilterLabel": "缩放过滤：", - "GraphicsScalingFilterTooltip": "选择在分辨率缩放时将使用的缩放过滤器。\n\nBilinear（双线性过滤）对于3D游戏效果较好，是一个安全的默认选项。\n\nNearest（最近邻过滤）推荐用于像素艺术游戏。\n\nFSR（超级分辨率锐画）只是一个锐化过滤器，不推荐与 FXAA 或 SMAA 抗锯齿一起使用。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“Bilinear（双线性过滤）”。", + "GraphicsScalingFilterTooltip": "选择在分辨率缩放时将使用的缩放过滤器。\n\nBilinear（双线性过滤）对于3D游戏效果较好，是一个安全的默认选项。\n\nNearest（最近邻过滤）推荐用于像素艺术游戏。\n\nFSR（超级分辨率锐画）只是一个锐化过滤器，不推荐与 FXAA 或 SMAA 抗锯齿一起使用。\n\nArea（局部过滤），当渲染分辨率大于窗口实际分辨率，推荐该选项。该选项在渲染比例大于2.0的情况下，可以实现超采样的效果。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“Bilinear（双线性过滤）”。", "GraphicsScalingFilterBilinear": "Bilinear（双线性过滤）", "GraphicsScalingFilterNearest": "Nearest（最近邻过滤）", "GraphicsScalingFilterFsr": "FSR（超级分辨率锐画技术）", + "GraphicsScalingFilterArea": "Area（局部过滤）", "GraphicsScalingFilterLevelLabel": "等级", "GraphicsScalingFilterLevelTooltip": "设置 FSR 1.0 的锐化等级，数值越高，图像越锐利。", "SmaaLow": "SMAA 低质量", From 2d0d73b617886dc69977a0f19c28868861545041 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Wed, 23 Oct 2024 14:19:34 -0500 Subject: [PATCH 6/8] Null-coalesce autoload dirs on config load --- .../Configuration/ConfigurationState.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs index 3c3bc458c..fd065be1e 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs @@ -1500,7 +1500,7 @@ namespace Ryujinx.UI.Common.Configuration { Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 52."); - configurationFileFormat.AutoloadDirs = new(); + configurationFileFormat.AutoloadDirs = []; configurationFileUpdated = true; } @@ -1585,7 +1585,7 @@ namespace Ryujinx.UI.Common.Configuration UI.ColumnSort.SortColumnId.Value = configurationFileFormat.ColumnSort.SortColumnId; UI.ColumnSort.SortAscending.Value = configurationFileFormat.ColumnSort.SortAscending; UI.GameDirs.Value = configurationFileFormat.GameDirs; - UI.AutoloadDirs.Value = configurationFileFormat.AutoloadDirs; + UI.AutoloadDirs.Value = configurationFileFormat.AutoloadDirs ?? []; UI.ShownFileTypes.NSP.Value = configurationFileFormat.ShownFileTypes.NSP; UI.ShownFileTypes.PFS0.Value = configurationFileFormat.ShownFileTypes.PFS0; UI.ShownFileTypes.XCI.Value = configurationFileFormat.ShownFileTypes.XCI; @@ -1611,12 +1611,7 @@ namespace Ryujinx.UI.Common.Configuration Hid.EnableKeyboard.Value = configurationFileFormat.EnableKeyboard; Hid.EnableMouse.Value = configurationFileFormat.EnableMouse; Hid.Hotkeys.Value = configurationFileFormat.Hotkeys; - Hid.InputConfig.Value = configurationFileFormat.InputConfig; - - if (Hid.InputConfig.Value == null) - { - Hid.InputConfig.Value = new List(); - } + Hid.InputConfig.Value = configurationFileFormat.InputConfig ?? []; Multiplayer.LanInterfaceId.Value = configurationFileFormat.MultiplayerLanInterfaceId; Multiplayer.Mode.Value = configurationFileFormat.MultiplayerMode; From e30ee32eee07f950aea87f2c4c9cfd5e8d304101 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolov Date: Thu, 24 Oct 2024 11:10:54 +1000 Subject: [PATCH 7/8] Added option to ignore applet (gamepad connection window will not appear when it is disconnected) (#40) This option is under the hacks category for a reason; use if you know what you're doing. --- .../Configuration/ConfigurationFileFormat.cs | 7 ++++++- .../Configuration/ConfigurationState.cs | 18 ++++++++++++++++++ src/Ryujinx/Assets/Locales/ar_SA.json | 1 + src/Ryujinx/Assets/Locales/de_DE.json | 1 + src/Ryujinx/Assets/Locales/el_GR.json | 1 + src/Ryujinx/Assets/Locales/en_US.json | 1 + src/Ryujinx/Assets/Locales/es_ES.json | 1 + src/Ryujinx/Assets/Locales/fr_FR.json | 1 + src/Ryujinx/Assets/Locales/he_IL.json | 1 + src/Ryujinx/Assets/Locales/it_IT.json | 1 + src/Ryujinx/Assets/Locales/ja_JP.json | 1 + src/Ryujinx/Assets/Locales/ko_KR.json | 1 + src/Ryujinx/Assets/Locales/pl_PL.json | 1 + src/Ryujinx/Assets/Locales/pt_BR.json | 1 + src/Ryujinx/Assets/Locales/ru_RU.json | 1 + src/Ryujinx/Assets/Locales/th_TH.json | 1 + src/Ryujinx/Assets/Locales/tr_TR.json | 1 + src/Ryujinx/Assets/Locales/uk_UA.json | 1 + src/Ryujinx/Assets/Locales/zh_CN.json | 3 ++- src/Ryujinx/Assets/Locales/zh_TW.json | 1 + src/Ryujinx/UI/Applet/AvaHostUIHandler.cs | 8 ++++++++ src/Ryujinx/UI/ViewModels/SettingsViewModel.cs | 3 +++ .../UI/Views/Settings/SettingsSystemView.axaml | 3 +++ .../UI/Views/Settings/SettingsUIView.axaml | 2 +- 24 files changed, 58 insertions(+), 3 deletions(-) diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs index 89dcdb3ad..1eb970016 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs @@ -16,7 +16,7 @@ namespace Ryujinx.UI.Common.Configuration /// /// The current version of the file format /// - public const int CurrentVersion = 54; + public const int CurrentVersion = 55; /// /// Version of the configuration file format @@ -163,6 +163,11 @@ namespace Ryujinx.UI.Common.Configuration /// public bool ShowConfirmExit { get; set; } + /// + /// ignore "Applet" dialog + /// + public bool IgnoreApplet { get; set; } + /// /// Enables or disables save window size, position and state on close. /// diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs index 3d13fb2dd..dad4e7cea 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs @@ -642,6 +642,11 @@ namespace Ryujinx.UI.Common.Configuration /// public ReactiveObject ShowConfirmExit { get; private set; } + /// + /// Ignore Applet + /// + public ReactiveObject IgnoreApplet { get; private set; } + /// /// Enables or disables save window size, position and state on close. /// @@ -668,6 +673,7 @@ namespace Ryujinx.UI.Common.Configuration EnableDiscordIntegration = new ReactiveObject(); CheckUpdatesOnStart = new ReactiveObject(); ShowConfirmExit = new ReactiveObject(); + IgnoreApplet = new ReactiveObject(); RememberWindowState = new ReactiveObject(); EnableHardwareAcceleration = new ReactiveObject(); HideCursor = new ReactiveObject(); @@ -706,6 +712,7 @@ namespace Ryujinx.UI.Common.Configuration EnableDiscordIntegration = EnableDiscordIntegration, CheckUpdatesOnStart = CheckUpdatesOnStart, ShowConfirmExit = ShowConfirmExit, + IgnoreApplet = IgnoreApplet, RememberWindowState = RememberWindowState, EnableHardwareAcceleration = EnableHardwareAcceleration, HideCursor = HideCursor, @@ -817,6 +824,7 @@ namespace Ryujinx.UI.Common.Configuration EnableDiscordIntegration.Value = true; CheckUpdatesOnStart.Value = true; ShowConfirmExit.Value = true; + IgnoreApplet.Value = false; RememberWindowState.Value = true; EnableHardwareAcceleration.Value = true; HideCursor.Value = HideCursorMode.OnIdle; @@ -1523,6 +1531,15 @@ namespace Ryujinx.UI.Common.Configuration configurationFileUpdated = true; } + if (configurationFileFormat.Version < 55) + { + Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 55."); + + configurationFileFormat.IgnoreApplet = true; + + configurationFileUpdated = true; + } + Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog; Graphics.ResScale.Value = configurationFileFormat.ResScale; Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom; @@ -1553,6 +1570,7 @@ namespace Ryujinx.UI.Common.Configuration EnableDiscordIntegration.Value = configurationFileFormat.EnableDiscordIntegration; CheckUpdatesOnStart.Value = configurationFileFormat.CheckUpdatesOnStart; ShowConfirmExit.Value = configurationFileFormat.ShowConfirmExit; + IgnoreApplet.Value = configurationFileFormat.IgnoreApplet; RememberWindowState.Value = configurationFileFormat.RememberWindowState; EnableHardwareAcceleration.Value = configurationFileFormat.EnableHardwareAcceleration; HideCursor.Value = configurationFileFormat.HideCursor; diff --git a/src/Ryujinx/Assets/Locales/ar_SA.json b/src/Ryujinx/Assets/Locales/ar_SA.json index ed06778cb..2c4f98b11 100644 --- a/src/Ryujinx/Assets/Locales/ar_SA.json +++ b/src/Ryujinx/Assets/Locales/ar_SA.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "تجاهل الخدمات المفقودة", + "SettingsTabSystemIgnoreApplet": "Ignore Applet", "SettingsTabGraphics": "الرسومات", "SettingsTabGraphicsAPI": "API الرسومات ", "SettingsTabGraphicsEnableShaderCache": "تفعيل ذاكرة المظللات المؤقتة", diff --git a/src/Ryujinx/Assets/Locales/de_DE.json b/src/Ryujinx/Assets/Locales/de_DE.json index b78e3ded8..a62d4dd26 100644 --- a/src/Ryujinx/Assets/Locales/de_DE.json +++ b/src/Ryujinx/Assets/Locales/de_DE.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignoriere fehlende Dienste", + "SettingsTabSystemIgnoreApplet": "Applet ignorieren", "SettingsTabGraphics": "Grafik", "SettingsTabGraphicsAPI": "Grafik-API", "SettingsTabGraphicsEnableShaderCache": "Shader-Cache aktivieren", diff --git a/src/Ryujinx/Assets/Locales/el_GR.json b/src/Ryujinx/Assets/Locales/el_GR.json index 7a6e5619d..bf285723e 100644 --- a/src/Ryujinx/Assets/Locales/el_GR.json +++ b/src/Ryujinx/Assets/Locales/el_GR.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Αγνόηση υπηρεσιών που λείπουν", + "SettingsTabSystemIgnoreApplet": "Αγνοήστε το Applet", "SettingsTabGraphics": "Γραφικά", "SettingsTabGraphicsAPI": "API Γραφικά", "SettingsTabGraphicsEnableShaderCache": "Ενεργοποίηση Προσωρινής Μνήμης Shader", diff --git a/src/Ryujinx/Assets/Locales/en_US.json b/src/Ryujinx/Assets/Locales/en_US.json index 1dfbb81f1..c5199d8cc 100644 --- a/src/Ryujinx/Assets/Locales/en_US.json +++ b/src/Ryujinx/Assets/Locales/en_US.json @@ -155,6 +155,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignore Missing Services", + "SettingsTabSystemIgnoreApplet": "Ignore Applet", "SettingsTabGraphics": "Graphics", "SettingsTabGraphicsAPI": "Graphics API", "SettingsTabGraphicsEnableShaderCache": "Enable Shader Cache", diff --git a/src/Ryujinx/Assets/Locales/es_ES.json b/src/Ryujinx/Assets/Locales/es_ES.json index 55311d7fd..4cd8d7ebe 100644 --- a/src/Ryujinx/Assets/Locales/es_ES.json +++ b/src/Ryujinx/Assets/Locales/es_ES.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignorar servicios no implementados", + "SettingsTabSystemIgnoreApplet": "Ignorar el Applet", "SettingsTabGraphics": "Gráficos", "SettingsTabGraphicsAPI": "API de gráficos", "SettingsTabGraphicsEnableShaderCache": "Habilitar caché de sombreadores", diff --git a/src/Ryujinx/Assets/Locales/fr_FR.json b/src/Ryujinx/Assets/Locales/fr_FR.json index 6d6174f40..2f4fcd193 100644 --- a/src/Ryujinx/Assets/Locales/fr_FR.json +++ b/src/Ryujinx/Assets/Locales/fr_FR.json @@ -155,6 +155,7 @@ "SettingsTabSystemDramSize8GiB": "8GiO", "SettingsTabSystemDramSize12GiB": "12GiO", "SettingsTabSystemIgnoreMissingServices": "Ignorer les services manquants", + "SettingsTabSystemIgnoreApplet": "Ignorer l'applet", "SettingsTabGraphics": "Graphismes", "SettingsTabGraphicsAPI": "API Graphique", "SettingsTabGraphicsEnableShaderCache": "Activer le cache des shaders", diff --git a/src/Ryujinx/Assets/Locales/he_IL.json b/src/Ryujinx/Assets/Locales/he_IL.json index 129ef72ac..57f28a81c 100644 --- a/src/Ryujinx/Assets/Locales/he_IL.json +++ b/src/Ryujinx/Assets/Locales/he_IL.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "התעלם משירותים חסרים", + "SettingsTabSystemIgnoreApplet": "Ignore Applet", "SettingsTabGraphics": "גרפיקה", "SettingsTabGraphicsAPI": "ממשק גראפי", "SettingsTabGraphicsEnableShaderCache": "הפעל מטמון הצללות", diff --git a/src/Ryujinx/Assets/Locales/it_IT.json b/src/Ryujinx/Assets/Locales/it_IT.json index 94fe67d78..6a5781de5 100644 --- a/src/Ryujinx/Assets/Locales/it_IT.json +++ b/src/Ryujinx/Assets/Locales/it_IT.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignora servizi mancanti", + "SettingsTabSystemIgnoreApplet": "Ignora l'applet", "SettingsTabGraphics": "Grafica", "SettingsTabGraphicsAPI": "API grafica", "SettingsTabGraphicsEnableShaderCache": "Attiva la cache degli shader", diff --git a/src/Ryujinx/Assets/Locales/ja_JP.json b/src/Ryujinx/Assets/Locales/ja_JP.json index 67dec4229..ec0c85d3f 100644 --- a/src/Ryujinx/Assets/Locales/ja_JP.json +++ b/src/Ryujinx/Assets/Locales/ja_JP.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "未実装サービスを無視する", + "SettingsTabSystemIgnoreApplet": "アプレットを無視する", "SettingsTabGraphics": "グラフィックス", "SettingsTabGraphicsAPI": "グラフィックスAPI", "SettingsTabGraphicsEnableShaderCache": "シェーダーキャッシュを有効にする", diff --git a/src/Ryujinx/Assets/Locales/ko_KR.json b/src/Ryujinx/Assets/Locales/ko_KR.json index 5552d233e..6dc905634 100644 --- a/src/Ryujinx/Assets/Locales/ko_KR.json +++ b/src/Ryujinx/Assets/Locales/ko_KR.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "누락된 서비스 무시", + "SettingsTabSystemIgnoreApplet": "애플릿 무시", "SettingsTabGraphics": "그래픽", "SettingsTabGraphicsAPI": "그래픽 API", "SettingsTabGraphicsEnableShaderCache": "셰이더 캐시 활성화", diff --git a/src/Ryujinx/Assets/Locales/pl_PL.json b/src/Ryujinx/Assets/Locales/pl_PL.json index 92573ee40..c06865dce 100644 --- a/src/Ryujinx/Assets/Locales/pl_PL.json +++ b/src/Ryujinx/Assets/Locales/pl_PL.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignoruj Brakujące Usługi", + "SettingsTabSystemIgnoreApplet": "Ignoruj ​​aplet", "SettingsTabGraphics": "Grafika", "SettingsTabGraphicsAPI": "Graficzne API", "SettingsTabGraphicsEnableShaderCache": "Włącz pamięć podręczną cieni", diff --git a/src/Ryujinx/Assets/Locales/pt_BR.json b/src/Ryujinx/Assets/Locales/pt_BR.json index b951659f7..276089a57 100644 --- a/src/Ryujinx/Assets/Locales/pt_BR.json +++ b/src/Ryujinx/Assets/Locales/pt_BR.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignorar serviços não implementados", + "SettingsTabSystemIgnoreApplet": "Ignorar applet", "SettingsTabGraphics": "Gráficos", "SettingsTabGraphicsAPI": "API gráfica", "SettingsTabGraphicsEnableShaderCache": "Habilitar cache de shader", diff --git a/src/Ryujinx/Assets/Locales/ru_RU.json b/src/Ryujinx/Assets/Locales/ru_RU.json index 299631306..b60423868 100644 --- a/src/Ryujinx/Assets/Locales/ru_RU.json +++ b/src/Ryujinx/Assets/Locales/ru_RU.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Игнорировать отсутствующие службы", + "SettingsTabSystemIgnoreApplet": "Игнорировать Апплет", "SettingsTabGraphics": "Графика", "SettingsTabGraphicsAPI": "Графические API", "SettingsTabGraphicsEnableShaderCache": "Кэшировать шейдеры", diff --git a/src/Ryujinx/Assets/Locales/th_TH.json b/src/Ryujinx/Assets/Locales/th_TH.json index 2b795c872..da2501373 100644 --- a/src/Ryujinx/Assets/Locales/th_TH.json +++ b/src/Ryujinx/Assets/Locales/th_TH.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "ไม่สนใจบริการที่ขาดหายไป", + "SettingsTabSystemIgnoreApplet": "Ignore Applet", "SettingsTabGraphics": "กราฟิก", "SettingsTabGraphicsAPI": "กราฟฟิก API", "SettingsTabGraphicsEnableShaderCache": "เปิดใช้งาน แคชพื้นผิวและแสงเงา", diff --git a/src/Ryujinx/Assets/Locales/tr_TR.json b/src/Ryujinx/Assets/Locales/tr_TR.json index 96c0fd61a..004791c1c 100644 --- a/src/Ryujinx/Assets/Locales/tr_TR.json +++ b/src/Ryujinx/Assets/Locales/tr_TR.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Eksik Servisleri Görmezden Gel", + "SettingsTabSystemIgnoreApplet": "Ignore Applet", "SettingsTabGraphics": "Grafikler", "SettingsTabGraphicsAPI": "Grafikler API", "SettingsTabGraphicsEnableShaderCache": "Shader Önbelleğini Etkinleştir", diff --git a/src/Ryujinx/Assets/Locales/uk_UA.json b/src/Ryujinx/Assets/Locales/uk_UA.json index 39270fe1d..25a1888af 100644 --- a/src/Ryujinx/Assets/Locales/uk_UA.json +++ b/src/Ryujinx/Assets/Locales/uk_UA.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ігнорувати відсутні служби", + "SettingsTabSystemIgnoreApplet": "Ігнорувати Аплет", "SettingsTabGraphics": "Графіка", "SettingsTabGraphicsAPI": "Графічний API", "SettingsTabGraphicsEnableShaderCache": "Увімкнути кеш шейдерів", diff --git a/src/Ryujinx/Assets/Locales/zh_CN.json b/src/Ryujinx/Assets/Locales/zh_CN.json index 2eeb5717e..78f2840b3 100644 --- a/src/Ryujinx/Assets/Locales/zh_CN.json +++ b/src/Ryujinx/Assets/Locales/zh_CN.json @@ -107,7 +107,7 @@ "SettingsTabGeneralGameDirectories": "游戏目录", "SettingsTabGeneralAutoloadDirectories": "自动加载DLC/游戏更新目录", "SettingsTabGeneralAdd": "添加", - "SettingsTabGeneralRemove": "删除", + "SettingsTabGeneralRemove": "删除", "SettingsTabSystem": "系统", "SettingsTabSystemCore": "核心", "SettingsTabSystemSystemRegion": "系统区域：", @@ -155,6 +155,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "忽略缺失的服务", + "SettingsTabSystemIgnoreApplet": "忽略小程序", "SettingsTabGraphics": "图形", "SettingsTabGraphicsAPI": "图形 API", "SettingsTabGraphicsEnableShaderCache": "启用着色器缓存", diff --git a/src/Ryujinx/Assets/Locales/zh_TW.json b/src/Ryujinx/Assets/Locales/zh_TW.json index b724a2697..7a74da9b3 100644 --- a/src/Ryujinx/Assets/Locales/zh_TW.json +++ b/src/Ryujinx/Assets/Locales/zh_TW.json @@ -151,6 +151,7 @@ "SettingsTabSystemDramSize8GiB": "8GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "忽略缺少的模擬器功能", + "SettingsTabSystemIgnoreApplet": "忽略小程式", "SettingsTabGraphics": "圖形", "SettingsTabGraphicsAPI": "圖形 API", "SettingsTabGraphicsEnableShaderCache": "啟用著色器快取", diff --git a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs index 6eb9fff8b..064a2f75a 100644 --- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs +++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs @@ -9,6 +9,7 @@ using Ryujinx.HLE; using Ryujinx.HLE.HOS.Applets; using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types; using Ryujinx.HLE.UI; +using Ryujinx.UI.Common.Configuration; using System; using System.Threading; @@ -31,8 +32,15 @@ namespace Ryujinx.Ava.UI.Applet { ManualResetEvent dialogCloseEvent = new(false); + bool ignoreApplet = ConfigurationState.Instance.IgnoreApplet; bool okPressed = false; + if (ignoreApplet) + { + + return false; + } + Dispatcher.UIThread.InvokeAsync(async () => { var response = await ControllerAppletDialog.ShowControllerAppletDialog(_parent, args); diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index 537418ea9..a1f92d072 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -144,6 +144,7 @@ namespace Ryujinx.Ava.UI.ViewModels public bool EnableDiscordIntegration { get; set; } public bool CheckUpdatesOnStart { get; set; } public bool ShowConfirmExit { get; set; } + public bool IgnoreApplet { get; set; } public bool RememberWindowState { get; set; } public int HideCursor { get; set; } public bool EnableDockedMode { get; set; } @@ -407,6 +408,7 @@ namespace Ryujinx.Ava.UI.ViewModels EnableDiscordIntegration = config.EnableDiscordIntegration; CheckUpdatesOnStart = config.CheckUpdatesOnStart; ShowConfirmExit = config.ShowConfirmExit; + IgnoreApplet = config.IgnoreApplet; RememberWindowState = config.RememberWindowState; HideCursor = (int)config.HideCursor.Value; @@ -503,6 +505,7 @@ namespace Ryujinx.Ava.UI.ViewModels config.EnableDiscordIntegration.Value = EnableDiscordIntegration; config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart; config.ShowConfirmExit.Value = ShowConfirmExit; + config.IgnoreApplet.Value = IgnoreApplet; config.RememberWindowState.Value = RememberWindowState; config.HideCursor.Value = (HideCursorMode)HideCursor; diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml index 384231880..afc5b2fc5 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml @@ -238,6 +238,9 @@ ToolTip.Tip="{locale:Locale IgnoreMissingServicesTooltip}"> + + + diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml index ac5e8371f..399165b16 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml @@ -1,4 +1,4 @@ - Date: Thu, 24 Oct 2024 11:25:12 -0500 Subject: [PATCH 8/8] Mention ryujinx-mirror --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b9b3af721..22f601083 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,9 @@ This fork is intended to be a direct continuation for existing Ryujinx users. Guides and documentation will not be provided at this time, though you can find the old ones on the Internet Archive.

+

+ If you would like a version more true to original Ryujinx, check out ryujinx-mirror. +