diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.h | 2 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 12 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 87a4b5c78..34329970e 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -65,7 +65,10 @@ const std::array<int, 2> Config::default_stick_mod = { | |||
| 65 | // This must be in alphabetical order according to action name as it must have the same order as | 65 | // This must be in alphabetical order according to action name as it must have the same order as |
| 66 | // UISetting::values.shortcuts, which is alphabetically ordered. | 66 | // UISetting::values.shortcuts, which is alphabetically ordered. |
| 67 | // clang-format off | 67 | // clang-format off |
| 68 | const std::array<UISettings::Shortcut, 18> Config::default_hotkeys{{ | 68 | const std::array<UISettings::Shortcut, 20> Config::default_hotkeys{{ |
| 69 | {QStringLiteral("Audio Mute/Unmute"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+M"), QStringLiteral("Home+Dpad_Right"), Qt::WindowShortcut}}, | ||
| 70 | {QStringLiteral("Audio Volume Down"), QStringLiteral("Main Window"), {QStringLiteral("-"), QStringLiteral("Home+Dpad_Down"), Qt::ApplicationShortcut}}, | ||
| 71 | {QStringLiteral("Audio Volume Up"), QStringLiteral("Main Window"), {QStringLiteral("+"), QStringLiteral("Home+Dpad_Up"), Qt::ApplicationShortcut}}, | ||
| 69 | {QStringLiteral("Capture Screenshot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+P"), QStringLiteral("Screenshot"), Qt::WidgetWithChildrenShortcut}}, | 72 | {QStringLiteral("Capture Screenshot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+P"), QStringLiteral("Screenshot"), Qt::WidgetWithChildrenShortcut}}, |
| 70 | {QStringLiteral("Change Docked Mode"), QStringLiteral("Main Window"), {QStringLiteral("F10"), QStringLiteral("Home+X"), Qt::ApplicationShortcut}}, | 73 | {QStringLiteral("Change Docked Mode"), QStringLiteral("Main Window"), {QStringLiteral("F10"), QStringLiteral("Home+X"), Qt::ApplicationShortcut}}, |
| 71 | {QStringLiteral("Continue/Pause Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F4"), QStringLiteral("Home+Plus"), Qt::WindowShortcut}}, | 74 | {QStringLiteral("Continue/Pause Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F4"), QStringLiteral("Home+Plus"), Qt::WindowShortcut}}, |
| @@ -74,7 +77,6 @@ const std::array<UISettings::Shortcut, 18> Config::default_hotkeys{{ | |||
| 74 | {QStringLiteral("Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("F11"), QStringLiteral("Home+B"), Qt::WindowShortcut}}, | 77 | {QStringLiteral("Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("F11"), QStringLiteral("Home+B"), Qt::WindowShortcut}}, |
| 75 | {QStringLiteral("Load Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F2"), QStringLiteral("Home+A"), Qt::WidgetWithChildrenShortcut}}, | 78 | {QStringLiteral("Load Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F2"), QStringLiteral("Home+A"), Qt::WidgetWithChildrenShortcut}}, |
| 76 | {QStringLiteral("Load File"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+O"), QStringLiteral(""), Qt::WidgetWithChildrenShortcut}}, | 79 | {QStringLiteral("Load File"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+O"), QStringLiteral(""), Qt::WidgetWithChildrenShortcut}}, |
| 77 | {QStringLiteral("Mute Audio"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+M"), QStringLiteral(""), Qt::WindowShortcut}}, | ||
| 78 | {QStringLiteral("Restart Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F6"), QStringLiteral(""), Qt::WindowShortcut}}, | 80 | {QStringLiteral("Restart Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F6"), QStringLiteral(""), Qt::WindowShortcut}}, |
| 79 | {QStringLiteral("Stop Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F5"), QStringLiteral(""), Qt::WindowShortcut}}, | 81 | {QStringLiteral("Stop Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F5"), QStringLiteral(""), Qt::WindowShortcut}}, |
| 80 | {QStringLiteral("TAS Start/Stop"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+F5"), QStringLiteral(""), Qt::ApplicationShortcut}}, | 82 | {QStringLiteral("TAS Start/Stop"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+F5"), QStringLiteral(""), Qt::ApplicationShortcut}}, |
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index 2e377d63b..22f27d80d 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h | |||
| @@ -46,7 +46,7 @@ public: | |||
| 46 | default_mouse_buttons; | 46 | default_mouse_buttons; |
| 47 | static const std::array<int, Settings::NativeKeyboard::NumKeyboardKeys> default_keyboard_keys; | 47 | static const std::array<int, Settings::NativeKeyboard::NumKeyboardKeys> default_keyboard_keys; |
| 48 | static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods; | 48 | static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods; |
| 49 | static const std::array<UISettings::Shortcut, 18> default_hotkeys; | 49 | static const std::array<UISettings::Shortcut, 20> default_hotkeys; |
| 50 | 50 | ||
| 51 | private: | 51 | private: |
| 52 | void Initialize(const std::string& config_name); | 52 | void Initialize(const std::string& config_name); |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b3ad89281..d9e689d14 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -1014,8 +1014,18 @@ void GMainWindow::InitializeHotkeys() { | |||
| 1014 | Settings::values.use_docked_mode.GetValue(), *system); | 1014 | Settings::values.use_docked_mode.GetValue(), *system); |
| 1015 | dock_status_button->setChecked(Settings::values.use_docked_mode.GetValue()); | 1015 | dock_status_button->setChecked(Settings::values.use_docked_mode.GetValue()); |
| 1016 | }); | 1016 | }); |
| 1017 | connect_shortcut(QStringLiteral("Mute Audio"), | 1017 | connect_shortcut(QStringLiteral("Audio Mute/Unmute"), |
| 1018 | [] { Settings::values.audio_muted = !Settings::values.audio_muted; }); | 1018 | [] { Settings::values.audio_muted = !Settings::values.audio_muted; }); |
| 1019 | connect_shortcut(QStringLiteral("Audio Volume Down"), [] { | ||
| 1020 | const auto current_volume = static_cast<int>(Settings::values.volume.GetValue()); | ||
| 1021 | const auto new_volume = std::max(current_volume - 5, 0); | ||
| 1022 | Settings::values.volume.SetValue(static_cast<u8>(new_volume)); | ||
| 1023 | }); | ||
| 1024 | connect_shortcut(QStringLiteral("Audio Volume Up"), [] { | ||
| 1025 | const auto current_volume = static_cast<int>(Settings::values.volume.GetValue()); | ||
| 1026 | const auto new_volume = std::min(current_volume + 5, 100); | ||
| 1027 | Settings::values.volume.SetValue(static_cast<u8>(new_volume)); | ||
| 1028 | }); | ||
| 1019 | connect_shortcut(QStringLiteral("Toggle Framerate Limit"), [] { | 1029 | connect_shortcut(QStringLiteral("Toggle Framerate Limit"), [] { |
| 1020 | Settings::values.disable_fps_limit.SetValue(!Settings::values.disable_fps_limit.GetValue()); | 1030 | Settings::values.disable_fps_limit.SetValue(!Settings::values.disable_fps_limit.GetValue()); |
| 1021 | }); | 1031 | }); |