Fixed an oopsies

https://stackoverflow.com/a/78577080

src/Ryujinx.UI.Common/Helper/ConsoleHelper.cs

@@ -7,6 +7,24 @@ namespace Ryujinx.UI.Common.Helper
 {
     public static partial class ConsoleHelper
     {
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("kernel32")]
+        private static partial nint GetConsoleWindow();
+
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool ShowWindow(nint hWnd, int nCmdShow);
+
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        private static partial nint GetForegroundWindow();
+        
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool SetForegroundWindow(nint hWnd);
+
         public static bool SetConsoleWindowStateSupported => OperatingSystem.IsWindows();
 
         public static void SetConsoleWindowState(bool show)
@@ -35,16 +53,11 @@ namespace Ryujinx.UI.Common.Helper
                 return;
             }
 
+            SetForegroundWindow(hWnd);
+
+            hWnd = GetForegroundWindow();
+
             ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
         }
-
-        [SupportedOSPlatform("windows")]
-        [LibraryImport("kernel32")]
-        private static partial nint GetConsoleWindow();
-
-        [SupportedOSPlatform("windows")]
-        [LibraryImport("user32")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static partial bool ShowWindow(nint hWnd, int nCmdShow);
     }
 }

src/Ryujinx/App.axaml

@@ -11,7 +11,7 @@
         </ResourceDictionary>
     </Application.Resources>
     <Application.Styles>
-        <sty:FluentAvaloniaTheme PreferSystemTheme="False" />
+        <sty:FluentAvaloniaTheme PreferUserAccentColor="True" PreferSystemTheme="False" />
         <StyleInclude Source="/Assets/Styles/Styles.xaml" />
     </Application.Styles>
 </Application>

src/Ryujinx/Assets/Locales/ar_SA.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "الغش متوفر لـ {0} [{1}]",
   "BuildId": "معرف البناء:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "المحتويات القابلة للتنزيل {0}",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/de_DE.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "Cheats verfügbar für {0} [{1}]",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
   "BuildId": "BuildId:",
-  "DlcWindowHeading": "DLC verfügbar für {0} [{1}]",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/el_GR.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "Διαθέσιμα Cheats για {0} [{1}]",
   "BuildId": "BuildId:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} Downloadable Content(s) available for {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/en_US.json

@@ -802,7 +802,7 @@
   "CheatWindowHeading": "Cheats Available for {0} [{1}]",
   "BuildId": "BuildId:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} Downloadable Content(s) available for {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/es_ES.json

@@ -31,14 +31,14 @@
   "MenuBarToolsInstallFirmware": "Instalar firmware",
   "MenuBarFileToolsInstallFirmwareFromFile": "Instalar firmware desde un archivo XCI o ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Instalar firmware desde una carpeta",
-  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarToolsInstallKeys": "Instalar Keys",
   "MenuBarFileToolsInstallKeysFromFile": "Instalar keys de KEYS o ZIP",
   "MenuBarFileToolsInstallKeysFromFolder": "Instalar keys de un directorio",
   "MenuBarToolsManageFileTypes": "Administrar tipos de archivo",
   "MenuBarToolsInstallFileTypes": "Instalar tipos de archivo",
   "MenuBarToolsUninstallFileTypes": "Desinstalar tipos de archivo",
   "MenuBarToolsXCITrimmer": "Recortar archivos XCI",
-  "MenuBarView": "_View",
+  "MenuBarView": "_Vista",
   "MenuBarViewWindow": "Tamaño Ventana",
   "MenuBarViewWindow720": "720p",
   "MenuBarViewWindow1080": "1080p",
@@ -148,6 +148,18 @@
   "SettingsTabSystemSystemLanguageTraditionalChinese": "Chino tradicional",
   "SettingsTabSystemSystemTimeZone": "Zona horaria del sistema:",
   "SettingsTabSystemSystemTime": "Hora del sistema:",
