diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/CollisionZone.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/CollisionZone.bmp deleted file mode 100644 index 570c14348..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/CollisionZone.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/Light.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/Light.bmp deleted file mode 100644 index ec622e009..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/Light.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/Located.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/Located.bmp deleted file mode 100644 index 32b5b1582..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/Located.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/LocatedInstance.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/LocatedInstance.bmp deleted file mode 100644 index b44267a71..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/LocatedInstance.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/Particle.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/Particle.bmp deleted file mode 100644 index 53326694b..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/Particle.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/ParticleSystem.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/ParticleSystem.bmp deleted file mode 100644 index 19345172e..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/ParticleSystem.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/ParticleSystemNotLoaded.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/ParticleSystemNotLoaded.bmp deleted file mode 100644 index 23bc58d42..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/ParticleSystemNotLoaded.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/Sound.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/Sound.bmp deleted file mode 100644 index 7c379927a..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/Sound.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/Workspace.bmp b/code/nel/tools/3d/object_viewer_qt/src/images/Workspace.bmp deleted file mode 100644 index 3215fe757..000000000 Binary files a/code/nel/tools/3d/object_viewer_qt/src/images/Workspace.bmp and /dev/null differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/bad_particle_system_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/bad_particle_system_item.png new file mode 100644 index 000000000..27ce05333 Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/bad_particle_system_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/collision_zone_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/collision_zone_item.png new file mode 100644 index 000000000..4f7f4df8a Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/collision_zone_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/instance_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/instance_item.png new file mode 100644 index 000000000..4c9d0417e Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/instance_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/light_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/light_item.png new file mode 100644 index 000000000..22d67cc40 Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/light_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/located_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/located_item.png new file mode 100644 index 000000000..50c0afd2f Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/located_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/particle_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/particle_item.png new file mode 100644 index 000000000..4fc3f9278 Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/particle_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/particle_system_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/particle_system_item.png new file mode 100644 index 000000000..2a863a043 Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/particle_system_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/polymode.png b/code/nel/tools/3d/object_viewer_qt/src/images/polymode.png new file mode 100644 index 000000000..98c13a7ba Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/polymode.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/sound_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/sound_item.png new file mode 100644 index 000000000..d86039a2d Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/sound_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/workspace_item.png b/code/nel/tools/3d/object_viewer_qt/src/images/workspace_item.png new file mode 100644 index 000000000..9143b7b6b Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/images/workspace_item.png differ diff --git a/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp index e68cfa44c..674919afe 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp +++ b/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())); diff --git a/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.qrc b/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.qrc index 908cf78c2..1e63d3f0a 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.qrc +++ b/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.qrc @@ -34,19 +34,21 @@ images/save-as.png images/save.png images/insert-horizontal.png - - images/Workspace.bmp - images/ParticleSystem.bmp + images/polymode.png + images/Emitter.bmp - images/Sound.bmp - images/Light.bmp images/Force.bmp - images/Particle.bmp - images/Located.bmp - images/LocatedInstance.bmp - images/CollisionZone.bmp - images/ParticleSystemNotLoaded.bmp - + images/nel_ide_load.png + + images/bad_particle_system_item.png + images/particle_system_item.png + images/instance_item.png + images/light_item.png + images/located_item.png + images/particle_item.png + images/sound_item.png + images/workspace_item.png + images/collision_zone_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.cpp b/code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.cpp index 69a425329..9e30dc8a7 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.cpp +++ b/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(); } diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.cpp index 382c06ec3..7b5a05535 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.cpp +++ b/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]);