diff --git a/Qt/ctrldisasmview.cpp b/Qt/ctrldisasmview.cpp
index 92d43f8e51..3bf021f23e 100644
--- a/Qt/ctrldisasmview.cpp
+++ b/Qt/ctrldisasmview.cpp
@@ -33,26 +33,15 @@ void CtrlDisAsmView::keyPressEvent(QKeyEvent *e)
{
int page=(rect().bottom()/rowHeight)/2-1;
- if(e->key() == Qt::Key_Down)
+ switch (e->key())
{
- curAddress += align;
- e->accept();
- }
- else if(e->key() == Qt::Key_Up)
- {
- curAddress -= align;
- e->accept();
- }
- else if(e->key() == Qt::Key_PageDown)
- {
- curAddress += page*align;
- e->accept();
- }
- else if(e->key() == Qt::Key_PageUp)
- {
- curAddress -= page*align;
- e->accept();
+ case Qt::Key_Down: curAddress += align; break;
+ case Qt::Key_Up: curAddress -= align; break;
+ case Qt::Key_PageDown: curAddress += page*align; break;
+ case Qt::Key_PageUp: curAddress -= page*align; break;
+ default: QWidget::keyPressEvent(e); break;
}
+
update();
}
@@ -68,7 +57,6 @@ void CtrlDisAsmView::mousePressEvent(QMouseEvent *e)
selecting=true;
if (!oldselecting || (selection!=oldSelection))
redraw();
- e->accept();
}
else
{
@@ -77,7 +65,6 @@ void CtrlDisAsmView::mousePressEvent(QMouseEvent *e)
EmuThread_LockDraw(false);
parentWindow->Update();
redraw();
- e->accept();
}
}
@@ -85,12 +72,11 @@ void CtrlDisAsmView::wheelEvent(QWheelEvent* e)
{
int numDegrees = e->delta() / 8;
int numSteps = numDegrees / 15;
- if (e->orientation() == Qt::Horizontal) {
- } else {
+ if (e->orientation() == Qt::Vertical)
+ {
curAddress -= numSteps*align;
- e->accept();
update();
- }
+ }
}
void CtrlDisAsmView::redraw()
@@ -243,7 +229,7 @@ void CtrlDisAsmView::RenameFunction()
}
else
{
- QMessageBox::information(this,"Warning","No symbol selected",QMessageBox::Ok);
+ QMessageBox::information(this,tr("Warning"),tr("No symbol selected"),QMessageBox::Ok);
}
}
@@ -265,20 +251,20 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *)
int width = rect().width();
int numRows=(rect().height()/rowHeight)/2+1;
- QColor bgColor = QColor(0xFFFFFFFF);
- QPen nullPen= QPen(bgColor);
- QPen currentPen=QPen(QColor(0,0,0));
- QPen selPen=QPen(QColor(0xFF808080));
- QPen condPen=QPen(QColor(0xFFFF3020));
+ QColor bgColor(0xFFFFFFFF);
+ QPen nullPen(bgColor);
+ QPen currentPen(QColor(0,0,0));
+ QPen selPen(QColor(0xFF808080));
+ QPen condPen(QColor(0xFFFF3020));
QBrush lbr;
lbr.setColor(bgColor);
- QBrush currentBrush=QBrush(QColor(0xFFFFEfE8));
- QBrush pcBrush=QBrush(QColor(0xFF70FF70));
+ QBrush currentBrush(QColor(0xFFFFEfE8));
+ QBrush pcBrush(QColor(0xFF70FF70));
- QFont normalFont = QFont("Arial", 10);
- QFont boldFont = QFont("Arial", 10);
- QFont alignedFont = QFont("Monospace", 10);
+ QFont normalFont("Arial", 10);
+ QFont boldFont("Arial", 10);
+ QFont alignedFont("Monospace", 10);
boldFont.setBold(true);
painter.setFont(normalFont);
@@ -295,17 +281,17 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *)
int rowY1 = rect().bottom()/2 + rowHeight*i - rowHeight/2;
int rowY2 = rect().bottom()/2 + rowHeight*i + rowHeight/2 - 1;
- lbr.setColor(marker==address?QColor(0xFFFFEEE0):QColor(debugger->getColor(address)));
+ lbr.setColor((unsigned int)marker == address ? QColor(0xFFFFEEE0) : QColor(debugger->getColor(address)));
QColor bg = lbr.color();
painter.setPen(nullPen);
painter.drawRect(0,rowY1,16-1,rowY2-rowY1);
- if (selecting && address == selection)
+ if (selecting && address == (unsigned int)selection)
painter.setPen(selPen);
else
painter.setPen(i==0 ? currentPen : nullPen);
- QBrush mojsBrush=QBrush(lbr.color());
+ QBrush mojsBrush(lbr.color());
painter.setBrush(mojsBrush);
if (address == debugger->getPC())
@@ -315,7 +301,7 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *)
painter.drawRect(16,rowY1,width-16-1,rowY2-rowY1);
painter.setBrush(currentBrush);
- QPen textPen = QPen(QColor(halfAndHalf(bg.rgba(),0)));
+ QPen textPen(QColor(halfAndHalf(bg.rgba(),0)));
painter.setPen(textPen);
painter.setFont(alignedFont);
painter.drawText(17,rowY1-3+rowHeight,QString("%1").arg(address,8,16,QChar('0')));
@@ -412,7 +398,7 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *)
{
painter.setPen(branches[i].conditional ? condPen : currentPen);
int x=280+(branches[i].srcAddr%9)*8;
- QPoint curPos = QPoint(x-2,branches[i].src);
+ QPoint curPos(x-2,branches[i].src);
if (branches[i].dst-200)
{
diff --git a/Qt/ctrldisasmview.h b/Qt/ctrldisasmview.h
index dd1bce826b..d60be7ac77 100644
--- a/Qt/ctrldisasmview.h
+++ b/Qt/ctrldisasmview.h
@@ -12,7 +12,6 @@ class CtrlDisAsmView : public QWidget
Q_OBJECT
public:
explicit CtrlDisAsmView(QWidget *parent = 0);
-
void redraw();
void setAlign(int l)
@@ -73,7 +72,6 @@ protected:
void mousePressEvent(QMouseEvent *e);
void keyPressEvent(QKeyEvent *);
void wheelEvent(QWheelEvent *e);
-signals:
public slots:
void CopyAddress();
diff --git a/Qt/ctrlmemview.cpp b/Qt/ctrlmemview.cpp
index 98571d03d2..5023d4f5f4 100644
--- a/Qt/ctrlmemview.cpp
+++ b/Qt/ctrlmemview.cpp
@@ -15,7 +15,6 @@
CtrlMemView::CtrlMemView(QWidget *parent) :
QWidget(parent)
{
-
curAddress=0;
rowHeight=14;
align=4;
@@ -32,44 +31,30 @@ void CtrlMemView::redraw()
update();
}
-
void CtrlMemView::wheelEvent(QWheelEvent* e)
{
int numDegrees = e->delta() / 8;
int numSteps = numDegrees / 15;
- if (e->orientation() == Qt::Horizontal) {
- } else {
+ if (e->orientation() == Qt::Vertical)
+ {
curAddress -= numSteps*align*alignMul;
- e->accept();
redraw();
- }
+ }
}
-
void CtrlMemView::keyPressEvent(QKeyEvent *e)
{
int page=(rect().bottom()/rowHeight)/2-1;
- if(e->key() == Qt::Key_Up)
+ switch (e->key())
{
- curAddress-=align*alignMul;
- e->accept();
- }
- else if(e->key() == Qt::Key_Down)
- {
- curAddress+=align*alignMul;
- e->accept();
- }
- else if(e->key() == Qt::Key_PageUp)
- {
- curAddress-=page*align*alignMul;
- e->accept();
- }
- else if(e->key() == Qt::Key_PageDown)
- {
- curAddress+=page*align*alignMul;
- e->accept();
+ case Qt::Key_Up: curAddress -= align*alignMul; break;
+ case Qt::Key_Down: curAddress += align*alignMul; break;
+ case Qt::Key_PageUp: curAddress -= page*align*alignMul; break;
+ case Qt::Key_PageDown: curAddress += page*align*alignMul; break;
+ default: QWidget::keyPressEvent(e); break;
}
+
redraw();
}
@@ -86,17 +71,17 @@ void CtrlMemView::paintEvent(QPaintEvent *)
int width = rect().width();
int numRows=(rect().bottom()/rowHeight)/2+1;
- QPen nullPen=QPen(0xFFFFFF);
- QPen currentPen=QPen(0xFF000000);
- QPen selPen=QPen(0x808080);
- QBrush lbr = QBrush(0xFFFFFF);
- QBrush nullBrush=QBrush(0xFFFFFF);
- QBrush currentBrush=QBrush(0xFFEfE8);
- QBrush pcBrush=QBrush(0x70FF70);
+ QPen nullPen(0xFFFFFF);
+ QPen currentPen(0xFF000000);
+ QPen selPen(0x808080);
+ QBrush lbr(0xFFFFFF);
+ QBrush nullBrush(0xFFFFFF);
+ QBrush currentBrush(0xFFEFE8);
+ QBrush pcBrush(0x70FF70);
QPen textPen;
- QFont normalFont = QFont("Arial", 10);
- QFont alignedFont = QFont("Monospace", 10);
+ QFont normalFont("Arial", 10);
+ QFont alignedFont("Monospace", 10);
painter.setFont(normalFont);
int i;
@@ -112,7 +97,7 @@ void CtrlMemView::paintEvent(QPaintEvent *)
painter.setBrush(currentBrush);
- if (selecting && address == selection)
+ if (selecting && address == (unsigned int)selection)
painter.setPen(selPen);
else
painter.setPen(i==0 ? currentPen : nullPen);
@@ -188,6 +173,7 @@ void CtrlMemView::paintEvent(QPaintEvent *)
painter.drawText(85,rowY1 - 2 + rowHeight, temp);
break;
}
+ case MV_MAX: break;
}
}
}
diff --git a/Qt/ctrlmemview.h b/Qt/ctrlmemview.h
index cc7f31c506..e4b52cfe63 100644
--- a/Qt/ctrlmemview.h
+++ b/Qt/ctrlmemview.h
@@ -67,7 +67,6 @@ protected:
void keyPressEvent(QKeyEvent *e);
void wheelEvent(QWheelEvent *e);
void mousePressEvent(QMouseEvent *e);
-signals:
public slots:
void CopyValue();
diff --git a/Qt/ctrlregisterlist.cpp b/Qt/ctrlregisterlist.cpp
index a52c5c88ab..64c19644a0 100644
--- a/Qt/ctrlregisterlist.cpp
+++ b/Qt/ctrlregisterlist.cpp
@@ -68,26 +68,15 @@ void CtrlRegisterList::scrollChanged(int action)
void CtrlRegisterList::keyPressEvent(QKeyEvent *e)
{
- if(e->key() == Qt::Key_Down)
+ switch (e->key())
{
- selection += 1;
- e->accept();
- }
- else if(e->key() == Qt::Key_Up)
- {
- selection -= 1;
- e->accept();
- }
- else if(e->key() == Qt::Key_PageDown)
- {
- selection += 4;
- e->accept();
- }
- else if(e->key() == Qt::Key_PageUp)
- {
- selection -= 4;
- e->accept();
+ case Qt::Key_Down: selection += 1; break;
+ case Qt::Key_Up: selection -= 1; break;
+ case Qt::Key_PageDown: selection += 4; break;
+ case Qt::Key_PageUp: selection -= 4; break;
+ default: QWidget::keyPressEvent(e); break;
}
+
int maxRowsDisplay =rect().bottom()/rowHeight - 1;
curVertOffset = std::min(std::max(curVertOffset, selection-maxRowsDisplay),selection);
update();
@@ -127,19 +116,17 @@ void CtrlRegisterList::mousePressEvent(QMouseEvent *e)
{
redraw();
}
- e->accept();
}
void CtrlRegisterList::wheelEvent(QWheelEvent* e)
{
int numDegrees = e->delta() / 8;
int numSteps = numDegrees / 15;
- if (e->orientation() == Qt::Horizontal) {
- } else {
+ if (e->orientation() == Qt::Vertical)
+ {
curVertOffset -= numSteps;
- e->accept();
update();
- }
+ }
}
@@ -175,17 +162,17 @@ void CtrlRegisterList::paintEvent(QPaintEvent *)
int width = rect().width();
- QColor bgColor = QColor(0xffffff);
- QPen nullPen=QPen(bgColor);
- QPen currentPen=QPen(QColor(0xFF000000));
- QPen selPen=QPen(0x808080);
+ QColor bgColor(0xffffff);
+ QPen nullPen(bgColor);
+ QPen currentPen(QColor(0xFF000000));
+ QPen selPen(0x808080);
QPen textPen;
QBrush lbr;
lbr.setColor(bgColor);
- QBrush nullBrush=QBrush(bgColor);
- QBrush currentBrush=QBrush(0xFFEfE8);
- QBrush pcBrush=QBrush(0x70FF70);
+ QBrush nullBrush(bgColor);
+ QBrush currentBrush(0xFFEfE8);
+ QBrush pcBrush(0x70FF70);
int nc = cpu->GetNumCategories();
for (int i=0; isetText(QString(symbolMap.GetSymbolName(i)) + " ("+ QString::number(symbolMap.GetSymbolSize(i)) +")");
+ item->setText(QString("%1 (%2)").arg(symbolMap.GetSymbolName(i)).arg(symbolMap.GetSymbolSize(i)));
item->setData(Qt::UserRole, symbolMap.GetAddress(i));
ui->FuncList->addItem(item);
}
@@ -431,7 +431,7 @@ void Debugger_Disasm::UpdateThreadGUI()
std::vector threads = GetThreadsInfo();
EmuThread_LockDraw(false);
- for(int i = 0; i < threads.size(); i++)
+ for(size_t i = 0; i < threads.size(); i++)
{
QTreeWidgetItem* item = new QTreeWidgetItem();
item->setText(0,QString::number(threads[i].id));
@@ -480,7 +480,7 @@ void Debugger_Disasm::on_threadList_customContextMenuRequested(const QPoint &pos
connect(gotoEntryPoint, SIGNAL(triggered()), this, SLOT(GotoThreadEntryPoint()));
menu.addAction(gotoEntryPoint);
- QMenu* changeStatus = menu.addMenu("Change status");
+ QMenu* changeStatus = menu.addMenu(tr("Change status"));
QAction *statusRunning = new QAction(tr("Running"), this);
connect(statusRunning, SIGNAL(triggered()), this, SLOT(SetThreadStatusRun()));
@@ -566,7 +566,7 @@ void Debugger_Disasm::UpdateDisplayListGUI()
item->setText(3,QString("%1").arg(dl->pc,8,16,QChar('0')));
item->setData(3, Qt::UserRole, dl->pc);
ui->displayList->addTopLevelItem(item);
- if(curDlId == dl->id)
+ if(curDlId == (u32)dl->id)
{
ui->displayList->setCurrentItem(item);
displayListRowSelected = item;
@@ -595,7 +595,7 @@ void Debugger_Disasm::UpdateDisplayListGUI()
item->setText(3,QString("%1").arg(it->pc,8,16,QChar('0')));
item->setData(3, Qt::UserRole, it->pc);
ui->displayList->addTopLevelItem(item);
- if(curDlId == it->id)
+ if(curDlId == (u32)it->id)
{
ui->displayList->setCurrentItem(item);
displayListRowSelected = item;
diff --git a/Qt/debugger_disasm.h b/Qt/debugger_disasm.h
index 5ca646e4be..4788b42fbf 100644
--- a/Qt/debugger_disasm.h
+++ b/Qt/debugger_disasm.h
@@ -58,49 +58,31 @@ private slots:
void UpdateThreadGUI();
void on_GotoPc_clicked();
-
void on_Go_clicked();
-
void on_Stop_clicked();
-
void on_StepInto_clicked();
-
void on_StepOver_clicked();
-
void on_Skip_clicked();
-
void on_NextHLE_clicked();
-
void on_GotoLr_clicked();
-
void on_GotoInt_currentIndexChanged(int index);
-
void on_Address_textChanged(const QString &arg1);
-
void on_DisasmView_customContextMenuRequested(const QPoint &pos);
- void releaseLock();
void on_RegList_customContextMenuRequested(const QPoint &pos);
-
void on_vfpu_clicked();
-
void on_FuncList_itemClicked(QListWidgetItem *item);
-
void on_breakpointsList_itemClicked(QTreeWidgetItem *item, int column);
-
void on_breakpointsList_customContextMenuRequested(const QPoint &pos);
-
void on_clearAllBP_clicked();
-
void on_threadList_itemClicked(QTreeWidgetItem *item, int column);
-
void on_threadList_customContextMenuRequested(const QPoint &pos);
void SetThreadStatusRun();
void SetThreadStatusWait();
void SetThreadStatusSuspend();
void on_displayList_customContextMenuRequested(const QPoint &pos);
-
+ void releaseLock();
private:
void SetThreadStatus(ThreadStatus status);
diff --git a/Qt/debugger_displaylist.cpp b/Qt/debugger_displaylist.cpp
index 9c125a2a76..ffbf6b0047 100644
--- a/Qt/debugger_displaylist.cpp
+++ b/Qt/debugger_displaylist.cpp
@@ -13,7 +13,6 @@
#include "base/display.h"
#include "mainwindow.h"
#include "GPU/GLES/VertexDecoder.h"
-#include
Debugger_DisplayList::Debugger_DisplayList(DebugInterface *_cpu, MainWindow* mainWindow_, QWidget *parent) :
@@ -78,39 +77,8 @@ void Debugger_DisplayList::UpdateDisplayListGUI()
EmuThread_LockDraw(true);
const std::deque& dlQueue = gpu->GetDisplayLists();
- DisplayList* dl = gpu->GetCurrentDisplayList();
- if(dl)
- {
- QTreeWidgetItem* item = new QTreeWidgetItem();
- item->setText(0,QString::number(dl->id));
- item->setData(0, Qt::UserRole, dl->id);
- switch(dl->status)
- {
- case PSP_GE_LIST_DONE: item->setText(1,"Done"); break;
- case PSP_GE_LIST_QUEUED: item->setText(1,"Queued"); break;
- case PSP_GE_LIST_DRAWING: item->setText(1,"Drawing"); break;
- case PSP_GE_LIST_STALL_REACHED: item->setText(1,"Stall Reached"); break;
- case PSP_GE_LIST_END_REACHED: item->setText(1,"End Reached"); break;
- case PSP_GE_LIST_CANCEL_DONE: item->setText(1,"Cancel Done"); break;
- default: break;
- }
- item->setText(2,QString("%1").arg(dl->startpc,8,16,QChar('0')));
- item->setData(2, Qt::UserRole, dl->startpc);
- item->setText(3,QString("%1").arg(dl->pc,8,16,QChar('0')));
- item->setData(3, Qt::UserRole, dl->pc);
- ui->displayList->addTopLevelItem(item);
- if(curDlId == dl->id)
- {
- ui->displayList->setCurrentItem(item);
- displayListRowSelected = item;
- ShowDLCode();
- }
- }
-
for(auto it = dlQueue.begin(); it != dlQueue.end(); ++it)
{
- if(dl && it->id == dl->id)
- continue;
QTreeWidgetItem* item = new QTreeWidgetItem();
item->setText(0,QString::number(it->id));
item->setData(0, Qt::UserRole, it->id);
@@ -129,7 +97,7 @@ void Debugger_DisplayList::UpdateDisplayListGUI()
item->setText(3,QString("%1").arg(it->pc,8,16,QChar('0')));
item->setData(3, Qt::UserRole, it->pc);
ui->displayList->addTopLevelItem(item);
- if(curDlId == it->id)
+ if(curDlId == (u32)it->id)
{
ui->displayList->setCurrentItem(item);
displayListRowSelected = item;
@@ -138,6 +106,14 @@ void Debugger_DisplayList::UpdateDisplayListGUI()
}
for(int i = 0; i < ui->displayList->columnCount(); i++)
ui->displayList->resizeColumnToContents(i);
+
+ if (ui->displayList->selectedItems().size() == 0 && ui->displayList->topLevelItemCount() != 0)
+ {
+ ui->displayList->setCurrentItem(ui->displayList->topLevelItem(0));
+ displayListRowSelected = ui->displayList->topLevelItem(0);
+ ShowDLCode();
+ }
+
EmuThread_LockDraw(false);
}
@@ -171,7 +147,7 @@ void Debugger_DisplayList::ShowDLCode()
item->setText(1,QString("%1").arg(it->second.cmd,2,16,QChar('0')));
item->setText(2,QString("%1").arg(it->second.data,6,16,QChar('0')));
item->setText(3,it->second.comment);
- if(curPc == it->first)
+ if(curPc == (u32)it->first)
{
curTexAddr = it->second.texAddr;
curVtxAddr = it->second.vtxAddr;
@@ -187,7 +163,7 @@ void Debugger_DisplayList::ShowDLCode()
}
ui->displayListData->addTopLevelItem(item);
- if(curPc == it->first)
+ if(curPc == (u32)it->first)
{
ui->displayListData->setCurrentItem(item);
}
@@ -209,7 +185,7 @@ void Debugger_DisplayList::ShowDLCode()
// Textures
QTreeWidgetItem* item = new QTreeWidgetItem();
u32 texaddr = (drawGPUState[i].texaddr[0] & 0xFFFFF0) | ((drawGPUState[i].texbufwidth[0]<<8) & 0x0F000000);
- if(!(usedTexAddr.find(texaddr) != usedTexAddr.end() || !Memory::IsValidAddress(texaddr)))
+ if(usedTexAddr.find(texaddr) == usedTexAddr.end() && Memory::IsValidAddress(texaddr))
{
u32 format = drawGPUState[i].texformat & 0xF;
int w = 1 << (drawGPUState[i].texsize[0] & 0xf);
@@ -234,7 +210,7 @@ void Debugger_DisplayList::ShowDLCode()
QTreeWidgetItem* vertexItem = new QTreeWidgetItem();
u32 baseExtended = ((drawGPUState[i].base & 0x0F0000) << 8) | (drawGPUState[i].vaddr & 0xFFFFFF);
u32 vaddr = ((drawGPUState[i].offsetAddr & 0xFFFFFF) + baseExtended) & 0x0FFFFFFF;
- if(!((drawGPUState[i].vaddr) == 0 || !Memory::IsValidAddress(vaddr) || usedVtxAddr.find(vaddr) != usedVtxAddr.end()))
+ if(drawGPUState[i].vaddr != 0 && Memory::IsValidAddress(vaddr) && usedVtxAddr.find(vaddr) == usedVtxAddr.end())
{
vertexItem->setText(0, QString("%1").arg(vaddr,8,16,QChar('0')));
vertexItem->setData(0,Qt::UserRole, i);
@@ -296,7 +272,7 @@ void Debugger_DisplayList::ShowDLCode()
QTreeWidgetItem* indexItem = new QTreeWidgetItem();
baseExtended = ((drawGPUState[i].base & 0x0F0000) << 8) | (drawGPUState[i].iaddr & 0xFFFFFF);
u32 iaddr = ((drawGPUState[i].offsetAddr & 0xFFFFFF) + baseExtended) & 0x0FFFFFFF;
- if(!((drawGPUState[i].iaddr & 0xFFFFFF) == 0 || !Memory::IsValidAddress(iaddr) || usedIdxAddr.find(iaddr) != usedIdxAddr.end()))
+ if((drawGPUState[i].iaddr & 0xFFFFFF) != 0 && Memory::IsValidAddress(iaddr) && usedIdxAddr.find(iaddr) == usedIdxAddr.end())
{
indexItem->setText(0, QString("%1").arg(iaddr,8,16,QChar('0')));
indexItem->setData(0,Qt::UserRole, i);
@@ -1573,7 +1549,7 @@ void Debugger_DisplayList::on_gotoPCBtn_clicked()
for(int i = 0; i < ui->displayListData->topLevelItemCount(); i++)
{
- if(ui->displayListData->topLevelItem(i)->data(0, Qt::UserRole).toInt() == currentPC)
+ if((u32)ui->displayListData->topLevelItem(i)->data(0, Qt::UserRole).toInt() == currentPC)
{
ui->displayListData->setCurrentItem(ui->displayListData->topLevelItem(i));
}
@@ -1610,7 +1586,7 @@ void Debugger_DisplayList::UpdateRenderBufferListGUI()
std::vector fboList = gpu->GetFramebufferList();
- for(int i = 0; i < fboList.size(); i++)
+ for(size_t i = 0; i < fboList.size(); i++)
{
QTreeWidgetItem* item = new QTreeWidgetItem();
item->setText(0,QString("%1").arg(fboList[i].fb_address,8,16,QChar('0')));
@@ -1643,7 +1619,7 @@ void Debugger_DisplayList::setCurrentFBO(u32 addr)
{
for(int i = 0; i < ui->fboList->topLevelItemCount(); i++)
{
- if(ui->fboList->topLevelItem(i)->data(0,Qt::UserRole+1).toInt() == addr)
+ if((u32)ui->fboList->topLevelItem(i)->data(0,Qt::UserRole+1).toInt() == addr)
{
for(int j = 0; j < ui->fboList->colorCount(); j++)
ui->fboList->topLevelItem(i)->setTextColor(j,Qt::green);
diff --git a/Qt/debugger_displaylist.h b/Qt/debugger_displaylist.h
index 7ecec82302..78b19d86b4 100644
--- a/Qt/debugger_displaylist.h
+++ b/Qt/debugger_displaylist.h
@@ -63,40 +63,23 @@ private slots:
void releaseLock();
void on_displayList_itemClicked(QTreeWidgetItem *item, int column);
-
void on_stepBtn_clicked();
-
void on_runBtn_clicked();
-
void on_stopBtn_clicked();
-
void on_nextDrawBtn_clicked();
-
void on_gotoPCBtn_clicked();
-
void on_texturesList_itemDoubleClicked(QTreeWidgetItem *item, int column);
-
void on_comboBox_currentIndexChanged(int index);
-
void on_fboList_itemClicked(QTreeWidgetItem *item, int column);
-
void on_nextDLBtn_clicked();
void setCurrentFBO(u32 addr);
-
void on_zoommBtn_clicked();
-
void on_zoompBtn_clicked();
-
void on_vertexList_itemClicked(QTreeWidgetItem *item, int column);
-
void on_pushButton_clicked();
-
void on_nextIdx_clicked();
-
void on_indexList_itemClicked(QTreeWidgetItem *item, int column);
-
void on_displayListData_customContextMenuRequested(const QPoint &pos);
-
void on_texturesList_customContextMenuRequested(const QPoint &pos);
void RunToDLPC();
void RunToDrawTex();
diff --git a/Qt/debugger_vfpu.cpp b/Qt/debugger_vfpu.cpp
index 5c30f3e12f..290dd26f08 100644
--- a/Qt/debugger_vfpu.cpp
+++ b/Qt/debugger_vfpu.cpp
@@ -12,7 +12,7 @@ Debugger_VFPU::Debugger_VFPU(DebugInterface *_cpu, MainWindow* mainWindow_, QWid
{
ui->setupUi(this);
- setWindowTitle(QString("VFPU - ")+cpu->GetName());
+ setWindowTitle(QString("VFPU - %1").arg(cpu->GetName()));
ui->vfpu->setCPU(_cpu);
}
diff --git a/Qt/gamepaddialog.cpp b/Qt/gamepaddialog.cpp
index 5094fc032c..2b1fb03e03 100644
--- a/Qt/gamepaddialog.cpp
+++ b/Qt/gamepaddialog.cpp
@@ -44,10 +44,10 @@ const int configOffset = 200;
GamePadDialog::GamePadDialog(InputState* state, QWidget *parent) :
QDialog(parent),
ui(new Ui::GamePadDialog),
- m_inputState(state),
#if QT_HAS_SDL
m_joystick(0),
#endif
+ m_inputState(state),
m_isInit(false)
{
ui->setupUi(this);
@@ -108,15 +108,10 @@ void GamePadDialog::showEvent(QShowEvent *)
void GamePadDialog::changeEvent(QEvent *event)
{
- QDialog::changeEvent(event);
-
- if (0 != event)
+ if (event->type() == QEvent::LanguageChange)
{
- if (event->type() == QEvent::LanguageChange)
- {
- ui->retranslateUi(this);
- on_refreshListBtn_clicked();
- }
+ ui->retranslateUi(this);
+ on_refreshListBtn_clicked();
}
}
diff --git a/Qt/gamepaddialog.h b/Qt/gamepaddialog.h
index 24163731cc..4157fa2aa5 100644
--- a/Qt/gamepaddialog.h
+++ b/Qt/gamepaddialog.h
@@ -21,23 +21,16 @@ public:
~GamePadDialog();
void SetViewMode();
- void SetCalibMode();
- void CalibNextButton();
protected:
void showEvent(QShowEvent *);
void changeEvent(QEvent *);
private slots:
void releaseLock();
void on_refreshListBtn_clicked();
-
void on_SelectPadBtn_clicked();
-
void pollJoystick();
-
void on_AssignBtn_clicked();
-
void on_buttonBox_accepted();
-
private:
int GetIntFromMapping(int inputId, int type, int sign);
void GetMappingFromInt(int value, int &inputId, int &type, int &sign);
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index 7304c06cbf..a7e08e35f9 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -16,7 +16,6 @@
#include "ConsoleListener.h"
#include "base/display.h"
#include "GPU/GPUInterface.h"
-#include "GPU/GPUState.h"
#include "QtHost.h"
#include "EmuThread.h"
@@ -35,7 +34,6 @@ MainWindow::MainWindow(QWidget *parent) :
displaylistWindow(0)
{
ui->setupUi(this);
- qApp->installEventFilter(this);
controls = new Controls(this);
#if QT_HAS_SDL
@@ -59,25 +57,23 @@ MainWindow::MainWindow(QWidget *parent) :
SetZoom(zoom);
EmuThread_Start(emugl);
+ SetGameTitle(fileToStart);
if (!fileToStart.isNull())
{
- SetGameTitle(fileToStart);
- UpdateMenus();
-
EmuThread_StartGame(fileToStart);
+ UpdateMenus();
if (stateToLoad != NULL)
SaveState::Load(stateToLoad);
}
- else
- SetGameTitle("");
}
MainWindow::~MainWindow()
{
delete ui;
}
+
void NativeInit(int argc, const char *argv[], const char *savegame_directory, const char *external_directory, const char *installID)
{
std::string config_filename;
@@ -175,31 +171,130 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
#endif
}
-void MainWindow::SetNextState(CoreState state)
+void MainWindow::ShowMemory(u32 addr)
{
- nextState = state;
+ if(memoryWindow)
+ memoryWindow->Goto(addr);
}
-void MainWindow::SetGameTitle(QString text)
+void MainWindow::Update()
{
- QString title = "PPSSPP " + QString(PPSSPP_VERSION_STR);
- if (text != "")
- title += QString(" - %1").arg(text);
+ UpdateInputState(&input_state);
- setWindowTitle(title);
-}
-
-void MainWindow::BrowseAndBoot(void)
-{
- QString filename = QFileDialog::getOpenFileName(NULL, "Load File", g_Config.currentDirectory.c_str(), "PSP ROMs (*.pbp *.elf *.iso *.cso *.prx)");
- if (QFile::exists(filename))
+ for (int i = 0; i < controllistCount; i++)
{
- QFileInfo info(filename);
- g_Config.currentDirectory = info.absolutePath().toStdString();
- EmuThread_StartGame(filename);
+ if (pressedKeys.contains(controllist[i].key) ||
+ input_state.pad_buttons_down & controllist[i].emu_id)
+ __CtrlButtonDown(controllist[i].psp_id);
+ else
+ __CtrlButtonUp(controllist[i].psp_id);
}
+ __CtrlSetAnalog(input_state.pad_lstick_x, input_state.pad_lstick_y);
}
+void MainWindow::UpdateMenus()
+{
+ // enabling
+ bool enable = g_State.bEmuThreadStarted ? false : true;
+ ui->action_FileLoad->setEnabled(enable);
+ ui->action_FileClose->setEnabled(!enable);
+ ui->action_FileSaveStateFile->setEnabled(!enable);
+ ui->action_FileLoadStateFile->setEnabled(!enable);
+ ui->action_FileQuickloadState->setEnabled(!enable);
+ ui->action_FileQuickSaveState->setEnabled(!enable);
+ ui->action_CPUDynarec->setEnabled(enable);
+ ui->action_CPUInterpreter->setEnabled(enable);
+ ui->action_DebugDumpFrame->setEnabled(!enable);
+ ui->action_DebugDisassembly->setEnabled(!enable);
+ ui->action_DebugMemoryView->setEnabled(!enable);
+ ui->action_DebugMemoryViewTexture->setEnabled(!enable);
+ ui->action_DebugDisplayList->setEnabled(!enable);
+
+ enable = !Core_IsStepping() ? false : true;
+ ui->action_EmulationRun->setEnabled(g_State.bEmuThreadStarted ? enable : false);
+ ui->action_EmulationPause->setEnabled(g_State.bEmuThreadStarted ? !enable : false);
+ ui->action_EmulationReset->setEnabled(g_State.bEmuThreadStarted ? true : false);
+
+ // checking
+ ui->action_EmulationRunLoad->setChecked(g_Config.bAutoRun);
+
+ ui->action_CPUInterpreter->setChecked(!g_Config.bJit);
+ ui->action_CPUDynarec->setChecked(g_Config.bJit);
+ ui->action_OptionsFastMemory->setChecked(g_Config.bFastMemory);
+ ui->action_OptionsIgnoreIllegalReadsWrites->setChecked(g_Config.bIgnoreBadMemAccess);
+
+ ui->action_AFOff->setChecked(g_Config.iAnisotropyLevel == 0);
+ ui->action_AF2x->setChecked(g_Config.iAnisotropyLevel == 2);
+ ui->action_AF4x->setChecked(g_Config.iAnisotropyLevel == 4);
+ ui->action_AF8x->setChecked(g_Config.iAnisotropyLevel == 8);
+ ui->action_AF16x->setChecked(g_Config.iAnisotropyLevel == 16);
+
+ ui->action_OptionsBufferedRendering->setChecked(g_Config.bBufferedRendering);
+ ui->action_OptionsLinearFiltering->setChecked(g_Config.bLinearFiltering);
+ ui->action_Simple_2xAA->setChecked(g_Config.SSAntiAliasing);
+
+ ui->action_OptionsScreen1x->setChecked(0 == (g_Config.iWindowZoom - 1));
+ ui->action_OptionsScreen2x->setChecked(1 == (g_Config.iWindowZoom - 1));
+ ui->action_OptionsScreen3x->setChecked(2 == (g_Config.iWindowZoom - 1));
+ ui->action_OptionsScreen4x->setChecked(3 == (g_Config.iWindowZoom - 1));
+
+ ui->action_Stretch_to_display->setChecked(g_Config.bStretchToDisplay);
+ ui->action_OptionsHardwareTransform->setChecked(g_Config.bHardwareTransform);
+ ui->action_OptionsUseVBO->setChecked(g_Config.bUseVBO);
+ ui->action_OptionsVertexCache->setChecked(g_Config.bVertexCache);
+ ui->action_OptionsWireframe->setChecked(g_Config.bDrawWireframe);
+ ui->action_OptionsDisplayRawFramebuffer->setChecked(g_Config.bDisplayFramebuffer);
+// ui->actionFrameskip->setChecked(g_Config.iFrameSkip != 0);
+
+ ui->action_Sound->setChecked(g_Config.bEnableSound);
+
+ ui->action_OptionsShowDebugStatistics->setChecked(g_Config.bShowDebugStats);
+ ui->action_Show_FPS_counter->setChecked(g_Config.bShowFPSCounter);
+
+ ui->actionLogDefDebug->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON) == LogTypes::LDEBUG);
+ ui->actionLogDefInfo->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON) == LogTypes::LINFO);
+ ui->actionLogDefWarning->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON) == LogTypes::LWARNING);
+ ui->actionLogDefError->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON) == LogTypes::LERROR);
+
+ ui->actionLogG3DDebug->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::G3D) == LogTypes::LDEBUG);
+ ui->actionLogG3DInfo->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::G3D) == LogTypes::LINFO);
+ ui->actionLogG3DWarning->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::G3D) == LogTypes::LWARNING);
+ ui->actionLogG3DError->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::G3D) == LogTypes::LERROR);
+
+ ui->actionLogHLEDebug->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::HLE) == LogTypes::LDEBUG);
+ ui->actionLogHLEInfo->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::HLE) == LogTypes::LINFO);
+ ui->actionLogHLEWarning->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::HLE) == LogTypes::LWARNING);
+ ui->actionLogHLEError->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::HLE) == LogTypes::LERROR);
+}
+
+void MainWindow::changeEvent(QEvent *e)
+{
+ if (e->type() == QEvent::LanguageChange)
+ ui->retranslateUi(this);
+}
+
+void MainWindow::closeEvent(QCloseEvent *)
+{
+ on_action_FileExit_triggered();
+}
+
+void MainWindow::keyPressEvent(QKeyEvent *e)
+{
+ if(isFullScreen() && e->key() == Qt::Key_F12)
+ {
+ on_action_OptionsFullScreen_triggered();
+ return;
+ }
+
+ pressedKeys.insert(e->key());
+}
+
+void MainWindow::keyReleaseEvent(QKeyEvent *e)
+{
+ pressedKeys.remove(e->key());
+}
+
+/* SLOTS */
void MainWindow::Boot()
{
dialogDisasm = new Debugger_Disasm(currentDebugMIPS, this, this);
@@ -213,10 +308,7 @@ void MainWindow::Boot()
memoryTexWindow = new Debugger_MemoryTex(this);
displaylistWindow = new Debugger_DisplayList(currentDebugMIPS, this, this);
- if (dialogDisasm)
- dialogDisasm->NotifyMapLoaded();
- if (memoryWindow)
- memoryWindow->NotifyMapLoaded();
+ notifyMapsLoaded();
if (nextState == CORE_RUNNING)
on_action_EmulationRun_triggered();
@@ -229,130 +321,22 @@ void MainWindow::CoreEmitWait(bool isWaiting)
EmuThread_LockDraw(!isWaiting);
}
-void MainWindow::UpdateMenus()
-{
- ui->action_OptionsDisplayRawFramebuffer->setChecked(g_Config.bDisplayFramebuffer);
- ui->action_OptionsIgnoreIllegalReadsWrites->setChecked(g_Config.bIgnoreBadMemAccess);
- ui->action_CPUInterpreter->setChecked(!g_Config.bJit);
- ui->action_CPUDynarec->setChecked(g_Config.bJit);
- ui->action_OptionsBufferedRendering->setChecked(g_Config.bBufferedRendering);
- ui->action_OptionsShowDebugStatistics->setChecked(g_Config.bShowDebugStats);
- ui->action_OptionsWireframe->setChecked(g_Config.bDrawWireframe);
- ui->action_OptionsHardwareTransform->setChecked(g_Config.bHardwareTransform);
- ui->action_OptionsFastMemory->setChecked(g_Config.bFastMemory);
- ui->action_OptionsLinearFiltering->setChecked(g_Config.bLinearFiltering);
- ui->action_EmulationRunLoad->setChecked(g_Config.bAutoRun);
- ui->action_OptionsUseVBO->setChecked(g_Config.bUseVBO);
- ui->action_OptionsVertexCache->setChecked(g_Config.bVertexCache);
- ui->action_AFOff->setChecked(g_Config.iAnisotropyLevel == 0);
- ui->action_AF2x->setChecked(g_Config.iAnisotropyLevel == 2);
- ui->action_AF4x->setChecked(g_Config.iAnisotropyLevel == 4);
- ui->action_AF8x->setChecked(g_Config.iAnisotropyLevel == 8);
- ui->action_AF16x->setChecked(g_Config.iAnisotropyLevel == 16);
- ui->action_Simple_2xAA->setChecked(g_Config.SSAntiAliasing);
- ui->action_Show_FPS_counter->setChecked(g_Config.bShowFPSCounter);
- ui->action_Stretch_to_display->setChecked(g_Config.bStretchToDisplay);
- ui->action_Sound->setChecked(g_Config.bEnableSound);
-
- bool enable = !Core_IsStepping() ? false : true;
- ui->action_EmulationRun->setEnabled(g_State.bEmuThreadStarted ? enable : false);
- ui->action_EmulationPause->setEnabled(g_State.bEmuThreadStarted ? !enable : false);
- ui->action_EmulationReset->setEnabled(g_State.bEmuThreadStarted ? true : false);
-
- enable = g_State.bEmuThreadStarted ? false : true;
- ui->action_FileLoad->setEnabled(enable);
- ui->action_FileSaveStateFile->setEnabled(!enable);
- ui->action_FileLoadStateFile->setEnabled(!enable);
- ui->action_FileQuickloadState->setEnabled(!enable);
- ui->action_FileQuickSaveState->setEnabled(!enable);
- ui->action_CPUDynarec->setEnabled(enable);
- ui->action_CPUInterpreter->setEnabled(enable);
- ui->action_EmulationStop->setEnabled(!enable);
- ui->action_DebugDumpFrame->setEnabled(!enable);
- ui->action_DebugDisassembly->setEnabled(!enable);
- ui->action_DebugMemoryView->setEnabled(!enable);
- ui->action_DebugMemoryViewTexture->setEnabled(!enable);
- ui->action_DebugDisplayList->setEnabled(!enable);
-
- ui->action_OptionsScreen1x->setChecked(0 == (g_Config.iWindowZoom - 1));
- ui->action_OptionsScreen2x->setChecked(1 == (g_Config.iWindowZoom - 1));
- ui->action_OptionsScreen3x->setChecked(2 == (g_Config.iWindowZoom - 1));
- ui->action_OptionsScreen4x->setChecked(3 == (g_Config.iWindowZoom - 1));
-
- ui->actionLogG3DDebug->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::G3D) == LogTypes::LDEBUG);
- ui->actionLogG3DInfo->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::G3D) == LogTypes::LINFO);
- ui->actionLogG3DWarning->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::G3D) == LogTypes::LWARNING);
- ui->actionLogG3DError->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::G3D) == LogTypes::LERROR);
-
- ui->actionLogHLEDebug->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::HLE) == LogTypes::LDEBUG);
- ui->actionLogHLEInfo->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::HLE) == LogTypes::LINFO);
- ui->actionLogHLEWarning->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::HLE) == LogTypes::LWARNING);
- ui->actionLogHLEError->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::HLE) == LogTypes::LERROR);
-
- ui->actionLogDefDebug->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON) == LogTypes::LDEBUG);
- ui->actionLogDefInfo->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON) == LogTypes::LINFO);
- ui->actionLogDefWarning->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON) == LogTypes::LWARNING);
- ui->actionLogDefError->setChecked(LogManager::GetInstance()->GetLogLevel(LogTypes::COMMON) == LogTypes::LERROR);
-}
-
-void MainWindow::SetZoom(float zoom) {
- if (zoom < 5)
- g_Config.iWindowZoom = (int) zoom;
-
- pixel_xres = 480 * zoom;
- pixel_yres = 272 * zoom;
- dp_xres = pixel_xres;
- dp_yres = pixel_yres;
-
- emugl->resize(pixel_xres, pixel_yres);
- emugl->setMinimumSize(pixel_xres, pixel_yres);
- emugl->setMaximumSize(pixel_xres, pixel_yres);
-
- ui->centralwidget->setFixedSize(pixel_xres, pixel_yres);
- ui->centralwidget->resize(pixel_xres, pixel_yres);
-
- setFixedSize(sizeHint());
- resize(sizeHint());
-
- PSP_CoreParameter().pixelWidth = pixel_xres;
- PSP_CoreParameter().pixelHeight = pixel_yres;
- PSP_CoreParameter().outputWidth = pixel_xres;
- PSP_CoreParameter().outputHeight = pixel_yres;
-
- if (g_Config.SSAntiAliasing)
- {
- zoom *= 2;
- PSP_CoreParameter().renderWidth = 480 * zoom;
- PSP_CoreParameter().renderHeight = 272 * zoom;
- }
-
- if (gpu)
- gpu->Resized();
-}
-
void MainWindow::on_action_FileLoad_triggered()
{
- BrowseAndBoot();
-}
-
-void MainWindow::on_action_EmulationRun_triggered()
-{
- if (g_State.bEmuThreadStarted)
+ QString filename = QFileDialog::getOpenFileName(NULL, "Load File", g_Config.currentDirectory.c_str(), "PSP ROMs (*.pbp *.elf *.iso *.cso *.prx)");
+ if (QFile::exists(filename))
{
- if(dialogDisasm)
- {
- dialogDisasm->Stop();
- dialogDisasm->Go();
- }
+ QFileInfo info(filename);
+ g_Config.currentDirectory = info.absolutePath().toStdString();
+ EmuThread_StartGame(filename);
}
}
-void MainWindow::on_action_EmulationStop_triggered()
+void MainWindow::on_action_FileClose_triggered()
{
if(dialogDisasm)
- {
dialogDisasm->Stop();
- }
+
// This will wait for ppsspp to pause
EmuThread_LockDraw(true);
EmuThread_LockDraw(false);
@@ -371,12 +355,6 @@ void MainWindow::on_action_EmulationStop_triggered()
UpdateMenus();
}
-void MainWindow::on_action_EmulationPause_triggered()
-{
- if(dialogDisasm)
- dialogDisasm->Stop();
-}
-
void SaveStateActionFinished(bool result, void *userdata)
{
// TODO: Improve messaging?
@@ -390,6 +368,16 @@ void SaveStateActionFinished(bool result, void *userdata)
}
}
+void MainWindow::on_action_FileQuickloadState_triggered()
+{
+ SaveState::LoadSlot(0, SaveStateActionFinished, this);
+}
+
+void MainWindow::on_action_FileQuickSaveState_triggered()
+{
+ SaveState::SaveSlot(0, SaveStateActionFinished, this);
+}
+
void MainWindow::on_action_FileLoadStateFile_triggered()
{
QFileDialog dialog(0,"Load state");
@@ -398,15 +386,13 @@ void MainWindow::on_action_FileLoadStateFile_triggered()
filters << "Save States (*.ppst)" << "|All files (*.*)";
dialog.setNameFilters(filters);
dialog.setAcceptMode(QFileDialog::AcceptOpen);
- QStringList fileNames;
if (dialog.exec())
{
- fileNames = dialog.selectedFiles();
+ QStringList fileNames = dialog.selectedFiles();
SaveState::Load(fileNames[0].toStdString(), SaveStateActionFinished, this);
}
}
-
void MainWindow::on_action_FileSaveStateFile_triggered()
{
QFileDialog dialog(0,"Save state");
@@ -415,22 +401,223 @@ void MainWindow::on_action_FileSaveStateFile_triggered()
QStringList filters;
filters << "Save States (*.ppst)" << "|All files (*.*)";
dialog.setNameFilters(filters);
- QStringList fileNames;
if (dialog.exec())
{
- fileNames = dialog.selectedFiles();
+ QStringList fileNames = dialog.selectedFiles();
SaveState::Save(fileNames[0].toStdString(), SaveStateActionFinished, this);
}
}
-void MainWindow::on_action_FileQuickloadState_triggered()
+void MainWindow::on_action_FileExit_triggered()
{
- SaveState::LoadSlot(0, SaveStateActionFinished, this);
+ on_action_FileClose_triggered();
+ EmuThread_Stop();
+ QApplication::exit(0);
}
-void MainWindow::on_action_FileQuickSaveState_triggered()
+void MainWindow::on_action_EmulationRun_triggered()
{
- SaveState::SaveSlot(0, SaveStateActionFinished, this);
+ if (g_State.bEmuThreadStarted)
+ {
+ if(dialogDisasm)
+ {
+ dialogDisasm->Stop();
+ dialogDisasm->Go();
+ }
+ }
+}
+
+void MainWindow::on_action_EmulationPause_triggered()
+{
+ if(dialogDisasm)
+ dialogDisasm->Stop();
+}
+
+void MainWindow::on_action_EmulationReset_triggered()
+{
+ if(dialogDisasm)
+ dialogDisasm->Stop();
+
+ EmuThread_LockDraw(true);
+ EmuThread_LockDraw(false);
+
+ if(dialogDisasm)
+ dialogDisasm->close();
+ if(memoryWindow)
+ memoryWindow->close();
+ if(memoryTexWindow)
+ memoryTexWindow->close();
+ if(displaylistWindow)
+ displaylistWindow->close();
+
+ EmuThread_StopGame();
+
+ EmuThread_StartGame(GetCurrentFilename());
+}
+
+void MainWindow::on_action_EmulationRunLoad_triggered()
+{
+ g_Config.bAutoRun = !g_Config.bAutoRun;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_DebugLoadMapFile_triggered()
+{
+ QFileDialog dialog(0,"Load .MAP");
+ dialog.setFileMode(QFileDialog::ExistingFile);
+ QStringList filters;
+ filters << "Maps (*.map)" << "|All files (*.*)";
+ dialog.setNameFilters(filters);
+ dialog.setAcceptMode(QFileDialog::AcceptOpen);
+ QStringList fileNames;
+ if (dialog.exec())
+ {
+ fileNames = dialog.selectedFiles();
+ symbolMap.LoadSymbolMap(fileNames[0].toStdString().c_str());
+ notifyMapsLoaded();
+ }
+}
+
+void MainWindow::on_action_DebugSaveMapFile_triggered()
+{
+ QFileDialog dialog(0,"Save .MAP");
+ dialog.setFileMode(QFileDialog::AnyFile);
+ dialog.setAcceptMode(QFileDialog::AcceptSave);
+ QStringList filters;
+ filters << "Save .MAP (*.map)" << "|All files (*.*)";
+ dialog.setNameFilters(filters);
+ QStringList fileNames;
+ if (dialog.exec())
+ {
+ fileNames = dialog.selectedFiles();
+ symbolMap.SaveSymbolMap(fileNames[0].toStdString().c_str());
+ }
+}
+
+void MainWindow::on_action_DebugResetSymbolTable_triggered()
+{
+ symbolMap.ResetSymbolMap();
+ notifyMapsLoaded();
+}
+
+void MainWindow::on_action_DebugDumpFrame_triggered()
+{
+ gpu->DumpNextFrame();
+}
+
+void MainWindow::on_action_DebugDisassembly_triggered()
+{
+ if(dialogDisasm)
+ dialogDisasm->show();
+}
+
+void MainWindow::on_action_DebugDisplayList_triggered()
+{
+ if(displaylistWindow)
+ displaylistWindow->show();
+}
+
+void MainWindow::on_action_DebugLog_triggered()
+{
+ LogManager::GetInstance()->GetConsoleListener()->Show(LogManager::GetInstance()->GetConsoleListener()->Hidden());
+}
+
+void MainWindow::on_action_DebugMemoryView_triggered()
+{
+ if (memoryWindow)
+ memoryWindow->show();
+}
+
+void MainWindow::on_action_DebugMemoryViewTexture_triggered()
+{
+ if(memoryTexWindow)
+ memoryTexWindow->show();
+}
+
+void MainWindow::on_action_CPUDynarec_triggered()
+{
+ g_Config.bJit = true;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_CPUInterpreter_triggered()
+{
+ g_Config.bJit = false;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_OptionsFastMemory_triggered()
+{
+ g_Config.bFastMemory = !g_Config.bFastMemory;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_OptionsIgnoreIllegalReadsWrites_triggered()
+{
+ g_Config.bIgnoreBadMemAccess = !g_Config.bIgnoreBadMemAccess;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_OptionsControls_triggered()
+{
+ controls->show();
+}
+
+void MainWindow::on_action_OptionsGamePadControls_triggered()
+{
+#if QT_HAS_SDL
+ gamePadDlg->show();
+#else
+ QMessageBox::information(this,tr("Gamepad"),tr("You need to compile with SDL to have Gamepad support."), QMessageBox::Ok);
+#endif
+}
+
+void MainWindow::on_action_AFOff_triggered()
+{
+ g_Config.iAnisotropyLevel = 0;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_AF2x_triggered()
+{
+ g_Config.iAnisotropyLevel = 2;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_AF4x_triggered()
+{
+ g_Config.iAnisotropyLevel = 4;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_AF8x_triggered()
+{
+ g_Config.iAnisotropyLevel = 8;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_AF16x_triggered()
+{
+ g_Config.iAnisotropyLevel = 16;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_OptionsBufferedRendering_triggered()
+{
+ g_Config.bBufferedRendering = !g_Config.bBufferedRendering;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_OptionsLinearFiltering_triggered()
+{
+ g_Config.bLinearFiltering = !g_Config.bLinearFiltering;
+ UpdateMenus();
+}
+
+void MainWindow::on_action_Simple_2xAA_triggered()
+{
+ g_Config.SSAntiAliasing = !g_Config.SSAntiAliasing;
+ UpdateMenus();
}
void MainWindow::on_action_OptionsScreen1x_triggered()
@@ -457,16 +644,12 @@ void MainWindow::on_action_OptionsScreen4x_triggered()
UpdateMenus();
}
-void MainWindow::on_action_OptionsBufferedRendering_triggered()
+void MainWindow::on_action_Stretch_to_display_triggered()
{
- g_Config.bBufferedRendering = !g_Config.bBufferedRendering;
- UpdateMenus();
-}
-
-void MainWindow::on_action_OptionsShowDebugStatistics_triggered()
-{
- g_Config.bShowDebugStats = !g_Config.bShowDebugStats;
+ g_Config.bStretchToDisplay = !g_Config.bStretchToDisplay;
UpdateMenus();
+ if (gpu)
+ gpu->Resized();
}
void MainWindow::on_action_OptionsHardwareTransform_triggered()
@@ -475,90 +658,39 @@ void MainWindow::on_action_OptionsHardwareTransform_triggered()
UpdateMenus();
}
-void MainWindow::on_action_FileExit_triggered()
+void MainWindow::on_action_OptionsUseVBO_triggered()
{
- on_action_EmulationStop_triggered();
- EmuThread_Stop();
- QApplication::exit(0);
-}
-
-void MainWindow::on_action_CPUDynarec_triggered()
-{
- g_Config.bJit = true;
+ g_Config.bUseVBO = !g_Config.bUseVBO;
UpdateMenus();
}
-void MainWindow::on_action_CPUInterpreter_triggered()
+void MainWindow::on_action_OptionsVertexCache_triggered()
{
- g_Config.bJit = false;
+ g_Config.bVertexCache = !g_Config.bVertexCache;
UpdateMenus();
}
-void MainWindow::on_action_DebugLoadMapFile_triggered()
+void MainWindow::on_action_OptionsWireframe_triggered()
{
- QFileDialog dialog(0,"Load .MAP");
- dialog.setFileMode(QFileDialog::ExistingFile);
- QStringList filters;
- filters << "Maps (*.map)" << "|All files (*.*)";
- dialog.setNameFilters(filters);
- dialog.setAcceptMode(QFileDialog::AcceptOpen);
- QStringList fileNames;
- if (dialog.exec())
- {
- fileNames = dialog.selectedFiles();
- symbolMap.LoadSymbolMap(fileNames[0].toStdString().c_str());
- if (dialogDisasm)
- dialogDisasm->NotifyMapLoaded();
- if (memoryWindow)
- memoryWindow->NotifyMapLoaded();
- }
+ g_Config.bDrawWireframe = !g_Config.bDrawWireframe;
+ UpdateMenus();
}
-void MainWindow::on_action_DebugSaveMapFile_triggered()
+void MainWindow::on_action_OptionsDisplayRawFramebuffer_triggered()
{
- QFileDialog dialog(0,"Save .MAP");
- dialog.setFileMode(QFileDialog::AnyFile);
- dialog.setAcceptMode(QFileDialog::AcceptSave);
- QStringList filters;
- filters << "Save .MAP (*.map)" << "|All files (*.*)";
- dialog.setNameFilters(filters);
- QStringList fileNames;
- if (dialog.exec())
- {
- fileNames = dialog.selectedFiles();
- symbolMap.SaveSymbolMap(fileNames[0].toStdString().c_str());
- }
+ g_Config.bDisplayFramebuffer = !g_Config.bDisplayFramebuffer;
+ UpdateMenus();
}
-void MainWindow::on_action_DebugResetSymbolTable_triggered()
+void MainWindow::on_actionFrameskip_triggered()
{
- symbolMap.ResetSymbolMap();
- if (dialogDisasm)
- dialogDisasm->NotifyMapLoaded();
- if (memoryWindow)
- memoryWindow->NotifyMapLoaded();
+// g_Config.iFrameSkip = !g_Config.iFrameSkip;
+ UpdateMenus();
}
-void MainWindow::on_action_DebugDisassembly_triggered()
+void MainWindow::on_action_Sound_triggered()
{
- if(dialogDisasm)
- dialogDisasm->show();
-}
-
-void MainWindow::on_action_DebugMemoryView_triggered()
-{
- if (memoryWindow)
- memoryWindow->show();
-}
-
-void MainWindow::on_action_DebugLog_triggered()
-{
- LogManager::GetInstance()->GetConsoleListener()->Show(LogManager::GetInstance()->GetConsoleListener()->Hidden());
-}
-
-void MainWindow::on_action_OptionsIgnoreIllegalReadsWrites_triggered()
-{
- g_Config.bIgnoreBadMemAccess = !g_Config.bIgnoreBadMemAccess;
+ g_Config.bEnableSound = !g_Config.bEnableSound;
UpdateMenus();
}
@@ -605,69 +737,50 @@ void MainWindow::on_action_OptionsFullScreen_triggered()
}
}
-void MainWindow::on_action_OptionsWireframe_triggered()
+void MainWindow::on_action_OptionsShowDebugStatistics_triggered()
{
- g_Config.bDrawWireframe = !g_Config.bDrawWireframe;
+ g_Config.bShowDebugStats = !g_Config.bShowDebugStats;
UpdateMenus();
}
-void MainWindow::on_action_OptionsDisplayRawFramebuffer_triggered()
+void MainWindow::on_action_Show_FPS_counter_triggered()
{
- g_Config.bDisplayFramebuffer = !g_Config.bDisplayFramebuffer;
+ g_Config.bShowFPSCounter = !g_Config.bShowFPSCounter;
UpdateMenus();
}
-void MainWindow::on_action_OptionsFastMemory_triggered()
+void setDefLogLevel(LogTypes::LOG_LEVELS level)
{
- g_Config.bFastMemory = !g_Config.bFastMemory;
- UpdateMenus();
-}
-
-void MainWindow::on_action_OptionsLinearFiltering_triggered()
-{
- g_Config.bLinearFiltering = !g_Config.bLinearFiltering;
- UpdateMenus();
-}
-
-void MainWindow::on_action_OptionsControls_triggered()
-{
- controls->show();
-}
-
-void MainWindow::on_action_HelpOpenWebsite_triggered()
-{
- QDesktopServices::openUrl(QUrl("http://www.ppsspp.org/"));
-}
-
-void MainWindow::on_action_HelpAbout_triggered()
-{
- // TODO display about
-}
-
-void MainWindow::closeEvent(QCloseEvent *event)
-{
- on_action_FileExit_triggered();
-}
-
-void MainWindow::keyPressEvent(QKeyEvent *e)
-{
- if(isFullScreen() && e->key() == Qt::Key_F12)
+ for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{
- on_action_OptionsFullScreen_triggered();
- return;
+ LogTypes::LOG_TYPE type = (LogTypes::LOG_TYPE)i;
+ if(type == LogTypes::G3D || type == LogTypes::HLE) continue;
+ LogManager::GetInstance()->SetLogLevel(type, level);
}
-
- pressedKeys.insert(e->key());
}
-void MainWindow::keyReleaseEvent(QKeyEvent *e)
+void MainWindow::on_actionLogDefDebug_triggered()
{
- pressedKeys.remove(e->key());
+ setDefLogLevel(LogTypes::LDEBUG);
+ UpdateMenus();
}
-void MainWindow::on_MainWindow_destroyed()
+void MainWindow::on_actionLogDefWarning_triggered()
{
+ setDefLogLevel(LogTypes::LWARNING);
+ UpdateMenus();
+}
+void MainWindow::on_actionLogDefInfo_triggered()
+{
+ setDefLogLevel(LogTypes::LINFO);
+ UpdateMenus();
+}
+
+void MainWindow::on_actionLogDefError_triggered()
+{
+ setDefLogLevel(LogTypes::LERROR);
+ UpdateMenus();
}
void MainWindow::on_actionLogG3DDebug_triggered()
@@ -718,65 +831,64 @@ void MainWindow::on_actionLogHLEError_triggered()
UpdateMenus();
}
-void MainWindow::on_actionLogDefDebug_triggered()
+void MainWindow::on_action_HelpOpenWebsite_triggered()
{
- for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
- {
- LogTypes::LOG_TYPE type = (LogTypes::LOG_TYPE)i;
- if(type == LogTypes::G3D || type == LogTypes::HLE) continue;
- LogManager::GetInstance()->SetLogLevel(type, LogTypes::LDEBUG);
- }
- UpdateMenus();
+ QDesktopServices::openUrl(QUrl("http://www.ppsspp.org/"));
}
-void MainWindow::on_actionLogDefWarning_triggered()
+void MainWindow::on_action_HelpAbout_triggered()
{
- for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
- {
- LogTypes::LOG_TYPE type = (LogTypes::LOG_TYPE)i;
- if(type == LogTypes::G3D || type == LogTypes::HLE) continue;
- LogManager::GetInstance()->SetLogLevel(type, LogTypes::LWARNING);
- }
- UpdateMenus();
-}
-
-void MainWindow::on_actionLogDefInfo_triggered()
-{
- for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
- {
- LogTypes::LOG_TYPE type = (LogTypes::LOG_TYPE)i;
- if(type == LogTypes::G3D || type == LogTypes::HLE) continue;
- LogManager::GetInstance()->SetLogLevel(type, LogTypes::LINFO);
- }
- UpdateMenus();
-}
-
-void MainWindow::on_actionLogDefError_triggered()
-{
- for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
- {
- LogTypes::LOG_TYPE type = (LogTypes::LOG_TYPE)i;
- if(type == LogTypes::G3D || type == LogTypes::HLE) continue;
- LogManager::GetInstance()->SetLogLevel(type, LogTypes::LERROR);
- }
- UpdateMenus();
-}
-
-void MainWindow::on_action_OptionsGamePadControls_triggered()
-{
-#if QT_HAS_SDL
- gamePadDlg->show();
-#else
- QMessageBox::information(this,"Gamepad","You need to compile with SDL to have Gamepad support.", QMessageBox::Ok);
-#endif
+ // TODO display about
}
void MainWindow::on_language_changed(QAction *action)
{
- if (0 != action)
+ loadLanguage(action->data().toString());
+}
+
+/* Private functions */
+void MainWindow::SetZoom(float zoom) {
+ if (zoom < 5)
+ g_Config.iWindowZoom = (int) zoom;
+
+ pixel_xres = 480 * zoom;
+ pixel_yres = 272 * zoom;
+ dp_xres = pixel_xres;
+ dp_yres = pixel_yres;
+
+ emugl->resize(pixel_xres, pixel_yres);
+ emugl->setMinimumSize(pixel_xres, pixel_yres);
+ emugl->setMaximumSize(pixel_xres, pixel_yres);
+
+ ui->centralwidget->setFixedSize(pixel_xres, pixel_yres);
+ ui->centralwidget->resize(pixel_xres, pixel_yres);
+
+ setFixedSize(sizeHint());
+ resize(sizeHint());
+
+ PSP_CoreParameter().pixelWidth = pixel_xres;
+ PSP_CoreParameter().pixelHeight = pixel_yres;
+ PSP_CoreParameter().outputWidth = pixel_xres;
+ PSP_CoreParameter().outputHeight = pixel_yres;
+
+ if (g_Config.SSAntiAliasing)
{
- loadLanguage(action->data().toString());
+ zoom *= 2;
+ PSP_CoreParameter().renderWidth = 480 * zoom;
+ PSP_CoreParameter().renderHeight = 272 * zoom;
}
+
+ if (gpu)
+ gpu->Resized();
+}
+
+void MainWindow::SetGameTitle(QString text)
+{
+ QString title = "PPSSPP " + QString(PPSSPP_VERSION_STR);
+ if (text != "")
+ title += QString(" - %1").arg(text);
+
+ setWindowTitle(title);
}
void switchTranslator(QTranslator &translator, const QString &filename)
@@ -792,9 +904,7 @@ void MainWindow::loadLanguage(const QString& language)
if (currentLanguage != language)
{
currentLanguage = language;
- QLocale locale = QLocale(currentLanguage);
- QLocale::setDefault(locale);
- QString languageName = QLocale::languageToString(locale.language());
+ QLocale::setDefault(QLocale(currentLanguage));
switchTranslator(translator, QString(":/languages/ppsspp_%1.qm").arg(language));
}
}
@@ -806,8 +916,6 @@ void MainWindow::createLanguageMenu()
connect(langGroup, SIGNAL(triggered(QAction *)), this, SLOT(on_language_changed(QAction *)));
- QString defaultLocale = QLocale::system().name();
- defaultLocale.truncate(defaultLocale.lastIndexOf('_'));
QStringList fileNames = QDir(":/languages").entryList(QStringList("ppsspp_*.qm"));
if (fileNames.size() == 0)
@@ -846,160 +954,10 @@ void MainWindow::createLanguageMenu()
}
}
-void MainWindow::changeEvent(QEvent *event)
+void MainWindow::notifyMapsLoaded()
{
- QMainWindow::changeEvent(event);
-
- if (0 != event)
- {
- switch (event->type())
- {
- case QEvent::LanguageChange:
- ui->retranslateUi(this);
- break;
- case QEvent::LocaleChange:
- {
- QString locale = QLocale::system().name();
- locale.truncate(locale.lastIndexOf('_'));
- loadLanguage(locale);
- }
- break;
- default:
- break;
- }
- }
-}
-
-void MainWindow::ShowMemory(u32 addr)
-{
- if(memoryWindow)
- memoryWindow->Goto(addr);
-}
-
-void MainWindow::Update()
-{
- UpdateInputState(&input_state);
-
- for (int i = 0; i < controllistCount; i++)
- {
- if (pressedKeys.contains(controllist[i].key) ||
- input_state.pad_buttons_down & controllist[i].emu_id)
- __CtrlButtonDown(controllist[i].psp_id);
- else
- __CtrlButtonUp(controllist[i].psp_id);
- }
- __CtrlSetAnalog(input_state.pad_lstick_x, input_state.pad_lstick_y);
-}
-
-void MainWindow::on_action_EmulationReset_triggered()
-{
- if(dialogDisasm)
- dialogDisasm->Stop();
-
- EmuThread_LockDraw(true);
- EmuThread_LockDraw(false);
-
- if(dialogDisasm)
- dialogDisasm->close();
- if(memoryWindow)
- memoryWindow->close();
- if(memoryTexWindow)
- memoryTexWindow->close();
- if(displaylistWindow)
- displaylistWindow->close();
-
- EmuThread_StopGame();
-
- EmuThread_StartGame(GetCurrentFilename());
-}
-
-void MainWindow::on_action_DebugDumpFrame_triggered()
-{
- gpu->DumpNextFrame();
-}
-
-void MainWindow::on_action_EmulationRunLoad_triggered()
-{
- g_Config.bAutoRun = !g_Config.bAutoRun;
- UpdateMenus();
-}
-
-void MainWindow::on_action_OptionsVertexCache_triggered()
-{
- g_Config.bVertexCache = !g_Config.bVertexCache;
- UpdateMenus();
-}
-
-void MainWindow::on_action_OptionsUseVBO_triggered()
-{
- g_Config.bUseVBO = !g_Config.bUseVBO;
- UpdateMenus();
-}
-
-void MainWindow::on_action_Simple_2xAA_triggered()
-{
- g_Config.SSAntiAliasing = !g_Config.SSAntiAliasing;
- UpdateMenus();
-}
-
-void MainWindow::on_action_AFOff_triggered()
-{
- g_Config.iAnisotropyLevel = 0;
- UpdateMenus();
-}
-
-void MainWindow::on_action_AF2x_triggered()
-{
- g_Config.iAnisotropyLevel = 2;
- UpdateMenus();
-}
-
-void MainWindow::on_action_AF4x_triggered()
-{
- g_Config.iAnisotropyLevel = 4;
- UpdateMenus();
-}
-
-void MainWindow::on_action_AF8x_triggered()
-{
- g_Config.iAnisotropyLevel = 8;
- UpdateMenus();
-}
-
-void MainWindow::on_action_AF16x_triggered()
-{
- g_Config.iAnisotropyLevel = 16;
- UpdateMenus();
-}
-
-void MainWindow::on_action_Show_FPS_counter_triggered()
-{
- g_Config.bShowFPSCounter = !g_Config.bShowFPSCounter;
- UpdateMenus();
-}
-
-void MainWindow::on_action_Stretch_to_display_triggered()
-{
- g_Config.bStretchToDisplay = !g_Config.bStretchToDisplay;
- UpdateMenus();
- if (gpu)
- gpu->Resized();
-}
-
-void MainWindow::on_action_Sound_triggered()
-{
- g_Config.bEnableSound = !g_Config.bEnableSound;
- UpdateMenus();
-}
-
-void MainWindow::on_action_DebugMemoryViewTexture_triggered()
-{
- if(memoryTexWindow)
- memoryTexWindow->show();
-}
-
-void MainWindow::on_action_DebugDisplayList_triggered()
-{
- if(displaylistWindow)
- displaylistWindow->show();
+ if (dialogDisasm)
+ dialogDisasm->NotifyMapLoaded();
+ if (memoryWindow)
+ memoryWindow->NotifyMapLoaded();
}
diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
index d2de287927..cb0af14bb0 100644
--- a/Qt/mainwindow.h
+++ b/Qt/mainwindow.h
@@ -24,182 +24,142 @@ class MainWindow : public QMainWindow
public:
explicit MainWindow(QWidget *parent = 0);
- ~MainWindow();
-
- void UpdateMenus();
- void SetZoom(float zoom);
- void Create(int argc, const char *argv[], const char *savegame_directory, const char *external_directory, const char *installID);
- void BrowseAndBoot();
- void SetNextState(CoreState state);
- void SetGameTitle(QString text);
+ ~MainWindow();
Debugger_Disasm* GetDialogDisasm() { return dialogDisasm; }
Debugger_Memory* GetDialogMemory() { return memoryWindow; }
Debugger_MemoryTex* GetDialogMemoryTex() { return memoryTexWindow; }
Debugger_DisplayList* GetDialogDisplaylist() { return displaylistWindow; }
CoreState GetNextState() { return nextState; }
- void closeEvent(QCloseEvent *event);
- void keyPressEvent(QKeyEvent *);
- void keyReleaseEvent(QKeyEvent *e);
+
void ShowMemory(u32 addr);
void Update();
-public slots:
+ void UpdateMenus();
+protected:
+ void changeEvent(QEvent *e);
+ void closeEvent(QCloseEvent *);
+ void keyPressEvent(QKeyEvent *e);
+ void keyReleaseEvent(QKeyEvent *e);
+
+public slots:
void Boot();
void CoreEmitWait(bool);
private slots:
+ // File
void on_action_FileLoad_triggered();
-
- void on_action_EmulationRun_triggered();
-
- void on_action_EmulationStop_triggered();
-
- void on_action_EmulationPause_triggered();
-
- void on_action_FileLoadStateFile_triggered();
-
- void on_action_FileSaveStateFile_triggered();
-
+ void on_action_FileClose_triggered();
void on_action_FileQuickloadState_triggered();
-
void on_action_FileQuickSaveState_triggered();
-
- void on_action_OptionsScreen1x_triggered();
-
- void on_action_OptionsScreen2x_triggered();
-
- void on_action_OptionsScreen3x_triggered();
-
- void on_action_OptionsScreen4x_triggered();
-
- void on_action_OptionsBufferedRendering_triggered();
-
- void on_action_OptionsShowDebugStatistics_triggered();
-
- void on_action_OptionsHardwareTransform_triggered();
-
+ void on_action_FileLoadStateFile_triggered();
+ void on_action_FileSaveStateFile_triggered();
void on_action_FileExit_triggered();
- void on_action_CPUDynarec_triggered();
-
- void on_action_CPUInterpreter_triggered();
+ // Emulation
+ void on_action_EmulationRun_triggered();
+ void on_action_EmulationPause_triggered();
+ void on_action_EmulationReset_triggered();
+ void on_action_EmulationRunLoad_triggered();
+ // Debug
void on_action_DebugLoadMapFile_triggered();
-
void on_action_DebugSaveMapFile_triggered();
-
void on_action_DebugResetSymbolTable_triggered();
-
+ void on_action_DebugDumpFrame_triggered();
void on_action_DebugDisassembly_triggered();
-
- void on_action_DebugMemoryView_triggered();
-
+ void on_action_DebugDisplayList_triggered();
void on_action_DebugLog_triggered();
+ void on_action_DebugMemoryView_triggered();
+ void on_action_DebugMemoryViewTexture_triggered();
+ // Options
+ // Core
+ void on_action_CPUDynarec_triggered();
+ void on_action_CPUInterpreter_triggered();
+ void on_action_OptionsFastMemory_triggered();
void on_action_OptionsIgnoreIllegalReadsWrites_triggered();
- void on_action_OptionsFullScreen_triggered();
-
- void on_action_OptionsWireframe_triggered();
-
- void on_action_OptionsDisplayRawFramebuffer_triggered();
-
- void on_action_OptionsFastMemory_triggered();
-
- void on_action_OptionsLinearFiltering_triggered();
-
+ // Controls
void on_action_OptionsControls_triggered();
+ void on_action_OptionsGamePadControls_triggered();
- void on_action_HelpOpenWebsite_triggered();
+ // Video
+ void on_action_AFOff_triggered();
+ void on_action_AF2x_triggered();
+ void on_action_AF4x_triggered();
+ void on_action_AF8x_triggered();
+ void on_action_AF16x_triggered();
- void on_action_HelpAbout_triggered();
+ void on_action_OptionsBufferedRendering_triggered();
+ void on_action_OptionsLinearFiltering_triggered();
+ void on_action_Simple_2xAA_triggered();
- void on_MainWindow_destroyed();
+ void on_action_OptionsScreen1x_triggered();
+ void on_action_OptionsScreen2x_triggered();
+ void on_action_OptionsScreen3x_triggered();
+ void on_action_OptionsScreen4x_triggered();
+
+ void on_action_Stretch_to_display_triggered();
+ void on_action_OptionsHardwareTransform_triggered();
+ void on_action_OptionsUseVBO_triggered();
+ void on_action_OptionsVertexCache_triggered();
+ void on_action_OptionsWireframe_triggered();
+ void on_action_OptionsDisplayRawFramebuffer_triggered();
+ void on_actionFrameskip_triggered();
+
+ // Sound
+ void on_action_Sound_triggered();
+
+ void on_action_OptionsFullScreen_triggered();
+ void on_action_OptionsShowDebugStatistics_triggered();
+ void on_action_Show_FPS_counter_triggered();
+
+ // Logs
+ void on_actionLogDefDebug_triggered();
+ void on_actionLogDefWarning_triggered();
+ void on_actionLogDefInfo_triggered();
+ void on_actionLogDefError_triggered();
void on_actionLogG3DDebug_triggered();
-
void on_actionLogG3DWarning_triggered();
-
void on_actionLogG3DError_triggered();
-
void on_actionLogG3DInfo_triggered();
void on_actionLogHLEDebug_triggered();
-
void on_actionLogHLEWarning_triggered();
-
void on_actionLogHLEInfo_triggered();
-
void on_actionLogHLEError_triggered();
- void on_actionLogDefDebug_triggered();
-
- void on_actionLogDefWarning_triggered();
-
- void on_actionLogDefInfo_triggered();
-
- void on_actionLogDefError_triggered();
-
- void on_action_OptionsGamePadControls_triggered();
+ // Help
+ void on_action_HelpOpenWebsite_triggered();
+ void on_action_HelpAbout_triggered();
+ // Others
void on_language_changed(QAction *action);
- void on_action_EmulationReset_triggered();
-
- void on_action_DebugDumpFrame_triggered();
-
- void on_action_EmulationRunLoad_triggered();
-
- void on_action_OptionsVertexCache_triggered();
-
- void on_action_OptionsUseVBO_triggered();
-
- void on_action_Simple_2xAA_triggered();
-
- void on_action_AFOff_triggered();
-
- void on_action_AF2x_triggered();
-
- void on_action_AF4x_triggered();
-
- void on_action_AF8x_triggered();
-
- void on_action_AF16x_triggered();
-
- void on_action_Show_FPS_counter_triggered();
-
- void on_action_Stretch_to_display_triggered();
-
- void on_action_Sound_triggered();
-
- void on_action_DebugMemoryViewTexture_triggered();
-
- void on_action_DebugDisplayList_triggered();
-
private:
+ void SetZoom(float zoom);
+ void SetGameTitle(QString text);
void loadLanguage(const QString &language);
void createLanguageMenu();
- void changeEvent(QEvent *);
+ void notifyMapsLoaded();
QTranslator translator;
- QTranslator qtTranslator;
QString currentLanguage;
- QString languagePath;
Ui::MainWindow *ui;
- QtEmuGL* emugl;
+ QtEmuGL *emugl;
CoreState nextState;
-
InputState input_state;
Debugger_Disasm *dialogDisasm;
Debugger_Memory *memoryWindow;
Debugger_MemoryTex *memoryTexWindow;
Debugger_DisplayList *displaylistWindow;
- Controls* controls;
- GamePadDialog* gamePadDlg;
+ Controls *controls;
+ GamePadDialog *gamePadDlg;
QSet pressedKeys;
};
diff --git a/Qt/mainwindow.ui b/Qt/mainwindow.ui
index a6ef9df025..6cabbd9838 100644
--- a/Qt/mainwindow.ui
+++ b/Qt/mainwindow.ui
@@ -44,7 +44,7 @@
0
0
800
- 23
+ 21