diff options
| author | 2020-07-06 19:45:57 -0400 | |
|---|---|---|
| committer | 2020-07-06 19:45:57 -0400 | |
| commit | 40cf9288e9814d022bfbe247d1948e08c1a655d6 (patch) | |
| tree | 88265573414ac59d35fede9377ab96042b0b07eb /src | |
| parent | Revert inadvertent dynarmic update (diff) | |
| download | yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.tar.gz yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.tar.xz yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.zip | |
change shortcut context for other hotkeys with file open dialog
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 9e6125e18..5e0d0e7af 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -220,8 +220,8 @@ const std::array<UISettings::Shortcut, 16> Config::default_hotkeys{{ | |||
| 220 | {QStringLiteral("Exit yuzu"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Q"), Qt::WindowShortcut}}, | 220 | {QStringLiteral("Exit yuzu"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Q"), Qt::WindowShortcut}}, |
| 221 | {QStringLiteral("Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("F11"), Qt::WindowShortcut}}, | 221 | {QStringLiteral("Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("F11"), Qt::WindowShortcut}}, |
| 222 | {QStringLiteral("Increase Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("+"), Qt::ApplicationShortcut}}, | 222 | {QStringLiteral("Increase Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("+"), Qt::ApplicationShortcut}}, |
| 223 | {QStringLiteral("Load Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F2"), Qt::ApplicationShortcut}}, | 223 | {QStringLiteral("Load Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F2"), Qt::WidgetWithChildrenShortcut}}, |
| 224 | {QStringLiteral("Load File"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+O"), Qt::WindowShortcut}}, | 224 | {QStringLiteral("Load File"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+O"), Qt::WidgetWithChildrenShortcut}}, |
| 225 | {QStringLiteral("Mute Audio"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+M"), Qt::WindowShortcut}}, | 225 | {QStringLiteral("Mute Audio"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+M"), Qt::WindowShortcut}}, |
| 226 | {QStringLiteral("Restart Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F6"), Qt::WindowShortcut}}, | 226 | {QStringLiteral("Restart Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F6"), Qt::WindowShortcut}}, |
| 227 | {QStringLiteral("Stop Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F5"), Qt::WindowShortcut}}, | 227 | {QStringLiteral("Stop Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F5"), Qt::WindowShortcut}}, |
| @@ -666,8 +666,8 @@ void Config::ReadShortcutValues() { | |||
| 666 | qt_config->beginGroup(group); | 666 | qt_config->beginGroup(group); |
| 667 | qt_config->beginGroup(name); | 667 | qt_config->beginGroup(name); |
| 668 | // No longer using ReadSetting for shortcut.second as it innacurately returns a value of 1 | 668 | // No longer using ReadSetting for shortcut.second as it innacurately returns a value of 1 |
| 669 | // for WidgetWithChildrenShortcut which is a value of 3. Needed to fix screenshot shortcut | 669 | // for WidgetWithChildrenShortcut which is a value of 3. Needed to fix shortcuts the open |
| 670 | // in windowed mode | 670 | // a file dialog in windowed mode |
| 671 | UISettings::values.shortcuts.push_back( | 671 | UISettings::values.shortcuts.push_back( |
| 672 | {name, | 672 | {name, |
| 673 | group, | 673 | group, |