octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

citra-qt: Add back missing hotkeys & conflict fixes.

Browse Source 
* Also fixed a missing spacer in ConfigureGeneral.
This commit is contained in:
Adityarup Laha
2018-11-17 16:55:05 +05:30
parent 4309585623
commit 988acf588a
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/citra_qt/configuration/config.cpp
View File

@ -320,7 +320,7 @@ void Config::ReadValues() {
qt_config->endGroup();
qt_config->beginGroup("Shortcuts");
const std::array<UISettings::Shortcut, 14> default_hotkeys{
const std::array<UISettings::Shortcut, 19> default_hotkeys{
{{"Load File", "Main Window",
UISettings::ContextualShortcut(QKeySequence(QKeySequence::Open).toString(),
Qt::WindowShortcut)},
@ -349,7 +349,17 @@ void Config::ReadValues() {
{"Increase Speed Limit", "Main Window",
UISettings::ContextualShortcut("+", Qt::ApplicationShortcut)},
{"Decrease Speed Limit", "Main Window",
UISettings::ContextualShortcut("-", Qt::ApplicationShortcut)}}};
UISettings::ContextualShortcut("-", Qt::ApplicationShortcut)},
{"Advance Frame", "Main Window",
UISettings::ContextualShortcut("\\", Qt::ApplicationShortcut)},
{"Toggle Frame Advancing", "Main Window",
UISettings::ContextualShortcut("Ctrl+A", Qt::ApplicationShortcut)},
{"Load Amiibo", "Main Window",
UISettings::ContextualShortcut("F2", Qt::ApplicationShortcut)},
{"Remove Amiibo", "Main Window",
UISettings::ContextualShortcut("F3", Qt::ApplicationShortcut)},
{"Capture Screenshot", "Main Window",
UISettings::ContextualShortcut("Ctrl+P", Qt::ApplicationShortcut)}}};
for (int i = 0; i < default_hotkeys.size(); i++) {
qt_config->beginGroup(default_hotkeys[i].group);