+  "SettingsTabSystemVSyncMode": "Sincronización vertical:",
+  "SettingsTabSystemEnableCustomVSyncInterval": "Activar tasa de refresco personalizada (Experimental)",
+  "SettingsTabSystemVSyncModeSwitch": "Switch",
+  "SettingsTabSystemVSyncModeUnbounded": "Sin límite",
+  "SettingsTabSystemVSyncModeCustom": "Tasa de refresco personalizada",
+  "SettingsTabSystemVSyncModeTooltip": "Sincronización vertical a emular. 'Switch' emula la tasa de refresco de 60Hz de la Switch. 'Sin límite' es una tasa de refresco sin límite.",
+  "SettingsTabSystemVSyncModeTooltipCustom": "Sincronización vertical a emular. 'Switch' emula la tasa de refresco de 60Hz de la Switch. 'Sin límite' es una tasa de refresco sin límite. 'Personalizada' emula la tasa de refresco especificada.",
+  "SettingsTabSystemEnableCustomVSyncIntervalTooltip": "Permite al usuario especificar una tasa de refresco personalizada. En algunos títulos, puede acelerar o ralentizar la lógica del juego. En otros, puede permitir limitar los FPS a cierto múltiplo de la tasa de refresco, o producir comportamiento impredecible. Ésta es una característica experimiental, sin garantías de como se afectará la jugabilidad. \n\nDesactívalo si no sabes que hacer.",
+  "SettingsTabSystemCustomVSyncIntervalValueTooltip": "El valor objetivo de la tasa de refresco personalizada.",
+  "SettingsTabSystemCustomVSyncIntervalSliderTooltip": "La tasa de refresco personalizada, como un porcentaje de la tasa de refresco normal de la Switch.",
+  "SettingsTabSystemCustomVSyncIntervalPercentage": "% de tasa de refresco personalizada:",
+  "SettingsTabSystemCustomVSyncIntervalValue": "Valor de tasa de refresco personalizada:",
   "SettingsTabSystemEnableVsync": "Sincronización vertical",
   "SettingsTabSystemEnablePptc": "PPTC (Cache de Traducción de Perfil Persistente)",
   "SettingsTabSystemEnableLowPowerPptc": "Cache PPTC de bajo consumo",
@@ -292,58 +304,58 @@
   "ControllerSettingsSave": "Guardar",
   "ControllerSettingsClose": "Cerrar",
   "KeyUnknown": "Desconocido",
-  "KeyShiftLeft": "Shift Left",
+  "KeyShiftLeft": "Shift Izq.",
-  "KeyShiftRight": "Shift Right",
+  "KeyShiftRight": "Shift Der.",
-  "KeyControlLeft": "Ctrl Left",
+  "KeyControlLeft": "Ctrl Izq.",
-  "KeyMacControlLeft": "⌃ Left",
+  "KeyMacControlLeft": "⌃ Izq.",
-  "KeyControlRight": "Ctrl Right",
+  "KeyControlRight": "Ctrl Der.",
-  "KeyMacControlRight": "⌃ Right",
+  "KeyMacControlRight": "⌃ Der.",
-  "KeyAltLeft": "Alt Left",
+  "KeyAltLeft": "Alt Izq.",
-  "KeyMacAltLeft": "⌥ Left",
+  "KeyMacAltLeft": "⌥ Izq.",
-  "KeyAltRight": "Alt Right",
+  "KeyAltRight": "Alt Der.",
-  "KeyMacAltRight": "⌥ Right",
+  "KeyMacAltRight": "⌥ Der.",
-  "KeyWinLeft": "⊞ Left",
+  "KeyWinLeft": "⊞ Izq.",
-  "KeyMacWinLeft": "⌘ Left",
+  "KeyMacWinLeft": "⌘ Izq.",
-  "KeyWinRight": "⊞ Right",
+  "KeyWinRight": "⊞ Der.",
-  "KeyMacWinRight": "⌘ Right",
+  "KeyMacWinRight": "⌘ Der.",
-  "KeyMenu": "Menu",
+  "KeyMenu": "Menú",
-  "KeyUp": "Up",
+  "KeyUp": "Arriba",
-  "KeyDown": "Down",
+  "KeyDown": "Abajo",
-  "KeyLeft": "Left",
+  "KeyLeft": "Izq.",
-  "KeyRight": "Right",
+  "KeyRight": "Der.",
   "KeyEnter": "Enter",
   "KeyEscape": "Escape",
-  "KeySpace": "Space",
+  "KeySpace": "Espacio",
   "KeyTab": "Tab",
