Changed: #1193 New icons set for particles editor.

code/nel/tools/3d/object_viewer_qt/src/main_window.cpp

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

code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.qrc

@@ -34,19 +34,21 @@
     <file>images/save-as.png</file>
     <file>images/save.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/Sound.bmp</file>
-    <file>images/Light.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/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>
 </RCC>

code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.cpp

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

code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.cpp

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