Changed: #1193 New icons set for particles editor.

This commit is contained in:
dnk-88 2011-01-24 11:59:01 +02:00
parent 415c436936
commit 9337c6f0d4
23 changed files with 30 additions and 20 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

@ -386,6 +386,7 @@ void CMainWindow::createActions()
connect(_resetCameraAction, SIGNAL(triggered()), this, SLOT(resetCamera())); connect(_resetCameraAction, SIGNAL(triggered()), this, SLOT(resetCamera()));
_renderModeAction = new QAction("Change render mode", this); _renderModeAction = new QAction("Change render mode", this);
_renderModeAction->setIcon(QIcon(":/images/polymode.png"));
_renderModeAction->setShortcut(tr("Ctrl+M")); _renderModeAction->setShortcut(tr("Ctrl+M"));
_renderModeAction->setStatusTip(tr("Change render mode (Line, Point, Filled)")); _renderModeAction->setStatusTip(tr("Change render mode (Line, Point, Filled)"));
connect(_renderModeAction, SIGNAL(triggered()), this, SLOT(changeRenderMode())); connect(_renderModeAction, SIGNAL(triggered()), this, SLOT(changeRenderMode()));

View file

@ -34,19 +34,21 @@
<file>images/save-as.png</file> <file>images/save-as.png</file>
<file>images/save.png</file> <file>images/save.png</file>
<file>images/insert-horizontal.png</file> <file>images/insert-horizontal.png</file>
<file>images/polymode.png</file>
<file>images/Workspace.bmp</file>
<file>images/ParticleSystem.bmp</file>
<file>images/Emitter.bmp</file> <file>images/Emitter.bmp</file>
<file>images/Sound.bmp</file>
<file>images/Light.bmp</file>
<file>images/Force.bmp</file> <file>images/Force.bmp</file>
<file>images/Particle.bmp</file>
<file>images/Located.bmp</file>
<file>images/LocatedInstance.bmp</file>
<file>images/CollisionZone.bmp</file>
<file>images/ParticleSystemNotLoaded.bmp</file>
<file>images/nel_ide_load.png</file> <file>images/nel_ide_load.png</file>
<file>images/bad_particle_system_item.png</file>
<file>images/particle_system_item.png</file>
<file>images/instance_item.png</file>
<file>images/light_item.png</file>
<file>images/located_item.png</file>
<file>images/particle_item.png</file>
<file>images/sound_item.png</file>
<file>images/workspace_item.png</file>
<file>images/collision_zone_item.png</file>
</qresource> </qresource>
</RCC> </RCC>

View file

@ -337,27 +337,27 @@ QIcon CParticleTreeModel::getIcon(const QModelIndex &index) const
case ItemType::Root: case ItemType::Root:
break; break;
case ItemType::Workspace: case ItemType::Workspace:
return QIcon(":/images/Workspace.bmp"); return QIcon(":/images/workspace_item.png");
case ItemType::ParticleSystem: case ItemType::ParticleSystem:
return QIcon(":/images/ParticleSystem.bmp"); return QIcon(":/images/particle_system_item.png");
case ItemType::Particle: case ItemType::Particle:
return QIcon(":/images/Particle.bmp"); return QIcon(":/images/particle_item.png");
case ItemType::Emitter: case ItemType::Emitter:
return QIcon(":/images/Emitter.bmp"); return QIcon(":/images/Emitter.bmp");
case ItemType::Force: case ItemType::Force:
return QIcon(":/images/Force.bmp"); return QIcon(":/images/Force.bmp");
case ItemType::Light: case ItemType::Light:
return QIcon(":/images/Light.bmp"); return QIcon(":/images/light_item.png");
case ItemType::Sound: case ItemType::Sound:
return QIcon(":/images/Sound.bmp"); return QIcon(":/images/sound_item.png");
case ItemType::Located: case ItemType::Located:
return QIcon(":/images/Located.bmp"); return QIcon(":/images/located_item.png");
case ItemType::CollisionZone: case ItemType::CollisionZone:
return QIcon(":/images/CollisionZone.bmp"); return QIcon(":/images/collision_zone_item.png");
case ItemType::LocatedInstance: case ItemType::LocatedInstance:
return QIcon(":/images/LocatedInstance.bmp"); return QIcon(":/images/instance_item.png");
case ItemType::ParticleSystemNotLoaded: case ItemType::ParticleSystemNotLoaded:
return QIcon(":/images/ParticleSystemNotLoaded.bmp"); return QIcon(":/images/bad_particle_system_item.png");
} }
return QIcon(); return QIcon();
} }

