x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

GUI: move MRUList to a separate utility class

This commit is contained in:
mrexodia 2017-03-14 10:31:59 +01:00
parent c29aa34baa
commit e267eedec0
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
6 changed files with 169 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/gui/Src/Gui/MainWindow.cpp
View File

@ -50,6 +50,7 @@
#include "main.h"
#include "SimpleTraceDialog.h"
#include "CPUArgumentWidget.h"
#include "MRUList.h"
QString MainWindow::windowTitle = "";
@ -101,7 +102,10 @@ MainWindow::MainWindow(QWidget* parent)
SetApplicationIcon(MainWindow::winId());
// Load recent files
loadMRUList(16);
mMRUList = new MRUList(this, "Recent Files");
connect(mMRUList, SIGNAL(openFile(QString)), this, SLOT(openRecentFileSlot(QString)));
mMRUList->load();
updateMRUMenu();
// Accept drops
setAcceptDrops(true);
@ -245,7 +249,7 @@ MainWindow::MainWindow(QWidget* parent)
makeCommandAction(ui->actionRtr, "rtr");
connect(ui->actionLog, SIGNAL(triggered()), this, SLOT(displayLogWidget()));
connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(displayAboutWidget()));
connect(ui->actionOpen, SIGNAL(triggered()), this, SLOT(openFile()));
connect(ui->actionOpen, SIGNAL(triggered()), this, SLOT(openFileSlot()));
makeCommandAction(ui->actionPause, "pause");
makeCommandAction(ui->actionScylla, "StartScylla");
connect(ui->actionRestart, SIGNAL(triggered()), this, SLOT(restartDebugging()));
@ -706,91 +710,13 @@ void MainWindow::refreshShortcuts()
setGlobalShortcut(ui->actionCalls, ConfigShortcut("ActionFindIntermodularCalls"));
}
//Reads recent files list from settings
void MainWindow::loadMRUList(int maxItems)
{
mMaxMRU = maxItems;
for(int i = 0; i < mMaxMRU; i++)
{
char currentFile[MAX_SETTING_SIZE] = "";
if(!BridgeSettingGet("Recent Files", QString().sprintf("%.2d", i + 1).toUtf8().constData(), currentFile))
break;
if(QString(currentFile).size() && QFile(currentFile).exists())
mMRUList.push_back(currentFile);
}
mMRUList.removeDuplicates();
updateMRUMenu();
}
//save recent files to settings
void MainWindow::saveMRUList()
{
BridgeSettingSet("Recent Files", 0, 0); //clear
mMRUList.removeDuplicates();
int mruSize = mMRUList.size();
for(int i = 0; i < mruSize; i++)
{
if(QFile(mMRUList.at(i)).exists())
BridgeSettingSet("Recent Files", QString().sprintf("%.2d", i + 1).toUtf8().constData(), mMRUList.at(i).toUtf8().constData());
}
}
void MainWindow::addMRUEntry(QString entry)
{
if(!entry.size())
return;
//remove duplicate entry if it exists
removeMRUEntry(entry);
mMRUList.insert(mMRUList.begin(), entry);
if(mMRUList.size() > mMaxMRU)
mMRUList.erase(mMRUList.begin() + mMaxMRU, mMRUList.end());
}
void MainWindow::removeMRUEntry(QString entry)
{
if(!entry.size())
return;
QList<QString>::iterator it;
for(it = mMRUList.begin(); it != mMRUList.end(); ++it)
{
if((*it) == entry)
{
mMRUList.erase(it);
break;
}
}
}
void MainWindow::updateMRUMenu()
{
if(mMaxMRU < 1)
return;
QMenu* fileMenu = ui->menuRecentFiles;
QList<QAction*> list = fileMenu->actions();
for(int i = 1; i < list.length(); ++i)
fileMenu->removeAction(list.at(i));
//add items to list
if(mMRUList.size() > 0)
{
list = fileMenu->actions();
for(int index = 0; index < mMRUList.size(); ++index)
{
fileMenu->addAction(new QAction(mMRUList.at(index), this));
fileMenu->actions().last()->setObjectName(QString("MRU").append(QString::number(index)));
connect(fileMenu->actions().last(), SIGNAL(triggered()), this, SLOT(openFile()));
}
}
}
QString MainWindow::getMRUEntry(int index)
{
if(index < mMRUList.size())
return mMRUList.at(index);
return "";
mMRUList->appendMenu(fileMenu);
}
void MainWindow::executeCommand()
@ -894,27 +820,18 @@ void MainWindow::displayAboutWidget()
msg.exec();
}
void MainWindow::openFile()
void MainWindow::openFileSlot()
{
QString lastPath, filename;
QAction* fileToOpen = qobject_cast<QAction*>(sender());
auto filename = QFileDialog::getOpenFileName(this, tr("Open file"), mMRUList->getEntry(0), tr("Executables (*.exe *.dll);;All files (*.*)"));
if(!filename.length())
return;
filename = QDir::toNativeSeparators(filename); //convert to native path format (with backlashes)
openRecentFileSlot(filename);
}
//if sender is from recent list directly open file, otherwise show dialog
if(fileToOpen == NULL || !fileToOpen->objectName().startsWith("MRU") || !(fileToOpen->text().length()))
{
lastPath = (mMRUList.size() > 0) ? mMRUList.at(0) : 0;
filename = QFileDialog::getOpenFileName(this, tr("Open file"), lastPath, tr("Executables (*.exe *.dll);;All files (*.*)"));
if(!filename.length())
return;
filename = QDir::toNativeSeparators(filename); //convert to native path format (with backlashes)
}
else
{
filename = fileToOpen->text();
}
void MainWindow::openRecentFileSlot(QString filename)
{
DbgCmdExec(QString().sprintf("init \"%s\"", filename.toUtf8().constData()).toUtf8().constData());
if(DbgValFromString("$pid") != 0)
mCpuWidget->setDisasmFocus();
}
void MainWindow::runSlot()
@ -927,11 +844,9 @@ void MainWindow::runSlot()
void MainWindow::restartDebugging()
{
if(!mMRUList.size())
return;
DbgCmdExec(QString().sprintf("init \"%s\"", mMRUList.at(0).toUtf8().constData()).toUtf8().constData());
mCpuWidget->setDisasmFocus();
auto last = mMRUList->getEntry(0);
if(!last.isEmpty())
DbgCmdExec(QString("init \"%1\"").arg(last).toUtf8().constData());
}
void MainWindow::displayBreakpointWidget()
@ -1058,9 +973,9 @@ void MainWindow::changeTopmost(bool checked)
void MainWindow::addRecentFile(QString file)
{
addMRUEntry(file);
mMRUList->addEntry(file);
updateMRUMenu();
saveMRUList();
mMRUList->save();
}
void MainWindow::setLastException(unsigned int exceptionCode)
@ -1739,7 +1654,7 @@ void MainWindow::clickFavouriteTool()
QString toolPath = data.mid(5);
duint PID = DbgValFromString("$pid");
toolPath.replace(QString("%PID%"), QString::number(PID), Qt::CaseInsensitive);
toolPath.replace(QString("%DEBUGGEE%"), mMRUList.at(0), Qt::CaseInsensitive);
toolPath.replace(QString("%DEBUGGEE%"), mMRUList->getEntry(0), Qt::CaseInsensitive);
char modpath[MAX_MODULE_SIZE] = "";
DbgFunctions()->ModPathFromAddr(DbgValFromString("dis.sel()"), modpath, MAX_MODULE_SIZE);
toolPath.replace(QString("%MODULE%"), modpath, Qt::CaseInsensitive);

