mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
Add Hotkeys for Skylanders Portal and Infinity Base Menus
Adds two new hotkeys to open the menus for emulated USB devices- Skylanders Portal of Power and the Infinity Base. (Hotkeys only active when game is running). Portal menu: Default is <Ctrl+P>. Infinity base: Default is <Ctrl+I>
This commit is contained in:
@ -125,6 +125,8 @@ add_executable(dolphin-emu
|
||||
Config/Mapping/HotkeyStatesOther.h
|
||||
Config/Mapping/HotkeyTAS.cpp
|
||||
Config/Mapping/HotkeyTAS.h
|
||||
Config/Mapping/HotkeyUSBEmu.cpp
|
||||
Config/Mapping/HotkeyUSBEmu.h
|
||||
Config/Mapping/HotkeyWii.cpp
|
||||
Config/Mapping/HotkeyWii.h
|
||||
Config/Mapping/IOWindow.cpp
|
||||
|
39
Source/Core/DolphinQt/Config/Mapping/HotkeyUSBEmu.cpp
Normal file
39
Source/Core/DolphinQt/Config/Mapping/HotkeyUSBEmu.cpp
Normal file
@ -0,0 +1,39 @@
|
||||
// Copyright 2023 Dolphin Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "DolphinQt/Config/Mapping/HotkeyUSBEmu.h"
|
||||
|
||||
#include <QGroupBox>
|
||||
#include <QHBoxLayout>
|
||||
|
||||
#include "Core/HotkeyManager.h"
|
||||
|
||||
HotkeyUSBEmu::HotkeyUSBEmu(MappingWindow* window) : MappingWidget(window)
|
||||
{
|
||||
CreateMainLayout();
|
||||
}
|
||||
|
||||
void HotkeyUSBEmu::CreateMainLayout()
|
||||
{
|
||||
m_main_layout = new QHBoxLayout();
|
||||
|
||||
m_main_layout->addWidget(
|
||||
CreateGroupBox(tr("USB Device Emulation"), HotkeyManagerEmu::GetHotkeyGroup(HKGP_USB_EMU)));
|
||||
|
||||
setLayout(m_main_layout);
|
||||
}
|
||||
|
||||
InputConfig* HotkeyUSBEmu::GetConfig()
|
||||
{
|
||||
return HotkeyManagerEmu::GetConfig();
|
||||
}
|
||||
|
||||
void HotkeyUSBEmu::LoadSettings()
|
||||
{
|
||||
HotkeyManagerEmu::LoadConfig();
|
||||
}
|
||||
|
||||
void HotkeyUSBEmu::SaveSettings()
|
||||
{
|
||||
HotkeyManagerEmu::GetConfig()->SaveConfig();
|
||||
}
|
26
Source/Core/DolphinQt/Config/Mapping/HotkeyUSBEmu.h
Normal file
26
Source/Core/DolphinQt/Config/Mapping/HotkeyUSBEmu.h
Normal file
@ -0,0 +1,26 @@
|
||||
#pragma once
|
||||
// Copyright 2023 Dolphin Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "DolphinQt/Config/Mapping/MappingWidget.h"
|
||||
|
||||
class QHBoxLayout;
|
||||
|
||||
class HotkeyUSBEmu final : public MappingWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HotkeyUSBEmu(MappingWindow* window);
|
||||
|
||||
InputConfig* GetConfig() override;
|
||||
|
||||
private:
|
||||
void LoadSettings() override;
|
||||
void SaveSettings() override;
|
||||
void CreateMainLayout();
|
||||
|
||||
// Main
|
||||
QHBoxLayout* m_main_layout;
|
||||
};
|
@ -39,6 +39,7 @@
|
||||
#include "DolphinQt/Config/Mapping/HotkeyStates.h"
|
||||
#include "DolphinQt/Config/Mapping/HotkeyStatesOther.h"
|
||||
#include "DolphinQt/Config/Mapping/HotkeyTAS.h"
|
||||
#include "DolphinQt/Config/Mapping/HotkeyUSBEmu.h"
|
||||
#include "DolphinQt/Config/Mapping/HotkeyWii.h"
|
||||
#include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
|
||||
#include "DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h"
|
||||
@ -450,6 +451,7 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
|
||||
AddWidget(tr("Wii and Wii Remote"), new HotkeyWii(this));
|
||||
AddWidget(tr("Controller Profile"), new HotkeyControllerProfile(this));
|
||||
AddWidget(tr("Graphics"), new HotkeyGraphics(this));
|
||||
AddWidget(tr("USB Emulation"), new HotkeyUSBEmu(this));
|
||||
// i18n: Stereoscopic 3D
|
||||
AddWidget(tr("3D"), new Hotkey3D(this));
|
||||
AddWidget(tr("Save and Load State"), new HotkeyStates(this));
|
||||
|
@ -99,6 +99,7 @@
|
||||
<ClCompile Include="Config\Mapping\HotkeyStates.cpp" />
|
||||
<ClCompile Include="Config\Mapping\HotkeyStatesOther.cpp" />
|
||||
<ClCompile Include="Config\Mapping\HotkeyTAS.cpp" />
|
||||
<ClCompile Include="Config\Mapping\HotkeyUSBEmu.cpp" />
|
||||
<ClCompile Include="Config\Mapping\HotkeyWii.cpp" />
|
||||
<ClCompile Include="Config\Mapping\IOWindow.cpp" />
|
||||
<ClCompile Include="Config\Mapping\MappingButton.cpp" />
|
||||
@ -298,6 +299,7 @@
|
||||
<QtMoc Include="Config\Mapping\HotkeyStates.h" />
|
||||
<QtMoc Include="Config\Mapping\HotkeyStatesOther.h" />
|
||||
<QtMoc Include="Config\Mapping\HotkeyTAS.h" />
|
||||
<QtMoc Include="Config\Mapping\HotkeyUSBEmu.h" />
|
||||
<QtMoc Include="Config\Mapping\HotkeyWii.h" />
|
||||
<QtMoc Include="Config\Mapping\IOWindow.h" />
|
||||
<QtMoc Include="Config\Mapping\MappingButton.h" />
|
||||
|
@ -483,6 +483,13 @@ void HotkeyScheduler::Run()
|
||||
ShowEmulationSpeed();
|
||||
}
|
||||
|
||||
// USB Device Emulation
|
||||
if (IsHotkey(HK_SKYLANDERS_PORTAL))
|
||||
emit SkylandersPortalHotkey();
|
||||
|
||||
if (IsHotkey(HK_INFINITY_BASE))
|
||||
emit InfinityBaseHotkey();
|
||||
|
||||
// Slot Saving / Loading
|
||||
if (IsHotkey(HK_SAVE_STATE_SLOT_SELECTED))
|
||||
emit StateSaveSlotHotkey();
|
||||
|
@ -65,6 +65,9 @@ signals:
|
||||
void ToggleBreakpoint();
|
||||
void AddBreakpoint();
|
||||
|
||||
void SkylandersPortalHotkey();
|
||||
void InfinityBaseHotkey();
|
||||
|
||||
private:
|
||||
void Run();
|
||||
void CheckDebuggingHotkeys();
|
||||
|
@ -642,6 +642,11 @@ void MainWindow::ConnectHotkeys()
|
||||
&CodeWidget::ToggleBreakpoint);
|
||||
connect(m_hotkey_scheduler, &HotkeyScheduler::AddBreakpoint, m_code_widget,
|
||||
&CodeWidget::AddBreakpoint);
|
||||
|
||||
connect(m_hotkey_scheduler, &HotkeyScheduler::SkylandersPortalHotkey, this,
|
||||
&MainWindow::ShowSkylanderPortal);
|
||||
connect(m_hotkey_scheduler, &HotkeyScheduler::InfinityBaseHotkey, this,
|
||||
&MainWindow::ShowInfinityBase);
|
||||
}
|
||||
|
||||
void MainWindow::ConnectToolBar()
|
||||
|
Reference in New Issue
Block a user