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

Shortcuts: Added shortcut key mapping for "Exit"

Browse source
This commit is contained in:
Souryo 2017-02-18 13:59:58 -05:00
parent d6db1d50c5
commit 7e35d5b99e
12 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/EmulationSettings.h
View file

@ -222,6 +222,7 @@ struct EmulatorKeyMappings
uint32_t FastForward;
uint32_t Pause;
uint32_t Reset;
uint32_t Exit;
uint32_t MoveToNextStateSlot;
uint32_t MoveToPreviousStateSlot;

1
Core/INotificationListener.h
View file

@ -20,6 +20,7 @@ enum class ConsoleNotificationType
ConfigChanged = 14,
DisconnectedFromServer = 15,
PpuViewerDisplayFrame = 16,
RequestExit = 17,
};
class INotificationListener

4
Core/ShortcutKeyHandler.cpp
View file

@ -117,6 +117,10 @@ void ShortcutKeyHandler::CheckMappedKeys(EmulatorKeyMappings mappings)
EmulationSettings::SetFlags(EmulationFlags::Paused);
}
}
if(DetectKeyPress(mappings.Exit)) {
MessageManager::SendNotification(ConsoleNotificationType::RequestExit);
}
}
void ShortcutKeyHandler::ProcessKeys(EmulatorKeyMappingSet mappings)

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

@ -61,6 +61,7 @@
<Message ID="EmulatorShortcutMappings_DecreaseSpeed">Decrease Speed</Message>
<Message ID="EmulatorShortcutMappings_Pause">Pause</Message>
<Message ID="EmulatorShortcutMappings_Reset">Reset</Message>
<Message ID="EmulatorShortcutMappings_Exit">Exit</Message>
<Message ID="EmulatorShortcutMappings_TakeScreenshot">Take Screenshot</Message>
<Message ID="EmulatorShortcutMappings_SwitchDiskSide">FDS - Switch Side</Message>
<Message ID="EmulatorShortcutMappings_InsertNextDisk">FDS - Insert Next Disk</Message>

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

@ -550,6 +550,7 @@
<Message ID="EmulatorShortcutMappings_DecreaseSpeed">Reducir velocidad</Message>
<Message ID="EmulatorShortcutMappings_Pause">Pausa</Message>
<Message ID="EmulatorShortcutMappings_Reset">Reiniciar</Message>
<Message ID="EmulatorShortcutMappings_Exit">Exit</Message>
<Message ID="EmulatorShortcutMappings_TakeScreenshot">Captura de pantalla</Message>
<Message ID="EmulatorShortcutMappings_SwitchDiskSide">FDS - Cambiar cara del disco</Message>
<Message ID="EmulatorShortcutMappings_InsertNextDisk">FDS - Insertar siguiente disco</Message>

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

@ -566,6 +566,7 @@
<Message ID="EmulatorShortcutMappings_DecreaseSpeed">Réduire la vitesse</Message>
<Message ID="EmulatorShortcutMappings_Pause">Pause</Message>
<Message ID="EmulatorShortcutMappings_Reset">Reset</Message>
<Message ID="EmulatorShortcutMappings_Exit">Quitter</Message>
<Message ID="EmulatorShortcutMappings_TakeScreenshot">Capture d'écran</Message>
<Message ID="EmulatorShortcutMappings_SwitchDiskSide">FDS - Changer le disque de côté</Message>
<Message ID="EmulatorShortcutMappings_InsertNextDisk">FDS - Insérer le disque suivant</Message>

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

