diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs index 995523d1d..b1ed01656 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 = 61; + public const int CurrentVersion = 62; /// /// Version of the configuration file format @@ -132,6 +132,11 @@ namespace Ryujinx.UI.Common.Configuration /// Enables printing FS access log messages /// public bool LoggingEnableFsAccessLog { get; set; } + + /// + /// Enables log messages from Avalonia + /// + public bool LoggingEnableAvalonia { get; set; } /// /// Controls which log messages are written to the log targets diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs index e070b944f..e4f5cb58d 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs @@ -270,6 +270,11 @@ namespace Ryujinx.UI.Common.Configuration /// public ReactiveObject EnableFsAccessLog { get; private set; } + /// + /// Enables log messages from Avalonia + /// + public ReactiveObject EnableAvaloniaLog { get; private set; } + /// /// Controls which log messages are written to the log targets /// @@ -295,6 +300,7 @@ namespace Ryujinx.UI.Common.Configuration EnableTrace = new ReactiveObject(); EnableGuest = new ReactiveObject(); EnableFsAccessLog = new ReactiveObject(); + EnableAvaloniaLog = new ReactiveObject(); FilteredClasses = new ReactiveObject(); EnableFileLog = new ReactiveObject(); EnableFileLog.Event += static (_, e) => LogValueChange(e, nameof(EnableFileLog)); @@ -845,6 +851,7 @@ namespace Ryujinx.UI.Common.Configuration LoggingEnableFsAccessLog = Logger.EnableFsAccessLog, LoggingFilteredClasses = Logger.FilteredClasses, LoggingGraphicsDebugLevel = Logger.GraphicsDebugLevel, + LoggingEnableAvalonia = Logger.EnableAvaloniaLog, SystemLanguage = System.Language, SystemRegion = System.Region, SystemTimeZone = System.TimeZone, @@ -974,6 +981,7 @@ namespace Ryujinx.UI.Common.Configuration Logger.EnableFsAccessLog.Value = false; Logger.FilteredClasses.Value = []; Logger.GraphicsDebugLevel.Value = GraphicsDebugLevel.None; + Logger.EnableAvaloniaLog.Value = false; System.Language.Value = Language.AmericanEnglish; System.Region.Value = Region.USA; System.TimeZone.Value = "UTC"; @@ -1806,6 +1814,15 @@ namespace Ryujinx.UI.Common.Configuration configurationFileUpdated = true; } + if (configurationFileFormat.Version < 62) + { + Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 62."); + + configurationFileFormat.LoggingEnableAvalonia = false; + + configurationFileUpdated = true; + } + Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog; Graphics.ResScale.Value = configurationFileFormat.ResScale; Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom; @@ -1823,6 +1840,7 @@ namespace Ryujinx.UI.Common.Configuration Graphics.ScalingFilter.Value = configurationFileFormat.ScalingFilter; Graphics.ScalingFilterLevel.Value = configurationFileFormat.ScalingFilterLevel; Logger.EnableDebug.Value = configurationFileFormat.LoggingEnableDebug; + Logger.EnableAvaloniaLog.Value = configurationFileFormat.LoggingEnableAvalonia; Logger.EnableStub.Value = configurationFileFormat.LoggingEnableStub; Logger.EnableInfo.Value = configurationFileFormat.LoggingEnableInfo; Logger.EnableWarn.Value = configurationFileFormat.LoggingEnableWarn; diff --git a/src/Ryujinx/Assets/Locales/de_DE.json b/src/Ryujinx/Assets/Locales/de_DE.json index 02e6b17a3..93652f82a 100644 --- a/src/Ryujinx/Assets/Locales/de_DE.json +++ b/src/Ryujinx/Assets/Locales/de_DE.json @@ -207,6 +207,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Verlangsamungen", "SettingsTabLoggingGraphicsBackendLogLevelAll": "Alle", "SettingsTabLoggingEnableDebugLogs": "Aktiviere Debug-Log", + "SettingsTabLoggingEnableAvaloniaLogs": "UI-Logs aktivieren", "SettingsTabInput": "Eingabe", "SettingsTabInputEnableDockedMode": "Angedockter Modus", "SettingsTabInputDirectKeyboardAccess": "Direkter Tastaturzugriff", @@ -621,6 +622,7 @@ "DeveloperOptionTooltip": "Mit Vorsicht verwenden", "OpenGlLogLevel": "Erfordert die Aktivierung der entsprechenden Log-Level", "DebugLogTooltip": "Ausgabe von Debug-Logs in der Konsole.\n\nVerwende diese Option nur auf ausdrückliche Anweisung von Ryujinx Entwicklern, da sie das Lesen der Protokolle erschwert und die Leistung des Emulators verschlechtert.", + "AvaloniaLogTooltip": "Druckt Avalonia (UI) Logmeldungen in die Konsole.", "LoadApplicationFileTooltip": "Öffnet die Dateiauswahl um Datei zu laden, welche mit der Switch kompatibel ist", "LoadApplicationFolderTooltip": "Öffnet die Dateiauswahl um ein Spiel zu laden, welches mit der Switch kompatibel ist", "OpenRyujinxFolderTooltip": "Öffnet den Ordner, der das Ryujinx Dateisystem enthält", diff --git a/src/Ryujinx/Assets/Locales/en_US.json b/src/Ryujinx/Assets/Locales/en_US.json index 1cb33d44e..f25332847 100644 --- a/src/Ryujinx/Assets/Locales/en_US.json +++ b/src/Ryujinx/Assets/Locales/en_US.json @@ -237,6 +237,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Slowdowns", "SettingsTabLoggingGraphicsBackendLogLevelAll": "All", "SettingsTabLoggingEnableDebugLogs": "Enable Debug Logs", + "SettingsTabLoggingEnableAvaloniaLogs": "Enable UI Logs", "SettingsTabInput": "Input", "SettingsTabInputEnableDockedMode": "Docked Mode", "SettingsTabInputDirectKeyboardAccess": "Direct Keyboard Access", @@ -667,6 +668,7 @@ "DeveloperOptionTooltip": "Use with care", "OpenGlLogLevel": "Requires appropriate log levels enabled", "DebugLogTooltip": "Prints debug log messages in the console.\n\nOnly use this if specifically instructed by a staff member, as it will make logs difficult to read and worsen emulator performance.", + "AvaloniaLogTooltip": "Prints Avalonia (UI) log messages in the console.", "LoadApplicationFileTooltip": "Open a file explorer to choose a Switch compatible file to load", "LoadApplicationFolderTooltip": "Open a file explorer to choose a Switch compatible, unpacked application to load", "LoadDlcFromFolderTooltip": "Open a file explorer to choose one or more folders to bulk load DLC from", diff --git a/src/Ryujinx/Assets/Locales/es_ES.json b/src/Ryujinx/Assets/Locales/es_ES.json index 5427abecb..ea752b834 100644 --- a/src/Ryujinx/Assets/Locales/es_ES.json +++ b/src/Ryujinx/Assets/Locales/es_ES.json @@ -206,6 +206,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Ralentizaciones", "SettingsTabLoggingGraphicsBackendLogLevelAll": "Todo", "SettingsTabLoggingEnableDebugLogs": "Habilitar registros de debug", + "SettingsTabLoggingEnableAvaloniaLogs": "Habilitar Registros UI", "SettingsTabInput": "Entrada", "SettingsTabInputEnableDockedMode": "Modo dock/TV", "SettingsTabInputDirectKeyboardAccess": "Acceso directo al teclado", @@ -620,6 +621,7 @@ "DeveloperOptionTooltip": "Usar con cuidado", "OpenGlLogLevel": "Requiere activar los niveles de registro apropiados", "DebugLogTooltip": "Escribe mensajes de debug en la consola\n\nActiva esto solo si un miembro del equipo te lo pide expresamente, pues hará que el registro sea difícil de leer y empeorará el rendimiento del emulador.", + "AvaloniaLogTooltip": "Muestra los mensajes del registro de Avalonia (UI) en la consola.", "LoadApplicationFileTooltip": "Abre el explorador de archivos para elegir un archivo compatible con Switch para cargar", "LoadApplicationFolderTooltip": "Abre el explorador de archivos para elegir un archivo desempaquetado y compatible con Switch para cargar", "OpenRyujinxFolderTooltip": "Abre la carpeta de sistema de Ryujinx", diff --git a/src/Ryujinx/Assets/Locales/fr_FR.json b/src/Ryujinx/Assets/Locales/fr_FR.json index c7c2ce87b..ddcef3442 100644 --- a/src/Ryujinx/Assets/Locales/fr_FR.json +++ b/src/Ryujinx/Assets/Locales/fr_FR.json @@ -208,6 +208,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Ralentissements", "SettingsTabLoggingGraphicsBackendLogLevelAll": "Tout", "SettingsTabLoggingEnableDebugLogs": "Activer les journaux de debug", + "SettingsTabLoggingEnableAvaloniaLogs": "Activer les Journaux de l'Interface Utilisateur", "SettingsTabInput": "Contrôles", "SettingsTabInputEnableDockedMode": "Active le mode station d'accueil", "SettingsTabInputDirectKeyboardAccess": "Accès direct au clavier", @@ -623,6 +624,7 @@ "DeveloperOptionTooltip": "Utiliser avec précaution", "OpenGlLogLevel": "Nécessite l'activation des niveaux de journalisation appropriés", "DebugLogTooltip": "Affiche les messages de débogage dans la console.\n\nN'utilisez ceci que si un membre du personnel le demande, car cela rendra les logs difficiles à lire et réduit les performances de l'émulateur.", + "AvaloniaLogTooltip": "Affiche les journaux Avalonia (Interface Utilisateur) dans la console.", "LoadApplicationFileTooltip": "Ouvrir un explorateur de fichiers pour choisir un fichier compatible Switch à charger", "LoadApplicationFolderTooltip": "Ouvrir un explorateur de fichiers pour choisir une application Switch compatible et décompressée à charger", "OpenRyujinxFolderTooltip": "Ouvrir le dossier du système de fichiers Ryujinx", diff --git a/src/Ryujinx/Assets/Locales/it_IT.json b/src/Ryujinx/Assets/Locales/it_IT.json index 70be561a1..8cbe96bf2 100644 --- a/src/Ryujinx/Assets/Locales/it_IT.json +++ b/src/Ryujinx/Assets/Locales/it_IT.json @@ -229,6 +229,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Rallentamenti", "SettingsTabLoggingGraphicsBackendLogLevelAll": "Tutto", "SettingsTabLoggingEnableDebugLogs": "Attiva log di debug", + "SettingsTabLoggingEnableAvaloniaLogs": "Abilita i log UI", "SettingsTabInput": "Comandi", "SettingsTabInputEnableDockedMode": "Attiva modalità TV", "SettingsTabInputDirectKeyboardAccess": "Accesso diretto alla tastiera", @@ -653,6 +654,7 @@ "DeveloperOptionTooltip": "Usa con cautela", "OpenGlLogLevel": "Richiede che i livelli di log appropriati siano abilitati", "DebugLogTooltip": "Stampa i messaggi di log per il debug nella console.\n\nUsa questa opzione solo se specificatamente richiesto da un membro del team, dal momento che rende i log difficili da leggere e riduce le prestazioni dell'emulatore.", + "AvaloniaLogTooltip": "Stampa i messaggi di log di Avalonia (UI) nella console.", "LoadApplicationFileTooltip": "Apri un selettore file per scegliere un file compatibile con Switch da caricare", "LoadApplicationFolderTooltip": "Apri un selettore file per scegliere un'applicazione estratta compatibile con Switch da caricare", "LoadDlcFromFolderTooltip": "Apri un selettore file per scegliere una o più cartelle dalle quali caricare DLC in blocco", diff --git a/src/Ryujinx/Assets/Locales/ko_KR.json b/src/Ryujinx/Assets/Locales/ko_KR.json index d3647d139..abfcd9ea6 100644 --- a/src/Ryujinx/Assets/Locales/ko_KR.json +++ b/src/Ryujinx/Assets/Locales/ko_KR.json @@ -209,6 +209,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "느려짐", "SettingsTabLoggingGraphicsBackendLogLevelAll": "모두", "SettingsTabLoggingEnableDebugLogs": "디버그 로그 활성화", + "SettingsTabLoggingEnableAvaloniaLogs": "UI 로그 활성화", "SettingsTabInput": "입력", "SettingsTabInputEnableDockedMode": "도킹 모드", "SettingsTabInputDirectKeyboardAccess": "직접 키보드 접속", @@ -624,6 +625,7 @@ "DeveloperOptionTooltip": "주의해서 사용", "OpenGlLogLevel": "적절한 로그 수준을 활성화해야 함", "DebugLogTooltip": "콘솔에 디버그 로그 메시지를 인쇄합니다.\n\n로그를 읽기 어렵게 만들고 에뮬레이터 성능을 악화시키므로 직원이 구체적으로 지시한 경우에만 사용하세요.", + "AvaloniaLogTooltip": "콘솔에 Avalonia(UI) 로그 메시지를 출력합니다.", "LoadApplicationFileTooltip": "파일 탐색기를 열어 불러올 스위치 호환 파일 선택", "LoadApplicationFolderTooltip": "파일 탐색기를 열어 불러올 스위치 호환 압축 해제 응용 프로그램 선택", "OpenRyujinxFolderTooltip": "Ryujinx 파일 시스템 폴더 열기", diff --git a/src/Ryujinx/Assets/Locales/pt_BR.json b/src/Ryujinx/Assets/Locales/pt_BR.json index cd6ef41f8..c9289e2a8 100644 --- a/src/Ryujinx/Assets/Locales/pt_BR.json +++ b/src/Ryujinx/Assets/Locales/pt_BR.json @@ -209,6 +209,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Lentidão", "SettingsTabLoggingGraphicsBackendLogLevelAll": "Todos", "SettingsTabLoggingEnableDebugLogs": "Habilitar logs de depuração", + "SettingsTabLoggingEnableAvaloniaLogs": "Habilitar Logs da IU", "SettingsTabInput": "Controle", "SettingsTabInputEnableDockedMode": "Habilitar modo TV", "SettingsTabInputDirectKeyboardAccess": "Acesso direto ao teclado", @@ -623,6 +624,7 @@ "DeveloperOptionTooltip": "Use com cuidado", "OpenGlLogLevel": "Requer que os níveis de log apropriados estejaam habilitados", "DebugLogTooltip": "Habilita exibição de mensagens de depuração", + "AvaloniaLogTooltip": "Imprime mensagens de log do Avalonia (UI) no console.", "LoadApplicationFileTooltip": "Abre o navegador de arquivos para seleção de um arquivo do Switch compatível a ser carregado", "LoadApplicationFolderTooltip": "Abre o navegador de pastas para seleção de pasta extraída do Switch compatível a ser carregada", "OpenRyujinxFolderTooltip": "Abre o diretório do sistema de arquivos do Ryujinx", diff --git a/src/Ryujinx/Assets/Locales/ru_RU.json b/src/Ryujinx/Assets/Locales/ru_RU.json index 82c6ce8a4..c600e31f9 100644 --- a/src/Ryujinx/Assets/Locales/ru_RU.json +++ b/src/Ryujinx/Assets/Locales/ru_RU.json @@ -228,6 +228,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Замедления", "SettingsTabLoggingGraphicsBackendLogLevelAll": "Всё", "SettingsTabLoggingEnableDebugLogs": "Включить журнал отладки", + "SettingsTabLoggingEnableAvaloniaLogs": "Включить журналы интерфейса", "SettingsTabInput": "Управление", "SettingsTabInputEnableDockedMode": "Стационарный режим", "SettingsTabInputDirectKeyboardAccess": "Прямой ввод клавиатуры", @@ -651,6 +652,7 @@ "DeveloperOptionTooltip": "Используйте с осторожностью", "OpenGlLogLevel": "Требует включения соответствующих уровней ведения журнала", "DebugLogTooltip": "Выводит журнал сообщений отладки в консоли.\n\nИспользуйте только в случае просьбы разработчика, так как включение этой функции затруднит чтение журналов и ухудшит работу эмулятора.", + "AvaloniaLogTooltip": "Выводит сообщения журнала Avalonia (интерфейс) в консоли.", "LoadApplicationFileTooltip": "Открывает файловый менеджер для выбора файла, совместимого с Nintendo Switch.", "LoadApplicationFolderTooltip": "Открывает файловый менеджер для выбора распакованного приложения, совместимого с Nintendo Switch.", "LoadDlcFromFolderTooltip": "Открывает файловый менеджер для выбора одной или несколько папок для массовой загрузки DLC", diff --git a/src/Ryujinx/Assets/Locales/th_TH.json b/src/Ryujinx/Assets/Locales/th_TH.json index 72312be21..6f9d504ff 100644 --- a/src/Ryujinx/Assets/Locales/th_TH.json +++ b/src/Ryujinx/Assets/Locales/th_TH.json @@ -620,6 +620,7 @@ "DeveloperOptionTooltip": "โปรดใช้ด้วยความระมัดระวัง", "OpenGlLogLevel": "จำเป็นต้องเปิดใช้งานระดับบันทึกที่เหมาะสม", "DebugLogTooltip": "พิมพ์ข้อความประวัติการแก้ไขข้อบกพร่องในคอนโซล\n\nใช้สิ่งนี้เฉพาะเมื่อได้รับคำแนะนำจากเจ้าหน้าที่โดยเฉพาะเท่านั้น เนื่องจากจะทำให้บันทึกอ่านยากและทำให้ประสิทธิภาพของโปรแกรมจำลองแย่ลง", + "AvaloniaLogTooltip": "แสดงข้อความบันทึก (log) ของ Avalonia (UI) ในคอนโซล", "LoadApplicationFileTooltip": "เปิด File Explorer เพื่อเลือกไฟล์ที่เข้ากันได้กับ Switch ที่จะโหลด", "LoadApplicationFolderTooltip": "เปิดตัวสำรวจไฟล์เพื่อเลือกไฟล์ที่เข้ากันได้กับ Switch ที่จะโหลด", "OpenRyujinxFolderTooltip": "เปิดโฟลเดอร์ระบบไฟล์ Ryujinx", diff --git a/src/Ryujinx/Assets/Locales/uk_UA.json b/src/Ryujinx/Assets/Locales/uk_UA.json index 0af1a1fb3..8e48e0016 100644 --- a/src/Ryujinx/Assets/Locales/uk_UA.json +++ b/src/Ryujinx/Assets/Locales/uk_UA.json @@ -209,6 +209,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Уповільнення", "SettingsTabLoggingGraphicsBackendLogLevelAll": "Все", "SettingsTabLoggingEnableDebugLogs": "Увімкнути журнали налагодження", + "SettingsTabLoggingEnableAvaloniaLogs": "Увімкнути журнали інтерфейсу", "SettingsTabInput": "Введення", "SettingsTabInputEnableDockedMode": "Режим док-станції", "SettingsTabInputDirectKeyboardAccess": "Прямий доступ з клавіатури", @@ -624,6 +625,7 @@ "DeveloperOptionTooltip": "Використовуйте з обережністю", "OpenGlLogLevel": "Потрібно увімкнути відповідні рівні журналу", "DebugLogTooltip": "Друкує повідомлення журналу налагодження на консолі.\n\nВикористовуйте це лише за спеціальною вказівкою співробітника, оскільки це ускладнить читання журналів і погіршить роботу емулятора.", + "AvaloniaLogTooltip": "Виводити повідомлення журналу Avalonia (UI) в консоль", "LoadApplicationFileTooltip": "Відкриває файловий провідник, щоб вибрати для завантаження сумісний файл Switch", "LoadApplicationFolderTooltip": "Відкриває файловий провідник, щоб вибрати сумісну з комутатором розпаковану програму для завантаження", "OpenRyujinxFolderTooltip": "Відкриває папку файлової системи Ryujinx", diff --git a/src/Ryujinx/Assets/Locales/zh_CN.json b/src/Ryujinx/Assets/Locales/zh_CN.json index f2737e77d..016b0d85b 100644 --- a/src/Ryujinx/Assets/Locales/zh_CN.json +++ b/src/Ryujinx/Assets/Locales/zh_CN.json @@ -209,6 +209,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "减速", "SettingsTabLoggingGraphicsBackendLogLevelAll": "全部", "SettingsTabLoggingEnableDebugLogs": "启用调试日志", + "SettingsTabLoggingEnableAvaloniaLogs": "启用 UI 日志", "SettingsTabInput": "输入", "SettingsTabInputEnableDockedMode": "主机模式", "SettingsTabInputDirectKeyboardAccess": "直通键盘控制", @@ -624,6 +625,7 @@ "DeveloperOptionTooltip": "请谨慎使用", "OpenGlLogLevel": "需要启用适当的日志级别", "DebugLogTooltip": "在控制台中显示调试日志。\n\n仅在特别需要时使用此功能,因为它会导致日志信息难以阅读,并降低模拟器性能。", + "AvaloniaLogTooltip": "在控制台显示 Avalonia (UI) 的日志信息", "LoadApplicationFileTooltip": "选择 Switch 游戏文件并加载", "LoadApplicationFolderTooltip": "选择解包后的 Switch 游戏目录并加载", "OpenRyujinxFolderTooltip": "打开 Ryujinx 模拟器系统目录", diff --git a/src/Ryujinx/Assets/Locales/zh_TW.json b/src/Ryujinx/Assets/Locales/zh_TW.json index 42b69100a..5b975483b 100644 --- a/src/Ryujinx/Assets/Locales/zh_TW.json +++ b/src/Ryujinx/Assets/Locales/zh_TW.json @@ -209,6 +209,7 @@ "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "減速", "SettingsTabLoggingGraphicsBackendLogLevelAll": "全部", "SettingsTabLoggingEnableDebugLogs": "啟用偵錯日誌", + "SettingsTabLoggingEnableAvaloniaLogs": "啟用 UI 日誌", "SettingsTabInput": "輸入", "SettingsTabInputEnableDockedMode": "底座模式", "SettingsTabInputDirectKeyboardAccess": "鍵盤直接存取", @@ -624,6 +625,7 @@ "DeveloperOptionTooltip": "謹慎使用", "OpenGlLogLevel": "需要啟用適當的日誌等級", "DebugLogTooltip": "在控制台中輸出偵錯日誌訊息。\n\n只有在人員特別指示的情況下才能使用,因為這會導致日誌難以閱讀,並降低模擬器效能。", + "AvaloniaLogTooltip": "在控制台中輸出 Avalonia (UI) 日誌訊息。", "LoadApplicationFileTooltip": "開啟檔案總管,選擇與 Switch 相容的檔案來載入", "LoadApplicationFolderTooltip": "開啟檔案總管,選擇與 Switch 相容且未封裝的應用程式來載入", "OpenRyujinxFolderTooltip": "開啟 Ryujinx 檔案系統資料夾", diff --git a/src/Ryujinx/UI/Helpers/LoggerAdapter.cs b/src/Ryujinx/UI/Helpers/LoggerAdapter.cs index 179a9c124..a0dd9cba4 100644 --- a/src/Ryujinx/UI/Helpers/LoggerAdapter.cs +++ b/src/Ryujinx/UI/Helpers/LoggerAdapter.cs @@ -1,6 +1,6 @@ using Avalonia.Logging; -using Avalonia.Utilities; using Ryujinx.Common.Logging; +using Ryujinx.UI.Common.Configuration; using System; using System.Text; @@ -13,13 +13,19 @@ namespace Ryujinx.Ava.UI.Helpers internal class LoggerAdapter : ILogSink { + private static bool _avaloniaLogsEnabled = ConfigurationState.Instance.Logger.EnableAvaloniaLog; + public static void Register() { AvaLogger.Sink = new LoggerAdapter(); + ConfigurationState.Instance.Logger.EnableAvaloniaLog.Event + += (_, e) => _avaloniaLogsEnabled = e.NewValue; } private static RyuLogger.Log? GetLog(AvaLogLevel level) { + if (!_avaloniaLogsEnabled) return null; + return level switch { AvaLogLevel.Verbose => RyuLogger.Debug, diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index 2a40470f0..7df97eb14 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -255,6 +255,7 @@ namespace Ryujinx.Ava.UI.ViewModels public bool EnableTrace { get; set; } public bool EnableGuest { get; set; } public bool EnableFsAccessLog { get; set; } + public bool EnableAvaloniaLog { get; set; } public bool EnableDebug { get; set; } public bool IsOpenAlEnabled { get; set; } public bool IsSoundIoEnabled { get; set; } @@ -663,6 +664,7 @@ namespace Ryujinx.Ava.UI.ViewModels EnableGuest = config.Logger.EnableGuest; EnableDebug = config.Logger.EnableDebug; EnableFsAccessLog = config.Logger.EnableFsAccessLog; + EnableAvaloniaLog = config.Logger.EnableAvaloniaLog; FsGlobalAccessLogMode = config.System.FsGlobalAccessLogMode; OpenglDebugLevel = (int)config.Logger.GraphicsDebugLevel.Value; @@ -795,6 +797,7 @@ namespace Ryujinx.Ava.UI.ViewModels config.Logger.EnableGuest.Value = EnableGuest; config.Logger.EnableDebug.Value = EnableDebug; config.Logger.EnableFsAccessLog.Value = EnableFsAccessLog; + config.Logger.EnableAvaloniaLog.Value = EnableAvaloniaLog; config.System.FsGlobalAccessLogMode.Value = FsGlobalAccessLogMode; config.Logger.GraphicsDebugLevel.Value = (GraphicsDebugLevel)OpenglDebugLevel; diff --git a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml index 554f62d1a..967eb1e74 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml @@ -74,6 +74,10 @@ ToolTip.Tip="{locale:Locale DebugLogTooltip}"> + + +