-  "KeyBackSpace": "Backspace",
+  "KeyBackSpace": "Retroceso",
-  "KeyInsert": "Insert",
+  "KeyInsert": "Insertar",
-  "KeyDelete": "Delete",
+  "KeyDelete": "Suprimir",
-  "KeyPageUp": "Page Up",
+  "KeyPageUp": "Av. Pág.",
-  "KeyPageDown": "Page Down",
+  "KeyPageDown": "Re. Pág",
-  "KeyHome": "Home",
+  "KeyHome": "Inicio",
-  "KeyEnd": "End",
+  "KeyEnd": "Fin",
-  "KeyCapsLock": "Caps Lock",
+  "KeyCapsLock": "Bloq. Mayús.",
-  "KeyScrollLock": "Scroll Lock",
+  "KeyScrollLock": "Bloq. Despl.",
-  "KeyPrintScreen": "Print Screen",
+  "KeyPrintScreen": "Impr. Pant.",
-  "KeyPause": "Pause",
+  "KeyPause": "Pausa",
-  "KeyNumLock": "Num Lock",
+  "KeyNumLock": "Bloq. Num.",
   "KeyClear": "Clear",
-  "KeyKeypad0": "Keypad 0",
+  "KeyKeypad0": "0 tec. num.",
-  "KeyKeypad1": "Keypad 1",
+  "KeyKeypad1": "1 tec. num.",
-  "KeyKeypad2": "Keypad 2",
+  "KeyKeypad2": "2 tec. num.",
-  "KeyKeypad3": "Keypad 3",
+  "KeyKeypad3": "3 tec. num.",
-  "KeyKeypad4": "Keypad 4",
+  "KeyKeypad4": "4 tec. num.",
-  "KeyKeypad5": "Keypad 5",
+  "KeyKeypad5": "5 tec. num.",
-  "KeyKeypad6": "Keypad 6",
+  "KeyKeypad6": "6 tec. num.",
-  "KeyKeypad7": "Keypad 7",
+  "KeyKeypad7": "7 tec. num.",
-  "KeyKeypad8": "Keypad 8",
+  "KeyKeypad8": "8 tec. num.",
-  "KeyKeypad9": "Keypad 9",
+  "KeyKeypad9": "9 tec. num.",
-  "KeyKeypadDivide": "Keypad Divide",
+  "KeyKeypadDivide": "Dividir tec. num.",
-  "KeyKeypadMultiply": "Keypad Multiply",
+  "KeyKeypadMultiply": "Multiplicar tec. num.",
-  "KeyKeypadSubtract": "Keypad Subtract",
+  "KeyKeypadSubtract": "Resta tec. num.",
-  "KeyKeypadAdd": "Keypad Add",
+  "KeyKeypadAdd": "Suma tec. num.",
-  "KeyKeypadDecimal": "Keypad Decimal",
+  "KeyKeypadDecimal": "Decimal tec. num.",
-  "KeyKeypadEnter": "Keypad Enter",
+  "KeyKeypadEnter": "Enter tec. num.",
   "KeyNumber0": "0",
   "KeyNumber1": "1",
   "KeyNumber2": "2",
@@ -366,32 +378,32 @@
   "KeyPeriod": ".",
   "KeySlash": "/",
   "KeyBackSlash": "\\",
-  "KeyUnbound": "Unbound",
+  "KeyUnbound": "S. reg.",
-  "GamepadLeftStick": "L Stick Button",
+  "GamepadLeftStick": "Botón A. Izq.",
-  "GamepadRightStick": "R Stick Button",
+  "GamepadRightStick": "Botón A. Der.",
-  "GamepadLeftShoulder": "Left Shoulder",
+  "GamepadLeftShoulder": "Hombro izq.",
-  "GamepadRightShoulder": "Right Shoulder",
+  "GamepadRightShoulder": "Hombro der.",
-  "GamepadLeftTrigger": "Left Trigger",
+  "GamepadLeftTrigger": "Trigger izq.",
-  "GamepadRightTrigger": "Right Trigger",
+  "GamepadRightTrigger": "Trigger der.",
-  "GamepadDpadUp": "Up",
+  "GamepadDpadUp": "Arriba",
-  "GamepadDpadDown": "Down",
+  "GamepadDpadDown": "Abajo",
-  "GamepadDpadLeft": "Left",
+  "GamepadDpadLeft": "Izq.",
-  "GamepadDpadRight": "Right",
+  "GamepadDpadRight": "Der.",
   "GamepadMinus": "-",
   "GamepadPlus": "+",
