diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.cpp
index e300c8fa7..3caa64e5a 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.cpp
@@ -67,8 +67,8 @@ QString ObjectViewerPlugin::description() const
QStringList ObjectViewerPlugin::dependencies() const
{
- QStringList list;
- list.append(Core::Constants::OVQT_CORE_PLUGIN);
+ QStringList list;
+ list.append(Core::Constants::OVQT_CORE_PLUGIN);
return list;
}
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_form.ui
index aeef7c78b..108b64375 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_form.ui
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_form.ui
@@ -6,171 +6,119 @@
0
0
- 239
- 264
+ 200
+ 252
Form
-
-
- 6
-
- -
-
-
- QTabWidget::East
+
+
-
+
+
+ Sound name
-
- 0
-
-
-
- General
-
-
-
-
-
-
- Sound name
-
-
-
-
-
-
- true
-
-
-
- -
-
-
- Browse
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 93
- 20
-
-
-
-
- -
-
-
- Play
-
-
-
-
-
-
- -
-
-
-
-
-
- Spawn
-
-
-
- -
-
-
- Mute
-
-
-
-
-
- -
-
-
- Keep original pitch
-
-
-
- -
-
-
- Emission percent:
-
-
-
- -
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 51
-
-
-
-
-
-
-
-
- Sound volume
-
-
- -
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 209
-
-
-
-
-
-
-
-
- Sound pitch
-
-
- -
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 208
-
-
-
-
-
-
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Browse
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 93
+ 20
+
+
+
+
+ -
+
+
+ Play
+
+
+
+
+ -
+
+
-
+
+
+ Spawn
+
+
+
+ -
+
+
+ Mute
+
+
+
+
+
+ -
+
+
+ Keep original pitch
+
+
+
+ -
+
+
+ Emission percent:
+
+
+
+ -
+
+
+ -
+
+
+ Sound volume
+
+
+
+ -
+
+
+ Sound pitch
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 22
+
+
+
+
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_form.ui
index 6418bbc6a..10f2632b0 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_form.ui
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_form.ui
@@ -60,6 +60,9 @@
+
+ true
+
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_widget.cpp
index 9d5615275..f09e752da 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_widget.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_widget.cpp
@@ -112,24 +112,31 @@ void CParticleTextureWidget::updateTexture()
_ui.nameLabel->setText(tr("Name:"));
_ui.sizeLabel->setText(tr("Size:"));
_ui.depthLabel->setText(tr("Depth:"));
+ _ui.imageLabel->setText("");
+ _ui.imageLabel->setPixmap(QPixmap());
if (!_Texture)
- {
- _ui.imageLabel->setPixmap(QPixmap());
return;
- }
if (dynamic_cast(_Wrapper->get()))
{
std::string texName = (static_cast(_Wrapper->get()))->getFileName().c_str();
_ui.nameLabel->setText(tr("Name: %1").arg(texName.c_str()));
if (!NLMISC::CFile::getFilename(texName).empty())
{
- QPixmap pixmap(NLMISC::CPath::lookup(texName).c_str());
+ std::string path;
+ try
+ {
+ path = NLMISC::CPath::lookup(texName);
+ }
+ catch (NLMISC::Exception &e)
+ {
+ _ui.imageLabel->setText(e.what());
+ return;
+ }
+ QPixmap pixmap(path.c_str());
_ui.sizeLabel->setText(tr("Size: %1x%2").arg(pixmap.width()).arg(pixmap.height()));
_ui.depthLabel->setText(tr("Depth: %1").arg(pixmap.depth()));
_ui.imageLabel->setPixmap(pixmap);
}
- else
- _ui.imageLabel->setPixmap(QPixmap());
}
}
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_gradient_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_gradient_dialog.cpp
index edc5402b8..c8165ceed 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_gradient_dialog.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_gradient_dialog.cpp
@@ -321,7 +321,7 @@ void CTextureGradientInterface::displayValue(uint index, QListWidgetItem *item)
std::string texName = (static_cast(tex.getPtr()))->getFileName().c_str();
if (!texName.empty())
{
- pixmap.load(NLMISC::CPath::lookup(texName).c_str());
+ pixmap.load(NLMISC::CPath::lookup(texName, false).c_str());
item->setText(texName.c_str());
}
else