@ -7,7 +7,7 @@
<Control ID="mnuSaveState">クイックセーブ</Control>
<Control ID="mnuLoadState">クイックロード</Control>
<Control ID="mnuRecentFiles">最近開いたファイル</Control>
<Control ID="mnuExit">終わる</Control>
<Control ID="mnuExit">終了</Control>
<Control ID="mnuGame">ゲーム</Control>
<Control ID="mnuPause">ポーズ</Control>
<Control ID="mnuReset">リセット</Control>
@ -548,6 +548,7 @@
<Message ID="EmulatorShortcutMappings_DecreaseSpeed">速度を下げる</Message>
<Message ID="EmulatorShortcutMappings_Pause">ポーズ</Message>
<Message ID="EmulatorShortcutMappings_Reset">リセット</Message>
<Message ID="EmulatorShortcutMappings_Exit">終了</Message>
<Message ID="EmulatorShortcutMappings_TakeScreenshot">スクリーンショットを撮る</Message>
<Message ID="EmulatorShortcutMappings_SwitchDiskSide">FDS - A面B面切り替え</Message>
<Message ID="EmulatorShortcutMappings_InsertNextDisk">FDS - 次のディスクを入れる</Message>

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

@ -550,6 +550,7 @@
<Message ID="EmulatorShortcutMappings_DecreaseSpeed">Reduzir velocidade</Message>
<Message ID="EmulatorShortcutMappings_Pause">Pausar</Message>
<Message ID="EmulatorShortcutMappings_Reset">Reiniciar</Message>
<Message ID="EmulatorShortcutMappings_Exit">Exit</Message>
<Message ID="EmulatorShortcutMappings_TakeScreenshot">Tirar screenshot</Message>
<Message ID="EmulatorShortcutMappings_SwitchDiskSide">FDS - Mudar lado do disco</Message>
<Message ID="EmulatorShortcutMappings_InsertNextDisk">FDS - Inserir próximo disco</Message>

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

@ -557,6 +557,7 @@
<Message ID="EmulatorShortcutMappings_DecreaseSpeed">Decrease Speed</Message>
<Message ID="EmulatorShortcutMappings_Pause">Пауза</Message>
<Message ID="EmulatorShortcutMappings_Reset">Сброс</Message>
<Message ID="EmulatorShortcutMappings_Exit">Exit</Message>
<Message ID="EmulatorShortcutMappings_TakeScreenshot">Сделать сриншот</Message>
<Message ID="EmulatorShortcutMappings_SwitchDiskSide">FDS - Перевернуть диск</Message>
<Message ID="EmulatorShortcutMappings_InsertNextDisk">FDS - Вставить следующий диск</Message>

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

@ -556,6 +556,7 @@
<Message ID="EmulatorShortcutMappings_DecreaseSpeed">Зменшити Швидкість</Message>
<Message ID="EmulatorShortcutMappings_Pause">Пауза</Message>
<Message ID="EmulatorShortcutMappings_Reset">Скидання</Message>
<Message ID="EmulatorShortcutMappings_Exit">Exit</Message>
<Message ID="EmulatorShortcutMappings_TakeScreenshot">Зробити скріншот</Message>
<Message ID="EmulatorShortcutMappings_SwitchDiskSide">FDS - Перевернути диск</Message>
<Message ID="EmulatorShortcutMappings_InsertNextDisk">FDS - Вставити наступний диск</Message>

4
GUI.NET/Forms/frmMain.cs
View file

@ -430,6 +430,10 @@ namespace Mesen.GUI.Forms
SelectFdsBiosPrompt();
}));
break;
case InteropEmu.ConsoleNotificationType.RequestExit:
this.BeginInvoke((MethodInvoker)(() => this.Close()));
break;
}
if(e.NotificationType != InteropEmu.ConsoleNotificationType.PpuFrameDone) {

2
GUI.NET/InteropEmu.cs
View file

@ -487,6 +487,7 @@ namespace Mesen.GUI
ConfigChanged = 14,
DisconnectedFromServer = 15,
PpuViewerDisplayFrame = 16,
RequestExit = 17,
}
public enum ControllerType
@ -901,6 +902,7 @@ namespace Mesen.GUI
public UInt32 FastForward;
public UInt32 Pause;
public UInt32 Reset;
public UInt32 Exit;
public UInt32 MoveToNextStateSlot;
public UInt32 MoveToPreviousStateSlot;