-  "GamepadGuide": "Guide",
+  "GamepadGuide": "Guía",
-  "GamepadMisc1": "Misc",
+  "GamepadMisc1": "Misc.",
   "GamepadPaddle1": "Paddle 1",
   "GamepadPaddle2": "Paddle 2",
   "GamepadPaddle3": "Paddle 3",
   "GamepadPaddle4": "Paddle 4",
-  "GamepadTouchpad": "Touchpad",
+  "GamepadTouchpad": "Panel tác.",
-  "GamepadSingleLeftTrigger0": "Left Trigger 0",
+  "GamepadSingleLeftTrigger0": "Trigger izq. 0",
-  "GamepadSingleRightTrigger0": "Right Trigger 0",
+  "GamepadSingleRightTrigger0": "Trigger der. 0",
-  "GamepadSingleLeftTrigger1": "Left Trigger 1",
+  "GamepadSingleLeftTrigger1": "Trigger izq. 1",
-  "GamepadSingleRightTrigger1": "Right Trigger 1",
+  "GamepadSingleRightTrigger1": "Trigger der. 1",
-  "StickLeft": "Left Stick",
+  "StickLeft": "Análogo izq.",
-  "StickRight": "Right Stick",
+  "StickRight": "Análogo der.",
   "UserProfilesSelectedUserProfile": "Perfil de usuario seleccionado:",
   "UserProfilesSaveProfileName": "Guardar nombre de perfil",
   "UserProfilesChangeProfileImage": "Cambiar imagen de perfil",
@@ -408,8 +420,8 @@
   "InputDialogTitle": "Cuadro de diálogo de entrada",
   "InputDialogOk": "Aceptar",
   "InputDialogCancel": "Cancelar",
-  "InputDialogCancelling": "Cancelling",
+  "InputDialogCancelling": "Cancelando",
-  "InputDialogClose": "Close",
+  "InputDialogClose": "Cerrar",
   "InputDialogAddNewProfileTitle": "Introducir nombre de perfil",
   "InputDialogAddNewProfileHeader": "Por favor elige un nombre de usuario",
   "InputDialogAddNewProfileSubtext": "(Máximo de caracteres: {0})",
@@ -461,7 +473,7 @@
   "DialogUpdaterExtractionMessage": "Extrayendo actualización...",
   "DialogUpdaterRenamingMessage": "Renombrando actualización...",
   "DialogUpdaterAddingFilesMessage": "Aplicando actualización...",
-  "DialogUpdaterShowChangelogMessage": "Show Changelog",
+  "DialogUpdaterShowChangelogMessage": "Mostrar reg. de cambios",
   "DialogUpdaterCompleteMessage": "¡Actualización completa!",
   "DialogUpdaterRestartMessage": "¿Quieres reiniciar Ryujinx?",
   "DialogUpdaterNoInternetMessage": "¡No estás conectado a internet!",
@@ -733,11 +745,14 @@
   "RyujinxUpdater": "Actualizador de Ryujinx",
   "SettingsTabHotkeys": "Atajos de teclado",
   "SettingsTabHotkeysHotkeys": "Atajos de teclado",
+  "SettingsTabHotkeysToggleVSyncModeHotkey": "Activar modo sincronización vertical:",
   "SettingsTabHotkeysToggleVsyncHotkey": "Alternar la sincronización vertical:",
   "SettingsTabHotkeysScreenshotHotkey": "Captura de pantalla:",
   "SettingsTabHotkeysShowUiHotkey": "Mostrar interfaz:",
   "SettingsTabHotkeysPauseHotkey": "Pausar:",
   "SettingsTabHotkeysToggleMuteHotkey": "Silenciar:",
+  "SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey": "Aumentar tasa de refresco personalizada:",
+  "SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey": "Reducir tasa de refresco personalizada:",
   "ControllerMotionTitle": "Opciones de controles de movimiento",
   "ControllerRumbleTitle": "Opciones de vibración",
   "SettingsSelectThemeFileDialogTitle": "Selecciona un archivo de tema",
@@ -787,7 +802,7 @@
   "UpdateWindowBundledContentNotice": "Las actualizaciones agrupadas no pueden ser eliminadas, solamente deshabilitadas.",
   "CheatWindowHeading": "Cheats disponibles para {0} [{1}]",
   "BuildId": "Id de compilación:",
-  "DlcWindowHeading": "Contenido descargable disponible para {0} [{1}]",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "Se agregaron {0} nuevo(s) contenido(s) descargable(s)",
   "AutoloadDlcAddedMessage": "Se agregaron {0} nuevo(s) contenido(s) descargable(s)",
   "AutoloadDlcRemovedMessage": "Se eliminaron {0} contenido(s) descargable(s) faltantes",
