QT: Add reset button

This commit is contained in:
Simon McFarlane 2015-05-02 16:18:02 -07:00
parent 5988750fe4
commit 6c6fe8d724
3 changed files with 15 additions and 0 deletions

View File

@ -14,6 +14,7 @@
#include "Core/BootManager.h" #include "Core/BootManager.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/HW/ProcessorInterface.h"
#include "DolphinQt/AboutDialog.h" #include "DolphinQt/AboutDialog.h"
#include "DolphinQt/MainWindow.h" #include "DolphinQt/MainWindow.h"
@ -70,6 +71,7 @@ DMainWindow::DMainWindow(QWidget* parent_widget)
connect(m_game_tracker, SIGNAL(StartGame()), this, SLOT(OnPlay())); connect(m_game_tracker, SIGNAL(StartGame()), this, SLOT(OnPlay()));
connect(m_ui->actionStop, SIGNAL(triggered()), this, SLOT(OnStop())); connect(m_ui->actionStop, SIGNAL(triggered()), this, SLOT(OnStop()));
connect(m_ui->actionStop_mnu, SIGNAL(triggered()), this, SLOT(OnStop())); connect(m_ui->actionStop_mnu, SIGNAL(triggered()), this, SLOT(OnStop()));
connect(m_ui->actionReset, SIGNAL(triggered()), this, SLOT(OnReset()));
connect(m_ui->actionWebsite, SIGNAL(triggered()), this, SLOT(OnOpenWebsite())); connect(m_ui->actionWebsite, SIGNAL(triggered()), this, SLOT(OnOpenWebsite()));
connect(m_ui->actionOnlineDocs, SIGNAL(triggered()), this, SLOT(OnOpenDocs())); connect(m_ui->actionOnlineDocs, SIGNAL(triggered()), this, SLOT(OnOpenDocs()));
@ -270,6 +272,12 @@ bool DMainWindow::Stop()
return true; return true;
} }
void DMainWindow::OnReset()
{
// TODO: Movie needs to be reset here
ProcessorInterface::ResetButton_Tap();
}
void DMainWindow::OnGameListStyleChanged() void DMainWindow::OnGameListStyleChanged()
{ {
if (m_ui->actionListView->isChecked()) if (m_ui->actionListView->isChecked())

View File

@ -47,6 +47,7 @@ private slots:
void OnBrowse(); void OnBrowse();
void OnExit(); void OnExit();
void OnPlay(); void OnPlay();
void OnReset();
// View menu // View menu
void OnGameListStyleChanged(); void OnGameListStyleChanged();

View File

@ -51,6 +51,7 @@
</property> </property>
<addaction name="actionPlay_mnu"/> <addaction name="actionPlay_mnu"/>
<addaction name="actionStop_mnu"/> <addaction name="actionStop_mnu"/>
<addaction name="actionReset"/>
</widget> </widget>
<widget class="QMenu" name="mnuOptions"> <widget class="QMenu" name="mnuOptions">
<property name="title"> <property name="title">
@ -225,6 +226,11 @@
<string>Stop</string> <string>Stop</string>
</property> </property>
</action> </action>
<action name="actionReset">
<property name="text">
<string>Reset</string>
</property>
</action>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>