VERY experimental Nintendo Switch 2 emulator
C++
Add hotkeys for multiplayer actions
Hugo Locurciodd7c1354f703
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cppindex 782bcbb617..c8f59beb23 100644--- a/src/yuzu/main.cpp+++ b/src/yuzu/main.cpp@@ -1350,6 +1350,13 @@ void GMainWindow::InitializeHotkeys() {LinkActionShortcut(ui->action_TAS_Start, QStringLiteral("TAS Start/Stop"), true);LinkActionShortcut(ui->action_TAS_Record, QStringLiteral("TAS Record"), true);LinkActionShortcut(ui->action_TAS_Reset, QStringLiteral("TAS Reset"), true);+ LinkActionShortcut(ui->action_View_Lobby,+ QStringLiteral("Multiplayer Browse Public Game Lobby"));+ LinkActionShortcut(ui->action_Start_Room, QStringLiteral("Multiplayer Create Room"));+ LinkActionShortcut(ui->action_Connect_To_Room,+ QStringLiteral("Multiplayer Direct Connect to Room"));+ LinkActionShortcut(ui->action_Show_Room, QStringLiteral("Multiplayer Show Current Room"));+ LinkActionShortcut(ui->action_Leave_Room, QStringLiteral("Multiplayer Leave Room"));static const QString main_window = QStringLiteral("Main Window");const auto connect_shortcut = [&]<typename Fn>(const QString& action_name, const Fn& function) {diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.hindex f9906be336..8db8f75277 100644--- a/src/yuzu/uisettings.h+++ b/src/yuzu/uisettings.h@@ -222,7 +222,7 @@ void RestoreWindowState(std::unique_ptr<QtConfig>& qtConfig);// This must be in alphabetical order according to action name as it must have the same order as// UISetting::values.shortcuts, which is alphabetically ordered.// clang-format off-const std::array<Shortcut, 23> default_hotkeys{{+const std::array<Shortcut, 28> default_hotkeys{{{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Mute/Unmute")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+M"), std::string("Home+Dpad_Right"), Qt::WindowShortcut, false}},{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Volume Down")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("-"), std::string("Home+Dpad_Down"), Qt::ApplicationShortcut, true}},{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Volume Up")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("="), std::string("Home+Dpad_Up"), Qt::ApplicationShortcut, true}},@@ -236,6 +236,11 @@ const std::array<Shortcut, 23> default_hotkeys{{{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F11"), std::string("Home+B"), Qt::WindowShortcut, false}},{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load File")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+O"), std::string(""), Qt::WidgetWithChildrenShortcut, false}},{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load/Remove Amiibo")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F2"), std::string("Home+A"), Qt::WidgetWithChildrenShortcut, false}},+ {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Browse Public Game Lobby")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+B"), std::string(""), Qt::ApplicationShortcut, false}},+ {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Create Room")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+N"), std::string(""), Qt::ApplicationShortcut, false}},+ {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Direct Connect to Room")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+C"), std::string(""), Qt::ApplicationShortcut, false}},+ {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Leave Room")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+L"), std::string(""), Qt::ApplicationShortcut, false}},+ {QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Show Current Room")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+R"), std::string(""), Qt::ApplicationShortcut, false}},{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Restart Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F6"), std::string("R+Plus+Minus"), Qt::WindowShortcut, false}},{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Stop Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F5"), std::string("L+Plus+Minus"), Qt::WindowShortcut, false}},{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "TAS Record")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+F7"), std::string(""), Qt::ApplicationShortcut, false}},