|
|
|
@ -79,6 +79,10 @@ void QtHostInterface::setDefaultSettings()
|
|
|
|
|
m_qsettings.setValue(QStringLiteral("Controller1/ButtonL2"), QStringLiteral("Keyboard/1"));
|
|
|
|
|
m_qsettings.setValue(QStringLiteral("Controller1/ButtonR1"), QStringLiteral("Keyboard/E"));
|
|
|
|
|
m_qsettings.setValue(QStringLiteral("Controller1/ButtonR2"), QStringLiteral("Keyboard/3"));
|
|
|
|
|
m_qsettings.setValue(QStringLiteral("Hotkeys/FastForward"), QStringLiteral("Keyboard/Tab"));
|
|
|
|
|
m_qsettings.setValue(QStringLiteral("Hotkeys/PowerOff"), QStringLiteral("Keyboard/Escape"));
|
|
|
|
|
m_qsettings.setValue(QStringLiteral("Hotkeys/TogglePause"), QStringLiteral("Keyboard/Pause"));
|
|
|
|
|
m_qsettings.setValue(QStringLiteral("Hotkeys/ToggleFullscreen"), QStringLiteral("Keyboard/Alt+Return"));
|
|
|
|
|
|
|
|
|
|
updateQSettingsFromCoreSettings();
|
|
|
|
|
}
|
|
|
|
@ -431,8 +435,8 @@ std::vector<QtHostInterface::HotkeyInfo> QtHostInterface::getHotkeyList() const
|
|
|
|
|
{
|
|
|
|
|
std::vector<HotkeyInfo> hotkeys = {
|
|
|
|
|
{QStringLiteral("FastForward"), QStringLiteral("Toggle Fast Forward"), QStringLiteral("General")},
|
|
|
|
|
{QStringLiteral("Fullscreen"), QStringLiteral("Toggle Fullscreen"), QStringLiteral("General")},
|
|
|
|
|
{QStringLiteral("Pause"), QStringLiteral("Toggle Pause"), QStringLiteral("General")},
|
|
|
|
|
{QStringLiteral("ToggleFullscreen"), QStringLiteral("Toggle Fullscreen"), QStringLiteral("General")},
|
|
|
|
|
{QStringLiteral("TogglePause"), QStringLiteral("Toggle Pause"), QStringLiteral("General")},
|
|
|
|
|
{QStringLiteral("PowerOff"), QStringLiteral("Power Off System"), QStringLiteral("General")},
|
|
|
|
|
{QStringLiteral("ToggleSoftwareRendering"), QStringLiteral("Toggle Software Rendering"),
|
|
|
|
|
QStringLiteral("Graphics")},
|
|
|
|
@ -477,12 +481,12 @@ void QtHostInterface::updateHotkeyInputMap()
|
|
|
|
|
HostInterface::UpdateSpeedLimiterState();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
hk(QStringLiteral("Fullscreen"), [this](bool pressed) {
|
|
|
|
|
hk(QStringLiteral("ToggleFullscreen"), [this](bool pressed) {
|
|
|
|
|
if (!pressed)
|
|
|
|
|
emit toggleFullscreenRequested();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
hk(QStringLiteral("Pause"), [this](bool pressed) {
|
|
|
|
|
hk(QStringLiteral("TogglePause"), [this](bool pressed) {
|
|
|
|
|
if (!pressed)
|
|
|
|
|
pauseSystem(!m_paused);
|
|
|
|
|
});
|
|
|
|
|