@@ -837,7 +852,7 @@
   "Recover": "Recuperar",
   "UserProfilesRecoverHeading": "Datos de guardado fueron encontrados para las siguientes cuentas",
   "UserProfilesRecoverEmptyList": "No hay perfiles a recuperar",
-  "GraphicsAATooltip": "Aplica antia-aliasing al rendereo del juego.\n\nFXAA desenfocará la mayor parte del la iamgen, mientras que SMAA intentará encontrar bordes irregulares y suavizarlos.\n\nNo se recomienda usar en conjunto con filtro de escala FSR.\n\nEsta opción puede ser modificada mientras que esté corriendo el juego haciendo click en \"Aplicar\" más abajo; simplemente puedes mover la ventana de configuración a un lado y experimentar hasta que encuentres tu estilo preferido para un juego.\n\nDejar en NADA si no está seguro.",
+  "GraphicsAATooltip": "Aplica anti-aliasing al rendereo del juego.\n\nFXAA desenfocará la mayor parte del la iamgen, mientras que SMAA intentará encontrar bordes irregulares y suavizarlos.\n\nNo se recomienda usar en conjunto con filtro de escala FSR.\n\nEsta opción puede ser modificada mientras que esté corriendo el juego haciendo click en \"Aplicar\" más abajo; simplemente puedes mover la ventana de configuración a un lado y experimentar hasta que encuentres tu estilo preferido para un juego.\n\nDejar en NADA si no está seguro.",
   "GraphicsAALabel": "Suavizado de bordes:",
   "GraphicsScalingFilterLabel": "Filtro de escalado:",
   "GraphicsScalingFilterTooltip": "Elija el filtro de escala que se aplicará al utilizar la escala de resolución.\n\nBilinear funciona bien para juegos 3D y es una opción predeterminada segura.\n\nSe recomienda el bilinear para juegos de pixel art.\n\nFSR 1.0 es simplemente un filtro de afilado, no se recomienda su uso con FXAA o SMAA.\n\nEsta opción se puede cambiar mientras se ejecuta un juego haciendo clic en \"Aplicar\" a continuación; simplemente puedes mover la ventana de configuración a un lado y experimentar hasta que encuentres tu estilo preferido para un juego.\n\nDéjelo en BILINEAR si no está seguro.",

src/Ryujinx/Assets/Locales/fr_FR.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "Cheats disponibles pour {0} [{1}]",
   "BuildId": "BuildId :",
   "DlcWindowBundledContentNotice": "Les DLC inclus avec le jeu ne peuvent pas être supprimés mais peuvent être désactivés.",
-  "DlcWindowHeading": "{0} Contenu(s) téléchargeable(s)",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} nouveau(x) contenu(s) téléchargeable(s) ajouté(s)",
   "AutoloadDlcAddedMessage": "{0} nouveau(x) contenu(s) téléchargeable(s) ajouté(s)",
   "AutoloadDlcRemovedMessage": "{0} contenu(s) téléchargeable(s) manquant(s) supprimé(s)",

src/Ryujinx/Assets/Locales/it_IT.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "Trucchi disponibili per {0} [{1}]",
   "BuildId": "ID Build",
   "DlcWindowBundledContentNotice": "i DLC \"impacchettati\" non possono essere rimossi, ma solo disabilitati.",
-  "DlcWindowHeading": "DLC disponibili per {0} [{1}]",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} nuovo/i contenuto/i scaricabile/i aggiunto/i",
   "AutoloadDlcAddedMessage": "{0} contenuto/i scaricabile/i aggiunto/i",
   "AutoloadDlcRemovedMessage": "{0} contenuto/i scaricabile/i mancante/i rimosso/i",

src/Ryujinx/Assets/Locales/ja_JP.json

@@ -787,7 +787,7 @@
   "UpdateWindowBundledContentNotice": "Bundled updates cannot be removed, only disabled.",
   "CheatWindowHeading": "利用可能なチート {0} [{1}]",
   "BuildId": "ビルドID:",
-  "DlcWindowHeading": "利用可能な DLC {0} [{1}]",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/ko_KR.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "{0} [{1}]에 사용 가능한 치트",
   "BuildId": "빌드ID:",
   "DlcWindowBundledContentNotice": "번들 DLC는 제거할 수 없으며 비활성화만 가능합니다.",
