forked from qt-creator/qt-creator
debugger: rename resource path for generic images from 'gdbdebugger' to 'debugger'
This commit is contained in:
@@ -77,9 +77,9 @@ public:
|
|||||||
|
|
||||||
static const QIcon &icon(bool pending, bool enabled)
|
static const QIcon &icon(bool pending, bool enabled)
|
||||||
{
|
{
|
||||||
static const QIcon icon(":/gdbdebugger/images/breakpoint.svg");
|
static const QIcon icon(":/debugger/images/breakpoint.svg");
|
||||||
static const QIcon icon1(":/gdbdebugger/images/breakpoint_disabled.svg");
|
static const QIcon icon1(":/debugger/images/breakpoint_disabled.svg");
|
||||||
static const QIcon icon2(":/gdbdebugger/images/breakpoint_pending.svg");
|
static const QIcon icon2(":/debugger/images/breakpoint_pending.svg");
|
||||||
return enabled ? (pending ? icon2 : icon) : icon1;
|
return enabled ? (pending ? icon2 : icon) : icon1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ BreakWindow::BreakWindow(QWidget *parent)
|
|||||||
{
|
{
|
||||||
QAction *act = theDebuggerAction(UseAlternatingRowColors);
|
QAction *act = theDebuggerAction(UseAlternatingRowColors);
|
||||||
setWindowTitle(tr("Breakpoints"));
|
setWindowTitle(tr("Breakpoints"));
|
||||||
setWindowIcon(QIcon(":/gdbdebugger/images/debugger_breakpoints.png"));
|
setWindowIcon(QIcon(":/debugger/images/debugger_breakpoints.png"));
|
||||||
setAlternatingRowColors(act->isChecked());
|
setAlternatingRowColors(act->isChecked());
|
||||||
setRootIsDecorated(false);
|
setRootIsDecorated(false);
|
||||||
setIconSize(QSize(10, 10));
|
setIconSize(QSize(10, 10));
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<RCC>
|
<RCC>
|
||||||
<qresource prefix="/gdbdebugger" >
|
<qresource prefix="/debugger" >
|
||||||
<file>images/breakpoint.svg</file>
|
<file>images/breakpoint.svg</file>
|
||||||
<file>images/breakpoint_pending.svg</file>
|
<file>images/breakpoint_pending.svg</file>
|
||||||
<file>images/breakpoint_disabled.svg</file>
|
<file>images/breakpoint_disabled.svg</file>
|
||||||
|
|||||||
@@ -311,11 +311,11 @@ void DebuggerManager::init()
|
|||||||
|
|
||||||
m_continueAction = new QAction(this);
|
m_continueAction = new QAction(this);
|
||||||
m_continueAction->setText(tr("Continue"));
|
m_continueAction->setText(tr("Continue"));
|
||||||
m_continueAction->setIcon(QIcon(":/gdbdebugger/images/debugger_continue_small.png"));
|
m_continueAction->setIcon(QIcon(":/debugger/images/debugger_continue_small.png"));
|
||||||
|
|
||||||
m_stopAction = new QAction(this);
|
m_stopAction = new QAction(this);
|
||||||
m_stopAction->setText(tr("Interrupt"));
|
m_stopAction->setText(tr("Interrupt"));
|
||||||
m_stopAction->setIcon(QIcon(":/gdbdebugger/images/debugger_interrupt_small.png"));
|
m_stopAction->setIcon(QIcon(":/debugger/images/debugger_interrupt_small.png"));
|
||||||
|
|
||||||
m_resetAction = new QAction(this);
|
m_resetAction = new QAction(this);
|
||||||
m_resetAction->setText(tr("Reset Debugger"));
|
m_resetAction->setText(tr("Reset Debugger"));
|
||||||
@@ -323,27 +323,27 @@ void DebuggerManager::init()
|
|||||||
m_nextAction = new QAction(this);
|
m_nextAction = new QAction(this);
|
||||||
m_nextAction->setText(tr("Step Over"));
|
m_nextAction->setText(tr("Step Over"));
|
||||||
//m_nextAction->setShortcut(QKeySequence(tr("F6")));
|
//m_nextAction->setShortcut(QKeySequence(tr("F6")));
|
||||||
m_nextAction->setIcon(QIcon(":/gdbdebugger/images/debugger_stepover_small.png"));
|
m_nextAction->setIcon(QIcon(":/debugger/images/debugger_stepover_small.png"));
|
||||||
|
|
||||||
m_stepAction = new QAction(this);
|
m_stepAction = new QAction(this);
|
||||||
m_stepAction->setText(tr("Step Into"));
|
m_stepAction->setText(tr("Step Into"));
|
||||||
//m_stepAction->setShortcut(QKeySequence(tr("F7")));
|
//m_stepAction->setShortcut(QKeySequence(tr("F7")));
|
||||||
m_stepAction->setIcon(QIcon(":/gdbdebugger/images/debugger_stepinto_small.png"));
|
m_stepAction->setIcon(QIcon(":/debugger/images/debugger_stepinto_small.png"));
|
||||||
|
|
||||||
m_nextIAction = new QAction(this);
|
m_nextIAction = new QAction(this);
|
||||||
m_nextIAction->setText(tr("Step Over Instruction"));
|
m_nextIAction->setText(tr("Step Over Instruction"));
|
||||||
//m_nextIAction->setShortcut(QKeySequence(tr("Shift+F6")));
|
//m_nextIAction->setShortcut(QKeySequence(tr("Shift+F6")));
|
||||||
m_nextIAction->setIcon(QIcon(":/gdbdebugger/images/debugger_stepoverproc_small.png"));
|
m_nextIAction->setIcon(QIcon(":/debugger/images/debugger_stepoverproc_small.png"));
|
||||||
|
|
||||||
m_stepIAction = new QAction(this);
|
m_stepIAction = new QAction(this);
|
||||||
m_stepIAction->setText(tr("Step One Instruction"));
|
m_stepIAction->setText(tr("Step One Instruction"));
|
||||||
//m_stepIAction->setShortcut(QKeySequence(tr("Shift+F9")));
|
//m_stepIAction->setShortcut(QKeySequence(tr("Shift+F9")));
|
||||||
m_stepIAction->setIcon(QIcon(":/gdbdebugger/images/debugger_steponeproc_small.png"));
|
m_stepIAction->setIcon(QIcon(":/debugger/images/debugger_steponeproc_small.png"));
|
||||||
|
|
||||||
m_stepOutAction = new QAction(this);
|
m_stepOutAction = new QAction(this);
|
||||||
m_stepOutAction->setText(tr("Step Out"));
|
m_stepOutAction->setText(tr("Step Out"));
|
||||||
//m_stepOutAction->setShortcut(QKeySequence(tr("Shift+F7")));
|
//m_stepOutAction->setShortcut(QKeySequence(tr("Shift+F7")));
|
||||||
m_stepOutAction->setIcon(QIcon(":/gdbdebugger/images/debugger_stepout_small.png"));
|
m_stepOutAction->setIcon(QIcon(":/debugger/images/debugger_stepout_small.png"));
|
||||||
|
|
||||||
m_runToLineAction = new QAction(this);
|
m_runToLineAction = new QAction(this);
|
||||||
m_runToLineAction->setText(tr("Run to Line"));
|
m_runToLineAction->setText(tr("Run to Line"));
|
||||||
@@ -1268,10 +1268,10 @@ void DebuggerManager::setStatus(int status)
|
|||||||
|
|
||||||
bool interruptIsExit = !running;
|
bool interruptIsExit = !running;
|
||||||
if (interruptIsExit) {
|
if (interruptIsExit) {
|
||||||
m_stopAction->setIcon(QIcon(":/gdbdebugger/images/debugger_stop_small.png"));
|
m_stopAction->setIcon(QIcon(":/debugger/images/debugger_stop_small.png"));
|
||||||
m_stopAction->setText(tr("Stop Debugger"));
|
m_stopAction->setText(tr("Stop Debugger"));
|
||||||
} else {
|
} else {
|
||||||
m_stopAction->setIcon(QIcon(":/gdbdebugger/images/debugger_interrupt_small.png"));
|
m_stopAction->setIcon(QIcon(":/debugger/images/debugger_interrupt_small.png"));
|
||||||
m_stopAction->setText(tr("Interrupt"));
|
m_stopAction->setText(tr("Interrupt"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ LocationMark::~LocationMark()
|
|||||||
|
|
||||||
QIcon LocationMark::icon() const
|
QIcon LocationMark::icon() const
|
||||||
{
|
{
|
||||||
static const QIcon icon(":/gdbdebugger/images/location.svg");
|
static const QIcon icon(":/debugger/images/location.svg");
|
||||||
return icon;
|
return icon;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -85,8 +85,8 @@ private:
|
|||||||
DisassemblerModel::DisassemblerModel(QObject *parent)
|
DisassemblerModel::DisassemblerModel(QObject *parent)
|
||||||
: QAbstractTableModel(parent), m_currentLine(0)
|
: QAbstractTableModel(parent), m_currentLine(0)
|
||||||
{
|
{
|
||||||
m_emptyIcon = QIcon(":/gdbdebugger/images/empty.svg");
|
m_emptyIcon = QIcon(":/debugger/images/empty.svg");
|
||||||
m_positionIcon = QIcon(":/gdbdebugger/images/location.svg");
|
m_positionIcon = QIcon(":/debugger/images/location.svg");
|
||||||
}
|
}
|
||||||
|
|
||||||
int DisassemblerModel::rowCount(const QModelIndex &parent) const
|
int DisassemblerModel::rowCount(const QModelIndex &parent) const
|
||||||
|
|||||||
@@ -96,8 +96,8 @@ QVariant ModulesModel::headerData(int section,
|
|||||||
|
|
||||||
QVariant ModulesModel::data(const QModelIndex &index, int role) const
|
QVariant ModulesModel::data(const QModelIndex &index, int role) const
|
||||||
{
|
{
|
||||||
//static const QIcon icon(":/gdbdebugger/images/breakpoint.svg");
|
//static const QIcon icon(":/debugger/images/breakpoint.svg");
|
||||||
//static const QIcon icon2(":/gdbdebugger/images/breakpoint_pending.svg");
|
//static const QIcon icon2(":/debugger/images/breakpoint_pending.svg");
|
||||||
|
|
||||||
int row = index.row();
|
int row = index.row();
|
||||||
if (row < 0 || row >= m_modules.size())
|
if (row < 0 || row >= m_modules.size())
|
||||||
|
|||||||
@@ -69,8 +69,8 @@ QString StackFrame::toToolTip() const
|
|||||||
|
|
||||||
StackHandler::StackHandler(QObject *parent)
|
StackHandler::StackHandler(QObject *parent)
|
||||||
: QAbstractTableModel(parent),
|
: QAbstractTableModel(parent),
|
||||||
m_positionIcon(QIcon(":/gdbdebugger/images/location.svg")),
|
m_positionIcon(QIcon(":/debugger/images/location.svg")),
|
||||||
m_emptyIcon(QIcon(":/gdbdebugger/images/empty.svg"))
|
m_emptyIcon(QIcon(":/debugger/images/empty.svg"))
|
||||||
{
|
{
|
||||||
m_currentIndex = 0;
|
m_currentIndex = 0;
|
||||||
m_canExpand = false;
|
m_canExpand = false;
|
||||||
@@ -215,8 +215,8 @@ bool StackHandler::isDebuggingDebuggingHelpers() const
|
|||||||
ThreadsHandler::ThreadsHandler(QObject *parent)
|
ThreadsHandler::ThreadsHandler(QObject *parent)
|
||||||
: QAbstractTableModel(parent), m_currentIndex(0)
|
: QAbstractTableModel(parent), m_currentIndex(0)
|
||||||
{
|
{
|
||||||
m_emptyIcon = QIcon(":/gdbdebugger/images/empty.svg");
|
m_emptyIcon = QIcon(":/debugger/images/empty.svg");
|
||||||
m_positionIcon = QIcon(":/gdbdebugger/images/location.svg");
|
m_positionIcon = QIcon(":/debugger/images/location.svg");
|
||||||
}
|
}
|
||||||
|
|
||||||
int ThreadsHandler::rowCount(const QModelIndex &parent) const
|
int ThreadsHandler::rowCount(const QModelIndex &parent) const
|
||||||
|
|||||||
Reference in New Issue
Block a user