sneedmca/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS synced 2025-01-09 13:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

main.cpp: Reorganized GMainWindow::InitializeHotkeys

Browse source
This commit is contained in:
OpenSauce04 2024-08-02 23:47:23 +01:00
parent fc8ef10853
commit e5cb0d559b
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/lime_qt/main.cpp
View file

@ -618,6 +618,7 @@ void GMainWindow::InitializeHotkeys() {
const QString swap_screens = QStringLiteral("Swap Screens"); const QString swap_screens = QStringLiteral("Swap Screens");
const QString rotate_screens = QStringLiteral("Rotate Screens Upright"); const QString rotate_screens = QStringLiteral("Rotate Screens Upright");
// QAction Hotkeys
const auto link_action_shortcut = [&](QAction* action, const QString& action_name, const auto link_action_shortcut = [&](QAction* action, const QString& action_name,
const bool primary_only = false) { const bool primary_only = false) {
static const QString main_window = QStringLiteral("Main Window"); static const QString main_window = QStringLiteral("Main Window");
@ -654,20 +655,7 @@ void GMainWindow::InitializeHotkeys() {
link_action_shortcut(ui->action_Show_Room, QStringLiteral("Multiplayer Show Current Room")); link_action_shortcut(ui->action_Show_Room, QStringLiteral("Multiplayer Show Current Room"));
link_action_shortcut(ui->action_Leave_Room, QStringLiteral("Multiplayer Leave Room")); link_action_shortcut(ui->action_Leave_Room, QStringLiteral("Multiplayer Leave Room"));
const auto add_secondary_window_hotkey = [this](QAction* action, QKeySequence hotkey, // QShortcut Hotkeys
const char* slot) {
// This action will fire specifically when secondary_window is in focus
action->setShortcut(hotkey);
disconnect(action, SIGNAL(triggered()), this, slot);
connect(action, SIGNAL(triggered()), this, slot);
secondary_window->addAction(action);
};
// Use the same fullscreen hotkey as the main window
const auto fullscreen_hotkey = hotkey_registry.GetKeySequence(main_window, fullscreen);
add_secondary_window_hotkey(action_secondary_fullscreen, fullscreen_hotkey,
SLOT(ToggleSecondaryFullscreen()));
const auto connect_shortcut = [&](const QString& action_name, const auto& function) { const auto connect_shortcut = [&](const QString& action_name, const auto& function) {
const auto* hotkey = hotkey_registry.GetHotkey(main_window, action_name, this); const auto* hotkey = hotkey_registry.GetHotkey(main_window, action_name, this);
const auto* secondary_hotkey = hotkey_registry.GetHotkey(main_window, action_name, secondary_window); const auto* secondary_hotkey = hotkey_registry.GetHotkey(main_window, action_name, secondary_window);
@ -748,6 +736,21 @@ void GMainWindow::InitializeHotkeys() {
UpdateStatusBar(); UpdateStatusBar();
} }
}); });
// Secondary Window QAction Hotkeys
const auto add_secondary_window_hotkey = [this](QAction* action, QKeySequence hotkey,
const char* slot) {
// This action will fire specifically when secondary_window is in focus
action->setShortcut(hotkey);
disconnect(action, SIGNAL(triggered()), this, slot);
connect(action, SIGNAL(triggered()), this, slot);
secondary_window->addAction(action);
};
// Use the same fullscreen hotkey as the main window
const auto fullscreen_hotkey = hotkey_registry.GetKeySequence(main_window, fullscreen);
add_secondary_window_hotkey(action_secondary_fullscreen, fullscreen_hotkey,
SLOT(ToggleSecondaryFullscreen()));
} }
void GMainWindow::SetDefaultUIGeometry() { void GMainWindow::SetDefaultUIGeometry() {