-  "DlcWindowHeading": "{1} ({2})에 내려받기 가능한 콘텐츠 {0}개 사용 가능",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0}개의 새로운 내려받기 가능한 콘텐츠가 추가됨",
   "AutoloadDlcAddedMessage": "{0}개의 새로운 내려받기 가능한 콘텐츠가 추가됨",
   "AutoloadDlcRemovedMessage": "{0}개의 내려받기 가능한 콘텐츠가 제거됨",

src/Ryujinx/Assets/Locales/pl_PL.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "Kody Dostępne dla {0} [{1}]",
   "BuildId": "Identyfikator wersji:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} Zawartości do Pobrania dostępna dla {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/pt_BR.json

@@ -787,7 +787,7 @@
   "CheatWindowHeading": "Cheats disponíveis para {0} [{1}]",
   "BuildId": "ID da Build:",
   "DlcWindowBundledContentNotice": "DLCs incorporadas não podem ser removidas, apenas desativadas.",
-  "DlcWindowHeading": "{0} DLCs disponíveis para {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} novo(s) conteúdo(s) para download adicionado(s)",
   "AutoloadDlcAddedMessage": "{0} novo(s) conteúdo(s) para download adicionado(s)",
   "AutoloadDlcRemovedMessage": "{0} conteúdo(s) para download ausente(s) removido(s)",

src/Ryujinx/Assets/Locales/ru_RU.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "Доступные читы для {0} [{1}]",
   "BuildId": "ID версии:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} DLC",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/th_TH.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "สูตรโกงมีให้สำหรับ {0} [{1}]",
   "BuildId": "รหัสการสร้าง:",
   "DlcWindowBundledContentNotice": "แพ็ค DLC ไม่สามารถลบทิ้งได้ สามารถปิดใช้งานได้เท่านั้น",
-  "DlcWindowHeading": "{0} DLC ที่สามารถดาวน์โหลดได้",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} DLC ใหม่ที่เพิ่มเข้ามา",
   "AutoloadDlcAddedMessage": "{0} ใหม่ที่เพิ่มเข้ามา",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/tr_TR.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "{0} için Hile mevcut [{1}]",
   "BuildId": "BuildId:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} Downloadable Content(s) available for {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/uk_UA.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "Коди доступні для {0} [{1}]",
   "BuildId": "ID збірки:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "Вміст для завантаження, доступний для {1} ({2}): {0}",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/zh_TW.json

@@ -788,7 +788,7 @@
   "CheatWindowHeading": "可用於 {0} [{1}] 的密技",
   "BuildId": "組建識別碼:",
   "DlcWindowBundledContentNotice": "附帶的 DLC 只能被停用而無法被刪除。",
-  "DlcWindowHeading": "{0} 個可下載內容",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "已加入 {0} 個 DLC",
   "AutoloadDlcAddedMessage": "已加入 {0} 個 DLC",
   "AutoloadDlcRemovedMessage": "已刪除 {0} 個遺失的 DLC",

src/Ryujinx/Assets/Styles/Themes.xaml

@@ -4,18 +4,6 @@
         <ResourceDictionary x:Key="Default">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
-            <SolidColorBrush x:Key="ThemeAccentColorBrush"
-                             Color="{DynamicResource SystemAccentColor}" />
-            <SolidColorBrush x:Key="ThemeAccentBrush4"
-                             Color="{DynamicResource ThemeAccentColor4}" />
-            <Color x:Key="SystemAccentColor">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark1">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark2">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark3">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight1">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight2">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight3">#FF00C3E3</Color>
-            <Color x:Key="ThemeAccentColor4">#FFe8e8e8</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
             <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
@@ -26,6 +14,7 @@
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
             <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
             <Color x:Key="SecondaryTextColor">#A0000000</Color>
+            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
             <Color x:Key="Switch">#FF2EEAC9</Color>
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
@@ -33,18 +22,6 @@
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
-            <SolidColorBrush x:Key="ThemeAccentColorBrush"
-                             Color="{DynamicResource SystemAccentColor}" />
-            <SolidColorBrush x:Key="ThemeAccentBrush4"
-                             Color="{DynamicResource ThemeAccentColor4}" />
-            <Color x:Key="SystemAccentColor">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark1">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark2">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark3">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight1">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight2">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight3">#FF00C3E3</Color>
-            <Color x:Key="ThemeAccentColor4">#FFe8e8e8</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
             <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