View file

@ -148,14 +148,19 @@ CParticleWorkspaceDialog::CParticleWorkspaceDialog(QWidget *parent)
_mergeAction = new QAction(tr("Merge"), this); _mergeAction = new QAction(tr("Merge"), this);
_newLocatedAction = new QAction(tr("New located"), this); _newLocatedAction = new QAction(tr("New located"), this);
_newLocatedAction->setIcon(QIcon(":/images/located_item.png"));
_pasteLocatedAction = new QAction(tr("Paste located"), this); _pasteLocatedAction = new QAction(tr("Paste located"), this);
for(int i = 0; LocatedBindable[i]; ++i) for(int i = 0; LocatedBindable[i]; ++i)
_bindNewLocatedBindable[i] = new QAction(tr(LocatedBindable[i]), this); _bindNewLocatedBindable[i] = new QAction(tr(LocatedBindable[i]), this);
_bindNewLocatedBindable[Action::Sound]->setIcon(QIcon(":/images/sound_item.png"));
_bindNewLocatedBindable[Action::Light]->setIcon(QIcon(":/images/light_item.png"));
_forceZBiasAction = new QAction(tr("Force ZBias"), this); _forceZBiasAction = new QAction(tr("Force ZBias"), this);
_instanciateAction = new QAction(tr("Instanciate"), this); _instanciateAction = new QAction(tr("Instanciate"), this);
_instanciateAction->setIcon(QIcon(":/images/instance_item.png"));
_copyLocatedAction = new QAction(tr("Copy located"), this); _copyLocatedAction = new QAction(tr("Copy located"), this);
_copyBindableAction = new QAction(tr("Copy bindable"), this); _copyBindableAction = new QAction(tr("Copy bindable"), this);
_pasteBindableAction = new QAction(tr("Paste bindable"), this); _pasteBindableAction = new QAction(tr("Paste bindable"), this);
@ -727,6 +732,7 @@ void CParticleWorkspaceDialog::updateTreeView()
void CParticleWorkspaceDialog::buildMenu(QMenu *menu) void CParticleWorkspaceDialog::buildMenu(QMenu *menu)
{ {
QMenu *bindParticleMenu = new QMenu(tr("Bind particle..."), menu); QMenu *bindParticleMenu = new QMenu(tr("Bind particle..."), menu);
bindParticleMenu->setIcon(QIcon(":/images/particle_system_item.png"));
menu->addAction(bindParticleMenu->menuAction()); menu->addAction(bindParticleMenu->menuAction());
for(int i = Action::ParticlePoint; i <= Action::ParticleRibbonLookAt; ++i) for(int i = Action::ParticlePoint; i <= Action::ParticleRibbonLookAt; ++i)
bindParticleMenu->addAction(_bindNewLocatedBindable[i]); bindParticleMenu->addAction(_bindNewLocatedBindable[i]);
@ -737,6 +743,7 @@ void CParticleWorkspaceDialog::buildMenu(QMenu *menu)
bindForceMenu->addAction(_bindNewLocatedBindable[i]); bindForceMenu->addAction(_bindNewLocatedBindable[i]);
QMenu *bindZoneMenu = new QMenu(tr("Bind zone..."), menu); QMenu *bindZoneMenu = new QMenu(tr("Bind zone..."), menu);
bindZoneMenu->setIcon(QIcon(":/images/collision_zone_item.png"));
menu->addAction(bindZoneMenu->menuAction()); menu->addAction(bindZoneMenu->menuAction());
for(int i = Action::ZonePlane; i <= Action::ZoneCylinder; ++i) for(int i = Action::ZonePlane; i <= Action::ZoneCylinder; ++i)
bindZoneMenu->addAction(_bindNewLocatedBindable[i]); bindZoneMenu->addAction(_bindNewLocatedBindable[i]);