Skip to content
Permalink
Browse files

Dropped EntryPointsDialog, CMake cleanup

  • Loading branch information...
Dax89 committed Feb 20, 2019
1 parent 335f5cf commit cfc1fe5d37810c49ab3e03822ec2d62b7407be1f
@@ -52,92 +52,51 @@ endif()

QT5_WRAP_UI(UI_HDRS ${UI_FILES})

SET(SOURCES
${QHEXVIEW_SOURCES}
${REDASM_TEST_SOURCES}
main.cpp
mainwindow.cpp
widgets/outputwidget.cpp
widgets/disassemblerview/disassemblerview.cpp
widgets/disassemblerview/disassemblerviewdocks.cpp
widgets/disassemblerview/disassemblerviewactions.cpp
models/gotomodel.cpp
models/disassemblermodel.cpp
models/segmentsmodel.cpp
widgets/listingmap.cpp
models/referencesmodel.cpp
dialogs/referencesdialog.cpp
dialogs/gotodialog.cpp
dialogs/aboutdialog.cpp
dialogs/manualloaddialog.cpp
dialogs/entrypointsdialog.cpp
themeprovider.cpp
widgets/graphview/graphview.cpp
models/listingitemmodel.cpp
models/symboltablemodel.cpp
models/listingfiltermodel.cpp
models/callgraphmodel.cpp
renderer/listingtextrenderer.cpp
renderer/listingrenderercommon.cpp
renderer/listinggraphrenderer.cpp
widgets/disassemblergraphview/disassemblergraphview.cpp
widgets/disassemblergraphview/disassemblerwebchannel.cpp
widgets/disassemblerpopup/disassemblerpopup.cpp
widgets/disassemblerpopup/disassemblerpopupwidget.cpp
renderer/listingpopuprenderer.cpp
redasmsettings.cpp
dialogs/settingsdialog.cpp
widgets/disassemblerlistingview/disassemblerlistingview.cpp
widgets/disassemblerlistingview/disassemblertextview.cpp
widgets/disassemblerlistingview/disassemblercolumnview.cpp)
# Widgets
file(GLOB_RECURSE WIDGETS_HEADERS widgets/*.h)
file(GLOB_RECURSE WIDGETS_SOURCES widgets/*.cpp)
file(GLOB_RECURSE WIDGETS_UIS widgets/*.ui)

# Dialogs
file(GLOB_RECURSE DIALOGS_HEADERS dialogs/*.h)
file(GLOB_RECURSE DIALOGS_SOURCES dialogs/*.cpp)
file(GLOB_RECURSE DIALOGS_UIS dialogs/*.ui)

# Models
file(GLOB_RECURSE MODELS_HEADERS models/*.h)
file(GLOB_RECURSE MODELS_SOURCES models/*.cpp)

# Renderer
file(GLOB_RECURSE RENDERER_HEADERS renderer/*.h)
file(GLOB_RECURSE RENDERER_SOURCES renderer/*.cpp)

SET(HEADERS
${QHEXVIEW_HEADERS}
${REDASM_TEST_HEADERS}
${WIDGETS_HEADERS}
${DIALOGS_HEADERS}
${MODELS_HEADERS}
${RENDERER_HEADERS}
mainwindow.h
widgets/disassemblerview/disassemblerview.h
widgets/disassemblerview/disassemblerviewdocks.h
widgets/disassemblerview/disassemblerviewactions.h
widgets/outputwidget.h
models/gotomodel.h
models/disassemblermodel.h
models/segmentsmodel.h
widgets/listingmap.h
models/referencesmodel.h
dialogs/referencesdialog.h
dialogs/gotodialog.h
dialogs/aboutdialog.h
dialogs/manualloaddialog.h
dialogs/entrypointsdialog.h
themeprovider.h
widgets/graphview/graphview.h
models/listingitemmodel.h
models/symboltablemodel.h
models/listingfiltermodel.h
models/callgraphmodel.h
renderer/listingtextrenderer.h
renderer/listingrenderercommon.h
renderer/listinggraphrenderer.h
widgets/disassemblergraphview/disassemblergraphview.h
widgets/disassemblergraphview/disassemblerwebchannel.h
widgets/disassemblerpopup/disassemblerpopup.h
widgets/disassemblerpopup/disassemblerpopupwidget.h
renderer/listingpopuprenderer.h
redasmsettings.h
dialogs/settingsdialog.h
widgets/disassemblerlistingview/disassemblerlistingview.h
widgets/disassemblerlistingview/disassemblertextview.h
widgets/disassemblerlistingview/disassemblercolumnview.h)
redasmsettings.h)

SET(SOURCES
${QHEXVIEW_SOURCES}
${REDASM_TEST_SOURCES}
${WIDGETS_SOURCES}
${DIALOGS_SOURCES}
${MODELS_SOURCES}
${RENDERER_SOURCES}
main.cpp
mainwindow.cpp
themeprovider.cpp
redasmsettings.cpp)

set(FORMS
mainwindow.ui
widgets/disassemblerview/disassemblerview.ui
dialogs/referencesdialog.ui
dialogs/gotodialog.ui
dialogs/aboutdialog.ui
dialogs/manualloaddialog.ui
dialogs/settingsdialog.ui
dialogs/entrypointsdialog.ui)
${WIDGETS_UIS}
${DIALOGS_UIS}
mainwindow.ui)

set(RESOURCES
resources.qrc

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
BIN -1.1 KB res/dark/entry.png
Binary file not shown.
BIN -1.19 KB res/light/entry.png
Binary file not shown.
@@ -25,8 +25,6 @@
<file>res/dark/open.png</file>
<file>res/dark/save.png</file>
<file>res/logo_big_dark.png</file>
<file>res/dark/entry.png</file>
<file>res/light/entry.png</file>
</qresource>
<qresource prefix="/web">
<file alias="d3.js">web/d3.v5.min.js</file>
@@ -1,7 +1,6 @@
#include "disassemblerview.h"
#include "ui_disassemblerview.h"
#include "../../dialogs/referencesdialog.h"
#include "../../dialogs/entrypointsdialog.h"
#include "../../themeprovider.h"
#include <QHexView/document/buffer/qmemoryrefbuffer.h>
#include <QMessageBox>
@@ -85,7 +84,6 @@ DisassemblerView::DisassemblerView(QLineEdit *lefilter, QWidget *parent) : QWidg
connect(m_actions, &DisassemblerViewActions::backRequested, m_listingview->textView(), &DisassemblerTextView::goBack);
connect(m_actions, &DisassemblerViewActions::forwardRequested, m_listingview->textView(), &DisassemblerTextView::goForward);
connect(m_actions, &DisassemblerViewActions::gotoRequested, this, &DisassemblerView::showGoto);
connect(m_actions, &DisassemblerViewActions::entryPointRequested, this, &DisassemblerView::showEntryPoints);
connect(m_actions, &DisassemblerViewActions::graphListingRequested, this, &DisassemblerView::switchGraphListing);

connect(m_docks->referencesView(), &QTreeView::doubleClicked, this, &DisassemblerView::gotoXRef);
@@ -157,7 +155,6 @@ void DisassemblerView::checkDisassemblerStatus()
m_actsetfilter->setEnabled(!m_disassembler->busy());
m_lefilter->setEnabled(!m_disassembler->busy());

m_actions->setEnabled(DisassemblerViewActions::EntryPointAction, !m_disassembler->busy());
m_actions->setEnabled(DisassemblerViewActions::GotoAction, !m_disassembler->busy());
m_actions->setEnabled(DisassemblerViewActions::GraphListingAction, !m_disassembler->busy());
}
@@ -421,14 +418,6 @@ void DisassemblerView::selectToHexDump(address_t address, u64 len)

void DisassemblerView::showMenu(const QPoint&) { m_contextmenu->exec(QCursor::pos()); }

void DisassemblerView::showEntryPoints()
{
EntryPointsDialog dlgentrypoints(m_disassembler.get(), this);

connect(&dlgentrypoints, &EntryPointsDialog::symbolSelected, this, &DisassemblerView::goTo);
dlgentrypoints.exec();
}

void DisassemblerView::showGoto()
{
GotoDialog dlggoto(m_disassembler.get(), this);
@@ -48,7 +48,6 @@ class DisassemblerView : public QWidget
void switchToHexDump();
void selectToHexDump(address_t address, u64 len);
void showMenu(const QPoint&);
void showEntryPoints();
void showGoto();

private:
@@ -50,13 +50,8 @@ void DisassemblerViewActions::addActions()
m_actions[DisassemblerViewActions::GotoAction] = m_toolbar->addAction(THEME_ICON("goto"), QString(),
this, &DisassemblerViewActions::gotoRequested);

m_actions[DisassemblerViewActions::EntryPointAction] = m_toolbar->addAction(THEME_ICON("entry"), QString(),
this, &DisassemblerViewActions::entryPointRequested);

m_actions[DisassemblerViewActions::GraphListingAction] = m_toolbar->addAction(THEME_ICON("graph"), QString(),
this, &DisassemblerViewActions::graphListingRequested);

m_actions[DisassemblerViewActions::EntryPointAction]->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_E));
}

void DisassemblerViewActions::removeActions()
@@ -10,7 +10,7 @@ class DisassemblerViewActions : public QObject
Q_OBJECT

public:
enum { BackAction = 0, ForwardAction, EntryPointAction, GotoAction, GraphListingAction };
enum { BackAction = 0, ForwardAction, GotoAction, GraphListingAction };

public:
explicit DisassemblerViewActions(QObject *parent = NULL);
@@ -26,7 +26,6 @@ class DisassemblerViewActions : public QObject
signals:
void backRequested();
void forwardRequested();
void entryPointRequested();
void gotoRequested();
void graphListingRequested();

0 comments on commit cfc1fe5

Please sign in to comment.
You can’t perform that action at this time.