diff --git a/debuggerui.qrc b/debuggerui.qrc index 1685e889..f012c924 100644 --- a/debuggerui.qrc +++ b/debuggerui.qrc @@ -1,19 +1,22 @@ - - icons/run.svg - icons/cancel.svg - icons/connect.svg - icons/disconnect.svg - icons/pause.svg - icons/restart.svg - icons/resume.svg - icons/stepinto.svg - icons/stepout.svg - icons/stepover.svg - icons/stop.svg - icons/debugger.svg - icons/breakpoint.svg - icons/menu.png - icons/settings.svg + + icons/add.png + icons/breakpoint.png + icons/cancel.png + icons/connect.png + icons/debugger.png + icons/disconnect.png + icons/menu.png + icons/pause.png + icons/remove.png + icons/restart.png + icons/resume.png + icons/settings.png + icons/start.png + icons/step-back.png + icons/step-into.png + icons/step-out.png + icons/step-over.png + icons/stop.png diff --git a/icons/add.png b/icons/add.png new file mode 100644 index 00000000..557d3235 Binary files /dev/null and b/icons/add.png differ diff --git a/icons/add.svg b/icons/add.svg deleted file mode 100644 index 9f5573f3..00000000 --- a/icons/add.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Layer 1 - - - - - \ No newline at end of file diff --git a/icons/breakpoint.png b/icons/breakpoint.png new file mode 100644 index 00000000..cf9813ec Binary files /dev/null and b/icons/breakpoint.png differ diff --git a/icons/breakpoint.svg b/icons/breakpoint.svg deleted file mode 100644 index 0874c766..00000000 --- a/icons/breakpoint.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/icons/cancel.png b/icons/cancel.png new file mode 100644 index 00000000..b78f3cdc Binary files /dev/null and b/icons/cancel.png differ diff --git a/icons/cancel.svg b/icons/cancel.svg deleted file mode 100644 index 7083aa35..00000000 --- a/icons/cancel.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Layer 1 - - - - - \ No newline at end of file diff --git a/icons/connect.png b/icons/connect.png new file mode 100644 index 00000000..d3e286fb Binary files /dev/null and b/icons/connect.png differ diff --git a/icons/connect.svg b/icons/connect.svg deleted file mode 100644 index 6e6d873f..00000000 --- a/icons/connect.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Layer 1 - - - - diff --git a/icons/debugger.png b/icons/debugger.png new file mode 100644 index 00000000..7f268c6a Binary files /dev/null and b/icons/debugger.png differ diff --git a/icons/debugger.svg b/icons/debugger.svg deleted file mode 100644 index 846558b5..00000000 --- a/icons/debugger.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/icons/disconnect.png b/icons/disconnect.png new file mode 100644 index 00000000..837e47e5 Binary files /dev/null and b/icons/disconnect.png differ diff --git a/icons/disconnect.svg b/icons/disconnect.svg deleted file mode 100644 index d21283fb..00000000 --- a/icons/disconnect.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Layer 1 - - - - diff --git a/icons/menu.png b/icons/menu.png index 0c1c69a1..f296da5a 100644 Binary files a/icons/menu.png and b/icons/menu.png differ diff --git a/icons/pause.png b/icons/pause.png new file mode 100644 index 00000000..19be7bf2 Binary files /dev/null and b/icons/pause.png differ diff --git a/icons/pause.svg b/icons/pause.svg deleted file mode 100644 index 6bf97078..00000000 --- a/icons/pause.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Layer 1 - - - - - \ No newline at end of file diff --git a/icons/remove.png b/icons/remove.png new file mode 100644 index 00000000..7215a774 Binary files /dev/null and b/icons/remove.png differ diff --git a/icons/remove.svg b/icons/remove.svg deleted file mode 100644 index eebadaff..00000000 --- a/icons/remove.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Layer 1 - - - - \ No newline at end of file diff --git a/icons/restart.png b/icons/restart.png new file mode 100644 index 00000000..790e4aac Binary files /dev/null and b/icons/restart.png differ diff --git a/icons/restart.svg b/icons/restart.svg deleted file mode 100644 index 353ca545..00000000 --- a/icons/restart.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Layer 1 - - - - \ No newline at end of file diff --git a/icons/resume.png b/icons/resume.png new file mode 100644 index 00000000..db926ed1 Binary files /dev/null and b/icons/resume.png differ diff --git a/icons/resume.svg b/icons/resume.svg deleted file mode 100644 index a25337f2..00000000 --- a/icons/resume.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Layer 1 - - - - - diff --git a/icons/run.svg b/icons/run.svg deleted file mode 100644 index 941484a4..00000000 --- a/icons/run.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Layer 1 - - - - diff --git a/icons/settings.png b/icons/settings.png new file mode 100644 index 00000000..19565a3c Binary files /dev/null and b/icons/settings.png differ diff --git a/icons/settings.svg b/icons/settings.svg deleted file mode 100644 index 4f33e750..00000000 --- a/icons/settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/start.png b/icons/start.png new file mode 100644 index 00000000..610e0aa0 Binary files /dev/null and b/icons/start.png differ diff --git a/icons/step-back.png b/icons/step-back.png new file mode 100644 index 00000000..247b37b5 Binary files /dev/null and b/icons/step-back.png differ diff --git a/icons/step-into.png b/icons/step-into.png new file mode 100644 index 00000000..124ed369 Binary files /dev/null and b/icons/step-into.png differ diff --git a/icons/step-out.png b/icons/step-out.png new file mode 100644 index 00000000..3c828f1c Binary files /dev/null and b/icons/step-out.png differ diff --git a/icons/step-over.png b/icons/step-over.png new file mode 100644 index 00000000..7bc44c0e Binary files /dev/null and b/icons/step-over.png differ diff --git a/icons/stepinto.svg b/icons/stepinto.svg deleted file mode 100644 index d6815f6c..00000000 --- a/icons/stepinto.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Layer 1 - - - - - - - \ No newline at end of file diff --git a/icons/stepout.svg b/icons/stepout.svg deleted file mode 100644 index 1a6a8040..00000000 --- a/icons/stepout.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Layer 1 - - - - - - - - - \ No newline at end of file diff --git a/icons/stepover.svg b/icons/stepover.svg deleted file mode 100644 index 5090f60f..00000000 --- a/icons/stepover.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Layer 1 - - - - - \ No newline at end of file diff --git a/icons/stop.png b/icons/stop.png new file mode 100644 index 00000000..3989a633 Binary files /dev/null and b/icons/stop.png differ diff --git a/icons/stop.svg b/icons/stop.svg deleted file mode 100644 index 00d0dfd2..00000000 --- a/icons/stop.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Layer 1 - - - - \ No newline at end of file diff --git a/ui/controlswidget.cpp b/ui/controlswidget.cpp index 5fd7e72b..af83e774 100644 --- a/ui/controlswidget.cpp +++ b/ui/controlswidget.cpp @@ -44,17 +44,17 @@ DebugControlsWidget::DebugControlsWidget(QWidget* parent, const std::string name auto red = getThemeColor(RedStandardHighlightColor); auto white = getThemeColor(WhiteStandardHighlightColor); - m_actionRun = addAction(getColoredIcon(":/debugger_icons/icons/run.svg", red), "Launch", [this]() { + m_actionRun = addAction(getColoredIcon(":/debugger/start", red), "Launch", [this]() { performLaunch(); }); m_actionRun->setToolTip(getToolTip("Launch")); - m_actionPause = addAction(getColoredIcon(":/debugger_icons/icons/pause.svg", white), "Pause", [this]() { + m_actionPause = addAction(getColoredIcon(":/debugger/pause", white), "Pause", [this]() { performPause(); }); m_actionPause->setToolTip(getToolTip("Pause")); - m_actionResume = addAction(getColoredIcon(":/debugger_icons/icons/resume.svg", green), "Resume", [this]() { + m_actionResume = addAction(getColoredIcon(":/debugger/resume", green), "Resume", [this]() { performResume(); }); m_actionResume->setToolTip(getToolTip("Resume")); @@ -63,45 +63,45 @@ DebugControlsWidget::DebugControlsWidget(QWidget* parent, const std::string name m_actionPause->setVisible(false); m_actionResume->setVisible(false); - m_actionAttachPid = addAction(getColoredIcon(":/debugger_icons/icons/connect.svg", white), "Attach To Process...", [this]() { + m_actionAttachPid = addAction(getColoredIcon(":/debugger/connect", white), "Attach To Process...", [this]() { performAttachPID(); }); m_actionAttachPid->setToolTip(getToolTip("Attach To Process...")); - m_actionDetach = addAction(getColoredIcon(":/debugger_icons/icons/disconnect.svg", red), "Detach", [this]() { + m_actionDetach = addAction(getColoredIcon(":/debugger/disconnect", red), "Detach", [this]() { performDetach(); }); m_actionDetach->setVisible(false); m_actionDetach->setToolTip(getToolTip("Detach")); - m_actionRestart = addAction(getColoredIcon(":/debugger_icons/icons/restart.svg", red), "Restart", [this]() { + m_actionRestart = addAction(getColoredIcon(":/debugger/restart", red), "Restart", [this]() { performRestart(); }); m_actionRestart->setToolTip(getToolTip("Restart")); - m_actionQuit = addAction(getColoredIcon(":/debugger_icons/icons/cancel.svg", red), "Kill", [this]() { + m_actionQuit = addAction(getColoredIcon(":/debugger/cancel", red), "Kill", [this]() { performQuit(); }); m_actionQuit->setToolTip(getToolTip("Kill")); addSeparator(); - m_actionStepInto = addAction(getColoredIcon(":/debugger_icons/icons/stepinto.svg", cyan), "Step Into", [this]() { + m_actionStepInto = addAction(getColoredIcon(":/debugger/step-into", cyan), "Step Into", [this]() { performStepInto(); }); m_actionStepInto->setToolTip(getToolTip("Step Into")); - m_actionStepOver = addAction(getColoredIcon(":/debugger_icons/icons/stepover.svg", cyan), "Step Over", [this]() { + m_actionStepOver = addAction(getColoredIcon(":/debugger/step-over", cyan), "Step Over", [this]() { performStepOver(); }); m_actionStepOver->setToolTip(getToolTip("Step Over")); - m_actionStepReturn = addAction(getColoredIcon(":/debugger_icons/icons/stepout.svg", cyan), "Step Return", [this]() { + m_actionStepReturn = addAction(getColoredIcon(":/debugger/step-out", cyan), "Step Return", [this]() { performStepReturn(); }); m_actionStepReturn->setToolTip(getToolTip("Step Return")); addSeparator(); - m_actionSettings = addAction(getColoredIcon(":/debugger_icons/icons/settings.svg", cyan), "Settings", [this]() { + m_actionSettings = addAction(getColoredIcon(":/debugger/settings", cyan), "Settings", [this]() { performSettings(); }); m_actionSettings->setToolTip(getToolTip("Debug Adapter Settings")); @@ -115,7 +115,7 @@ DebugControlsWidget::~DebugControlsWidget() {} QIcon DebugControlsWidget::getColoredIcon(const QString& iconPath, const QColor& color) { auto pixmap = QPixmap(iconPath); - auto mask = pixmap.createMaskFromColor(QColor("transparent"), Qt::MaskInColor); + auto mask = pixmap.createMaskFromColor(QColor(0, 0, 0), Qt::MaskInColor); pixmap.fill(color); pixmap.setMask(mask); return QIcon(pixmap); diff --git a/ui/moduleswidget.cpp b/ui/moduleswidget.cpp index e1f9c4f2..2e06a0c6 100644 --- a/ui/moduleswidget.cpp +++ b/ui/moduleswidget.cpp @@ -585,7 +585,7 @@ DebugModulesWithFilter::DebugModulesWithFilter(ViewFrame* view, BinaryViewRef da headerLayout->setContentsMargins(1, 1, 6, 0); headerLayout->setAlignment(Qt::AlignBaseline); - auto* icon = new ClickableIcon(QImage(":/debugger_icons/icons/menu.png"), QSize(16, 16)); + auto* icon = new ClickableIcon(QImage(":/debugger/menu"), QSize(16, 16)); connect(icon, &ClickableIcon::clicked, m_modules, &DebugModulesWidget::showContextMenu); headerLayout->addWidget(icon); @@ -723,5 +723,5 @@ bool DebugModulesFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelI DebugModulesSidebarWidgetType::DebugModulesSidebarWidgetType() : - SidebarWidgetType(QImage(":/icons/images/squares.png"), "Debugger Modules") + SidebarWidgetType(QImage(":/icons/images/squares-bug.png"), "Debugger Modules") {} diff --git a/ui/registerswidget.cpp b/ui/registerswidget.cpp index b6a8c417..8504128f 100644 --- a/ui/registerswidget.cpp +++ b/ui/registerswidget.cpp @@ -851,7 +851,7 @@ DebugRegistersContainer::DebugRegistersContainer(ViewFrame* view, BinaryViewRef headerLayout->setContentsMargins(1, 1, 6, 0); headerLayout->setAlignment(Qt::AlignBaseline); - ClickableIcon* icon = new ClickableIcon(QImage(":/debugger_icons/icons/menu.png"), QSize(16, 16)); + ClickableIcon* icon = new ClickableIcon(QImage(":/debugger/menu"), QSize(16, 16)); connect(icon, &ClickableIcon::clicked, m_register, &DebugRegistersWidget::showContextMenu); headerLayout->addWidget(icon); diff --git a/ui/threadframes.cpp b/ui/threadframes.cpp index 48677dd2..1ccb9a31 100644 --- a/ui/threadframes.cpp +++ b/ui/threadframes.cpp @@ -843,5 +843,5 @@ void GlobalThreadFramesContainer::notifyFontChanged() ThreadFramesSidebarWidgetType::ThreadFramesSidebarWidgetType() : - SidebarWidgetType(QImage(":/icons/images/stack_new.png"), "Stack Trace") + SidebarWidgetType(QImage(":/icons/images/stack-trace.png"), "Stack Trace") {} diff --git a/ui/ui.cpp b/ui/ui.cpp index 5cf0915d..2577c23c 100644 --- a/ui/ui.cpp +++ b/ui/ui.cpp @@ -1448,7 +1448,7 @@ static bool ConnectedAndRunning(BinaryView* view, uint64_t addr) void GlobalDebuggerUI::InitializeUI() { - Sidebar::addSidebarWidgetType(new DebuggerWidgetType(QImage(":/debugger_icons/icons/debugger.svg"), "Debugger")); + Sidebar::addSidebarWidgetType(new DebuggerWidgetType(QImage(":/debugger/debugger"), "Debugger")); Sidebar::addSidebarWidgetType(new DebugModulesSidebarWidgetType()); Sidebar::addSidebarWidgetType(new ThreadFramesSidebarWidgetType());