empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Added toggle fast forward & toggle rewind shortcuts

Browse source
This commit is contained in:
Souryo 2017-09-08 13:28:46 -04:00
parent 79110787e6
commit 3a2897d534
12 changed files with 52 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Core/EmulationSettings.h
View file

@ -346,7 +346,10 @@ enum class EmulatorShortcut
OpenPpuViewer,
OpenMemoryTools,
OpenScriptWindow,
OpenTraceLogger
OpenTraceLogger,
ToggleFastForward,
ToggleRewind,
};
struct KeyCombination

16
Core/ShortcutKeyHandler.cpp
View file

@ -88,6 +88,14 @@ void ShortcutKeyHandler::CheckMappedKeys()
EmulationSettings::ClearFlags(EmulationFlags::Turbo);
}
if(DetectKeyPress(EmulatorShortcut::ToggleFastForward)) {
if(EmulationSettings::CheckFlag(EmulationFlags::Turbo)) {
EmulationSettings::ClearFlags(EmulationFlags::Turbo);
} else {
EmulationSettings::SetFlags(EmulationFlags::Turbo);
}
}
if(VsControlManager::GetInstance() && !isNetplayClient && !isMovieActive) {
VsControlManager* manager = VsControlManager::GetInstance();
if(DetectKeyPress(EmulatorShortcut::VsServiceButton)) {
@ -139,6 +147,14 @@ void ShortcutKeyHandler::CheckMappedKeys()
}
if(!isNetplayClient && !isMovieActive && !EmulationSettings::CheckFlag(NsfPlayerEnabled)) {
if(DetectKeyPress(EmulatorShortcut::ToggleRewind)) {
if(RewindManager::IsRewinding()) {
RewindManager::StopRewinding();
} else {
RewindManager::StartRewinding();
}
}
if(DetectKeyPress(EmulatorShortcut::Rewind)) {
RewindManager::StartRewinding();
} else if(DetectKeyRelease(EmulatorShortcut::Rewind)) {

2
GUI.NET/Dependencies/resources.ca.xml
View file

@ -660,7 +660,9 @@
<Message ID="ConfirmExit">Esteu segurs de voler sortir?</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Avanç ràpid</Message>
<Message ID="EmulatorShortcutMappings_ToggleFastForward">Toggle Fast Forward</Message>
<Message ID="EmulatorShortcutMappings_Rewind">Rebobina</Message>
<Message ID="EmulatorShortcutMappings_ToggleRewind">Toggle Rewind</Message>
<Message ID="EmulatorShortcutMappings_RewindTenSecs">Rebobina 10 segons</Message>
<Message ID="EmulatorShortcutMappings_RewindOneMin">Rebobina 1 minut</Message>
<Message ID="EmulatorShortcutMappings_IncreaseSpeed">Augmenta la velocitat</Message>

6
GUI.NET/Dependencies/resources.en.xml
View file

@ -81,8 +81,10 @@
<Message ID="ConfirmPowerCycle">Are you sure you want to power cycle?</Message>
<Message ID="ConfirmExit">Are you sure you want to exit?</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Fast Forward</Message>
<Message ID="EmulatorShortcutMappings_Rewind">Rewind</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Fast Forward (Hold button)</Message>
<Message ID="EmulatorShortcutMappings_ToggleFastForward">Toggle Fast Forward</Message>
<Message ID="EmulatorShortcutMappings_Rewind">Rewind (Hold button)</Message>
<Message ID="EmulatorShortcutMappings_ToggleRewind">Toggle Rewind</Message>
<Message ID="EmulatorShortcutMappings_RewindTenSecs">Rewind 10 seconds</Message>
<Message ID="EmulatorShortcutMappings_RewindOneMin">Rewind 1 minute</Message>
<Message ID="EmulatorShortcutMappings_IncreaseSpeed">Increase Speed</Message>

2
GUI.NET/Dependencies/resources.es.xml
View file

@ -694,7 +694,9 @@
<Message ID="ConfirmExit">Are you sure you want to exit?</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Avance rápido</Message>
<Message ID="EmulatorShortcutMappings_ToggleFastForward">Toggle Fast Forward</Message>
<Message ID="EmulatorShortcutMappings_Rewind">Rebobinar</Message>
<Message ID="EmulatorShortcutMappings_ToggleRewind">Toggle Rewind</Message>
<Message ID="EmulatorShortcutMappings_RewindTenSecs">Rebobinar 10 segundos</Message>
<Message ID="EmulatorShortcutMappings_RewindOneMin">Rebobinar 1 minuto</Message>
<Message ID="EmulatorShortcutMappings_IncreaseSpeed">Aumentar velocidad</Message>

14
GUI.NET/Dependencies/resources.fr.xml
View file

@ -706,8 +706,10 @@
<Message ID="ConfirmPowerCycle">Êtes-vous certain de vouloir arrêter et redémarrer le jeu?</Message>
<Message ID="ConfirmExit">Êtes-vous certain de vouloir quitter?</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Avance rapide</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Avance rapide (garder enfoncé)</Message>
<Message ID="EmulatorShortcutMappings_ToggleFastForward">Activer/désactiver l'avance rapide</Message>
<Message ID="EmulatorShortcutMappings_Rewind">Rembobiner</Message>
<Message ID="EmulatorShortcutMappings_ToggleRewind">Activer/désactiver le rembobinage</Message>
<Message ID="EmulatorShortcutMappings_RewindTenSecs">Reculer de 10 secondes</Message>
<Message ID="EmulatorShortcutMappings_RewindOneMin">Reculer d'une minute</Message>
<Message ID="EmulatorShortcutMappings_IncreaseSpeed">Augmenter la vitesse</Message>
@ -727,8 +729,8 @@
<Message ID="EmulatorShortcutMappings_MoveToPreviousStateSlot">Position de sauvegarde précédente</Message>
<Message ID="EmulatorShortcutMappings_SaveState">Sauvegarder l'état à la position courante</Message>
<Message ID="EmulatorShortcutMappings_LoadState">Charger l'état de la position courante</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Activer/Désactiver tous les codes</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Activer/Désactiver l'audio</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Activer/désactiver tous les codes</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Activer/désactiver l'audio</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Avancer d'une seule image</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Éjecter le disque</Message>
@ -738,9 +740,9 @@
<Message ID="EmulatorShortcutMappings_SetScale4x">Taille de l'image 4x</Message>
<Message ID="EmulatorShortcutMappings_SetScale5x">Taille de l'image 5x</Message>
<Message ID="EmulatorShortcutMappings_SetScale6x">Taille de l'image 6x</Message>
<Message ID="EmulatorShortcutMappings_ToggleFullscreen">Activer/Désactiver le mode plein écran</Message>
<Message ID="EmulatorShortcutMappings_ToggleFps">Activer/Désactiver le compteur FPS</Message>
<Message ID="EmulatorShortcutMappings_MaxSpeed">Activer/Désactiver la vitesse maximale</Message>
<Message ID="EmulatorShortcutMappings_ToggleFullscreen">Activer/désactiver le mode plein écran</Message>
<Message ID="EmulatorShortcutMappings_ToggleFps">Activer/désactiver le compteur FPS</Message>
<Message ID="EmulatorShortcutMappings_MaxSpeed">Activer/désactiver la vitesse maximale</Message>
<Message ID="EmulatorShortcutMappings_LoadRandomGame">Ouvrir un jeu aléatoire</Message>
<Message ID="EmulatorShortcutMappings_SaveStateSlot1">Sauvegarde d'état - Position 1</Message>
<Message ID="EmulatorShortcutMappings_SaveStateSlot2">Sauvegarde d'état - Position 2</Message>

6
GUI.NET/Dependencies/resources.ja.xml
View file

@ -691,8 +691,10 @@
<Message ID="ConfirmPowerCycle">ゲームを停止して再起動します。よろしいですか？</Message>
<Message ID="ConfirmExit">Mesenを終了します。よろしいですか？</Message>
<Message ID="EmulatorShortcutMappings_FastForward">早送り</Message>
<Message ID="EmulatorShortcutMappings_Rewind">巻き戻す</Message>
<Message ID="EmulatorShortcutMappings_FastForward">早送り（押し続ける間だけ）</Message>
<Message ID="EmulatorShortcutMappings_ToggleFastForward">早送りをオン・オフにする</Message>
<Message ID="EmulatorShortcutMappings_Rewind">巻き戻す（押し続ける間だけ）</Message>
<Message ID="EmulatorShortcutMappings_ToggleRewind">巻き戻しをオン・オフにする</Message>
<Message ID="EmulatorShortcutMappings_RewindTenSecs">１０秒前に戻る</Message>
<Message ID="EmulatorShortcutMappings_RewindOneMin">１分前に戻る</Message>
<Message ID="EmulatorShortcutMappings_IncreaseSpeed">速度を上げる</Message>

2
GUI.NET/Dependencies/resources.pt.xml
View file

@ -694,7 +694,9 @@
<Message ID="ConfirmExit">Tem certeza que quer sair?</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Avançar rapidamente</Message>
<Message ID="EmulatorShortcutMappings_ToggleFastForward">Toggle Fast Forward</Message>
<Message ID="EmulatorShortcutMappings_Rewind">Rebobinar</Message>
<Message ID="EmulatorShortcutMappings_ToggleRewind">Toggle Rewind</Message>
<Message ID="EmulatorShortcutMappings_RewindTenSecs">Rebobinar 10 segundos</Message>
<Message ID="EmulatorShortcutMappings_RewindOneMin">Rebobinar 1 minuto</Message>
<Message ID="EmulatorShortcutMappings_IncreaseSpeed">Aumentar velocidade</Message>

2
GUI.NET/Dependencies/resources.ru.xml
View file

@ -697,7 +697,9 @@
<Message ID="ConfirmExit">Are you sure you want to exit?</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Перемотка</Message>
<Message ID="EmulatorShortcutMappings_ToggleFastForward">Toggle Fast Forward</Message>
<Message ID="EmulatorShortcutMappings_Rewind">Rewind</Message>
<Message ID="EmulatorShortcutMappings_ToggleRewind">Toggle Rewind</Message>
<Message ID="EmulatorShortcutMappings_RewindTenSecs">Rewind 10 seconds</Message>
<Message ID="EmulatorShortcutMappings_RewindOneMin">Rewind 1 minute</Message>
<Message ID="EmulatorShortcutMappings_IncreaseSpeed">Increase Speed</Message>

2
GUI.NET/Dependencies/resources.uk.xml
View file

@ -697,7 +697,9 @@
<Message ID="ConfirmExit">Are you sure you want to exit?</Message>
<Message ID="EmulatorShortcutMappings_FastForward">Швидке перемотування</Message>
<Message ID="EmulatorShortcutMappings_ToggleFastForward">Toggle Fast Forward</Message>
<Message ID="EmulatorShortcutMappings_Rewind">Перемотка</Message>
<Message ID="EmulatorShortcutMappings_ToggleRewind">Toggle Rewind</Message>
<Message ID="EmulatorShortcutMappings_RewindTenSecs">Перемотати 10 секунд</Message>
<Message ID="EmulatorShortcutMappings_RewindOneMin">Перемотати 1 хвилину</Message>
<Message ID="EmulatorShortcutMappings_IncreaseSpeed">Збільшити Швидкість</Message>

2
GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs
View file

@ -23,7 +23,9 @@ namespace Mesen.GUI.Forms.Config
{
EmulatorShortcut[] displayOrder = new EmulatorShortcut[] {
EmulatorShortcut.FastForward,
EmulatorShortcut.ToggleFastForward,
EmulatorShortcut.Rewind,
EmulatorShortcut.ToggleRewind,
EmulatorShortcut.RewindTenSecs,
EmulatorShortcut.RewindOneMin,

5
GUI.NET/InteropEmu.cs
View file

@ -1444,7 +1444,10 @@ namespace Mesen.GUI
OpenPpuViewer,
OpenMemoryTools,
OpenScriptWindow,
OpenTraceLogger
OpenTraceLogger,
ToggleFastForward,
ToggleRewind,
}
public struct InteropCheatInfo