12
src/gui/Src/Gui/MainWindow.h
View File

@ -32,6 +32,7 @@ class NotesManager;
class SettingsDialog;
class DisassemblerGraphView;
class SimpleTraceDialog;
class MRUList;
namespace Ui
{
@ -69,7 +70,8 @@ public slots:
void animateIntoSlot();
void animateOverSlot();
void animateCommandSlot();
void openFile();
void openFileSlot();
void openRecentFileSlot(QString filename);
void restartDebugging();
void displayBreakpointWidget();
void updateWindowTitleSlot(QString filename);
@ -184,18 +186,12 @@ private:
QString mWindowMainTitle;
QStringList mMRUList;
int mMaxMRU;
MRUList* mMRUList;
unsigned int lastException;
QAction* actionManageFavourites;
void loadMRUList(int maxItems);
void saveMRUList();
void addMRUEntry(QString entry);
void removeMRUEntry(QString entry);
void updateMRUMenu();
QString getMRUEntry(int index);
void setupLanguagesMenu();
void onMenuCustomized();
void setupMenuCustomization();

100
src/gui/Src/Utils/MRUList.cpp Normal file
View File

@ -0,0 +1,100 @@
#include "MRUList.h"
#include "Bridge.h"
#include <QMenu>
MRUList::MRUList(QObject* parent, const char* section, int maxItems)
: QObject(parent),
mSection(section),
mMaxMRU(maxItems)
{
}
void MRUList::load()
{
for(int i = 0; i < mMaxMRU; i++)
{
char currentFile[MAX_SETTING_SIZE] = "";
if(!BridgeSettingGet(mSection, QString().sprintf("%.2d", i + 1).toUtf8().constData(), currentFile))
break;
if(QString(currentFile).size() && QFile(currentFile).exists())
mMRUList.push_back(currentFile);
}
mMRUList.removeDuplicates();
}
void MRUList::save()
{
BridgeSettingSet(mSection, 0, 0); //clear
mMRUList.removeDuplicates();
int mruSize = mMRUList.size();
for(int i = 0; i < mruSize; i++)
{
if(QFile(mMRUList.at(i)).exists())
BridgeSettingSet(mSection, QString().sprintf("%.2d", i + 1).toUtf8().constData(), mMRUList.at(i).toUtf8().constData());
}
}
void MRUList::appendMenu(QMenu* menu)
{
if(mMaxMRU < 1)
return;
/*QList<QAction*> list = menu->actions();
for(int i = 1; i < list.length(); ++i)
menu->removeAction(list.at(i));*/
//add items to list
if(mMRUList.size() > 0)
{
for(int index = 0; index < mMRUList.size(); ++index)
{
menu->addAction(new QAction(mMRUList.at(index), this));
menu->actions().last()->setObjectName(QString("MRU").append(QString::number(index)));
connect(menu->actions().last(), SIGNAL(triggered()), this, SLOT(openFileSlot()));
}
}
}
void MRUList::addEntry(QString entry)
{
if(!entry.size())
return;
//remove duplicate entry if it exists
removeEntry(entry);
mMRUList.insert(mMRUList.begin(), entry);
if(mMRUList.size() > mMaxMRU)
mMRUList.erase(mMRUList.begin() + mMaxMRU, mMRUList.end());
}
void MRUList::removeEntry(QString entry)
{
if(!entry.size())
return;
for(auto it = mMRUList.begin(); it != mMRUList.end(); ++it)
{
if(*it == entry)
{
mMRUList.erase(it);
break;
}
}
}
QString MRUList::getEntry(int index)
{
if(index < mMRUList.size())
return mMRUList.at(index);
return "";
}
void MRUList::openFileSlot()
{
QAction* fileToOpen = qobject_cast<QAction*>(sender());
//if sender is from recent list directly open file
if(fileToOpen && fileToOpen->objectName().startsWith("MRU") && fileToOpen->text().length())
emit openFile(fileToOpen->text());
}

35
src/gui/Src/Utils/MRUList.h Normal file
View File

@ -0,0 +1,35 @@
#ifndef MRULIST_H
#define MRULIST_H
#include <QObject>
#include <Qlist>
class QMenu;
class MRUList : public QObject
{
Q_OBJECT
public:
explicit MRUList(QObject* parent, const char* section, int maxItems = 16);
void load();
void save();
void appendMenu(QMenu* menu);
void addEntry(QString entry);
void removeEntry(QString entry);
QString getEntry(int index);
signals:
void openFile(QString filename);
private slots:
void openFileSlot();
private:
const char* mSection;
QList<QString> mMRUList;
int mMaxMRU;
};
#endif // MRULIST_H

6
src/gui/x64dbg.pro
View File

@ -176,7 +176,8 @@ SOURCES += \
Src/Gui/StructWidget.cpp \
Src/Gui/CustomizeMenuDialog.cpp \
Src/Gui/SimpleTraceDialog.cpp \
Src/Gui/BreakpointsViewTable.cpp
Src/Gui/BreakpointsViewTable.cpp \
Src/Utils/MRUList.cpp
HEADERS += \
@ -287,7 +288,8 @@ HEADERS += \
Src/Gui/CustomizeMenuDialog.h \
Src/Gui/StructWidget.h \
Src/Gui/SimpleTraceDialog.h \
Src/Gui/BreakpointsViewTable.h
Src/Gui/BreakpointsViewTable.h \
Src/Utils/MRUList.h
FORMS += \

6
src/x64dbg_translations.pro
View File

@ -216,7 +216,8 @@ SOURCES += \
gui/Src/Gui/BreakpointsViewTable.cpp \
dbg/formatfunctions.cpp \
dbg/types.cpp \
dbg/typesparser.cpp
dbg/typesparser.cpp \
gui/Src/Utils/MRUList.cpp
HEADERS += \
gui/Src/Exports.h \
@ -443,7 +444,8 @@ HEADERS += \
gui/Src/Gui/BreakpointsViewTable.h \
dbg/filemap.h \
dbg/formatfunctions.h \
dbg/types.h
dbg/types.h \
gui/Src/Utils/MRUList.h
FORMS += \
gui/Src/Gui/AppearanceDialog.ui \