ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-02-01 09:07:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace changeDebugView and changeDefinedView with toggleDebugView

Browse Source
This commit is contained in:
yossizap 2019-12-13 17:30:55 +00:00 committed by Itay Cohen
parent 2f6e4b183e
commit 17d5ae0cfd
4 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/Cutter.cpp
View File

@ -1264,7 +1264,7 @@ void CutterCore::startDebug()
if (!currentlyDebugging) { if (!currentlyDebugging) {
setConfig("asm.flags", false); setConfig("asm.flags", false);
currentlyDebugging = true; currentlyDebugging = true;
emit changeDebugView(); emit toggleDebugView();
emit refreshCodeViews(); emit refreshCodeViews();
} }
@ -1306,7 +1306,7 @@ void CutterCore::startEmulation()
setConfig("io.cache", true); setConfig("io.cache", true);
currentlyDebugging = true; currentlyDebugging = true;
currentlyEmulating = true; currentlyEmulating = true;
emit changeDebugView(); emit toggleDebugView();
} }
emit registersChanged(); emit registersChanged();
@ -1363,7 +1363,7 @@ void CutterCore::attachRemote(const QString &uri)
// prevent register flags from appearing during debug/emul // prevent register flags from appearing during debug/emul
setConfig("asm.flags", false); setConfig("asm.flags", false);
currentlyDebugging = true; currentlyDebugging = true;
emit changeDebugView(); emit toggleDebugView();
} }
emit codeRebased(); emit codeRebased();
@ -1403,7 +1403,7 @@ void CutterCore::attachDebug(int pid)
currentlyDebugging = true; currentlyDebugging = true;
currentlyOpenFile = getConfig("file.path"); currentlyOpenFile = getConfig("file.path");
currentlyAttachedToPID = pid; currentlyAttachedToPID = pid;
emit changeDebugView(); emit toggleDebugView();
} }
emit codeRebased(); emit codeRebased();
@ -1462,7 +1462,7 @@ void CutterCore::stopDebug()
setConfig("asm.flags", true); setConfig("asm.flags", true);
setConfig("io.cache", false); setConfig("io.cache", false);
emit codeRebased(); emit codeRebased();
emit changeDefinedView(); emit toggleDebugView();
offsetPriorDebugging = getOffset(); offsetPriorDebugging = getOffset();
emit debugTaskStateChanged(); emit debugTaskStateChanged();
} }

3
src/core/Cutter.h
View File

@ -529,8 +529,7 @@ signals:
*/ */
void seekChanged(RVA offset); void seekChanged(RVA offset);
void changeDefinedView(); void toggleDebugView();
void changeDebugView();
void newMessage(const QString &msg); void newMessage(const QString &msg);
void newDebugMessage(const QString &msg); void newDebugMessage(const QString &msg);

32
src/core/MainWindow.cpp
View File

@ -172,8 +172,7 @@ void MainWindow::initUI()
connect(core, SIGNAL(projectSaved(bool, const QString &)), this, SLOT(projectSaved(bool, connect(core, SIGNAL(projectSaved(bool, const QString &)), this, SLOT(projectSaved(bool,
const QString &))); const QString &)));
connect(core, &CutterCore::changeDebugView, this, &MainWindow::changeDebugView); connect(core, &CutterCore::toggleDebugView, this, &MainWindow::toggleDebugView);
connect(core, &CutterCore::changeDefinedView, this, &MainWindow::changeDefinedView);
connect(core, SIGNAL(newMessage(const QString &)), connect(core, SIGNAL(newMessage(const QString &)),
this->consoleDock, SLOT(addOutput(const QString &))); this->consoleDock, SLOT(addOutput(const QString &)));
@ -1541,22 +1540,21 @@ void MainWindow::projectSaved(bool successfully, const QString &name)
core->message(tr("Failed to save project: %1").arg(name)); core->message(tr("Failed to save project: %1").arg(name));
} }
void MainWindow::changeDebugView() void MainWindow::toggleDebugView()
{ {
saveSettings(); if (Core()->currentlyDebugging) {
restoreDebugLayout(); saveSettings();
enableDebugWidgetsMenu(true); restoreDebugLayout();
} enableDebugWidgetsMenu(true);
} else {
void MainWindow::changeDefinedView() saveDebugSettings();
{ MemoryWidgetType memType = getMemoryWidgetTypeToRestore();
saveDebugSettings(); hideAllDocks();
MemoryWidgetType memType = getMemoryWidgetTypeToRestore(); restoreDocks();
hideAllDocks(); readSettingsOrDefault();
restoreDocks(); enableDebugWidgetsMenu(false);
readSettingsOrDefault(); showMemoryWidget(memType);
enableDebugWidgetsMenu(false); }
showMemoryWidget(memType);
} }
void MainWindow::mousePressEvent(QMouseEvent *event) void MainWindow::mousePressEvent(QMouseEvent *event)

3
src/core/MainWindow.h
View File

@ -193,8 +193,7 @@ private slots:
void mousePressEvent(QMouseEvent *event) override; void mousePressEvent(QMouseEvent *event) override;
bool eventFilter(QObject *object, QEvent *event) override; bool eventFilter(QObject *object, QEvent *event) override;
void changeDebugView(); void toggleDebugView();
void changeDefinedView();
void chooseThemeIcons(); void chooseThemeIcons();
void onZoomIn(); void onZoomIn();