@@ -59,18 +36,7 @@
         <ResourceDictionary x:Key="Dark">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
-            <SolidColorBrush x:Key="ThemeAccentColorBrush"
-                             Color="{DynamicResource SystemAccentColor}" />
-            <SolidColorBrush x:Key="ThemeAccentBrush4"
-                             Color="{DynamicResource ThemeAccentColor4}" />
             <Color x:Key="ControlFillColorSecondary">#008AA8</Color>
-            <Color x:Key="SystemAccentColor">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark1">#FF99b000</Color>
-            <Color x:Key="SystemAccentColorDark2">#FF006d7d</Color>
-            <Color x:Key="SystemAccentColorDark3">#FF00525E</Color>
-            <Color x:Key="SystemAccentColorLight1">#FF00dbff</Color>
-            <Color x:Key="SystemAccentColorLight2">#FF19dfff</Color>
-            <Color x:Key="SystemAccentColorLight3">#FF33e3ff</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FF2D2D2D</Color>
             <Color x:Key="ThemeControlBorderColor">#FF505050</Color>

src/Ryujinx/Common/Markup/BasicMarkupExtension.cs

@@ -17,13 +17,13 @@ namespace Ryujinx.Ava.Common.Markup
         public virtual string Name => "Item";
         public virtual Action<object, T?>? Setter => null;
 
-        protected abstract T? GetValue();
+        protected abstract T? Value { get; }
 
         protected virtual void ConfigureBindingExtension(CompiledBindingExtension _) { }
 
         private ClrPropertyInfo PropertyInfo =>
             new(Name,
-                _ => GetValue(),
+                _ => Value,
                 Setter as Action<object, object?>,
                 typeof(T));
 

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -6,17 +6,17 @@ namespace Ryujinx.Ava.Common.Markup
 {
     internal class IconExtension(string iconString) : BasicMarkupExtension<Icon>
     {
-        protected override Icon GetValue() => new() { Value = iconString };
+        protected override Icon Value => new() { Value = iconString };
     }
     
     internal class SpinningIconExtension(string iconString) : BasicMarkupExtension<Icon>
     {
-        protected override Icon GetValue() => new() { Value = iconString, Animation = IconAnimation.Spin };
+        protected override Icon Value => new() { Value = iconString, Animation = IconAnimation.Spin };
     }
     
     internal class LocaleExtension(LocaleKeys key) : BasicMarkupExtension<string>
     {
-        protected override string GetValue() => LocaleManager.Instance[key];
+        protected override string Value => LocaleManager.Instance[key];
 
         protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
             => bindingExtension.Source = LocaleManager.Instance;

src/Ryujinx/UI/Controls/ApplicationGridView.axaml

@@ -91,7 +91,7 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
                             FontSize="16"
-                            Foreground="{DynamicResource SystemAccentColor}"
+                            Foreground="{DynamicResource FavoriteApplicationIconColor}"
                             IsVisible="{Binding Favorite}"
                             Symbol="StarFilled" />
                     </Grid>

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -146,7 +146,7 @@
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Top"
                                     FontSize="16"
-                                    Foreground="{DynamicResource SystemAccentColor}"
+                                    Foreground="{DynamicResource FavoriteApplicationIconColor}"
                                     IsVisible="{Binding Favorite}"
                                     Symbol="StarFilled" />
                             </Grid>

src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml.cs

@@ -61,23 +61,17 @@ namespace Ryujinx.Ava.UI.Windows
 
         private void RemoveDLC(object sender, RoutedEventArgs e)
         {
-            if (sender is Button button)
+            if (sender is Button { DataContext: DownloadableContentModel dlc })
             {
-                if (button.DataContext is DownloadableContentModel model)
+                ViewModel.Remove(dlc);
-                {
-                    ViewModel.Remove(model);
-                }
             }
         }
 
         private void OpenLocation(object sender, RoutedEventArgs e)
         {
-            if (sender is Button button)
+            if (sender is Button { DataContext: DownloadableContentModel dlc })
             {
-                if (button.DataContext is DownloadableContentModel model)
+                OpenHelper.LocateFile(dlc.ContainerPath);
-                {
-                    OpenHelper.LocateFile(model.ContainerPath);
-                }
             }
         }