Qt: Add Resume button
This commit is contained in:
parent
e24e4c20e1
commit
e6d52ce6de
|
@ -435,7 +435,7 @@ void MainWindow::updateEmulationActions(bool starting, bool running)
|
||||||
{
|
{
|
||||||
m_ui.actionStartDisc->setDisabled(starting || running);
|
m_ui.actionStartDisc->setDisabled(starting || running);
|
||||||
m_ui.actionStartBios->setDisabled(starting || running);
|
m_ui.actionStartBios->setDisabled(starting || running);
|
||||||
m_ui.actionPowerOff->setDisabled(starting || running);
|
m_ui.actionResumeLastState->setDisabled(starting || running);
|
||||||
|
|
||||||
m_ui.actionPowerOff->setDisabled(starting || !running);
|
m_ui.actionPowerOff->setDisabled(starting || !running);
|
||||||
m_ui.actionReset->setDisabled(starting || !running);
|
m_ui.actionReset->setDisabled(starting || !running);
|
||||||
|
@ -490,6 +490,7 @@ void MainWindow::connectSignals()
|
||||||
|
|
||||||
connect(m_ui.actionStartDisc, &QAction::triggered, this, &MainWindow::onStartDiscActionTriggered);
|
connect(m_ui.actionStartDisc, &QAction::triggered, this, &MainWindow::onStartDiscActionTriggered);
|
||||||
connect(m_ui.actionStartBios, &QAction::triggered, this, &MainWindow::onStartBIOSActionTriggered);
|
connect(m_ui.actionStartBios, &QAction::triggered, this, &MainWindow::onStartBIOSActionTriggered);
|
||||||
|
connect(m_ui.actionResumeLastState, &QAction::triggered, m_host_interface, &QtHostInterface::resumeSystemFromMostRecentState);
|
||||||
connect(m_ui.actionChangeDisc, &QAction::triggered, [this] { m_ui.menuChangeDisc->exec(QCursor::pos()); });
|
connect(m_ui.actionChangeDisc, &QAction::triggered, [this] { m_ui.menuChangeDisc->exec(QCursor::pos()); });
|
||||||
connect(m_ui.actionChangeDiscFromFile, &QAction::triggered, this, &MainWindow::onChangeDiscFromFileActionTriggered);
|
connect(m_ui.actionChangeDiscFromFile, &QAction::triggered, this, &MainWindow::onChangeDiscFromFileActionTriggered);
|
||||||
connect(m_ui.actionChangeDiscFromGameList, &QAction::triggered, this,
|
connect(m_ui.actionChangeDiscFromGameList, &QAction::triggered, this,
|
||||||
|
|
|
@ -69,6 +69,7 @@
|
||||||
</widget>
|
</widget>
|
||||||
<addaction name="actionStartDisc"/>
|
<addaction name="actionStartDisc"/>
|
||||||
<addaction name="actionStartBios"/>
|
<addaction name="actionStartBios"/>
|
||||||
|
<addaction name="actionResumeLastState"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionPowerOff"/>
|
<addaction name="actionPowerOff"/>
|
||||||
<addaction name="actionReset"/>
|
<addaction name="actionReset"/>
|
||||||
|
@ -97,6 +98,7 @@
|
||||||
<addaction name="actionAdvancedSettings"/>
|
<addaction name="actionAdvancedSettings"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionAddGameDirectory"/>
|
<addaction name="actionAddGameDirectory"/>
|
||||||
|
<addaction name="actionRefreshGameList"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menuHelp">
|
<widget class="QMenu" name="menuHelp">
|
||||||
|
@ -163,7 +165,7 @@
|
||||||
</attribute>
|
</attribute>
|
||||||
<addaction name="actionStartDisc"/>
|
<addaction name="actionStartDisc"/>
|
||||||
<addaction name="actionStartBios"/>
|
<addaction name="actionStartBios"/>
|
||||||
<addaction name="actionRefreshGameList"/>
|
<addaction name="actionResumeLastState"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionPowerOff"/>
|
<addaction name="actionPowerOff"/>
|
||||||
<addaction name="actionReset"/>
|
<addaction name="actionReset"/>
|
||||||
|
@ -202,7 +204,7 @@
|
||||||
<normaloff>:/icons/folder-open.png</normaloff>:/icons/folder-open.png</iconset>
|
<normaloff>:/icons/folder-open.png</normaloff>:/icons/folder-open.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Refresh</string>
|
<string>&Refresh Game List</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionPowerOff">
|
<action name="actionPowerOff">
|
||||||
|
@ -506,6 +508,18 @@
|
||||||
<string>&Memory Card Settings...</string>
|
<string>&Memory Card Settings...</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="actionResumeLastState">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="resources/icons.qrc">
|
||||||
|
<normaloff>:/icons/media-playback-start.png</normaloff>:/icons/media-playback-start.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Resume</string>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Resumes the last save state created.</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="resources/icons.qrc"/>
|
<include location="resources/icons.qrc"/>
|
||||||
|
|
|
@ -227,6 +227,17 @@ void QtHostInterface::resumeSystemFromState(const QString& filename, bool boot_o
|
||||||
HostInterface::ResumeSystemFromState(filename.toStdString().c_str(), boot_on_failure);
|
HostInterface::ResumeSystemFromState(filename.toStdString().c_str(), boot_on_failure);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void QtHostInterface::resumeSystemFromMostRecentState()
|
||||||
|
{
|
||||||
|
if (!isOnWorkerThread())
|
||||||
|
{
|
||||||
|
QMetaObject::invokeMethod(this, "resumeSystemFromMostRecentState");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
HostInterface::ResumeSystemFromMostRecentState();
|
||||||
|
}
|
||||||
|
|
||||||
void QtHostInterface::onDisplayWindowKeyEvent(int key, bool pressed)
|
void QtHostInterface::onDisplayWindowKeyEvent(int key, bool pressed)
|
||||||
{
|
{
|
||||||
DebugAssert(isOnWorkerThread());
|
DebugAssert(isOnWorkerThread());
|
||||||
|
|
|
@ -118,6 +118,7 @@ public Q_SLOTS:
|
||||||
void onDisplayWindowMouseButtonEvent(int button, bool pressed);
|
void onDisplayWindowMouseButtonEvent(int button, bool pressed);
|
||||||
void bootSystem(const SystemBootParameters& params);
|
void bootSystem(const SystemBootParameters& params);
|
||||||
void resumeSystemFromState(const QString& filename, bool boot_on_failure);
|
void resumeSystemFromState(const QString& filename, bool boot_on_failure);
|
||||||
|
void resumeSystemFromMostRecentState();
|
||||||
void powerOffSystem();
|
void powerOffSystem();
|
||||||
void synchronousPowerOffSystem();
|
void synchronousPowerOffSystem();
|
||||||
void resetSystem();
|
void resetSystem();
|
||||||
|
|
Loading…
Reference in New Issue