Commit bf9bc8f6 authored by con's avatar con
Browse files

Merge commit 'icons/icons'

parents e0a12e9e a456d951
<RCC>
<qresource prefix="/debugger" >
<qresource prefix="/debugger">
<file>images/breakpoint.svg</file>
<file>images/breakpoint_pending.svg</file>
<file>images/breakpoint_disabled.svg</file>
......@@ -22,5 +22,9 @@
<file>images/location.svg</file>
<file>images/newitem.png</file>
<file>images/running.png</file>
<file>images/debugger_continue.png</file>
<file>images/debugger_interrupt.png</file>
<file>images/debugger_stop.png</file>
<file>images/SingleInstructionMode.png</file>
</qresource>
</RCC>
......@@ -162,7 +162,7 @@ DebuggerSettings *DebuggerSettings::instance()
item->setText(tr("Operate by Instruction"));
item->setCheckable(true);
item->setDefaultValue(false);
item->setIcon(QIcon(":/debugger/images/debugger_stepoverproc_small.png"));
item->setIcon(QIcon(":/debugger/images/SingleInstructionMode.png"));
item->setToolTip(tr("This switches the debugger to instruction-wise "
"operation mode. In this mode, stepping operates on single "
"instructions and the source location view also shows the "
......
......@@ -253,8 +253,8 @@ struct DebuggerManagerPrivate
static DebuggerManager *instance;
const QIcon m_stopSmallIcon;
const QIcon m_interruptSmallIcon;
QIcon m_stopIcon;
QIcon m_interruptIcon;
const QIcon m_locationMarkIcon;
// FIXME: Remove engine-specific state
......@@ -311,14 +311,16 @@ struct DebuggerManagerPrivate
DebuggerManager *DebuggerManagerPrivate::instance = 0;
DebuggerManagerPrivate::DebuggerManagerPrivate(DebuggerManager *manager) :
m_stopSmallIcon(QLatin1String(":/debugger/images/debugger_stop_small.png")),
m_interruptSmallIcon(QLatin1String(":/debugger/images/debugger_interrupt_small.png")),
m_stopIcon(QLatin1String(":/debugger/images/debugger_stop_small.png")),
m_interruptIcon(QLatin1String(":/debugger/images/debugger_interrupt_small.png")),
m_locationMarkIcon(QLatin1String(":/debugger/images/location.svg")),
m_startParameters(new DebuggerStartParameters),
m_inferiorPid(0),
m_disassemblerViewAgent(manager),
m_engine(0)
{
m_interruptIcon.addFile(":/debugger/images/debugger_interrupt.png");
m_stopIcon.addFile(":/debugger/images/debugger_stop.png");
}
DebuggerManager::DebuggerManager()
......@@ -465,10 +467,12 @@ void DebuggerManager::init()
qRegisterMetaType<StackCookie>("StackCookie");
d->m_actions.continueAction = new QAction(tr("Continue"), this);
d->m_actions.continueAction->setIcon(QIcon(":/debugger/images/debugger_continue_small.png"));
QIcon continueIcon = QIcon(":/debugger/images/debugger_continue_small.png");
continueIcon.addFile(":/debugger/images/debugger_continue.png");
d->m_actions.continueAction->setIcon(continueIcon);
d->m_actions.stopAction = new QAction(tr("Interrupt"), this);
d->m_actions.stopAction->setIcon(d->m_interruptSmallIcon);
d->m_actions.stopAction->setIcon(d->m_interruptIcon);
d->m_actions.resetAction = new QAction(tr("Abort Debugging"), this);
d->m_actions.resetAction->setToolTip(tr("Aborts debugging and "
......@@ -1767,10 +1771,10 @@ void DebuggerManager::setState(DebuggerState state, bool forced)
const bool interruptIsExit = !running;
if (interruptIsExit) {
d->m_actions.stopAction->setIcon(d->m_stopSmallIcon);
d->m_actions.stopAction->setIcon(d->m_stopIcon);
d->m_actions.stopAction->setText(tr("Stop Debugger"));
} else {
d->m_actions.stopAction->setIcon(d->m_interruptSmallIcon);
d->m_actions.stopAction->setIcon(d->m_interruptIcon);
d->m_actions.stopAction->setText(tr("Interrupt"));
}
......
......@@ -94,7 +94,7 @@ IPropertiesPanel *BuildSettingsPanelFactory::createPanel(Target *target)
BuildSettingsPanel::BuildSettingsPanel(Target *target) :
m_widget(new BuildSettingsWidget(target)),
m_icon(":/projectexplorer/images/rebuild.png")
m_icon(":/projectexplorer/images/BuildSettings.png")
{
}
......
......@@ -259,7 +259,7 @@ DependenciesWidget::DependenciesWidget(SessionManager *session,
DependenciesPanel::DependenciesPanel(SessionManager *session, Project *project) :
m_widget(new DependenciesWidget(session, project)),
m_icon(":/projectexplorer/images/session.png")
m_icon(":/projectexplorer/images/ProjectDependencies.png")
{
}
......
......@@ -73,7 +73,7 @@ IPropertiesPanel *EditorSettingsPanelFactory::createPanel(Target *target)
EditorSettingsPanel::EditorSettingsPanel(Project *project) :
m_widget(new EditorSettingsWidget(project)),
m_icon(":/projectexplorer/images/rebuild.png")
m_icon(":/projectexplorer/images/EditorSettings.png")
{
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment