From c211d135ca9a7ee869dd4b680afbc535669005dd Mon Sep 17 00:00:00 2001 From: Souryo Date: Mon, 2 Oct 2017 18:44:36 -0400 Subject: [PATCH] UI: Added some new shortcuts (game timer, frame counter, etc.) --- Core/EmulationSettings.h | 6 +++ GUI.NET/Dependencies/resources.ca.xml | 6 +++ GUI.NET/Dependencies/resources.en.xml | 9 +++- GUI.NET/Dependencies/resources.es.xml | 6 +++ GUI.NET/Dependencies/resources.fr.xml | 6 +++ GUI.NET/Dependencies/resources.ja.xml | 6 +++ GUI.NET/Dependencies/resources.pt.xml | 6 +++ GUI.NET/Dependencies/resources.ru.xml | 6 +++ GUI.NET/Dependencies/resources.uk.xml | 6 +++ GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs | 6 +++ GUI.NET/Forms/frmMain.cs | 52 ++++++++++++++++++- GUI.NET/InteropEmu.cs | 6 +++ 12 files changed, 118 insertions(+), 3 deletions(-) diff --git a/Core/EmulationSettings.h b/Core/EmulationSettings.h index c9758b65..95412c01 100644 --- a/Core/EmulationSettings.h +++ b/Core/EmulationSettings.h @@ -323,6 +323,12 @@ enum class EmulatorShortcut SetScale6x, ToggleFullscreen, ToggleFps, + ToggleGameTimer, + ToggleFrameCounter, + ToggleLagCounter, + ToggleOsd, + ToggleSprites, + ToggleBackground, LoadRandomGame, SaveStateSlot1, diff --git a/GUI.NET/Dependencies/resources.ca.xml b/GUI.NET/Dependencies/resources.ca.xml index 8f52488a..de3db7ef 100644 --- a/GUI.NET/Dependencies/resources.ca.xml +++ b/GUI.NET/Dependencies/resources.ca.xml @@ -716,6 +716,12 @@ Set Scale 6x Toggle Fullscreen Mode Toggle FPS Counter + Toggle Game Timer + Toggle Frame Counter + Toggle Lag Counter + Toggle OSD (On-Screen Display) + Toggle Background Layer + Toggle Sprite Layer Toggle Maximum Speed Load Random Game Save State - Slot 1 diff --git a/GUI.NET/Dependencies/resources.en.xml b/GUI.NET/Dependencies/resources.en.xml index f6c3b220..d3fb3dfc 100644 --- a/GUI.NET/Dependencies/resources.en.xml +++ b/GUI.NET/Dependencies/resources.en.xml @@ -119,7 +119,14 @@ Set Scale 5x Set Scale 6x Toggle Fullscreen Mode - Toggle FPS Counter + Toggle FPS Counter + Toggle Game Timer + Toggle Frame Counter + Toggle Lag Counter + Toggle OSD (On-Screen Display) + Toggle Background Layer + Toggle Sprite Layer + Toggle Maximum Speed Load Random Game Save State - Slot 1 diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml index 78b6519e..0b30f823 100644 --- a/GUI.NET/Dependencies/resources.es.xml +++ b/GUI.NET/Dependencies/resources.es.xml @@ -735,6 +735,12 @@ Set Scale 6x Toggle Fullscreen Mode Toggle FPS Counter + Toggle Game Timer + Toggle Frame Counter + Toggle Lag Counter + Toggle OSD (On-Screen Display) + Toggle Background Layer + Toggle Sprite Layer Toggle Maximum Speed Load Random Game Save State - Slot 1 diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml index e3f24329..66aaa016 100644 --- a/GUI.NET/Dependencies/resources.fr.xml +++ b/GUI.NET/Dependencies/resources.fr.xml @@ -748,6 +748,12 @@ Taille de l'image 6x Activer/désactiver le mode plein écran Activer/désactiver le compteur FPS + Activer/désactiver le compteur de temps + Activer/désactiver le compteur d'images + Activer/désactiver le compteur de lag + Activer/désactiver les messages à l'écran (OSD) + Activer/désactiver l'arrière-plan + Activer/désactiver les sprites Activer/désactiver la vitesse maximale Ouvrir un jeu aléatoire Sauvegarde d'état - Position 1 diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml index b0e2dacc..2c1c0a6f 100644 --- a/GUI.NET/Dependencies/resources.ja.xml +++ b/GUI.NET/Dependencies/resources.ja.xml @@ -733,6 +733,12 @@ 映像サイズ ６倍 全画面表示 フレームレート表示 + ゲームタイマー表示 + フレームカウンタ表示 + ラグカウンタ表示 + オンスクリーン表示を無効・有効にする + バックグラウンドレイヤー表示 + スプライトレイヤー表示 最高速度を無効・有効にする ランダムゲームを開く クイックセーブスロット１に保存する diff --git a/GUI.NET/Dependencies/resources.pt.xml b/GUI.NET/Dependencies/resources.pt.xml index 3850c788..448185d0 100644 --- a/GUI.NET/Dependencies/resources.pt.xml +++ b/GUI.NET/Dependencies/resources.pt.xml @@ -733,6 +733,12 @@ Definir escala 6x Alternar tela cheia Alternar contador de quadros por segundo + Toggle Game Timer + Toggle Frame Counter + Toggle Lag Counter + Toggle OSD (On-Screen Display) + Toggle Background Layer + Toggle Sprite Layer Alternar velocidade máxima Carrear jogo aleatório Salvar estado - Posição 1 diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml index 016f73e0..6ff44b18 100644 --- a/GUI.NET/Dependencies/resources.ru.xml +++ b/GUI.NET/Dependencies/resources.ru.xml @@ -738,6 +738,12 @@ Set Scale 6x Toggle Fullscreen Mode Toggle FPS Counter + Toggle Game Timer + Toggle Frame Counter + Toggle Lag Counter + Toggle OSD (On-Screen Display) + Toggle Background Layer + Toggle Sprite Layer Toggle Maximum Speed Load Random Game Save State - Slot 1 diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml index 34c6ecaf..ef85ce87 100644 --- a/GUI.NET/Dependencies/resources.uk.xml +++ b/GUI.NET/Dependencies/resources.uk.xml @@ -738,6 +738,12 @@ Встановити масштаб 6x Переключити повноекранний режим Переключити лічильник FPS + Toggle Game Timer + Toggle Frame Counter + Toggle Lag Counter + Toggle OSD (On-Screen Display) + Toggle Background Layer + Toggle Sprite Layer Переключити максимальну швидкість Завантажити випадкову гру/Message> Save State - Slot 1 diff --git a/GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs b/GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs index 1adc1d18..c91c57e6 100644 --- a/GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs +++ b/GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs @@ -64,6 +64,12 @@ namespace Mesen.GUI.Forms.Config EmulatorShortcut.ToggleFullscreen, EmulatorShortcut.ToggleFps, + EmulatorShortcut.ToggleGameTimer, + EmulatorShortcut.ToggleFrameCounter, + EmulatorShortcut.ToggleLagCounter, + EmulatorShortcut.ToggleOsd, + EmulatorShortcut.ToggleBackground, + EmulatorShortcut.ToggleSprites, EmulatorShortcut.ToggleCheats, EmulatorShortcut.ToggleAudio, diff --git a/GUI.NET/Forms/frmMain.cs b/GUI.NET/Forms/frmMain.cs index 40ae957d..4a741b32 100644 --- a/GUI.NET/Forms/frmMain.cs +++ b/GUI.NET/Forms/frmMain.cs @@ -609,6 +609,12 @@ namespace Mesen.GUI.Forms case EmulatorShortcut.ToggleCheats: ToggleCheats(); break; case EmulatorShortcut.ToggleAudio: ToggleAudio(); break; case EmulatorShortcut.ToggleFps: ToggleFps(); break; + case EmulatorShortcut.ToggleBackground: ToggleBackground(); break; + case EmulatorShortcut.ToggleSprites: ToggleSprites(); break; + case EmulatorShortcut.ToggleGameTimer: ToggleGameTimer(); break; + case EmulatorShortcut.ToggleFrameCounter: ToggleFrameCounter(); break; + case EmulatorShortcut.ToggleLagCounter: ToggleLagCounter(); break; + case EmulatorShortcut.ToggleOsd: ToggleOsd(); break; case EmulatorShortcut.MaxSpeed: ToggleMaxSpeed(); break; case EmulatorShortcut.ToggleFullscreen: ToggleFullscreen(); break; @@ -680,14 +686,56 @@ namespace Mesen.GUI.Forms UpdateEmulationFlags(); } - private static void ToggleAudio() + private void ToggleAudio() { ConfigManager.Config.AudioInfo.EnableAudio = !ConfigManager.Config.AudioInfo.EnableAudio; AudioInfo.ApplyConfig(); ConfigManager.ApplyChanges(); } - private static void ToggleCheats() + private void ToggleFrameCounter() + { + ConfigManager.Config.PreferenceInfo.ShowFrameCounter = !ConfigManager.Config.PreferenceInfo.ShowFrameCounter; + PreferenceInfo.ApplyConfig(); + ConfigManager.ApplyChanges(); + } + + private void ToggleLagCounter() + { + ConfigManager.Config.EmulationInfo.ShowLagCounter = !ConfigManager.Config.EmulationInfo.ShowLagCounter; + EmulationInfo.ApplyConfig(); + ConfigManager.ApplyChanges(); + } + + private void ToggleGameTimer() + { + ConfigManager.Config.PreferenceInfo.ShowGameTimer = !ConfigManager.Config.PreferenceInfo.ShowGameTimer; + PreferenceInfo.ApplyConfig(); + ConfigManager.ApplyChanges(); + } + + private void ToggleOsd() + { + ConfigManager.Config.PreferenceInfo.DisableOsd = !ConfigManager.Config.PreferenceInfo.DisableOsd; + PreferenceInfo.ApplyConfig(); + ConfigManager.ApplyChanges(); + } + + private void ToggleSprites() + { + ConfigManager.Config.VideoInfo.DisableSprites = !ConfigManager.Config.VideoInfo.DisableSprites; + VideoInfo.ApplyConfig(); + ConfigManager.ApplyChanges(); + } + + private void ToggleBackground() + { + ConfigManager.Config.VideoInfo.DisableBackground = !ConfigManager.Config.VideoInfo.DisableBackground; + VideoInfo.ApplyConfig(); + ConfigManager.ApplyChanges(); + } + + private void ToggleCheats() { ConfigManager.Config.DisableAllCheats = !ConfigManager.Config.DisableAllCheats; if(ConfigManager.Config.DisableAllCheats) { diff --git a/GUI.NET/InteropEmu.cs b/GUI.NET/InteropEmu.cs index d761b230..346be678 100644 --- a/GUI.NET/InteropEmu.cs +++ b/GUI.NET/InteropEmu.cs @@ -1496,6 +1496,12 @@ namespace Mesen.GUI SetScale6x, ToggleFullscreen, ToggleFps, + ToggleGameTimer, + ToggleFrameCounter, + ToggleLagCounter, + ToggleOsd, + ToggleSprites, + ToggleBackground, LoadRandomGame, SaveStateSlot1,