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")
{
}
......
<RCC>
<qresource prefix="/projectexplorer">
<file>images/build.png</file>
<file>images/build_small.png</file>
<file>images/clean.png</file>
<file>images/clean_small.png</file>
<file>images/closetab.png</file>
<file>images/compile_error.png</file>
<file>images/compile_unspecified.png</file>
<file>images/compile_warning.png</file>
<file>images/debugger_start.png</file>
<file>images/debugger_start_small.png</file>
<file>images/filtericon.png</file>
......@@ -28,5 +25,18 @@
<file>images/rightselection.png</file>
<file>images/midselection.png</file>
<file>images/targetremovebutton.png</file>
<file>images/compile_error.png</file>
<file>images/compile_warning.png</file>
<file>images/BuildSettings.png</file>
<file>images/RunSettings.png</file>
<file>images/EditorSettings.png</file>
<file>images/ProjectDependencies.png</file>
<file>images/MaemoDevice.png</file>
<file>images/MaemoEmulator.png</file>
<file>images/SymbianDevice.png</file>
<file>images/SymbianEmulator.png</file>
<file>images/ConnectionOff.png</file>
<file>images/ConnectionOn.png</file>
<file>images/build.png</file>
</qresource>
</RCC>
......@@ -169,7 +169,7 @@ void PanelsWidget::addPropertiesPanel(IPropertiesPanel *panel)
QLabel *iconLabel = new QLabel(m_root);
iconLabel->setPixmap(panel->icon().pixmap(ICON_SIZE, ICON_SIZE));
iconLabel->setContentsMargins(0, ABOVE_HEADING_MARGIN, 0, 0);
m_layout->addWidget(iconLabel, headerRow, 0, 2, 1, Qt::AlignTop | Qt::AlignHCenter);
m_layout->addWidget(iconLabel, headerRow, 0, 3, 1, Qt::AlignTop | Qt::AlignHCenter);
}
// name:
......@@ -178,13 +178,14 @@ void PanelsWidget::addPropertiesPanel(IPropertiesPanel *panel)
nameLabel->setContentsMargins(0, ABOVE_HEADING_MARGIN, 0, 0);
QFont f = nameLabel->font();
f.setBold(true);
f.setPointSizeF(f.pointSizeF() * 1.4);
f.setPointSizeF(f.pointSizeF() * 1.6);
nameLabel->setFont(f);
m_layout->addWidget(nameLabel, headerRow, 1, 1, 1, Qt::AlignBottom | Qt::AlignLeft);
m_layout->addWidget(nameLabel, headerRow, 1, 1, 1, Qt::AlignVCenter | Qt::AlignLeft);
// line:
const int lineRow(headerRow + 1);
m_layout->addWidget(new OnePixelBlackLine(m_root), lineRow, 1);
QWidget *line = new OnePixelBlackLine(m_root);
m_layout->addWidget(line, lineRow, 1, 1, -1, Qt::AlignTop);
// add the widget:
const int widgetRow(lineRow + 1);
......
......@@ -131,7 +131,7 @@ IPropertiesPanel *RunSettingsPanelFactory::createPanel(Target *target)
RunSettingsPanel::RunSettingsPanel(Target *target) :
m_widget(new RunSettingsWidget(target)),
m_icon(":/projectexplorer/images/run.png")
m_icon(":/projectexplorer/images/RunSettings.png")
{
}
......
......@@ -48,6 +48,11 @@
#include <QtGui/QStyledItemDelegate>
#include <QtGui/QSortFilterProxyModel>
namespace {
const int TASK_ICON_SIZE = 16;
const int TASK_ICON_MARGIN = 2;
}
namespace ProjectExplorer {
namespace Internal {
......@@ -769,6 +774,8 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
} else {
s.setHeight(fontHeight + 3);
}
if (s.height() < TASK_ICON_SIZE + 2 * TASK_ICON_MARGIN)
s.setHeight(TASK_ICON_SIZE + 2 * TASK_ICON_MARGIN);
return s;
}
......@@ -817,7 +824,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
TaskModel *model = static_cast<TaskFilterModel *>(view->model())->taskModel();
TaskWindow::TaskType type = TaskWindow::TaskType(index.data(TaskModel::Type).toInt());
QIcon icon = model->iconFor(type);
painter->drawPixmap(2, opt.rect.top() + 2, icon.pixmap(16, 16));
painter->drawPixmap(TASK_ICON_MARGIN, opt.rect.top() + TASK_ICON_MARGIN, icon.pixmap(TASK_ICON_SIZE, TASK_ICON_SIZE));
int width = opt.rect.width() - model->sizeOfFile() - model->sizeOfLineNumber() - 12 - 22;
if (!selected) {
......
......@@ -10,7 +10,5 @@
<file>images/qt_qrc.png</file>
<file>images/sources.png</file>
<file>images/unknown.png</file>
<file>images/connected.png</file>
<file>images/notconnected.png</file>
</qresource>
</RCC>
......@@ -71,13 +71,13 @@ QIcon iconForId(const QString &id) {
if (id == QLatin1String(DESKTOP_TARGET_ID))
return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
if (id == QLatin1String(S60_EMULATOR_TARGET_ID))
return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
return QIcon(":/projectexplorer/images/SymbianEmulator.png");
if (id == QLatin1String(S60_DEVICE_TARGET_ID))
return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
return QIcon(":/projectexplorer/images/SymbianDevice.png");
if (id == QLatin1String(MAEMO_EMULATOR_TARGET_ID))
return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
return QIcon(":/projectexplorer/images/MaemoEmulator.png");
if (id == QLatin1String(MAEMO_DEVICE_TARGET_ID))
return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
return QIcon(":/projectexplorer/images/MaemoDevice.png");
return QIcon();
}
......@@ -200,8 +200,8 @@ Qt4Target *Qt4TargetFactory::restore(ProjectExplorer::Project *parent, const QVa
Qt4Target::Qt4Target(Qt4Project *parent, const QString &id) :
ProjectExplorer::Target(parent, id),
m_connectedPixmap(QLatin1String(":/qt4projectmanager/images/connected.png")),
m_disconnectedPixmap(QLatin1String(":/qt4projectmanager/images/notconnected.png")),
m_connectedPixmap(QLatin1String(":/projectexplorer/images/ConnectionOn.png")),
m_disconnectedPixmap(QLatin1String(":/projectexplorer/images/ConnectionOff.png")),
m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this))
{
connect(project(), SIGNAL(supportedTargetIdsChanged()),
......
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