diff --git a/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt index ba438d72a..c1095c544 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt @@ -1,84 +1,40 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${QT_INCLUDES}) INCLUDE( ${QT_USE_FILE} ) -FILE(GLOB OBJECT_VIEWER_SRC configuration.h entity.h object_viewer.h particle_editor.h modules.h sound_system.h - particle_node.h ps_initial_pos.h dup_ps.h vegetable_editor.h vegetable_node.h - extension_system/iplugin_spec.h extension_system/plugin_spec.h - extension_system/*.cpp *.cpp) +CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) -SET(OBJECT_VIEWER_HDR main_window.h graphics_viewport.h animation_dialog.h - animation_set_dialog.h settings_dialog.h setup_fog_dialog.h - slot_manager_dialog.h particle_control_dialog.h particle_workspace_dialog.h - particle_tree_model.h particle_system_page.h particle_workspace_page.h edit_range_widget.h - emitter_page.h attrib_widget.h located_bindable_page.h located_page.h - particle_force_page.h particle_light_page.h particle_zone_page.h particle_sound_page.h - basic_edit_widget.h direction_widget.h color_edit_widget.h particle_property_dialog.h - ps_mover_page.h value_blender_dialog.h value_gradient_dialog.h - value_from_emitter_dialog.h curve_dialog.h bin_op_dialog.h hoverpoints.h - mesh_widget.h morph_mesh_dialog.h constraint_mesh_widget.h tail_particle_widget.h - auto_lod_dialog.h particle_texture_widget.h particle_texture_anim_widget.h - multi_tex_dialog.h spinner_dialog.h follow_path_dialog.h water_pool_dialog.h - skeleton_scale_dialog.h skeleton_tree_model.h particle_link_skeleton_dialog.h - vegetable_dialog.h global_wind_dialog.h day_night_dialog.h sun_color_dialog.h - vegetable_noise_value_widget.h vegetable_density_page.h vegetable_landscape_page.h - vegetable_scale_page.h vegetable_appearance_page.h vegetable_rotate_page.h - tune_mrm_dialog.h tune_timer_dialog.h camera_control.h - extension_system/iplugin_manager.h extension_system/plugin_manager.h) - -SET(OBJECT_VIEWER_UIS animation_form.ui animation_set_form.ui settings_form.ui - setup_fog_form.ui slot_form.ui particle_control_form.ui particle_workspace_form.ui - edit_range_float_form.ui edit_range_uint_form.ui particle_system_form.ui workspace_form.ui - attrib_form.ui emitter_form.ui located_bindable_form.ui located_form.ui - particle_force_form.ui particle_light_form.ui particle_zone_form.ui particle_sound_form.ui - basic_edit_form.ui direction_form.ui color_edit_form.ui ps_mover_form.ui curve_form.ui - mesh_form.ui morph_mesh_form.ui constraint_mesh_form.ui tail_form.ui auto_lod_form.ui - particle_texture_form.ui particle_texture_anim_form.ui multi_tex_form.ui skeleton_scale_form.ui - particle_link_skeleton_form.ui water_pool_form.ui vegetable_dialog_form.ui - vegetable_noise_value_form.ui global_wind_form.ui sun_color_form.ui day_night_form.ui - vegetable_density_form.ui vegetable_apperance_form.ui vegetable_landscape_form.ui - vegetable_rotate_form.ui vegetable_scale_form.ui tune_mrm_form.ui tune_timer_form.ui) +FILE(GLOB OBJECT_VIEWER_SRC extension_system/*.h + extension_system/*.cpp + *.h *.cpp) -SET(OBJECT_VIEWER_RCS object_viewer_qt.qrc) +SET(OBJECT_VIEWER_HDR extension_system/iplugin_manager.h + extension_system/plugin_manager.h) -SET(LANGUAGES en fr de ru) +SET(OBJECT_VIEWER_RCS object_viewer_qt.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc) + +SET(OBJECT_VIEWER_TS translations/object_viewer_qt_en.ts + translations/object_viewer_qt_fr.ts + translations/object_viewer_qt_de.ts + translations/object_viewer_qt_ru.ts) SET(QT_USE_QTGUI TRUE) SET(QT_USE_QTOPENGL TRUE) -QT4_ADD_RESOURCES( OBJECT_VIEWER_RC_SRCS ${OBJECT_VIEWER_RCS} ) +QT4_ADD_TRANSLATION(OBJECT_VIEWER_QM ${OBJECT_VIEWER_TS}) +QT4_ADD_RESOURCES( OBJECT_VIEWER_RC_SRCS ${OBJECT_VIEWER_RCS}) QT4_WRAP_CPP( OBJECT_VIEWER_MOC_SRCS ${OBJECT_VIEWER_HDR} ) -QT4_WRAP_UI( OBJECT_VIEWER_UI_HDRS ${OBJECT_VIEWER_UIS} ) -FOREACH(LANGUAGE ${LANGUAGES}) - SET (TS ${CMAKE_CURRENT_SOURCE_DIR}/translations/object_viewer_qt_${LANGUAGE}.ts) - SET (QM ${CMAKE_CURRENT_SOURCE_DIR}/translations/object_viewer_qt_${LANGUAGE}.qm) - SET (TRANSLATIONS ${TRANSLATIONS} ${TS}) - SET (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM}) - ADD_CUSTOM_COMMAND (OUTPUT ${QM} COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS} MAIN_DEPENDENCY ${TS}) -ENDFOREACH() - -ADD_CUSTOM_TARGET (translations COMMAND ${QT_LUPDATE_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} -recursive -no-obsolete -ts ${TRANSLATIONS}) -ADD_CUSTOM_COMMAND (TARGET translations COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS}) - -SOURCE_GROUP(QtResources FILES ${OBJECT_VIEWER_UIS} ${OBJECT_VIEWER_RCS}) -SOURCE_GROUP(QtGeneratedUiHdr FILES ${OBJECT_VIEWER_UI_HDRS}) -SOURCE_GROUP(QtGeneratedMocSrc FILES ${OBJECT_VIEWER_MOC_SRCS}) +SOURCE_GROUP(QtResources FILES ${OBJECT_VIEWER_RCS}) +SOURCE_GROUP(QtGeneratedMocQrcSrc FILES ${OBJECT_VIEWER_MOC_SRCS} ${OBJECT_VIEWER_RC_SRCS}) ADD_EXECUTABLE(object_viewer_qt WIN32 MACOSX_BUNDLE ${OBJECT_VIEWER_SRC} ${OBJECT_VIEWER_MOC_SRCS} - ${OBJECT_VIEWER_RC_SRCS} - ${OBJECT_VIEWER_UI_HDRS} - ${TRANSLATIONS}) + ${OBJECT_VIEWER_RC_SRCS}) TARGET_LINK_LIBRARIES(object_viewer_qt nelmisc - nel3d - nelsound - nelligo - nelgeorges ${QT_LIBRARIES} - ${QT_QTOPENGL_LIBRARY} ${QT_QTMAIN_LIBRARY}) ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS}) diff --git a/code/nel/tools/3d/object_viewer_qt/src/main.cpp b/code/nel/tools/3d/object_viewer_qt/src/main.cpp index 90381cfea..b8559b06d 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/main.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/main.cpp @@ -15,9 +15,19 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include "stdpch.h" +// Project includes +#include "extension_system/iplugin_spec.h" +#include "extension_system/plugin_manager.h" + +// NeL includes #include #include +#include +#include +#include +#include +#include +#include // Qt includes #include @@ -29,19 +39,6 @@ #include #include -// NeL includes -#include -#include -#include -#include -#include -#include - -// Project includes -#include "modules.h" -#include "extension_system/iplugin_spec.h" -#include "extension_system/plugin_manager.h" - static const char *appNameC = "ObjectViewerQt"; // nel_qt log file name @@ -57,17 +54,12 @@ static const char *appNameC = "ObjectViewerQt"; # define NLQT_USE_LOG 1 #endif -using namespace std; -using namespace NLMISC; - namespace NLQT { namespace { - -CFileDisplayer *s_FileDisplayer = NULL; - +NLMISC::CFileDisplayer *s_FileDisplayer = NULL; } /* anonymous namespace */ } /* namespace NLQT */ @@ -106,28 +98,26 @@ static inline QString msgCoreLoadFailure(const QString &why) return QCoreApplication::translate("Application", "Failed to load Core plugin: %1").arg(why); } -#define OVQT_OLD true - sint main(int argc, char **argv) { // go nel! new NLMISC::CApplicationContext; { // use log.log if NEL_LOG_IN_FILE and NLQT_USE_LOG_LOG defined as 1 - createDebug(NULL, NLQT_USE_LOG_LOG, false); + NLMISC::createDebug(NULL, NLQT_USE_LOG_LOG, false); #if NLQT_USE_LOG // create NLQT_LOG_FILE // filedisplayer only deletes the 001 etc - if (NLQT_ERASE_LOG && CFile::isExists(NLQT_LOG_FILE)) - CFile::deleteFile(NLQT_LOG_FILE); + if (NLQT_ERASE_LOG && NLMISC::CFile::isExists(NLQT_LOG_FILE)) + NLMISC::CFile::deleteFile(NLQT_LOG_FILE); // initialize the log file - NLQT::s_FileDisplayer = new CFileDisplayer(); + NLQT::s_FileDisplayer = new NLMISC::CFileDisplayer(); NLQT::s_FileDisplayer->setParam(NLQT_LOG_FILE, NLQT_ERASE_LOG); - DebugLog->addDisplayer(NLQT::s_FileDisplayer); - InfoLog->addDisplayer(NLQT::s_FileDisplayer); - WarningLog->addDisplayer(NLQT::s_FileDisplayer); - AssertLog->addDisplayer(NLQT::s_FileDisplayer); - ErrorLog->addDisplayer(NLQT::s_FileDisplayer); + NLMISC::DebugLog->addDisplayer(NLQT::s_FileDisplayer); + NLMISC::InfoLog->addDisplayer(NLQT::s_FileDisplayer); + NLMISC::WarningLog->addDisplayer(NLQT::s_FileDisplayer); + NLMISC::AssertLog->addDisplayer(NLQT::s_FileDisplayer); + NLMISC::ErrorLog->addDisplayer(NLQT::s_FileDisplayer); #endif nlinfo("Welcome to NeL Object Viewer Qt!"); @@ -145,7 +135,7 @@ sint main(int argc, char **argv) QTranslator qtTranslator; QString locale = settings->value("Language", QLocale::system().name()).toString(); QString qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); - translator.load("object_viewer_qt_" + locale, ":/translations"); + translator.load("object_viewer_qt_" + locale, ":/"); qtTranslator.load("qt_" + locale, qtTrPath); app.installTranslator(&translator); app.installTranslator(&qtTranslator); @@ -155,41 +145,6 @@ sint main(int argc, char **argv) CLibrary::addLibPath((qApp->applicationDirPath() + QString("/../PlugIns/nel")).toStdString()); #endif -#if defined(OVQT_OLD) - Modules::init(); - - Modules::plugMan().setSettings(settings); - - // load and set remap extensions from config - Modules::config().configRemapExtensions(); - // load and set search paths from config - Modules::config().configSearchPaths(); - - Modules::mainWin().showMaximized(); - Modules::plugMan().addObject(&Modules::mainWin()); - -#if !defined(NL_OS_MAC) - Modules::plugMan().setPluginPaths(QStringList() << QString("./plugins")); -#else - Modules::plugMan().setPluginPaths(QStringList() << - qApp->applicationDirPath() + QString("/../PlugIns/ovqt")); -#endif - - Modules::plugMan().loadPlugins(); - - QStringList errors; - Q_FOREACH (ExtensionSystem::IPluginSpec *spec, Modules::plugMan().plugins()) - if (spec->hasError()) - errors.append(spec->fileName() + " : " + spec->errorString()); - - if (!errors.isEmpty()) - QMessageBox::warning(0, QCoreApplication::translate("Application", "Object Viewer Qt - Plugin loader messages"), - errors.join(QString::fromLatin1("\n\n"))); - - splash->finish(&Modules::mainWin()); - int result = app.exec(); - Modules::release(); -#else ExtensionSystem::CPluginManager pluginManager; pluginManager.setSettings(settings); QStringList pluginPaths; @@ -239,7 +194,5 @@ sint main(int argc, char **argv) errors.join(QString::fromLatin1("\n\n"))); int result = app.exec(); -#endif - return result; } \ No newline at end of file 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 7839fd539..13d47d75b 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 @@ -1,62 +1,5 @@ - images/nel.png - images/open-file.png - images/go-down.png - images/go-up.png - images/list-add.png - images/list-remove.png - images/play.png - images/pause.png - images/stop.png - images/seek-backward.png - images/seek-forward.png - images/skip-backward.png - images/skip-forward.png - images/preferences.png - images/time.png - images/anim.png - images/animset.png - images/dqynight.png - images/mixer.png - images/pqrticles.png - images/sound.png - images/veget.png - images/water.png - images/wind.png - images/ico_bgcolor.png - images/ico_framedelay.png - images/ico_skelscale.png - images/ico_mrm_mesh.png - images/ico_light_group.png - images/clear.png - images/insert.png - images/new.png - images/refresh.png - images/save-as.png - images/save.png - images/insert-horizontal.png - images/polymode.png - images/rmfill.png - images/rmline.png - images/rmpoints.png - images/cam_del.png - images/cam_add.png - images/Emitter.bmp - images/Force.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 - translations/object_viewer_qt_en.qm - translations/object_viewer_qt_fr.qm - translations/object_viewer_qt_de.qm - translations/object_viewer_qt_ru.qm - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt index e36da9e65..4ac0fff11 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt @@ -2,4 +2,5 @@ ADD_SUBDIRECTORY(core) ADD_SUBDIRECTORY(example) ADD_SUBDIRECTORY(ovqt_sheet_builder) ADD_SUBDIRECTORY(log) -ADD_SUBDIRECTORY(disp_sheet_id) \ No newline at end of file +ADD_SUBDIRECTORY(disp_sheet_id) +ADD_SUBDIRECTORY(object_viewer) \ No newline at end of file diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp index f8f4a6ea0..4ecddb826 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp @@ -49,8 +49,7 @@ CorePlugin::~CorePlugin() qDeleteAll(_autoReleaseObjects); _autoReleaseObjects.clear(); - if (_oldOVQT) - delete _mainWindow; + delete _mainWindow; } bool CorePlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString) @@ -58,71 +57,26 @@ bool CorePlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QStr Q_UNUSED(errorString); _plugMan = pluginManager; - // for old ovqt - QMainWindow *wnd = qobject_cast(_plugMan->objectByName("CMainWindow")); - if (wnd) + _mainWindow = new MainWindow(pluginManager); +/* if (QtWin::isCompositionEnabled()) { - _pluginView = new ExtensionSystem::CPluginView(_plugMan); - QMenu *toolsMenu = qobject_cast(_plugMan->objectByName("ovqt.Menu.Tools")); - QMenu *helpMenu = qobject_cast(_plugMan->objectByName("ovqt.Menu.Help")); - nlassert(toolsMenu); - nlassert(helpMenu); - - QAction *newAction = toolsMenu->addAction(tr("New settings")); - QAction *newAction2 = helpMenu->addAction(tr("About plugins")); - newAction->setIcon(QIcon(Constants::ICON_SETTINGS)); - - connect(newAction, SIGNAL(triggered()), this, SLOT(execSettings())); - connect(newAction2, SIGNAL(triggered()), _pluginView, SLOT(show())); - _oldOVQT = false; - return true; - } - else - { - _mainWindow = new MainWindow(pluginManager); -#ifdef Q_WS_X11 - _mainWindow->setAttribute(Qt::WA_TranslucentBackground); - _mainWindow->setAttribute(Qt::WA_NoSystemBackground, false); - QPalette pal = _mainWindow->palette(); - QColor bg = pal.window().color(); - bg.setAlpha(180); - pal.setColor(QPalette::Window, bg); - _mainWindow->setPalette(pal); - _mainWindow->ensurePolished(); // workaround Oxygen filling the background - _mainWindow->setAttribute(Qt::WA_StyledBackground, false); -#endif - if (QtWin::isCompositionEnabled()) - { - QtWin::extendFrameIntoClientArea(_mainWindow); - _mainWindow->setContentsMargins(0, 0, 0, 0); - } - _oldOVQT = true; - bool success = _mainWindow->initialize(errorString); - CSearchPathsSettingsPage *serchPathPage = new CSearchPathsSettingsPage(this); - serchPathPage->applySearchPaths(); - addAutoReleasedObject(serchPathPage); - - return success; + QtWin::extendFrameIntoClientArea(_mainWindow); + _mainWindow->setContentsMargins(0, 0, 0, 0); } +*/ bool success = _mainWindow->initialize(errorString); + CSearchPathsSettingsPage *serchPathPage = new CSearchPathsSettingsPage(this); + serchPathPage->applySearchPaths(); + addAutoReleasedObject(serchPathPage); + return success; } void CorePlugin::extensionsInitialized() { - _pluginView = new ExtensionSystem::CPluginView(_plugMan); - if (_oldOVQT) - _mainWindow->extensionsInitialized(); + _mainWindow->extensionsInitialized(); } void CorePlugin::shutdown() { - delete _pluginView; -} - -void CorePlugin::execSettings() -{ - CSettingsDialog settingsDialog(_plugMan); - settingsDialog.show(); - settingsDialog.execDialog(); } void CorePlugin::setNelContext(NLMISC::INelContext *nelContext) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.h index 0df1bb238..45f95fd77 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.h @@ -69,15 +69,10 @@ public: protected: NLMISC::CLibraryContext *_LibContext; -private Q_SLOTS: - void execSettings(); - private: ExtensionSystem::IPluginManager *_plugMan; - ExtensionSystem::CPluginView *_pluginView; MainWindow *_mainWindow; QList _autoReleaseObjects; - bool _oldOVQT; }; } // namespace Core diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp index 087f5d3c5..694c2c30f 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp @@ -59,6 +59,7 @@ MainWindow::MainWindow(ExtensionSystem::IPluginManager *pluginManager, QWidget * m_tabWidget = new QTabWidget(this); m_tabWidget->setTabPosition(QTabWidget::South); + m_tabWidget->setMovable(true); setCentralWidget(m_tabWidget); setDockNestingEnabled(true); diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp index 75ff06692..776f982c7 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp @@ -44,21 +44,16 @@ bool MyPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QStrin void MyPlugin::extensionsInitialized() { Core::ICore *core = Core::ICore::instance(); - if (core == 0) - nlinfo("This not ovqt ng"); - else - { - Core::IMenuManager *menuManager = core->menuManager(); - //menuManager = _plugMan->getObject(); - QAction *exampleAction1 = new QAction("Example1", this); - QAction *exampleAction2 = new QAction("Example2", this); - QAction *aboutQtAction = menuManager->action(Core::Constants::ABOUT_QT); - QMenu *helpMenu = menuManager->menu(Core::Constants::M_HELP); - helpMenu->insertAction(aboutQtAction, exampleAction1); - helpMenu->addSeparator(); - helpMenu->addAction(exampleAction2); - menuManager->menuBar()->addMenu("ExampleMenu"); - } + Core::IMenuManager *menuManager = core->menuManager(); + //menuManager = _plugMan->getObject(); + QAction *exampleAction1 = new QAction("Example1", this); + QAction *exampleAction2 = new QAction("Example2", this); + QAction *aboutQtAction = menuManager->action(Core::Constants::ABOUT_QT); + QMenu *helpMenu = menuManager->menu(Core::Constants::M_HELP); + helpMenu->insertAction(aboutQtAction, exampleAction1); + helpMenu->addSeparator(); + helpMenu->addAction(exampleAction2); + menuManager->menuBar()->addMenu("ExampleMenu"); } void MyPlugin::setNelContext(NLMISC::INelContext *nelContext) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt new file mode 100644 index 000000000..841a0ff95 --- /dev/null +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt @@ -0,0 +1,154 @@ +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${QT_INCLUDES}) + +FILE(GLOB SRC *.cpp *.h) + +SET(OVQT_EXT_SYS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.h + ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h) + +SET(OBJECT_VIEWER_PLUGIN_HDR object_viewer_plugin.h + main_window.h + graphics_viewport.h + animation_dialog.h + animation_set_dialog.h + settings_dialog.h + setup_fog_dialog.h + slot_manager_dialog.h + particle_control_dialog.h + particle_workspace_dialog.h + particle_tree_model.h + particle_system_page.h + particle_workspace_page.h + edit_range_widget.h + emitter_page.h + attrib_widget.h + located_bindable_page.h + located_page.h + particle_force_page.h + particle_light_page.h + particle_zone_page.h + particle_sound_page.h + basic_edit_widget.h + direction_widget.h + color_edit_widget.h + particle_property_dialog.h + ps_mover_page.h + value_blender_dialog.h + value_gradient_dialog.h + value_from_emitter_dialog.h + curve_dialog.h + bin_op_dialog.h + hoverpoints.h + mesh_widget.h + morph_mesh_dialog.h + constraint_mesh_widget.h + tail_particle_widget.h + auto_lod_dialog.h + particle_texture_widget.h + particle_texture_anim_widget.h + multi_tex_dialog.h + spinner_dialog.h + follow_path_dialog.h + water_pool_dialog.h + skeleton_scale_dialog.h + skeleton_tree_model.h + particle_link_skeleton_dialog.h + vegetable_dialog.h + global_wind_dialog.h + day_night_dialog.h + sun_color_dialog.h + vegetable_noise_value_widget.h + vegetable_density_page.h + vegetable_landscape_page.h + vegetable_scale_page.h + vegetable_appearance_page.h + vegetable_rotate_page.h + tune_mrm_dialog.h + tune_timer_dialog.h + camera_control.h) + +SET(OBJECT_VIEWER_PLUGIN_UIS animation_form.ui + animation_set_form.ui + settings_form.ui + setup_fog_form.ui + slot_form.ui + particle_control_form.ui + particle_workspace_form.ui + edit_range_float_form.ui + edit_range_uint_form.ui + particle_system_form.ui + workspace_form.ui + attrib_form.ui + emitter_form.ui + located_bindable_form.ui + located_form.ui + particle_force_form.ui + particle_light_form.ui + particle_zone_form.ui + particle_sound_form.ui + basic_edit_form.ui + direction_form.ui + color_edit_form.ui + ps_mover_form.ui + curve_form.ui + mesh_form.ui + morph_mesh_form.ui + constraint_mesh_form.ui + tail_form.ui + auto_lod_form.ui + particle_texture_form.ui + particle_texture_anim_form.ui + multi_tex_form.ui + skeleton_scale_form.ui + particle_link_skeleton_form.ui + water_pool_form.ui + vegetable_dialog_form.ui + vegetable_noise_value_form.ui + global_wind_form.ui + sun_color_form.ui + day_night_form.ui + vegetable_density_form.ui + vegetable_apperance_form.ui + vegetable_landscape_form.ui + vegetable_rotate_form.ui + vegetable_scale_form.ui + tune_mrm_form.ui + tune_timer_form.ui) + +SET(OBJECT_VIEWER_PLUGIN_RCS object_viewer.qrc) + +SET(QT_USE_QTGUI TRUE) +SET(QT_USE_QTOPENGL TRUE) + +QT4_ADD_RESOURCES(OBJECT_VIEWER_PLUGIN_RC_SRCS ${OBJECT_VIEWER_PLUGIN_RCS}) +QT4_WRAP_CPP(OBJECT_VIEWER_PLUGIN_MOC_SRC ${OBJECT_VIEWER_PLUGIN_HDR}) +QT4_WRAP_UI(OBJECT_VIEWER_PLUGIN_UI_HDRS ${OBJECT_VIEWER_PLUGIN_UIS}) + +SOURCE_GROUP(QtResources FILES ${OBJECT_VIEWER_PLUGIN_UIS}) +SOURCE_GROUP(QtGeneratedUiHdr FILES ${OBJECT_VIEWER_PLUGIN_UI_HDRS}) +SOURCE_GROUP(QtGeneratedMocSrc FILES ${OBJECT_VIEWER_PLUGIN_MOC_SRC}) +SOURCE_GROUP("Object Viewer Plugin" FILES ${SRC}) +SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC}) + +ADD_LIBRARY(ovqt_plugin_object_viewer MODULE ${SRC} ${OBJECT_VIEWER_PLUGIN_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OBJECT_VIEWER_PLUGIN_UI_HDRS} ${OBJECT_VIEWER_PLUGIN_RC_SRCS}) + +TARGET_LINK_LIBRARIES(ovqt_plugin_object_viewer + ovqt_plugin_core + nelmisc + nel3d + nelsound + nelligo + nelgeorges + ${QT_LIBRARIES} + ${QT_QTOPENGL_LIBRARY}) + +NL_DEFAULT_PROPS(ovqt_plugin_object_viewer "NeL, Tools, 3D: Object Viewer Qt Plugin: Object Viewer") +NL_ADD_RUNTIME_FLAGS(ovqt_plugin_object_viewer) +NL_ADD_LIB_SUFFIX(ovqt_plugin_object_viewer) + +ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS}) + +INSTALL(TARGETS ovqt_plugin_object_viewer LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d) diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/animation_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/animation_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_form.ui similarity index 96% rename from code/nel/tools/3d/object_viewer_qt/src/animation_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_form.ui index 42a7bfbd8..90d496d17 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_form.ui @@ -192,7 +192,7 @@ - + :/images/animset.png:/images/animset.png @@ -236,7 +236,7 @@ - + :/images/mixer.png:/images/mixer.png @@ -274,7 +274,7 @@ - + :/images/skip-backward.png:/images/skip-backward.png @@ -306,7 +306,7 @@ - + :/images/seek-backward.png:/images/seek-backward.png @@ -344,7 +344,7 @@ - + :/images/play.png :/images/pause.png:/images/play.png @@ -383,7 +383,7 @@ - + :/images/stop.png:/images/stop.png @@ -418,7 +418,7 @@ - + :/images/seek-forward.png:/images/seek-forward.png @@ -450,7 +450,7 @@ - + :/images/skip-forward.png:/images/skip-forward.png @@ -482,7 +482,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_set_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_set_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_set_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_set_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_set_form.ui similarity index 97% rename from code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_set_form.ui index 9b9d78c40..eef9f0950 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/animation_set_form.ui @@ -23,7 +23,7 @@ - + :/images/animset.png:/images/animset.png @@ -308,7 +308,7 @@ - + :/images/clear.png:/images/clear.png @@ -354,7 +354,7 @@ - + :/images/list-add.png:/images/list-add.png @@ -380,7 +380,7 @@ - + :/images/list-remove.png:/images/list-remove.png @@ -403,7 +403,7 @@ - + :/images/go-up.png:/images/go-up.png @@ -426,7 +426,7 @@ - + :/images/go-down.png:/images/go-down.png @@ -470,7 +470,7 @@ - + :/images/time.png:/images/time.png @@ -490,7 +490,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/attrib_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/attrib_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/attrib_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/attrib_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/attrib_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/attrib_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/auto_lod_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/auto_lod_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/auto_lod_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/auto_lod_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/auto_lod_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/auto_lod_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/auto_lod_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/auto_lod_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/auto_lod_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/auto_lod_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/auto_lod_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/auto_lod_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/basic_edit_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/basic_edit_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/basic_edit_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/basic_edit_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/basic_edit_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/basic_edit_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/basic_edit_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/basic_edit_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/basic_edit_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/basic_edit_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/basic_edit_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/basic_edit_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/bin_op_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/bin_op_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/bin_op_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/bin_op_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/callback.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/callback.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/callback.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/callback.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/callback.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/callback.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/callback.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/callback.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/camera_control.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/camera_control.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/camera_control.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/camera_control.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/camera_control.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/camera_control.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/camera_control.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/camera_control.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/color_edit_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/color_edit_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/color_edit_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/color_edit_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/color_edit_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/color_edit_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/color_edit_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/color_edit_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/color_edit_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/color_edit_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/color_edit_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/color_edit_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/configuration.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/configuration.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/configuration.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/configuration.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/configuration.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/configuration.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/configuration.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/configuration.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/constraint_mesh_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/constraint_mesh_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/constraint_mesh_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/constraint_mesh_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/constraint_mesh_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/constraint_mesh_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/curve_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/curve_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/curve_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/curve_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/curve_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/curve_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/curve_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/curve_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/curve_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/curve_form.ui similarity index 98% rename from code/nel/tools/3d/object_viewer_qt/src/curve_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/curve_form.ui index 5825da66c..d811f2f4b 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/curve_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/curve_form.ui @@ -136,7 +136,7 @@ Right click to remove points. - + :/images/refresh.png:/images/refresh.png @@ -230,7 +230,7 @@ Right click to remove points. - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/day_night_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/day_night_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/day_night_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/day_night_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/day_night_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/day_night_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/day_night_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/day_night_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/day_night_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/day_night_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/day_night_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/day_night_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/direction_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/direction_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/direction_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/direction_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/direction_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/direction_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/direction_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/direction_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/direction_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/direction_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/direction_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/direction_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/dup_ps.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/dup_ps.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/dup_ps.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/dup_ps.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/dup_ps.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/dup_ps.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/dup_ps.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/dup_ps.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/edit_range_float_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_float_form.ui similarity index 94% rename from code/nel/tools/3d/object_viewer_qt/src/edit_range_float_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_float_form.ui index a6149649d..f739a116d 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/edit_range_float_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_float_form.ui @@ -108,7 +108,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/edit_range_uint_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_uint_form.ui similarity index 98% rename from code/nel/tools/3d/object_viewer_qt/src/edit_range_uint_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_uint_form.ui index 821a8f9be..72748d072 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/edit_range_uint_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_uint_form.ui @@ -75,7 +75,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/edit_range_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/edit_range_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/edit_range_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/edit_range_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/edit_range_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/emitter_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/emitter_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/emitter_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/emitter_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/emitter_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/emitter_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/emitter_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/emitter_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/emitter_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/emitter_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/entity.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/entity.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/entity.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/entity.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/entity.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/entity.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/entity.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/entity.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/follow_path_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/follow_path_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/follow_path_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/follow_path_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/follow_path_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/follow_path_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/follow_path_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/follow_path_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/global_wind_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/global_wind_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/global_wind_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/global_wind_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/global_wind_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/global_wind_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/global_wind_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/global_wind_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/global_wind_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/global_wind_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/global_wind_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/global_wind_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/graphics_viewport.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.cpp similarity index 99% rename from code/nel/tools/3d/object_viewer_qt/src/graphics_viewport.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.cpp index 04f956c11..2a15932b7 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/graphics_viewport.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.cpp @@ -49,7 +49,6 @@ namespace NLQT CGraphicsViewport::CGraphicsViewport(QWidget *parent) : QNLWidget(parent) { - this->setStatusTip("Status ready"); } CGraphicsViewport::~CGraphicsViewport() diff --git a/code/nel/tools/3d/object_viewer_qt/src/graphics_viewport.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/graphics_viewport.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/hoverpoints.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/hoverpoints.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/hoverpoints.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/hoverpoints.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/hoverpoints.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/hoverpoints.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/Emitter.bmp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/Emitter.bmp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/Emitter.bmp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/Emitter.bmp diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/Force.bmp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/Force.bmp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/Force.bmp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/Force.bmp diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/anim.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/anim.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/anim.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/anim.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/animset.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/animset.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/animset.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/animset.png 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/plugins/object_viewer/images/bad_particle_system_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/bad_particle_system_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/bad_particle_system_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/cam_add.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/cam_add.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/cam_add.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/cam_add.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/cam_del.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/cam_del.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/cam_del.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/cam_del.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/clear.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/clear.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/clear.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/clear.png 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/plugins/object_viewer/images/collision_zone_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/collision_zone_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/collision_zone_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/dqynight.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/dqynight.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/dqynight.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/dqynight.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/go-down.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/go-down.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/go-down.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/go-down.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/go-up.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/go-up.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/go-up.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/go-up.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/ico_bgcolor.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_bgcolor.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/ico_bgcolor.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_bgcolor.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/ico_framedelay.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_framedelay.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/ico_framedelay.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_framedelay.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/ico_light_group.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_light_group.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/ico_light_group.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_light_group.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/ico_mrm_mesh.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_mrm_mesh.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/ico_mrm_mesh.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_mrm_mesh.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/ico_skelscale.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_skelscale.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/ico_skelscale.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_skelscale.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/insert-horizontal.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/insert-horizontal.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/insert-horizontal.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/insert-horizontal.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/insert.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/insert.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/insert.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/insert.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/instance_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/instance_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/instance_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/instance_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/light_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/light_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/light_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/light_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/list-add.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/list-add.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/list-add.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/list-add.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/list-remove.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/list-remove.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/list-remove.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/list-remove.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/located_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/located_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/located_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/located_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/mixer.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/mixer.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/mixer.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/mixer.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/nel.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/nel.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/nel.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/nel.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/new.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/new.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/new.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/new.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/open-file.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/open-file.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/open-file.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/open-file.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/particle_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/particle_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/particle_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/particle_item.png 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/plugins/object_viewer/images/particle_system_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/particle_system_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/particle_system_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/pause.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/pause.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/pause.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/pause.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/play.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/play.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/play.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/play.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/polymode.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/polymode.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/polymode.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/polymode.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/pqrticles.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/pqrticles.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/pqrticles.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/pqrticles.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/preferences.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/preferences.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/preferences.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/preferences.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/refresh.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/refresh.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/refresh.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/refresh.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/rmfill.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmfill.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/rmfill.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmfill.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/rmline.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmline.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/rmline.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmline.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/rmpoints.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmpoints.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/rmpoints.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmpoints.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/save-as.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/save-as.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/save-as.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/save-as.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/save.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/save.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/save.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/save.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/seek-backward.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/seek-backward.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/seek-backward.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/seek-backward.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/seek-forward.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/seek-forward.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/seek-forward.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/seek-forward.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/skip-backward.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/skip-backward.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/skip-backward.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/skip-backward.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/skip-forward.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/skip-forward.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/skip-forward.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/skip-forward.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/sound.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/sound.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/sound.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/sound.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/sound_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/sound_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/sound_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/sound_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/stop.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/stop.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/stop.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/stop.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/time.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/time.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/time.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/time.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/veget.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/veget.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/veget.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/veget.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/water.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/water.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/water.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/water.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/wind.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/wind.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/wind.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/wind.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/workspace_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/workspace_item.png similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/images/workspace_item.png rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/workspace_item.png diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_bindable_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_bindable_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_bindable_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_bindable_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_bindable_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_bindable_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/located_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/located_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/located_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/located_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.cpp similarity index 79% rename from code/nel/tools/3d/object_viewer_qt/src/main_window.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.cpp index a157c7e78..8a1ae7764 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.cpp @@ -51,6 +51,10 @@ #include "tune_timer_dialog.h" #include "camera_control.h" +#include "../core/icore.h" +#include "../core/imenu_manager.h" +#include "../core/core_constants.h" + using namespace std; using namespace NLMISC; @@ -97,7 +101,6 @@ CMainWindow::CMainWindow(QWidget *parent) createActions(); createMenus(); createToolBars(); - createStatusBar(); setWindowIcon(QIcon(":/images/nel.png")); @@ -117,8 +120,8 @@ CMainWindow::CMainWindow(QWidget *parent) _statusBarTimer = new QTimer(this); connect(_statusBarTimer, SIGNAL(timeout()), this, SLOT(updateStatusBar())); - _statusInfo = new QLabel(this); - this->statusBar()->addPermanentWidget(_statusInfo); + //_statusInfo = new QLabel(this); + // statusBar()->addPermanentWidget(_statusInfo); } CMainWindow::~CMainWindow() @@ -154,28 +157,25 @@ CMainWindow::~CMainWindow() delete _GraphicsViewport; } -void CMainWindow::setVisible(bool visible) +void CMainWindow::showEvent(QShowEvent *showEvent) { - // called by show() - // code assuming visible window needed to init the 3d driver - if (visible != isVisible()) + QWidget::showEvent(showEvent); + if (isVisible()) { - if (visible) - { - QMainWindow::setVisible(true); - if (_isSoundInitialized) - Modules::sound().initGraphics(); - _mainTimer->start(); - _statusBarTimer->start(1000); - } - else - { - _mainTimer->stop(); - _statusBarTimer->stop(); - if (_isSoundInitialized) - Modules::sound().releaseGraphics(); - QMainWindow::setVisible(false); - } + QMainWindow::setVisible(true); + Modules::objView().getDriver()->activate(); + if (_isSoundInitialized) + Modules::sound().initGraphics(); + _mainTimer->start(); + //_statusBarTimer->start(1000); + } + else + { + _mainTimer->stop(); + //_statusBarTimer->stop(); + if (_isSoundInitialized) + Modules::sound().releaseGraphics(); + QMainWindow::setVisible(false); } } @@ -239,23 +239,16 @@ void CMainWindow::settings() _settingsDialog.exec(); } -void CMainWindow::about() -{ - QMessageBox::about(this, tr("About Object Viewer Qt"), - tr("

Object Viewer Qt 8-)

" - "

Authors: dnk-88, sfb, Kaetemi, kervala

Compiled on %1 %2").arg(__DATE__).arg(__TIME__)); -} - void CMainWindow::updateStatusBar() { - if (_isGraphicsInitialized) +/* if (_isGraphicsInitialized) { _statusInfo->setText(QString("%1, Nb tri: %2 , Texture used (Mb): %3 , fps: %4 ").arg( Modules::objView().getDriver()->getVideocardInformation()).arg( _numTri).arg( _texMem, 0,'f',4).arg( _fps, 0,'f',2)); - } + }*/ } void CMainWindow::createActions() @@ -266,25 +259,11 @@ void CMainWindow::createActions() _openAction->setStatusTip(tr("Open an existing file")); connect(_openAction, SIGNAL(triggered()), this, SLOT(open())); - _exitAction = new QAction(tr("E&xit"), this); - _exitAction->setShortcut(tr("Ctrl+Q")); - _exitAction->setStatusTip(tr("Exit the application")); - connect(_exitAction, SIGNAL(triggered()), this, SLOT(close())); - _setBackColorAction = _GraphicsViewport->createSetBackgroundColor(this); _setBackColorAction->setText(tr("Set &background color")); _setBackColorAction->setIcon(QIcon(":/images/ico_bgcolor.png")); _setBackColorAction->setStatusTip(tr("Set background color")); - _resetCameraAction = new QAction(tr("Reset camera"), this); - _resetCameraAction->setShortcut(tr("Ctrl+R")); - _resetCameraAction->setStatusTip(tr("Reset current camera")); - - _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)")); - _resetSceneAction = new QAction(tr("&Reset scene"), this); _resetSceneAction->setStatusTip(tr("Reset current scene")); connect(_resetSceneAction, SIGNAL(triggered()), this, SLOT(resetScene())); @@ -297,78 +276,77 @@ void CMainWindow::createActions() _saveScreenshotAction->setText(tr("Save &Screenshot")); _saveScreenshotAction->setStatusTip(tr("Make a screenshot of the current viewport and save")); - _settingsAction = new QAction(tr("&Settings"), this); + _settingsAction = new QAction(tr("&Settings OV"), this); _settingsAction->setIcon(QIcon(":/images/preferences.png")); _settingsAction->setStatusTip(tr("Settings")); connect(_settingsAction, SIGNAL(triggered()), this, SLOT(settings())); - - _aboutAction = new QAction(tr("&About"), this); - _aboutAction->setStatusTip(tr("Show the application's About box")); - connect(_aboutAction, SIGNAL(triggered()), this, SLOT(about())); - - _aboutQtAction = new QAction(tr("About &Qt"), this); - _aboutQtAction->setStatusTip(tr("Show the Qt library's About box")); - connect(_aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); } void CMainWindow::createMenus() { - _fileMenu = menuBar()->addMenu(tr("&File")); - _fileMenu->setObjectName("ovqt.Menu.File"); - _fileMenu->addAction(_openAction); - _fileMenu->addSeparator(); - _fileMenu->addAction(_exitAction); + Core::IMenuManager *menuManager = Core::ICore::instance()->menuManager(); + + // register actions for file menu + menuManager->registerAction(_openAction, "ObjectViewer.File.Open"); + + // add actions in file menu + QMenu *fileMenu = menuManager->menu(Core::Constants::M_FILE); + QAction *exitAction = menuManager->action(Core::Constants::EXIT); + fileMenu->insertAction(exitAction, _openAction); + fileMenu->insertSeparator(exitAction); - _viewMenu = menuBar()->addMenu(tr("&View")); - _viewMenu->setObjectName("ovqt.Menu.View"); - _viewMenu->addAction(_setBackColorAction); - _viewMenu->addAction(_resetCameraAction); - _viewMenu->addAction(_renderModeAction); - _viewMenu->addAction(_SetupFog->toggleViewAction()); + // register actions for view menu + menuManager->registerAction(_setBackColorAction, "ObjectViewer.View.SetBackgroundColor"); + menuManager->registerAction(_SetupFog->toggleViewAction(), "ObjectViewer.View.SetupFog"); + menuManager->registerAction(_resetSceneAction, "ObjectViewer.View.ResetScene"); + menuManager->registerAction(_reloadTexturesAction, "ObjectViewer.View.ReloadTextures"); + menuManager->registerAction(_saveScreenshotAction, "ObjectViewer.View.SaveScreenshot"); + + // add actions in view menu + QMenu *viewMenu = menuManager->menu(Core::Constants::M_VIEW); + viewMenu->addAction(_setBackColorAction); + viewMenu->addAction(_SetupFog->toggleViewAction()); + viewMenu->addAction(_resetSceneAction); + viewMenu->addAction(_reloadTexturesAction); + viewMenu->addAction(_saveScreenshotAction); - _sceneMenu = menuBar()->addMenu(tr("&Scene")); - _sceneMenu->setObjectName("ovqt.Menu.Scene"); - _sceneMenu->addAction(_resetSceneAction); - _sceneMenu->addAction(_reloadTexturesAction); - _sceneMenu->addAction(_saveScreenshotAction); - - _toolsMenu = menuBar()->addMenu(tr("&Tools")); - _toolsMenu->setObjectName("ovqt.Menu.Tools"); - - _toolsMenu->addAction(_AnimationDialog->toggleViewAction()); + // add actions in tools menu + QMenu *toolsMenu = menuManager->menu(Core::Constants::M_TOOLS); + QAction *settingsAction = menuManager->action(Core::Constants::SETTINGS); + toolsMenu->insertAction(settingsAction ,_AnimationDialog->toggleViewAction()); _AnimationDialog->toggleViewAction()->setIcon(QIcon(":/images/anim.png")); - _toolsMenu->addAction(_AnimationSetDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_AnimationSetDialog->toggleViewAction()); _AnimationSetDialog->toggleViewAction()->setIcon(QIcon(":/images/animset.png")); - _toolsMenu->addAction(_SlotManagerDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_SlotManagerDialog->toggleViewAction()); _SlotManagerDialog->toggleViewAction()->setIcon(QIcon(":/images/mixer.png")); - _toolsMenu->addAction(_ParticleControlDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_ParticleControlDialog->toggleViewAction()); _ParticleControlDialog->toggleViewAction()->setIcon(QIcon(":/images/pqrticles.png")); - _toolsMenu->addAction(_DayNightDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_DayNightDialog->toggleViewAction()); _DayNightDialog->toggleViewAction()->setIcon(QIcon(":/images/dqynight.png")); - _toolsMenu->addAction(_WaterPoolDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_WaterPoolDialog->toggleViewAction()); _WaterPoolDialog->toggleViewAction()->setIcon(QIcon(":/images/water.png")); _WaterPoolDialog->toggleViewAction()->setEnabled(false); - _toolsMenu->addAction(_VegetableDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_VegetableDialog->toggleViewAction()); _VegetableDialog->toggleViewAction()->setIcon(QIcon(":/images/veget.png")); - _toolsMenu->addAction(_GlobalWindDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_GlobalWindDialog->toggleViewAction()); _GlobalWindDialog->toggleViewAction()->setIcon(QIcon(":/images/wind.png")); - _toolsMenu->addAction(_SkeletonScaleDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_SkeletonScaleDialog->toggleViewAction()); _SkeletonScaleDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_skelscale.png")); - _toolsMenu->addAction(_TuneTimerDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_TuneTimerDialog->toggleViewAction()); _TuneTimerDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_framedelay.png")); - _toolsMenu->addAction(_SunColorDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_SunColorDialog->toggleViewAction()); - _toolsMenu->addAction(_TuneMRMDialog->toggleViewAction()); + toolsMenu->insertAction(settingsAction ,_TuneMRMDialog->toggleViewAction()); _TuneMRMDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_mrm_mesh.png")); connect(_ParticleControlDialog->toggleViewAction(), SIGNAL(triggered(bool)), @@ -377,22 +355,8 @@ void CMainWindow::createMenus() connect(_ParticleControlDialog->toggleViewAction(), SIGNAL(triggered(bool)), _ParticleWorkspaceDialog->_PropertyDialog, SLOT(setVisible(bool))); - _toolsMenu->addSeparator(); - - _toolsMenu->addAction(_settingsAction); - - menuBar()->addSeparator(); - - _helpMenu = menuBar()->addMenu(tr("&Help")); - _helpMenu->setObjectName("ovqt.Menu.Help"); - _helpMenu->addAction(_aboutAction); - _helpMenu->addAction(_aboutQtAction); - - Modules::plugMan().addObject(_fileMenu); - Modules::plugMan().addObject(_viewMenu); - Modules::plugMan().addObject(_sceneMenu); - Modules::plugMan().addObject(_toolsMenu); - Modules::plugMan().addObject(_helpMenu); + toolsMenu->insertAction(settingsAction ,_settingsAction); + toolsMenu->insertSeparator(settingsAction); } void CMainWindow::createToolBars() @@ -400,9 +364,13 @@ void CMainWindow::createToolBars() _fileToolBar = addToolBar(tr("&File")); _fileToolBar->addAction(_openAction); - //_editToolBar = addToolBar(tr("&Edit")); - //_editToolBar->addSeparator(); + //_viewToolBar = addToolBar(tr("&Edit")); + _toolsBar = addToolBar(tr("&Tools")); + + _toolsBar->addAction(_setBackColorAction); + _toolsBar->addSeparator(); + _toolsBar->addAction(_AnimationDialog->toggleViewAction()); _toolsBar->addAction(_AnimationSetDialog->toggleViewAction()); _toolsBar->addAction(_SlotManagerDialog->toggleViewAction()); @@ -417,14 +385,6 @@ void CMainWindow::createToolBars() _cameraControl = new CCameraControl(this); this->addToolBar(_cameraControl->getToolBar()); - - connect(_resetCameraAction, SIGNAL(triggered()), _cameraControl, SLOT(resetCamera())); - connect(_renderModeAction, SIGNAL(triggered()), _cameraControl, SLOT(setRenderMode())); -} - -void CMainWindow::createStatusBar() -{ - statusBar()->showMessage(tr("StatusReady")); } void CMainWindow::createDialogs() @@ -523,10 +483,10 @@ bool CMainWindow::loadFile(const QString &fileName, const QString &skelName) if (!loaded) { - statusBar()->showMessage(tr("Loading canceled"),2000); + //statusBar()->showMessage(tr("Loading canceled"),2000); return false; } - statusBar()->showMessage(tr("File loaded"),2000); + //statusBar()->showMessage(tr("File loaded"),2000); return true; } diff --git a/code/nel/tools/3d/object_viewer_qt/src/main_window.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.h similarity index 91% rename from code/nel/tools/3d/object_viewer_qt/src/main_window.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.h index 8864b1c6b..b07e764fa 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/main_window.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.h @@ -66,8 +66,6 @@ public: CMainWindow(QWidget *parent = 0); ~CMainWindow(); - virtual void setVisible(bool visible); - int getFrameRate(); CSkeletonTreeModel *getSkeletonModel() const { @@ -83,16 +81,17 @@ private Q_SLOTS: void resetScene(); void reloadTextures(); void settings(); - void about(); void updateStatusBar(); void updateRender(); void setInterval(int value); +protected: + virtual void showEvent(QShowEvent *showEvent); + private: void createActions(); void createMenus(); void createToolBars(); - void createStatusBar(); void createDialogs(); bool loadFile(const QString &fileName, const QString &skelName); @@ -129,28 +128,17 @@ private: QTimer *_mainTimer; QTimer *_statusBarTimer; - QMenu *_fileMenu; - QMenu *_viewMenu; - QMenu *_sceneMenu; - QMenu *_toolsMenu; - QMenu *_helpMenu; QToolBar *_fileToolBar; - QToolBar *_editToolBar; + QToolBar *_viewToolBar; QToolBar *_toolsBar; QAction *_openAction; - QAction *_exitAction; QAction *_setBackColorAction; - QAction *_renderModeAction; QAction *_frameDelayAction; QAction *_lightGroupAction; QAction *_reloadTexturesAction; - QAction *_resetCameraAction; QAction *_resetSceneAction; QAction *_saveScreenshotAction; QAction *_settingsAction; - QAction *_aboutAction; - QAction *_aboutQtAction; - QLabel *_statusInfo; float _fps; diff --git a/code/nel/tools/3d/object_viewer_qt/src/mesh_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/mesh_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/mesh_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/mesh_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/mesh_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/mesh_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/mesh_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/mesh_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/mesh_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/mesh_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/mesh_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/mesh_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/modules.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.cpp similarity index 90% rename from code/nel/tools/3d/object_viewer_qt/src/modules.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.cpp index f48a311d8..76504eb27 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/modules.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.cpp @@ -26,14 +26,12 @@ NLQT::CMainWindow *Modules::_mainWindow = NULL; NLQT::CParticleEditor *Modules::_particleEditor = NULL; NLQT::CSoundSystem *Modules::_soundSystem = NULL; NLQT::CVegetableEditor *Modules::_vegetableEditor = NULL; -ExtensionSystem::CPluginManager *Modules::_pluginManager = NULL; void Modules::init() { if (_configuration == NULL) _configuration = new NLQT::CConfiguration; config().init(); - if (_pluginManager == NULL) _pluginManager = new ExtensionSystem::CPluginManager; if (_objectViewer == NULL) _objectViewer = new NLQT::CObjectViewer; if (_soundSystem == NULL) _soundSystem = new NLQT::CSoundSystem; if (_particleEditor == NULL) _particleEditor = new NLQT::CParticleEditor; @@ -43,8 +41,6 @@ void Modules::init() void Modules::release() { - delete _pluginManager; - _pluginManager = NULL; delete _mainWindow; _mainWindow = NULL; delete _particleEditor; diff --git a/code/nel/tools/3d/object_viewer_qt/src/modules.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.h similarity index 90% rename from code/nel/tools/3d/object_viewer_qt/src/modules.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.h index 1e26e1f91..4b2394b77 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/modules.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.h @@ -26,7 +26,6 @@ #include "main_window.h" #include "sound_system.h" #include "vegetable_editor.h" -#include "extension_system/plugin_manager.h" /** @class Modules @@ -62,10 +61,6 @@ public: { return *_vegetableEditor; } - static ExtensionSystem::CPluginManager &plugMan() - { - return *_pluginManager; - } private: static NLQT::CConfiguration *_configuration; @@ -74,7 +69,6 @@ private: static NLQT::CParticleEditor *_particleEditor; static NLQT::CSoundSystem *_soundSystem; static NLQT::CVegetableEditor *_vegetableEditor; - static ExtensionSystem::CPluginManager *_pluginManager; }; #endif // MODULES_H diff --git a/code/nel/tools/3d/object_viewer_qt/src/morph_mesh_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/morph_mesh_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/morph_mesh_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/morph_mesh_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/morph_mesh_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/morph_mesh_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/morph_mesh_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/morph_mesh_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/morph_mesh_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/morph_mesh_form.ui similarity index 95% rename from code/nel/tools/3d/object_viewer_qt/src/morph_mesh_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/morph_mesh_form.ui index aa6992d93..9f2bd474a 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/morph_mesh_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/morph_mesh_form.ui @@ -53,7 +53,7 @@ Add - + :/images/list-add.png:/images/list-add.png @@ -64,7 +64,7 @@ Change - + :/images/refresh.png:/images/refresh.png @@ -82,7 +82,7 @@ Remove - + :/images/list-remove.png:/images/list-remove.png @@ -93,7 +93,7 @@ Up - + :/images/go-up.png:/images/go-up.png @@ -104,7 +104,7 @@ Down - + :/images/go-down.png:/images/go-down.png @@ -217,7 +217,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/multi_tex_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/multi_tex_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/multi_tex_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/multi_tex_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/multi_tex_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/multi_tex_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/multi_tex_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/multi_tex_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/multi_tex_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/multi_tex_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/multi_tex_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/multi_tex_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/object_viewer.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/object_viewer.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/object_viewer.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/object_viewer.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.qrc b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.qrc new file mode 100644 index 000000000..3f09bdc1b --- /dev/null +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.qrc @@ -0,0 +1,57 @@ + + + images/nel.png + images/open-file.png + images/go-down.png + images/go-up.png + images/list-add.png + images/list-remove.png + images/play.png + images/pause.png + images/stop.png + images/seek-backward.png + images/seek-forward.png + images/skip-backward.png + images/skip-forward.png + images/preferences.png + images/time.png + images/anim.png + images/animset.png + images/dqynight.png + images/mixer.png + images/pqrticles.png + images/sound.png + images/veget.png + images/water.png + images/wind.png + images/ico_bgcolor.png + images/ico_framedelay.png + images/ico_skelscale.png + images/ico_mrm_mesh.png + images/ico_light_group.png + images/clear.png + images/insert.png + images/new.png + images/refresh.png + images/save-as.png + images/save.png + images/insert-horizontal.png + images/polymode.png + images/rmfill.png + images/rmline.png + images/rmpoints.png + images/cam_del.png + images/cam_add.png + images/Emitter.bmp + images/Force.bmp + 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/plugins/object_viewer/object_viewer_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.cpp new file mode 100644 index 000000000..20f60c1a6 --- /dev/null +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.cpp @@ -0,0 +1,86 @@ +// Project includes +#include "object_viewer_plugin.h" +#include "modules.h" +#include "../core/core_constants.h" + +// NeL includes +#include "nel/misc/debug.h" + +// Qt includes +#include + +namespace NLQT +{ +ObjectViewerPlugin::~ObjectViewerPlugin() +{ + Q_FOREACH(QObject *obj, _autoReleaseObjects) + { + _plugMan->removeObject(obj); + } + qDeleteAll(_autoReleaseObjects); + _autoReleaseObjects.clear(); + Modules::release(); +} + +bool ObjectViewerPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString) +{ + Q_UNUSED(errorString); + _plugMan = pluginManager; + Modules::init(); + addAutoReleasedObject(new CObjectViewerContext()); + return true; +} + +void ObjectViewerPlugin::extensionsInitialized() +{ +} + +void ObjectViewerPlugin::setNelContext(NLMISC::INelContext *nelContext) +{ +#ifdef NL_OS_WINDOWS + // Ensure that a context doesn't exist yet. + // This only applies to platforms without PIC, e.g. Windows. + nlassert(!NLMISC::INelContext::isContextInitialised()); +#endif // NL_OS_WINDOWS + _LibContext = new NLMISC::CLibraryContext(*nelContext); +} + +QString ObjectViewerPlugin::name() const +{ + return "ObjectViewer"; +} + +QString ObjectViewerPlugin::version() const +{ + return "0.8"; +} + +QString ObjectViewerPlugin::vendor() const +{ + return Core::Constants::OVQT_VENDOR; +} + +QString ObjectViewerPlugin::description() const +{ + return "Object Viewer plugin."; +} + +QList ObjectViewerPlugin::dependencies() const +{ + return QList(); +} + +void ObjectViewerPlugin::addAutoReleasedObject(QObject *obj) +{ + _plugMan->addObject(obj); + _autoReleaseObjects.prepend(obj); +} + +QWidget *CObjectViewerContext::widget() +{ + return &Modules::mainWin(); +} + +} + +Q_EXPORT_PLUGIN(NLQT::ObjectViewerPlugin) \ No newline at end of file diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.h new file mode 100644 index 000000000..6ecb7668d --- /dev/null +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.h @@ -0,0 +1,81 @@ +#ifndef OBJECT_VIEWER_PLUGIN_H +#define OBJECT_VIEWER_PLUGIN_H + +// Project includes +#include "../../extension_system/iplugin.h" +#include "../core/icontext.h" + +// NeL includes +#include "nel/misc/app_context.h" + +// Qt includes +#include +#include + +namespace NLMISC +{ +class CLibraryContext; +} + +namespace ExtensionSystem +{ +class IPluginSpec; +} + +namespace NLQT +{ + +class ObjectViewerPlugin : public QObject, public ExtensionSystem::IPlugin +{ + Q_OBJECT + Q_INTERFACES(ExtensionSystem::IPlugin) +public: + + virtual ~ObjectViewerPlugin(); + + bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString); + void extensionsInitialized(); + + void setNelContext(NLMISC::INelContext *nelContext); + + QString name() const; + QString version() const; + QString vendor() const; + QString description() const; + QList dependencies() const; + + void addAutoReleasedObject(QObject *obj); + +protected: + NLMISC::CLibraryContext *_LibContext; + +private: + ExtensionSystem::IPluginManager *_plugMan; + QList _autoReleaseObjects; +}; + +class CObjectViewerContext: public Core::IContext +{ + Q_OBJECT +public: + CObjectViewerContext(QObject *parent = 0): IContext(parent) {} + virtual ~CObjectViewerContext() {} + + virtual QString id() const + { + return QLatin1String("ObjectViewer"); + } + virtual QString trName() const + { + return tr("Object Viewer"); + } + virtual QIcon icon() const + { + return QIcon(); + } + virtual QWidget *widget(); +}; + +} // namespace NLQT + +#endif // OBJECT_VIEWER_PLUGIN_H diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_control_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_control_dialog.cpp similarity index 95% rename from code/nel/tools/3d/object_viewer_qt/src/particle_control_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_control_dialog.cpp index 431fd2818..a6abdc5e3 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_control_dialog.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_control_dialog.cpp @@ -160,16 +160,16 @@ void CParticleControlDialog::updateCount() sint currNumParticles = (sint) ps->getCurrNumParticles(); // display number of particles for the currently active node - _ui.numParticlesLabel->setText(tr("Num particles: %1").arg(currNumParticles)); - + _ui.numParticlesSpinBox->setValue(currNumParticles); + // display max number of wanted faces NLMISC::CMatrix camMat = ps->getScene()->getCam()->getMatrix(); sint numWantedFaces = (uint) ps->getWantedNumTris((ps->getSysMat().getPos() - camMat.getPos()).norm()); - _ui.numWantedFacesLabel->setText(tr("Num wanted faces: %1").arg(numWantedFaces)); - + _ui.numWantedFacesSpinBox->setValue(numWantedFaces); + // display system date - _ui.systemTimesLabel->setText(tr("System time: %1").arg(ps->getSystemDate(),0,'f',2)); - + _ui.timeDoubleSpinBox->setValue(ps->getSystemDate()); + Q_EMIT changeCount(); } diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_control_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_control_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_control_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_control_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_control_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_control_form.ui similarity index 82% rename from code/nel/tools/3d/object_viewer_qt/src/particle_control_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_control_form.ui index 11c19572d..e672d4ceb 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_control_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_control_form.ui @@ -6,8 +6,8 @@ 0 0 - 1053 - 85 + 914 + 92 @@ -18,14 +18,14 @@ - 896 - 85 + 0 + 0 - 524287 - 85 + 16777215 + 120 @@ -72,7 +72,7 @@ - + :/images/play.png :/images/pause.png:/images/play.png @@ -92,11 +92,17 @@ - - + + 0 - + + 6 + + + 0 + + 3 @@ -344,22 +350,6 @@ - - - - - 0 - 0 - - - - System time:99999999999 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -369,11 +359,30 @@ - Num particles:9999999 + Num particles: + + + + 0 + 0 + + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + @@ -382,14 +391,68 @@ - Num wanted faces:9999999 + Num wanted faces: Qt::AlignCenter - + + + + + 0 + 0 + + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + + + + + 0 + 0 + + + + System time: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + true + + + QAbstractSpinBox::NoButtons + + + 9999999.990000000223517 + + + + @@ -433,7 +496,7 @@ - + Qt::Horizontal @@ -446,7 +509,7 @@ - + 100 @@ -477,7 +540,7 @@ - + :/images/stop.png:/images/stop.png @@ -495,7 +558,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_editor.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_editor.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_editor.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_editor.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_editor.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_editor.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_editor.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_editor.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_force_form.ui similarity index 90% rename from code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_force_form.ui index 2e99b6b87..dddea02c1 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_force_form.ui @@ -73,32 +73,6 @@ - - - - - 30 - 16777215 - - - - < - - - - - - - - 30 - 16777215 - - - - > - - - @@ -152,6 +126,38 @@ + + + + + 30 + 16777215 + + + + + + + Qt::LeftArrow + + + + + + + + 30 + 16777215 + + + + + + + Qt::RightArrow + + + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_force_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_force_page.cpp similarity index 97% rename from code/nel/tools/3d/object_viewer_qt/src/particle_force_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_force_page.cpp index eca32998e..e7e19abc9 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_force_page.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_force_page.cpp @@ -45,8 +45,8 @@ CForcePage::CForcePage(QWidget *parent) _ui.radialViscosityWidget->setRange(0.0, 1.0); _ui.tangentialViscosityWidget->setRange(0, 1); - connect(_ui.toTargetsPushButton, SIGNAL(clicked()), this, SLOT(addTarget())); - connect(_ui.toAvaibleTargetsPushButton, SIGNAL(clicked()), this, SLOT(removeTarget())); + connect(_ui.toTargetsButton, SIGNAL(clicked()), this, SLOT(addTarget())); + connect(_ui.toAvaibleTargetsButton, SIGNAL(clicked()), this, SLOT(removeTarget())); connect(_ui.parametricFactorWidget, SIGNAL(valueChanged(float)), this, SLOT(setFactorBrownianForce(float))); connect(_ui.radialViscosityWidget, SIGNAL(valueChanged(float)), this, SLOT(setRadialViscosity(float))); diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_force_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_force_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_force_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_force_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_light_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_light_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_light_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_light_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_light_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_light_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_light_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_light_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_light_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_light_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_link_skeleton_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_link_skeleton_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_link_skeleton_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_link_skeleton_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_link_skeleton_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_link_skeleton_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_link_skeleton_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_link_skeleton_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_link_skeleton_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_link_skeleton_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_link_skeleton_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_link_skeleton_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_node.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_node.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_node.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_node.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_node.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_node.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_property_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_property_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_property_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_property_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_sound_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_sound_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_sound_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_sound_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_sound_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_sound_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_sound_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_system_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_system_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_system_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_system_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_system_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_system_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_anim_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_anim_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_anim_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_anim_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_anim_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_anim_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_form.ui similarity index 95% rename from code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_form.ui index 4e5139533..6418bbc6a 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_form.ui @@ -26,7 +26,7 @@ 3 - + 100 @@ -39,8 +39,11 @@ 100 - - + + QFrame::StyledPanel + + + QFrame::Sunken diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_texture_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_tree_model.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_tree_model.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_tree_model.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_tree_model.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_workspace_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_workspace_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_workspace_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_workspace_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_zone_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_zone_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_zone_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_zone_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_zone_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_zone_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/particle_zone_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_zone_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/ps_initial_pos.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_initial_pos.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/ps_initial_pos.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_initial_pos.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/ps_initial_pos.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_initial_pos.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/ps_initial_pos.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_initial_pos.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/ps_mover_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_mover_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/ps_mover_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_mover_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/ps_mover_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_mover_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/ps_mover_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_mover_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/ps_mover_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_mover_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/ps_mover_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_mover_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/ps_wrapper.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_wrapper.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/ps_wrapper.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ps_wrapper.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_dialog.cpp similarity index 80% rename from code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_dialog.cpp index c41d59a68..1d712eac5 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_dialog.cpp @@ -46,8 +46,7 @@ CSettingsDialog::CSettingsDialog(QWidget *parent) loadGraphicsSettings(); loadSoundSettings(); - loadPathsSettings(); - loadVegetableSettings(); +loadVegetableSettings(); connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(applyPressed())); @@ -55,11 +54,6 @@ CSettingsDialog::CSettingsDialog(QWidget *parent) connect(ui.squareBloomCheckBox, SIGNAL(toggled(bool)), this, SLOT(setEnableSquareBloon(bool))); connect(ui.bloomDensityHorizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(setDensityBloom(int))); - connect(ui.addToolButton, SIGNAL(clicked()), this, SLOT(addPath())); - connect(ui.removeToolButton, SIGNAL(clicked()), this, SLOT(removePath())); - connect(ui.upToolButton, SIGNAL(clicked()), this, SLOT(upPath())); - connect(ui.downToolButton, SIGNAL(clicked()), this, SLOT(downPath())); - connect(ui.tileBankToolButton, SIGNAL(clicked()), this, SLOT(setTileBank())); connect(ui.tileFarBankToolButton, SIGNAL(clicked()), this, SLOT(setTileFarBank())); connect(ui.vegetTexToolButton, SIGNAL(clicked()), this, SLOT(setTextureVegetable())); @@ -76,47 +70,6 @@ CSettingsDialog::~CSettingsDialog() { Modules::config().dropCallback("GraphicsDrivers"); Modules::config().dropCallback("SoundDrivers"); - Modules::config().dropCallback("SearchPaths"); -} - -void CSettingsDialog::addPath() -{ - QString newPath = QFileDialog::getExistingDirectory(this); - if (!newPath.isEmpty()) - { - QListWidgetItem *newItem = new QListWidgetItem; - newItem->setText(newPath); - newItem->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); - ui.pathsListWidget->addItem(newItem); - } -} - -void CSettingsDialog::removePath() -{ - QListWidgetItem *removeItem = ui.pathsListWidget->takeItem(ui.pathsListWidget->currentRow()); - if (!removeItem) delete removeItem; -} - -void CSettingsDialog::upPath() -{ - sint currentRow = ui.pathsListWidget->currentRow(); - if (!(currentRow == 0)) - { - QListWidgetItem *item = ui.pathsListWidget->takeItem(currentRow); - ui.pathsListWidget->insertItem(--currentRow, item); - ui.pathsListWidget->setCurrentRow(currentRow); - } -} - -void CSettingsDialog::downPath() -{ - sint currentRow = ui.pathsListWidget->currentRow(); - if (!(currentRow == ui.pathsListWidget->count()-1)) - { - QListWidgetItem *item = ui.pathsListWidget->takeItem(currentRow); - ui.pathsListWidget->insertItem(++currentRow, item); - ui.pathsListWidget->setCurrentRow(currentRow); - } } void CSettingsDialog::applyPressed() @@ -130,14 +83,10 @@ void CSettingsDialog::applyPressed() saveGraphicsSettings(); saveSoundSettings(); - savePathsSettings(); saveVegetableSettings(); // save config file Modules::config().getConfigFile().save(); - - // reload search paths - Modules::config().configSearchPaths(); } void CSettingsDialog::setTileBank() @@ -259,20 +208,6 @@ void CSettingsDialog::cfcbSoundDrivers(NLMISC::CConfigFile::CVar& var) } } -void CSettingsDialog::cfcbSearchPaths(NLMISC::CConfigFile::CVar &var) -{ - /// TODO: create custom widget add/insert/del/up/down paths (also this is use landscape zones) - - ui.pathsListWidget->clear(); - - // load search paths from the config file - for (uint i = 0; i < var.size(); ++i) - { - ui.pathsListWidget->addItem(var.asString(i).c_str()); - ui.pathsListWidget->item(i)->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); - } -} - void CSettingsDialog::loadGraphicsSettings() { // setup config file callbacks and initialize values @@ -304,12 +239,6 @@ void CSettingsDialog::loadSoundSettings() ui.maxTrackSpinBox->setValue(Modules::config().getValue("SoundMaxTrack", 48)); } -void CSettingsDialog::loadPathsSettings() -{ - // setup config file callbacks and initialize values - Modules::config().setAndCallback("SearchPaths", CConfigCallback(this, &CSettingsDialog::cfcbSearchPaths)); -} - void CSettingsDialog::loadVegetableSettings() { ui.tileBankLineEdit->setText(Modules::config().getConfigFile().getVar("VegetTileBank").asString().c_str()); @@ -360,18 +289,6 @@ void CSettingsDialog::saveSoundSettings() Modules::config().getConfigFile().getVar("SoundMaxTrack").setAsInt(ui.maxTrackSpinBox->value()); } -void CSettingsDialog::savePathsSettings() -{ - std::vector list; - for (sint i = 0; i < ui.pathsListWidget->count(); ++i) - { - std::string str = ui.pathsListWidget->item(i)->text().toStdString(); - list.push_back(str); - } - Modules::config().getConfigFile().getVar("SearchPaths").Type = NLMISC::CConfigFile::CVar::T_STRING; - Modules::config().getConfigFile().getVar("SearchPaths").setAsString(list); -} - void CSettingsDialog::saveVegetableSettings() { Modules::config().getConfigFile().getVar("VegetTileBank").setAsString(ui.tileBankLineEdit->text().toStdString()); diff --git a/code/nel/tools/3d/object_viewer_qt/src/settings_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_dialog.h similarity index 91% rename from code/nel/tools/3d/object_viewer_qt/src/settings_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_dialog.h index d8c306150..b84236f53 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/settings_dialog.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_dialog.h @@ -46,10 +46,6 @@ public: ~CSettingsDialog(); private Q_SLOTS: - void addPath(); - void removePath(); - void upPath(); - void downPath(); void applyPressed(); void setTileBank(); @@ -65,15 +61,12 @@ private Q_SLOTS: private: void cfcbGraphicsDrivers(NLMISC::CConfigFile::CVar &var); void cfcbSoundDrivers(NLMISC::CConfigFile::CVar &var); - void cfcbSearchPaths(NLMISC::CConfigFile::CVar &var); void loadGraphicsSettings(); void loadSoundSettings(); - void loadPathsSettings(); void loadVegetableSettings(); void saveGraphicsSettings(); void saveSoundSettings(); - void savePathsSettings(); void saveVegetableSettings(); Ui::CSettingsDialog ui; diff --git a/code/nel/tools/3d/object_viewer_qt/src/settings_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_form.ui similarity index 83% rename from code/nel/tools/3d/object_viewer_qt/src/settings_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_form.ui index 5f18a43fb..f871c28d5 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/settings_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/settings_form.ui @@ -17,7 +17,7 @@ Settings - + :/images/preferences.png:/images/preferences.png @@ -48,11 +48,6 @@ Sound - - - Paths - - Vegetable @@ -75,7 +70,7 @@ QFrame::Plain - 3 + 0 @@ -373,95 +368,6 @@ - - - - - - Search paths - - - - - - - - - - - - 0 - 0 - - - - ... - - - - :/images/list-add.png:/images/list-add.png - - - - 16 - 16 - - - - - - - - ... - - - - :/images/list-remove.png:/images/list-remove.png - - - - - - - ... - - - - :/images/go-up.png:/images/go-up.png - - - - - - - ... - - - - :/images/go-down.png:/images/go-down.png - - - - - - - - - Qt::Vertical - - - - 20 - 195 - - - - - - - - - @@ -582,7 +488,7 @@ ... - + :/images/list-add.png:/images/list-add.png @@ -599,7 +505,7 @@ ... - + :/images/list-remove.png:/images/list-remove.png @@ -653,15 +559,10 @@ forceSoftwareCheckBox useADPCMCheckBox maxTrackSpinBox - pathsListWidget - addToolButton - removeToolButton - upToolButton - downToolButton buttonBox - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/setup_fog_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/setup_fog_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/setup_fog_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/setup_fog_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/setup_fog_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/setup_fog_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/setup_fog_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/setup_fog_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/setup_fog_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/setup_fog_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/setup_fog_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/setup_fog_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_scale_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_scale_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_scale_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_scale_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_scale_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_scale_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/skeleton_tree_model.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_tree_model.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/skeleton_tree_model.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_tree_model.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/skeleton_tree_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_tree_model.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/skeleton_tree_model.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/skeleton_tree_model.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/slot_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/slot_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/slot_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/slot_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/slot_manager_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/slot_manager_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/slot_manager_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/slot_manager_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/slot_manager_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/slot_manager_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/slot_manager_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/slot_manager_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/sound_system.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_system.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/sound_system.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_system.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/sound_system.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_system.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/sound_system.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_system.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/spinner_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/spinner_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/spinner_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/spinner_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/spinner_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/spinner_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/spinner_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/spinner_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/stdpch.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/stdpch.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/stdpch.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/stdpch.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/stdpch.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/stdpch.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/stdpch.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/stdpch.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/sun_color_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sun_color_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/sun_color_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sun_color_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/sun_color_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sun_color_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/sun_color_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sun_color_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/sun_color_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sun_color_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/sun_color_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sun_color_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/tail_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tail_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tail_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tail_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/tail_particle_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tail_particle_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tail_particle_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tail_particle_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/tail_particle_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tail_particle_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tail_particle_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tail_particle_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_mrm_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_mrm_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_mrm_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_mrm_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_mrm_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tune_mrm_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_mrm_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_timer_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_timer_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tune_timer_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_timer_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_timer_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_timer_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tune_timer_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_timer_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_timer_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_timer_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/tune_timer_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/tune_timer_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/value_blender_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_blender_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/value_blender_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_blender_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/value_blender_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_blender_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/value_blender_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_blender_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/value_from_emitter_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_from_emitter_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/value_from_emitter_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_from_emitter_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/value_from_emitter_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_from_emitter_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/value_from_emitter_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_from_emitter_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/value_gradient_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_gradient_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/value_gradient_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_gradient_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/value_gradient_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_gradient_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/value_gradient_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/value_gradient_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_appearance_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_appearance_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_appearance_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_appearance_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_appearance_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_appearance_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_appearance_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_appearance_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_apperance_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_apperance_form.ui similarity index 96% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_apperance_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_apperance_form.ui index 64c2baaa3..d379d629f 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/vegetable_apperance_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_apperance_form.ui @@ -129,7 +129,7 @@ - + :/images/list-remove.png:/images/list-remove.png @@ -147,7 +147,7 @@ - + :/images/insert-horizontal.png:/images/insert-horizontal.png @@ -158,7 +158,7 @@ - + :/images/list-add.png:/images/list-add.png @@ -177,7 +177,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_density_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_density_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_density_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_density_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_density_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_density_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_density_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_density_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_density_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_density_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_density_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_density_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_dialog_form.ui similarity index 96% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_dialog_form.ui index 95f04940e..fb023c416 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_dialog_form.ui @@ -11,7 +11,7 @@ - + :/images/veget.png:/images/veget.png @@ -101,7 +101,7 @@ - + :/images/list-add.png:/images/list-add.png @@ -115,7 +115,7 @@ - + :/images/insert-horizontal.png:/images/insert-horizontal.png @@ -129,7 +129,7 @@ - + :/images/list-remove.png:/images/list-remove.png @@ -143,7 +143,7 @@ - + :/images/clear.png:/images/clear.png @@ -301,7 +301,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_editor.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_editor.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_editor.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_editor.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_editor.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_editor.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_editor.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_editor.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_landscape_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_landscape_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_landscape_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_landscape_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_landscape_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_landscape_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_node.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_node.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_node.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_node.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_node.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_node.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_node.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_node.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_noise_value_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_noise_value_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_noise_value_widget.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_widget.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_noise_value_widget.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_noise_value_widget.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_widget.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_noise_value_widget.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_rotate_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_rotate_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_rotate_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_rotate_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_rotate_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_rotate_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_rotate_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_rotate_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_rotate_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_rotate_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_rotate_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_rotate_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_scale_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_scale_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_scale_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_scale_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_scale_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_scale_page.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_scale_page.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_scale_page.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_scale_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_scale_page.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/vegetable_scale_page.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_scale_page.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/water_pool_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/water_pool_dialog.cpp similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/water_pool_dialog.cpp rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/water_pool_dialog.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/water_pool_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/water_pool_dialog.h similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/water_pool_dialog.h rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/water_pool_dialog.h diff --git a/code/nel/tools/3d/object_viewer_qt/src/water_pool_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/water_pool_form.ui similarity index 100% rename from code/nel/tools/3d/object_viewer_qt/src/water_pool_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/water_pool_form.ui diff --git a/code/nel/tools/3d/object_viewer_qt/src/workspace_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/workspace_form.ui similarity index 93% rename from code/nel/tools/3d/object_viewer_qt/src/workspace_form.ui rename to code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/workspace_form.ui index 64292fce6..0670eaf9d 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/workspace_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/workspace_form.ui @@ -72,7 +72,7 @@ New - + :/images/new.png:/images/new.png @@ -113,7 +113,7 @@ Load - + :/images/open-file.png:/images/open-file.png @@ -157,7 +157,7 @@ Save - + :/images/save.png:/images/save.png @@ -204,7 +204,7 @@ Save As - + :/images/save-as.png:/images/save-as.png @@ -270,7 +270,7 @@ Insert New - + :/images/pqrticles.png:/images/pqrticles.png @@ -314,7 +314,7 @@ Create New - + :/images/insert.png:/images/insert.png @@ -358,7 +358,7 @@ Reset all - + :/images/clear.png:/images/clear.png @@ -420,7 +420,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts index 91812430e..228b54c8d 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts @@ -4,18 +4,17 @@ Application - + Failed to load Core plugin: %1 - - + Object Viewer Qt - Plugin loader messages - + Could not find ovqt_plugin_core in %1 @@ -23,42 +22,42 @@ CAnimationDialog - + Animation control - + Loop - + In place - + Increment pos - + Use the PlayList - + Use the Mixer - + Play/Pause - + Stop @@ -66,57 +65,57 @@ CAnimationSetDialog - + Animation set manager - + Edited object: - + Animations: - + Add anim - + Skeleton weight template: - + Add swt - + Animations playlist: - + Unload all anim and swt files - + Add anim in PlayList - + Delete anim from PlayList - + Set duration of time in Animation control @@ -124,102 +123,102 @@ CAttribWidget - + GroupBox - + Constant - + Scheme - + Input mutliplier: - + Clamp - + E - + Src: - + Date - + Position - + Inverse Mass - + Speed - + Random - + User param - + LOD - + Square LOD - + Clamped LOD - + Camped square LOD - + U - + P - + G @@ -227,27 +226,27 @@ CAutoLODDialog - + Auto LOD - + Start percent DIST: - + Max dist BIAS: - + Degradation exponent: - + Skip particles @@ -255,22 +254,22 @@ CBasicEditWidget - + Form - + Psi - + Theta - + Phi @@ -278,12 +277,12 @@ CColorEditWidget - + Form - + Browse Durchsuchen @@ -291,123 +290,123 @@ CConstraintMeshWidget - + Form - + Force stage modulation - + Stage 0 - + Stage 1 - + Stage 2 - + Stage 3 - + Force vertex color lighting - + Texture anim type: - + None - + Global - + Reinit when new element is created - + Stage: - + Translation - - + + V Start: - - + + U Speed: - - + + V Speed: - - + + U Accel: - - + + V Accel: - - + + U Start: - + Scale Größe - + Rotation Drehung - + Speed: - + Accel: @@ -415,17 +414,17 @@ CDayNightDialog - + Day/Night Tag/Nacht - + Day Tag - + Night Nacht @@ -433,47 +432,47 @@ CDirectionWidget - + Form - + Direction: Richtung: - + +I - + +J - + +K - + -I - + -J - + -K - + Global @@ -481,7 +480,7 @@ CEditRangeFloatWidget - + Form @@ -489,7 +488,7 @@ CEditRangeUIntWidget - + Form @@ -497,128 +496,128 @@ CEmitterPage - + Form - + General Allgemein - + Emitted type: - + Type of emission: - + Regular - + On death - + Once - + On bounce - + External only - + Direction: Richtung: - + Default - + Direction is aligned on the emitter direction - + Direction is in world - + Direction is local to the system - + User - + Force consistent emission - + Bypass Auto-LOD - + Speed inheritance factor: - + Delayed emission: - + Max Emission Count: - + Radius: - - + + Emission period - + Emission quantity/Speed - + Emission quantity - + Strenght modulation @@ -656,47 +655,37 @@ CForcePage - + Form - + Targets: Ziele: - + Avaible targets: Verfügbare Ziele: - - < - - - - - > - - - - + Parametric factor: - + Radial viscosity: - + Tangential viscosity: - + Force intensity @@ -704,12 +693,12 @@ CGlobalWindDialog - + Weather - + Power: Kraft: @@ -717,27 +706,27 @@ CLightPage - + Form - + Light color - + Attenuation start/end - + Attenuation start - + Attenuation end @@ -745,219 +734,219 @@ CLocatedBindablePage - + Form - + Blending mode: - + Add - + Modulate - + Alpha blend - + Alpha test - + No AutoLOD - + Global color lighting - + Z-Test - + ZBias: - + Color - + Independent size - + Height - + Width - + Size - + Angle 2D - + Rotation Drehung - + hint / precomputed rotations - + Rot speed min: - + Rot speed max: - + Nb models: - + Align on motion - + Z-Align - + Fake motion blur coeff.: - + Fake motion blur treshold: - + Radius cut: - - + + Number of segments: - + Phase smoothness: - + Duration segment: - - + + Texture U factor: - + Number fan light: - + Fan light speed: - + Fan light intensity: - + Texture V factor: - + Non parametric anim only - + Force constant length(m): - + LOD degradation: - + Trail coord. system: - + Local - + World - + User - + Father coord. system - + Use hermitte interpolation @@ -965,77 +954,77 @@ CLocatedPage - + Form - + General Allgemein - + Coord system: - + Particles are local to the system - + Particles are in world - + User - + Disgrade with lod - + Parametric motion - + Max number of particles: - + Set current count particles - + Life time - + Limited life time - + Triger on death - + Edit - + Particle mass @@ -1089,32 +1078,32 @@ CMeshWidget - + GroupBox - + Shape: - + Browse Durchsuchen - + Shape not loaded - + Morph - + Edit @@ -1122,42 +1111,42 @@ CMorphMeshDialog - + Morph mesh edit - + Add - + Change - + Insert - + Remove - + Up - + Down - + Warning: Shapes not found and incompatibles !! @@ -1165,95 +1154,95 @@ CMultiTexDialog - + Multitexturing - + Main tex - - + + U speed 1: - - + + V speed 1: - - + + U speed 2: - - + + V speed 2: - + Bump factor: - + Use particle data - - + + Tex op: - - + + Add - - + + Modulate - - + + Decal - + EnvBumpMap - + Alternate tex - + Use particle data all - + Force basic caps - + Enable alternate @@ -1261,52 +1250,52 @@ CPSMoverPage - + Form - + Position: - + X: - + Y: - + Z: - + Sub component: - + Scale X: - + Scale Y: - + Scale Z: - + Scale: @@ -1314,115 +1303,115 @@ CParticleControlDialog - + Particles system control - + Loop - + Display helpers - + Enable auto count - + Display box - + All particle system - + Reset auto count - + Link play to scene play - + Link to skeleton - + Unlink - + Restick all objects - + Set anim - + Clear anim - + General Allgemein - + Additional - - Num particles:9999999 + + Num particles: - - Num wanted faces:9999999 + + Num wanted faces: - - System time:99999999999 + + System time: CParticleLinkDialog - + Link to skeleton - + Choose bone to stick particle system - + Link - + Unlink @@ -1430,300 +1419,300 @@ CParticleSystemPage - + Form - + Integration - + Enable load balancing - + Accurate integration - + Enable motion slowDown - + Time threshold: - + Max steps: - + Lock - + User param - + User param1: - - - - + + + + Global - + User param2: - + User param3: - + User param4: - + PBBox / LOD param - + Enable Precomputed Bounding Box - + Auto - + Reset - + X: - + Y: - + Z: - + +10 % - + -10 % - + Sharable - + Auto-LOD - + Settings Einstellungen - + Max view dist: - + LOD Ratio: - + Global color - + Force global lighting - + Edit global color - + Wrn: Bypass multitex, not supported by all types - + Life mgt param - + Life mgt presets: - + Environment FX - + Running Environment FX - + Spell FX - + Looping Spell FX - + Minor transitory FX - + User defined - + Moving Looping FX - + Spawned Environment FX - + Ground FX - + Projectile FX - + Model removed when out of range - + PS resource removed when not visible - + Force life time update - + No max nb steps - + Anim type: - + Die on event: - + When visible - + When in visible clusters - + Always - + Disabled - + No more particles - + No more particles/emitters - + Apply after delay: - + s - + Auto delay @@ -1731,27 +1720,27 @@ CParticleTextureAnimWidget - + Form - + Enable texture anim - + Texture grouped - + Multitexturing - + Edit @@ -1759,32 +1748,32 @@ CParticleTextureWidget - + Form - + Choose texture - + Remove - + Name: - + Size: - + Depth: @@ -1792,7 +1781,7 @@ CParticleWorkspaceDialog - + Tree workspace @@ -1915,7 +1904,7 @@ CSettingsDialog - + Settings Einstellungen @@ -1925,151 +1914,151 @@ - + Graphics Video - + Sound Audio - + Paths Verzeichnisse - + Vegetable Vegetation - + Graphics settings - - + + Driver - + Bloom effect - + Bloom density - + Square bloom - + Enable bloom effect - + Qt Style - + Style - + Use style's standard palette - + Sound settings - + SoundAutoLoadSample - + SoundEnableOccludeObstruct - + SoundEnableReverb - + SoundManualRolloff - + SoundForceSoftware - + SoundUseADPCM - + SoundMaxTrack - + Search paths - - - - - - - - - + + + + + + + + + ... - + Setup Landscape - + Tile bank: - + Tile far bank: - + Vegetable texture: - + Landscape zones: @@ -2077,32 +2066,32 @@ CSetupFog - + Setup fog - + Start: - + End: - + Enable fog - + Color - + Apply @@ -2110,86 +2099,86 @@ CSkeletonScaleDialog - + Skeleton scale edition - + Bone scale - - + + X: - - - - - - - - - - - - + + + + + + + + + + + + % - - + + Y: - - + + Z: - + Skin scale (slower) - + Mirror selected - + Undo - + Redo - + Save .skel - + Save as - + Load .scale - + Save .scale @@ -2197,92 +2186,92 @@ CSlotGroupBox - + GroupBox - + Slot _:empty - + Start blend - + End blend - + Offset frame - + Speed x - + Start frame - + End frame - + Smooth - + Wrap mode: - + Clamp - + Repeat - + Disable - + Set anim - + Set skel - + Align blend - + Enable - + Invert skeleton weight @@ -2290,57 +2279,57 @@ CSoundPage - + Form - + General Allgemein - + Sound name - + Browse Durchsuchen - + Play - + Spawn - + Mute - + Keep original pitch - + Emission percent: - + Sound volume - + Sound pitch @@ -2348,22 +2337,22 @@ CSunColorDialog - + Sun color Sonnenfarbe - + Diffuse: - + Ambient - + Specular: @@ -2371,77 +2360,77 @@ CTailParticleWidget - + Form - + Ribbon orientation - + Follow Path - + Follow Path XY - + Identity - + Tail shape - + Triangle - + Quad - + Octogon - + Pentagram - + Simple segment X - + Simple segment Y - + Simple segment Z - + Simple brace - + Tail fading @@ -2449,17 +2438,17 @@ CTuneMRMDialog - + Tune MRM (The maximum faces in scene) - + Max (specify the max value) - + Current (real final max polygon value) @@ -2467,12 +2456,12 @@ CTuneTimerDialog - + Time interval update render - + ms @@ -2480,37 +2469,37 @@ CVegetNoiseValueWidget - + GroupBox - + AbsValue: - + *3 - + 100% - + /3 - + RandValue: - + Frequency: @@ -2518,37 +2507,37 @@ CVegetableApperancePage - + Form - + Bend Phase - + Bend Factor - + Color Noise - + Color setup - + Double cliclk to change color - + Get List from other @@ -2556,77 +2545,77 @@ CVegetableDensityPage - + Form Pflanzen Dichte Seite - + Vegetable mesh selection Pflanzen Mesh Auswahl - + Browse Durchsuchen - + Distance of creation Erstellungsdistanz - + 0 m - + Density Dichte - + MaxDensity Maximale Dichte - + MaxDensity enabled maximale Dichte aktiviert - + Angle setup Winkel Konfiguration - + Angle Mode: Winkel Modus: - + Floor Boden - + Wall Wand - + Ceiling Decke - + AngleMin Min Winkel - + AngleMax Max Winkel @@ -2634,102 +2623,102 @@ CVegetableDialog - + Vegetable editor Pflanzen Editor - + Vegetables: Pflanzen: - + List edition Liste bearbeiten - + Add vegetable Pflanze hinzufügen - + Insert vegetable Pflanze einfügen - + Remove vegetable Pflanze entfernen - + Clear all vegetables Alle entfernen - + Copy Vegetable Pflanze kopieren - + Load .vegetdesc Lade .vegetdesc - + Save .vegetdesc Speichere .vegetdesc - + List Save/Load Liste speichern/laden - + Load .vegetset Lade .vegetset - + Append .vegetset Anfügen eines.vegetset - + Save .vegetset Speichere.vegetset - + Display Vegetables Pflanzen anzeigen - + Landscape Landschaft - + General/Density Allgemein/Dichte - + Appearance Aussehen - + Scale Größe - + Rotation Drehung @@ -2737,47 +2726,47 @@ CVegetableLandscapePage - + Form Pflanzen Landschaft Seite - + Setup Wind Wind konfigurieren - + Power: Kraft: - + Bend Start: Start der Beugung: - + Frequency Frequenz - + Ambient color Ambient Farbe - + Diffuse color Diffuse Farbe - + Show Vegetable Lands Zeige Pflanzen - + Snap Camera To Ground Kamera bleibt am Boden @@ -2785,22 +2774,22 @@ CVegetableRotatePage - + Form Pflanzen Drehungs Seite - + Rotate X Drehung X - + Rotate Y Drehung Y - + Rotate Z Drehung Z @@ -2808,22 +2797,22 @@ CVegetableScalePage - + Form Pflanzen Größen seite - + Scale X/Y Größe X/Y - + Scale Z Größe Z - + Bend Frequency Factor Faktor Beugungsfrequenz @@ -2831,122 +2820,122 @@ CWaterPoolDialog - + Water pool editor - + Pool ID List: - + Add - + Delete - + Name... - + Size: - + 16 - + 32 - + 64 - + 128 - + 256 - + 512 - + Water Unit Size: - + Damping: - + Filter weight: - + Propagation time: - + Enable automatic waves generation - + Waves - + Impulsion strenght: - + Period: - + Impulsion radius: - + Generate on border only - + Load Laden - + Save Speichern @@ -2954,53 +2943,53 @@ CWorkspacePage - - + + Particle system editor Partikelsystem Editor - + Workspace Arbeitsbereich - + New Neu - + Load Laden - + Save Speichern - + Save As Speichern als ... - + Particle system Partikelsystem - + Insert New Neu einfügen - + Create New Neu erstellen - + Reset all Alles zurücksetzen @@ -3008,32 +2997,32 @@ CZonePage - + Form Partikel Zonen Editor - + Targets: Ziele: - + Avaible targets: Verfügbare Ziele: - + Bounce - + Destroy - + Bounce factor: @@ -3180,63 +3169,63 @@ CurveEditDialog - + Curve edit - + Left click to add points. Right click to remove points. - + Zoom: - + Scale curve - + Translate: - + Position curve - + Num samples: - + Last=First - + First=Last - + Display interpolation - + Smoothing - + Ok @@ -3264,49 +3253,21 @@ Right click to remove points. Beenden - - Form - - - AddInstance - - - - - AddCharacter - - - - - Reset - - - - - Play - - - - - Stop - - - NLQT::CAnimationSetDialog - - + + Open NeL anim file - + NeL anim files (*.anim);; - + NeL Skeleton Weight Template files (*.swt);; @@ -3314,27 +3275,27 @@ Right click to remove points. NLQT::CAttribFloatWidget - + value blender - + values gradient - + curve - + value computed from emitter - + binary operator @@ -3342,22 +3303,22 @@ Right click to remove points. NLQT::CAttribIntWidget - + value exact blender - + values gradient - + value computed from emitter - + binary operator @@ -3365,27 +3326,27 @@ Right click to remove points. NLQT::CAttribPlaneBasisWidget - + basis gradient - + follow path - + spinner - + values computed from emitter - + binary operator @@ -3393,27 +3354,27 @@ Right click to remove points. NLQT::CAttribRGBAWidget - + color sampled blender - + color gradient - + color exact blender - + values computed from emitter - + binary operator @@ -3421,22 +3382,22 @@ Right click to remove points. NLQT::CAttribUIntWidget - + value blender - + values gradient - + value computed from emitter - + binary operator @@ -3444,7 +3405,7 @@ Right click to remove points. NLQT::CAttribWidget - + Set user param @@ -3452,17 +3413,17 @@ Right click to remove points. NLQT::CBinOpDialog - + Bin operator - + Arg1 - + Arg2 @@ -3470,107 +3431,107 @@ Right click to remove points. NLQT::CCameraControl - + CameraControl - + Fly - + Set firstPerson camera mode - + Edit - + Set edit3d camera mode - + Render Mode - + Point mode - + Set point render mode - + Line mode - + Set line render mode - + Fill mode - + Set fill render mode - + Speed: - + Create camera - + Create new camera - + Delete camera - + Delete current camera - + defaultCamera - + Reset camera Kamera zurücksetzen - + Reset current camera Aktuelle Kamera zurücksetzen - + %1_Camera @@ -3578,7 +3539,7 @@ Right click to remove points. NLQT::CDirectionWidget - + Enter Name @@ -3586,31 +3547,31 @@ Right click to remove points. NLQT::CEmitterPage - - - - + + + + NeL Particle Editor - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX',and thus, should have a finite duration. This operation create a loop in the system, and so is forbidden. - + Loops with emitters are forbidden. - - + + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + no emission @@ -3618,32 +3579,32 @@ Right click to remove points. NLQT::CFollowPathDialog - + Follow path param - + Projection plane: - + No projection - + XY plane - + XZ plane - + YZ plane @@ -3651,12 +3612,12 @@ Right click to remove points. NLQT::CForcePage - + NeL particle system editor - + The target object last forever. Applying a force on such an object may result in instability in the system after a while. Continue ? (clue : you've been warned..) @@ -3664,7 +3625,7 @@ Right click to remove points. NLQT::CGradientDialog - + Num samples: @@ -3672,63 +3633,63 @@ Right click to remove points. NLQT::CLocatedBindablePage - + Material - + Size/Angle 2D - + Rotations - + Look At param - + Shock wave param - + Fan Light param - + Tail param - + Mesh param - - + + Texture param - + Width - + Height - + Size @@ -3736,28 +3697,28 @@ Right click to remove points. NLQT::CLocatedPage - - + + NeL particle system editor - + The object has force(s) applied on it. If it last forever, its motion can become instable after a while. Continue anyway ? (clue : you've been warned ..) - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + Set the extern ID - + 0 means no extern access. @@ -3765,228 +3726,148 @@ Right click to remove points. NLQT::CMainWindow - + Open NeL data file Öffne NeL Daten Dateien - + All NeL files (*.shape *.ps *.ig);;NeL shape files (*.shape);;NeL particle system files (*.ps)NeL Instance Group files (*.ig) Alle NeL Dateien (*.shape *.ps *.ig);;NeL shape (*.shape);;NeL Partikelsystem(*.ps)NeL Instanz Gruppen (*.ig) - + Open skeleton file Öffne Skelett Datei - + NeL skeleton file (*.skel) NeL Skelet (*.skel) - + About Object Viewer Qt Über Object Viewer Qt - + <h2>Object Viewer Qt 8-)</h2><p> Authors: dnk-88, sfb, Kaetemi, kervala <p>Compiled on %1 %2 <h2>Object Viewer Qt 8-)</h2><p> Autoren: dnk-88, sfb, Kaetemi, kervala <p>Kompiliert am %1 %2 - + &Open... &Öffnen... - + Open an existing file Datei öffnen - - E&xit - B&eenden - - - - Ctrl+Q - Ctrl+Q - - - - Exit the application - Object Viewer verlassen - - - + Set &background color Hintergrundfar&be setzen - + Set background color Hintergrundfarbe setzen - - Reset camera - Kamera zurücksetzen - - - - Ctrl+R - Ctrl+R - - - - Reset current camera - Aktuelle Kamera zurücksetzen - - - - Ctrl+M - Ctrl+M - - - - Change render mode (Line, Point, Filled) - Render Modus ändern (Linie, Punkt, Gefüllt) - - - + &Reset scene Szene zu&rücksetzen - + Reset current scene Aktuelle Szene zurücksetzen - - + + Reload textures Texturen neu laden - + Save &Screenshot Screenshot &Speichern - + Make a screenshot of the current viewport and save Speichert ein Screenshot der aktuellen Szene - + &Settings Ein&stellungen - + Settings Einstellungen - - &About - &Über - - - - Show the application's About box - Zeigt Informationen über den Object Viewer - - - - About &Qt - Über &Qt - - - - Show the Qt library's About box - Zeigt Informationen über Qt - - - - + + &File &Datei - + &View &Ansicht - + &Scene &Szene - - + + &Tools &Werkzeuge - - - &Help - &Hilfe - - - - StatusReady - Status Fertig - - - - Loading canceled - Laden abgebrochen - - - - File loaded - Datei geladen - NLQT::CMeshWidget - + Open NeL data file Öffne NeL Daten Dateien - + NeL shape file (*.shape) - + Shape loading error - + Error in morph meshes - + Not a mesh - + Shape not loaded - + Too much vertices @@ -3994,26 +3875,26 @@ Right click to remove points. NLQT::CMorphMeshDialog - + vertices - + (%1 vertices) - - - + + + Open NeL data file Öffne NeL Daten Dateien - - - + + + NeL shape files (*.shape) @@ -4021,60 +3902,45 @@ Right click to remove points. NLQT::CParticleControlDialog - + Num particles: - + Num wanted faces: - + System time: - - - Num particles: %1 - - - - - Num wanted faces: %1 - - - - - System time: %1 - - NLQT::CParticleSystemPage - + Are you sure? - + Load balancing on/off - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + The system must have a finite duration for this setting! Please check that the following object doesn't live forever or doesn't create a loop in the system : - + The system must have a finite duration for this setting! Please check that. @@ -4082,47 +3948,47 @@ Right click to remove points. NLQT::CParticleTextureWidget - + Open texture file - + Image file (*.tga *.png) - + Texture loading error - + Name: - + Size: - + Depth: - + Name: %1 - + Size: %1x%2 - + Depth: %1 @@ -4130,167 +3996,167 @@ Right click to remove points. NLQT::CParticleWorkspaceDialog - + Set as active particle system - + Save Speichern - + Save as - + Clear content - + Remove from workspace - + Merge - + New located - + Paste located - + Force ZBias - + Instanciate - + Copy located - + Copy bindable - + Paste bindable - + Delete - + All LOD - + LOD 1 - + LOD 2 - + extern ID - - - - - + + + + + NeL particle system editor - + uses auto count feature, and it has been modified. You should run the system entirely at least once at full detail before saving so that the editor can compute the number of particles in the system. If user params are used to modify system aspect, you should run the system for extreme cases before saving. - + Save as ps file - + ps files (*.ps) - + Clear content ? - - + + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + The system is flagged with 'No max Nb steps', or uses the preset 'Spell FX'.System must have finite duration. Can't add object. To solve this, set a limited life time for the father. - + All object force ZBias - + Set the extern ID - + 0 means no extern access. - + Bind particle... - + Bind force... - + Bind zone... - + Bind emitter... @@ -4298,7 +4164,7 @@ Right click to remove points. NLQT::CPropertyDialog - + Property editor Eigenschaften @@ -4306,52 +4172,52 @@ Right click to remove points. NLQT::CSettingsDialog - + Settings Einstellungen - + Graphics and sound settings take after restart the program - + Set new tile bank - + Tile Bank file (*.smallbank *.bank);; - + Set new tile far bank - + Tile Far Bank file (*.farbank);; - + Set MicroVegetable texture - + Texture file (*.tga *.png *.jpg *.dds);; - + Add zone files - + Zonel files (*.zonel *.zone);; @@ -4359,62 +4225,62 @@ Right click to remove points. NLQT::CSkeletonScaleDialog - - - - - - - + + + + + + + Skeleton scale editor - - - + + + Failed to open file for write! - + Save As Skeleton File - + Skeleton files (*.skel);; - + Open Skeleton Scale File - - + + SkelScale files (*.scale);; - + Failed to open file for read! - + Save As Skeleton Scale File - - + + Failed to save file! - + Failed to load file! @@ -4422,35 +4288,35 @@ Right click to remove points. NLQT::CSlotGroupBox - - - + + + Slot %1 : - - + + empty - + Select your anim - + Animation: - + Select your skel - + Skeleton weight template: @@ -4458,17 +4324,17 @@ Right click to remove points. NLQT::CSlotManagerDialog - + Slot %1 : empty : empty - + Slot %1 - + Slot manager @@ -4476,12 +4342,12 @@ Right click to remove points. NLQT::CSoundPage - + Select your sound - + Sound: @@ -4489,12 +4355,12 @@ Right click to remove points. NLQT::CSpinnerDialog - + Edit spinner - + Nb samples: @@ -4502,17 +4368,17 @@ Right click to remove points. NLQT::CValueBlenderDialog - + Value blender - + Start value: - + End value: @@ -4520,7 +4386,7 @@ Right click to remove points. NLQT::CValueFromEmitterDialog - + Value from emitter @@ -4528,12 +4394,12 @@ Right click to remove points. NLQT::CVegetableApperancePage - + Select on other vegetables - + Select the other vegetable to copy color. @@ -4541,12 +4407,12 @@ Right click to remove points. NLQT::CVegetableDensityPage - + Open Vegetable Shape - + veget files (*.veget);; @@ -4554,48 +4420,48 @@ Right click to remove points. NLQT::CVegetableDialog - + Load a new vegetset file - - + + vegetset files (*.vegetset);; - + Append vegetset file - + Save Vegetable Set - + VegetSetFiles (*.vegetset);; - + Open Vegetable Descriptor - + vegetdesc files (*.vegetdesc);; - + Save Vegetable Descriptor - + VegetDescFiles (*.vegetdesc);; @@ -4603,56 +4469,56 @@ Right click to remove points. NLQT::CWorkspacePage - + Create new pws file - - + + pws files (*.pws) - - + + Open NeL data file Öffne NeL Daten Dateien - + Particle Workspace file (*.pws);; - + Save as pws file - + Particle System file (*.ps);; - - - + + + NeL particle system editor - + Create new particle system file - + ps files (*.ps) - + Failed to create new particle system @@ -4660,12 +4526,12 @@ Right click to remove points. Plugin::CCoreListener - + Example close event hook - + Do you want to close window? @@ -4704,35 +4570,6 @@ Right click to remove points. Allgemein - - Plugin::CSimpleViewer - - - - Open NeL data file - Öffne NeL Daten Dateien - - - - All NeL files (*.shape *.ps);;NeL shape files (*.shape);;NeL particle system files (*.ps) - - - - - All NeL files (*.shape *.ps);; - - - - - Open skeleton file - Öffne Skelett Datei - - - - NeL skeleton file (*.skel) - NeL Skelet (*.skel) - - Plugin::MyPlugin @@ -4804,7 +4641,7 @@ Right click to remove points. - + Choose output file diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts index 3cdac595a..bf833ec14 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts @@ -4,18 +4,17 @@ Application - + Failed to load Core plugin: %1 - - + Object Viewer Qt - Plugin loader messages - + Could not find ovqt_plugin_core in %1 @@ -23,42 +22,42 @@ CAnimationDialog - + Animation control - + Loop - + In place - + Increment pos - + Use the PlayList - + Use the Mixer - + Play/Pause - + Stop @@ -66,57 +65,57 @@ CAnimationSetDialog - + Animation set manager - + Edited object: - + Animations: - + Add anim - + Skeleton weight template: - + Add swt - + Animations playlist: - + Unload all anim and swt files - + Add anim in PlayList - + Delete anim from PlayList - + Set duration of time in Animation control @@ -124,102 +123,102 @@ CAttribWidget - + GroupBox - + Constant - + Scheme - + Input mutliplier: - + Clamp - + E - + Src: - + Date - + Position - + Inverse Mass - + Speed - + Random - + User param - + LOD - + Square LOD - + Clamped LOD - + Camped square LOD - + U - + P - + G @@ -227,27 +226,27 @@ CAutoLODDialog - + Auto LOD - + Start percent DIST: - + Max dist BIAS: - + Degradation exponent: - + Skip particles @@ -255,22 +254,22 @@ CBasicEditWidget - + Form - + Psi - + Theta - + Phi @@ -278,12 +277,12 @@ CColorEditWidget - + Form - + Browse @@ -291,123 +290,123 @@ CConstraintMeshWidget - + Form - + Force stage modulation - + Stage 0 - + Stage 1 - + Stage 2 - + Stage 3 - + Force vertex color lighting - + Texture anim type: - + None - + Global - + Reinit when new element is created - + Stage: - + Translation - - + + V Start: - - + + U Speed: - - + + V Speed: - - + + U Accel: - - + + V Accel: - - + + U Start: - + Scale - + Rotation - + Speed: - + Accel: @@ -415,17 +414,17 @@ CDayNightDialog - + Day/Night - + Day - + Night @@ -433,47 +432,47 @@ CDirectionWidget - + Form - + Direction: - + +I - + +J - + +K - + -I - + -J - + -K - + Global @@ -481,7 +480,7 @@ CEditRangeFloatWidget - + Form @@ -489,7 +488,7 @@ CEditRangeUIntWidget - + Form @@ -497,128 +496,128 @@ CEmitterPage - + Form - + General - + Emitted type: - + Type of emission: - + Regular - + On death - + Once - + On bounce - + External only - + Direction: - + Default - + Direction is aligned on the emitter direction - + Direction is in world - + Direction is local to the system - + User - + Force consistent emission - + Bypass Auto-LOD - + Speed inheritance factor: - + Delayed emission: - + Max Emission Count: - + Radius: - - + + Emission period - + Emission quantity/Speed - + Emission quantity - + Strenght modulation @@ -656,47 +655,37 @@ CForcePage - + Form - + Targets: - + Avaible targets: - - < - - - - - > - - - - + Parametric factor: - + Radial viscosity: - + Tangential viscosity: - + Force intensity @@ -704,12 +693,12 @@ CGlobalWindDialog - + Weather - + Power: @@ -717,27 +706,27 @@ CLightPage - + Form - + Light color - + Attenuation start/end - + Attenuation start - + Attenuation end @@ -745,219 +734,219 @@ CLocatedBindablePage - + Form - + Blending mode: - + Add - + Modulate - + Alpha blend - + Alpha test - + No AutoLOD - + Global color lighting - + Z-Test - + ZBias: - + Color - + Independent size - + Height - + Width - + Size - + Angle 2D - + Rotation - + hint / precomputed rotations - + Rot speed min: - + Rot speed max: - + Nb models: - + Align on motion - + Z-Align - + Fake motion blur coeff.: - + Fake motion blur treshold: - + Radius cut: - - + + Number of segments: - + Phase smoothness: - + Duration segment: - - + + Texture U factor: - + Number fan light: - + Fan light speed: - + Fan light intensity: - + Texture V factor: - + Non parametric anim only - + Force constant length(m): - + LOD degradation: - + Trail coord. system: - + Local - + World - + User - + Father coord. system - + Use hermitte interpolation @@ -965,77 +954,77 @@ CLocatedPage - + Form - + General - + Coord system: - + Particles are local to the system - + Particles are in world - + User - + Disgrade with lod - + Parametric motion - + Max number of particles: - + Set current count particles - + Life time - + Limited life time - + Triger on death - + Edit - + Particle mass @@ -1089,32 +1078,32 @@ CMeshWidget - + GroupBox - + Shape: - + Browse - + Shape not loaded - + Morph - + Edit @@ -1122,42 +1111,42 @@ CMorphMeshDialog - + Morph mesh edit - + Add - + Change - + Insert - + Remove - + Up - + Down - + Warning: Shapes not found and incompatibles !! @@ -1165,95 +1154,95 @@ CMultiTexDialog - + Multitexturing - + Main tex - - + + U speed 1: - - + + V speed 1: - - + + U speed 2: - - + + V speed 2: - + Bump factor: - + Use particle data - - + + Tex op: - - + + Add - - + + Modulate - - + + Decal - + EnvBumpMap - + Alternate tex - + Use particle data all - + Force basic caps - + Enable alternate @@ -1261,52 +1250,52 @@ CPSMoverPage - + Form - + Position: - + X: - + Y: - + Z: - + Sub component: - + Scale X: - + Scale Y: - + Scale Z: - + Scale: @@ -1314,115 +1303,115 @@ CParticleControlDialog - + Particles system control - + Loop - + Display helpers - + Enable auto count - + Display box - + All particle system - + Reset auto count - + Link play to scene play - + Link to skeleton - + Unlink - + Restick all objects - + Set anim - + Clear anim - + General - + Additional - - Num particles:9999999 + + Num particles: - - Num wanted faces:9999999 + + Num wanted faces: - - System time:99999999999 + + System time: CParticleLinkDialog - + Link to skeleton - + Choose bone to stick particle system - + Link - + Unlink @@ -1430,300 +1419,300 @@ CParticleSystemPage - + Form - + Integration - + Enable load balancing - + Accurate integration - + Enable motion slowDown - + Time threshold: - + Max steps: - + Lock - + User param - + User param1: - - - - + + + + Global - + User param2: - + User param3: - + User param4: - + PBBox / LOD param - + Enable Precomputed Bounding Box - + Auto - + Reset - + X: - + Y: - + Z: - + +10 % - + -10 % - + Sharable - + Auto-LOD - + Settings - + Max view dist: - + LOD Ratio: - + Global color - + Force global lighting - + Edit global color - + Wrn: Bypass multitex, not supported by all types - + Life mgt param - + Life mgt presets: - + Environment FX - + Running Environment FX - + Spell FX - + Looping Spell FX - + Minor transitory FX - + User defined - + Moving Looping FX - + Spawned Environment FX - + Ground FX - + Projectile FX - + Model removed when out of range - + PS resource removed when not visible - + Force life time update - + No max nb steps - + Anim type: - + Die on event: - + When visible - + When in visible clusters - + Always - + Disabled - + No more particles - + No more particles/emitters - + Apply after delay: - + s - + Auto delay @@ -1731,27 +1720,27 @@ CParticleTextureAnimWidget - + Form - + Enable texture anim - + Texture grouped - + Multitexturing - + Edit @@ -1759,32 +1748,32 @@ CParticleTextureWidget - + Form - + Choose texture - + Remove - + Name: - + Size: - + Depth: @@ -1792,7 +1781,7 @@ CParticleWorkspaceDialog - + Tree workspace @@ -1915,7 +1904,7 @@ CSettingsDialog - + Settings @@ -1925,151 +1914,151 @@ - + Graphics - + Sound - + Paths - + Vegetable - + Graphics settings - - + + Driver - + Bloom effect - + Bloom density - + Square bloom - + Enable bloom effect - + Qt Style - + Style - + Use style's standard palette - + Sound settings - + SoundAutoLoadSample - + SoundEnableOccludeObstruct - + SoundEnableReverb - + SoundManualRolloff - + SoundForceSoftware - + SoundUseADPCM - + SoundMaxTrack - + Search paths - - - - - - - - - + + + + + + + + + ... - + Setup Landscape - + Tile bank: - + Tile far bank: - + Vegetable texture: - + Landscape zones: @@ -2077,32 +2066,32 @@ CSetupFog - + Setup fog - + Start: - + End: - + Enable fog - + Color - + Apply @@ -2110,86 +2099,86 @@ CSkeletonScaleDialog - + Skeleton scale edition - + Bone scale - - + + X: - - - - - - - - - - - - + + + + + + + + + + + + % - - + + Y: - - + + Z: - + Skin scale (slower) - + Mirror selected - + Undo - + Redo - + Save .skel - + Save as - + Load .scale - + Save .scale @@ -2197,92 +2186,92 @@ CSlotGroupBox - + GroupBox - + Slot _:empty - + Start blend - + End blend - + Offset frame - + Speed x - + Start frame - + End frame - + Smooth - + Wrap mode: - + Clamp - + Repeat - + Disable - + Set anim - + Set skel - + Align blend - + Enable - + Invert skeleton weight @@ -2290,57 +2279,57 @@ CSoundPage - + Form - + General - + Sound name - + Browse - + Play - + Spawn - + Mute - + Keep original pitch - + Emission percent: - + Sound volume - + Sound pitch @@ -2348,22 +2337,22 @@ CSunColorDialog - + Sun color - + Diffuse: - + Ambient - + Specular: @@ -2371,77 +2360,77 @@ CTailParticleWidget - + Form - + Ribbon orientation - + Follow Path - + Follow Path XY - + Identity - + Tail shape - + Triangle - + Quad - + Octogon - + Pentagram - + Simple segment X - + Simple segment Y - + Simple segment Z - + Simple brace - + Tail fading @@ -2449,17 +2438,17 @@ CTuneMRMDialog - + Tune MRM (The maximum faces in scene) - + Max (specify the max value) - + Current (real final max polygon value) @@ -2467,12 +2456,12 @@ CTuneTimerDialog - + Time interval update render - + ms @@ -2480,37 +2469,37 @@ CVegetNoiseValueWidget - + GroupBox - + AbsValue: - + *3 - + 100% - + /3 - + RandValue: - + Frequency: @@ -2518,37 +2507,37 @@ CVegetableApperancePage - + Form - + Bend Phase - + Bend Factor - + Color Noise - + Color setup - + Double cliclk to change color - + Get List from other @@ -2556,77 +2545,77 @@ CVegetableDensityPage - + Form - + Vegetable mesh selection - + Browse - + Distance of creation - + 0 m - + Density - + MaxDensity - + MaxDensity enabled - + Angle setup - + Angle Mode: - + Floor - + Wall - + Ceiling - + AngleMin - + AngleMax @@ -2634,102 +2623,102 @@ CVegetableDialog - + Vegetable editor - + Vegetables: - + List edition - + Add vegetable - + Insert vegetable - + Remove vegetable - + Clear all vegetables - + Copy Vegetable - + Load .vegetdesc - + Save .vegetdesc - + List Save/Load - + Load .vegetset - + Append .vegetset - + Save .vegetset - + Display Vegetables - + Landscape - + General/Density - + Appearance - + Scale - + Rotation @@ -2737,47 +2726,47 @@ CVegetableLandscapePage - + Form - + Setup Wind - + Power: - + Bend Start: - + Frequency - + Ambient color - + Diffuse color - + Show Vegetable Lands - + Snap Camera To Ground @@ -2785,22 +2774,22 @@ CVegetableRotatePage - + Form - + Rotate X - + Rotate Y - + Rotate Z @@ -2808,22 +2797,22 @@ CVegetableScalePage - + Form - + Scale X/Y - + Scale Z - + Bend Frequency Factor @@ -2831,122 +2820,122 @@ CWaterPoolDialog - + Water pool editor - + Pool ID List: - + Add - + Delete - + Name... - + Size: - + 16 - + 32 - + 64 - + 128 - + 256 - + 512 - + Water Unit Size: - + Damping: - + Filter weight: - + Propagation time: - + Enable automatic waves generation - + Waves - + Impulsion strenght: - + Period: - + Impulsion radius: - + Generate on border only - + Load - + Save @@ -2954,53 +2943,53 @@ CWorkspacePage - - + + Particle system editor - + Workspace - + New - + Load - + Save - + Save As - + Particle system - + Insert New - + Create New - + Reset all @@ -3008,32 +2997,32 @@ CZonePage - + Form - + Targets: - + Avaible targets: - + Bounce - + Destroy - + Bounce factor: @@ -3180,63 +3169,63 @@ CurveEditDialog - + Curve edit - + Left click to add points. Right click to remove points. - + Zoom: - + Scale curve - + Translate: - + Position curve - + Num samples: - + Last=First - + First=Last - + Display interpolation - + Smoothing - + Ok @@ -3264,49 +3253,21 @@ Right click to remove points. - - Form - - - AddInstance - - - - - AddCharacter - - - - - Reset - - - - - Play - - - - - Stop - - - NLQT::CAnimationSetDialog - - + + Open NeL anim file - + NeL anim files (*.anim);; - + NeL Skeleton Weight Template files (*.swt);; @@ -3314,27 +3275,27 @@ Right click to remove points. NLQT::CAttribFloatWidget - + value blender - + values gradient - + curve - + value computed from emitter - + binary operator @@ -3342,22 +3303,22 @@ Right click to remove points. NLQT::CAttribIntWidget - + value exact blender - + values gradient - + value computed from emitter - + binary operator @@ -3365,27 +3326,27 @@ Right click to remove points. NLQT::CAttribPlaneBasisWidget - + basis gradient - + follow path - + spinner - + values computed from emitter - + binary operator @@ -3393,27 +3354,27 @@ Right click to remove points. NLQT::CAttribRGBAWidget - + color sampled blender - + color gradient - + color exact blender - + values computed from emitter - + binary operator @@ -3421,22 +3382,22 @@ Right click to remove points. NLQT::CAttribUIntWidget - + value blender - + values gradient - + value computed from emitter - + binary operator @@ -3444,7 +3405,7 @@ Right click to remove points. NLQT::CAttribWidget - + Set user param @@ -3452,17 +3413,17 @@ Right click to remove points. NLQT::CBinOpDialog - + Bin operator - + Arg1 - + Arg2 @@ -3470,107 +3431,107 @@ Right click to remove points. NLQT::CCameraControl - + CameraControl - + Fly - + Set firstPerson camera mode - + Edit - + Set edit3d camera mode - + Render Mode - + Point mode - + Set point render mode - + Line mode - + Set line render mode - + Fill mode - + Set fill render mode - + Speed: - + Create camera - + Create new camera - + Delete camera - + Delete current camera - + defaultCamera - + Reset camera - + Reset current camera - + %1_Camera @@ -3578,7 +3539,7 @@ Right click to remove points. NLQT::CDirectionWidget - + Enter Name @@ -3586,31 +3547,31 @@ Right click to remove points. NLQT::CEmitterPage - - - - + + + + NeL Particle Editor - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX',and thus, should have a finite duration. This operation create a loop in the system, and so is forbidden. - + Loops with emitters are forbidden. - - + + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + no emission @@ -3618,32 +3579,32 @@ Right click to remove points. NLQT::CFollowPathDialog - + Follow path param - + Projection plane: - + No projection - + XY plane - + XZ plane - + YZ plane @@ -3651,12 +3612,12 @@ Right click to remove points. NLQT::CForcePage - + NeL particle system editor - + The target object last forever. Applying a force on such an object may result in instability in the system after a while. Continue ? (clue : you've been warned..) @@ -3664,7 +3625,7 @@ Right click to remove points. NLQT::CGradientDialog - + Num samples: @@ -3672,63 +3633,63 @@ Right click to remove points. NLQT::CLocatedBindablePage - + Material - + Size/Angle 2D - + Rotations - + Look At param - + Shock wave param - + Fan Light param - + Tail param - + Mesh param - - + + Texture param - + Width - + Height - + Size @@ -3736,28 +3697,28 @@ Right click to remove points. NLQT::CLocatedPage - - + + NeL particle system editor - + The object has force(s) applied on it. If it last forever, its motion can become instable after a while. Continue anyway ? (clue : you've been warned ..) - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + Set the extern ID - + 0 means no extern access. @@ -3765,228 +3726,148 @@ Right click to remove points. NLQT::CMainWindow - + Open NeL data file - + All NeL files (*.shape *.ps *.ig);;NeL shape files (*.shape);;NeL particle system files (*.ps)NeL Instance Group files (*.ig) - + Open skeleton file - + NeL skeleton file (*.skel) - + About Object Viewer Qt - + <h2>Object Viewer Qt 8-)</h2><p> Authors: dnk-88, sfb, Kaetemi, kervala <p>Compiled on %1 %2 - + &Open... - + Open an existing file - - E&xit - - - - - Ctrl+Q - - - - - Exit the application - - - - + Set &background color - + Set background color - - Reset camera - - - - - Ctrl+R - - - - - Reset current camera - - - - - Ctrl+M - - - - - Change render mode (Line, Point, Filled) - - - - + &Reset scene - + Reset current scene - - + + Reload textures - + Save &Screenshot - + Make a screenshot of the current viewport and save - + &Settings - + Settings - - &About - - - - - Show the application's About box - - - - - About &Qt - - - - - Show the Qt library's About box - - - - - + + &File - + &View - + &Scene - - + + &Tools - - - &Help - - - - - StatusReady - - - - - Loading canceled - - - - - File loaded - - NLQT::CMeshWidget - + Open NeL data file - + NeL shape file (*.shape) - + Shape loading error - + Error in morph meshes - + Not a mesh - + Shape not loaded - + Too much vertices @@ -3994,26 +3875,26 @@ Right click to remove points. NLQT::CMorphMeshDialog - + vertices - + (%1 vertices) - - - + + + Open NeL data file - - - + + + NeL shape files (*.shape) @@ -4021,60 +3902,45 @@ Right click to remove points. NLQT::CParticleControlDialog - + Num particles: - + Num wanted faces: - + System time: - - - Num particles: %1 - - - - - Num wanted faces: %1 - - - - - System time: %1 - - NLQT::CParticleSystemPage - + Are you sure? - + Load balancing on/off - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + The system must have a finite duration for this setting! Please check that the following object doesn't live forever or doesn't create a loop in the system : - + The system must have a finite duration for this setting! Please check that. @@ -4082,47 +3948,47 @@ Right click to remove points. NLQT::CParticleTextureWidget - + Open texture file - + Image file (*.tga *.png) - + Texture loading error - + Name: - + Size: - + Depth: - + Name: %1 - + Size: %1x%2 - + Depth: %1 @@ -4130,167 +3996,167 @@ Right click to remove points. NLQT::CParticleWorkspaceDialog - + Set as active particle system - + Save - + Save as - + Clear content - + Remove from workspace - + Merge - + New located - + Paste located - + Force ZBias - + Instanciate - + Copy located - + Copy bindable - + Paste bindable - + Delete - + All LOD - + LOD 1 - + LOD 2 - + extern ID - - - - - + + + + + NeL particle system editor - + uses auto count feature, and it has been modified. You should run the system entirely at least once at full detail before saving so that the editor can compute the number of particles in the system. If user params are used to modify system aspect, you should run the system for extreme cases before saving. - + Save as ps file - + ps files (*.ps) - + Clear content ? - - + + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + The system is flagged with 'No max Nb steps', or uses the preset 'Spell FX'.System must have finite duration. Can't add object. To solve this, set a limited life time for the father. - + All object force ZBias - + Set the extern ID - + 0 means no extern access. - + Bind particle... - + Bind force... - + Bind zone... - + Bind emitter... @@ -4298,7 +4164,7 @@ Right click to remove points. NLQT::CPropertyDialog - + Property editor @@ -4306,52 +4172,52 @@ Right click to remove points. NLQT::CSettingsDialog - + Settings - + Graphics and sound settings take after restart the program - + Set new tile bank - + Tile Bank file (*.smallbank *.bank);; - + Set new tile far bank - + Tile Far Bank file (*.farbank);; - + Set MicroVegetable texture - + Texture file (*.tga *.png *.jpg *.dds);; - + Add zone files - + Zonel files (*.zonel *.zone);; @@ -4359,62 +4225,62 @@ Right click to remove points. NLQT::CSkeletonScaleDialog - - - - - - - + + + + + + + Skeleton scale editor - - - + + + Failed to open file for write! - + Save As Skeleton File - + Skeleton files (*.skel);; - + Open Skeleton Scale File - - + + SkelScale files (*.scale);; - + Failed to open file for read! - + Save As Skeleton Scale File - - + + Failed to save file! - + Failed to load file! @@ -4422,35 +4288,35 @@ Right click to remove points. NLQT::CSlotGroupBox - - - + + + Slot %1 : - - + + empty - + Select your anim - + Animation: - + Select your skel - + Skeleton weight template: @@ -4458,17 +4324,17 @@ Right click to remove points. NLQT::CSlotManagerDialog - + Slot %1 : empty : empty - + Slot %1 - + Slot manager @@ -4476,12 +4342,12 @@ Right click to remove points. NLQT::CSoundPage - + Select your sound - + Sound: @@ -4489,12 +4355,12 @@ Right click to remove points. NLQT::CSpinnerDialog - + Edit spinner - + Nb samples: @@ -4502,17 +4368,17 @@ Right click to remove points. NLQT::CValueBlenderDialog - + Value blender - + Start value: - + End value: @@ -4520,7 +4386,7 @@ Right click to remove points. NLQT::CValueFromEmitterDialog - + Value from emitter @@ -4528,12 +4394,12 @@ Right click to remove points. NLQT::CVegetableApperancePage - + Select on other vegetables - + Select the other vegetable to copy color. @@ -4541,12 +4407,12 @@ Right click to remove points. NLQT::CVegetableDensityPage - + Open Vegetable Shape - + veget files (*.veget);; @@ -4554,48 +4420,48 @@ Right click to remove points. NLQT::CVegetableDialog - + Load a new vegetset file - - + + vegetset files (*.vegetset);; - + Append vegetset file - + Save Vegetable Set - + VegetSetFiles (*.vegetset);; - + Open Vegetable Descriptor - + vegetdesc files (*.vegetdesc);; - + Save Vegetable Descriptor - + VegetDescFiles (*.vegetdesc);; @@ -4603,56 +4469,56 @@ Right click to remove points. NLQT::CWorkspacePage - + Create new pws file - - + + pws files (*.pws) - - + + Open NeL data file - + Particle Workspace file (*.pws);; - + Save as pws file - + Particle System file (*.ps);; - - - + + + NeL particle system editor - + Create new particle system file - + ps files (*.ps) - + Failed to create new particle system @@ -4660,12 +4526,12 @@ Right click to remove points. Plugin::CCoreListener - + Example close event hook - + Do you want to close window? @@ -4704,35 +4570,6 @@ Right click to remove points. - - Plugin::CSimpleViewer - - - - Open NeL data file - - - - - All NeL files (*.shape *.ps);;NeL shape files (*.shape);;NeL particle system files (*.ps) - - - - - All NeL files (*.shape *.ps);; - - - - - Open skeleton file - - - - - NeL skeleton file (*.skel) - - - Plugin::MyPlugin @@ -4804,7 +4641,7 @@ Right click to remove points. - + Choose output file diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts index e2026366a..c545c162c 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts @@ -4,18 +4,17 @@ Application - + Failed to load Core plugin: %1 - - + Object Viewer Qt - Plugin loader messages - + Could not find ovqt_plugin_core in %1 @@ -23,42 +22,42 @@ CAnimationDialog - + Animation control - + Loop - + In place - + Increment pos - + Use the PlayList - + Use the Mixer - + Play/Pause - + Stop @@ -66,57 +65,57 @@ CAnimationSetDialog - + Animation set manager - + Edited object: - + Animations: - + Add anim - + Skeleton weight template: - + Add swt - + Animations playlist: - + Unload all anim and swt files - + Add anim in PlayList - + Delete anim from PlayList - + Set duration of time in Animation control @@ -124,102 +123,102 @@ CAttribWidget - + GroupBox - + Constant - + Scheme - + Input mutliplier: - + Clamp - + E - + Src: - + Date - + Position - + Inverse Mass - + Speed - + Random - + User param - + LOD - + Square LOD - + Clamped LOD - + Camped square LOD - + U - + P - + G @@ -227,27 +226,27 @@ CAutoLODDialog - + Auto LOD - + Start percent DIST: - + Max dist BIAS: - + Degradation exponent: - + Skip particles @@ -255,22 +254,22 @@ CBasicEditWidget - + Form - + Psi - + Theta - + Phi @@ -278,12 +277,12 @@ CColorEditWidget - + Form - + Browse @@ -291,123 +290,123 @@ CConstraintMeshWidget - + Form - + Force stage modulation - + Stage 0 - + Stage 1 - + Stage 2 - + Stage 3 - + Force vertex color lighting - + Texture anim type: - + None - + Global - + Reinit when new element is created - + Stage: - + Translation - - + + V Start: - - + + U Speed: - - + + V Speed: - - + + U Accel: - - + + V Accel: - - + + U Start: - + Scale - + Rotation - + Speed: - + Accel: @@ -415,17 +414,17 @@ CDayNightDialog - + Day/Night - + Day - + Night @@ -433,47 +432,47 @@ CDirectionWidget - + Form - + Direction: - + +I - + +J - + +K - + -I - + -J - + -K - + Global @@ -481,7 +480,7 @@ CEditRangeFloatWidget - + Form @@ -489,7 +488,7 @@ CEditRangeUIntWidget - + Form @@ -497,128 +496,128 @@ CEmitterPage - + Form - + General - + Emitted type: - + Type of emission: - + Regular - + On death - + Once - + On bounce - + External only - + Direction: - + Default - + Direction is aligned on the emitter direction - + Direction is in world - + Direction is local to the system - + User - + Force consistent emission - + Bypass Auto-LOD - + Speed inheritance factor: - + Delayed emission: - + Max Emission Count: - + Radius: - - + + Emission period - + Emission quantity/Speed - + Emission quantity - + Strenght modulation @@ -656,47 +655,37 @@ CForcePage - + Form - + Targets: - + Avaible targets: - - < - - - - - > - - - - + Parametric factor: - + Radial viscosity: - + Tangential viscosity: - + Force intensity @@ -704,12 +693,12 @@ CGlobalWindDialog - + Weather - + Power: @@ -717,27 +706,27 @@ CLightPage - + Form - + Light color - + Attenuation start/end - + Attenuation start - + Attenuation end @@ -745,219 +734,219 @@ CLocatedBindablePage - + Form - + Blending mode: - + Add - + Modulate - + Alpha blend - + Alpha test - + No AutoLOD - + Global color lighting - + Z-Test - + ZBias: - + Color - + Independent size - + Height - + Width - + Size - + Angle 2D - + Rotation - + hint / precomputed rotations - + Rot speed min: - + Rot speed max: - + Nb models: - + Align on motion - + Z-Align - + Fake motion blur coeff.: - + Fake motion blur treshold: - + Radius cut: - - + + Number of segments: - + Phase smoothness: - + Duration segment: - - + + Texture U factor: - + Number fan light: - + Fan light speed: - + Fan light intensity: - + Texture V factor: - + Non parametric anim only - + Force constant length(m): - + LOD degradation: - + Trail coord. system: - + Local - + World - + User - + Father coord. system - + Use hermitte interpolation @@ -965,77 +954,77 @@ CLocatedPage - + Form - + General - + Coord system: - + Particles are local to the system - + Particles are in world - + User - + Disgrade with lod - + Parametric motion - + Max number of particles: - + Set current count particles - + Life time - + Limited life time - + Triger on death - + Edit - + Particle mass @@ -1089,32 +1078,32 @@ CMeshWidget - + GroupBox - + Shape: - + Browse - + Shape not loaded - + Morph - + Edit @@ -1122,42 +1111,42 @@ CMorphMeshDialog - + Morph mesh edit - + Add - + Change - + Insert - + Remove - + Up - + Down - + Warning: Shapes not found and incompatibles !! @@ -1165,95 +1154,95 @@ CMultiTexDialog - + Multitexturing - + Main tex - - + + U speed 1: - - + + V speed 1: - - + + U speed 2: - - + + V speed 2: - + Bump factor: - + Use particle data - - + + Tex op: - - + + Add - - + + Modulate - - + + Decal - + EnvBumpMap - + Alternate tex - + Use particle data all - + Force basic caps - + Enable alternate @@ -1261,52 +1250,52 @@ CPSMoverPage - + Form - + Position: - + X: - + Y: - + Z: - + Sub component: - + Scale X: - + Scale Y: - + Scale Z: - + Scale: @@ -1314,115 +1303,115 @@ CParticleControlDialog - + Particles system control - + Loop - + Display helpers - + Enable auto count - + Display box - + All particle system - + Reset auto count - + Link play to scene play - + Link to skeleton - + Unlink - + Restick all objects - + Set anim - + Clear anim - + General - + Additional - - Num particles:9999999 + + Num particles: - - Num wanted faces:9999999 + + Num wanted faces: - - System time:99999999999 + + System time: CParticleLinkDialog - + Link to skeleton - + Choose bone to stick particle system - + Link - + Unlink @@ -1430,300 +1419,300 @@ CParticleSystemPage - + Form - + Integration - + Enable load balancing - + Accurate integration - + Enable motion slowDown - + Time threshold: - + Max steps: - + Lock - + User param - + User param1: - - - - + + + + Global - + User param2: - + User param3: - + User param4: - + PBBox / LOD param - + Enable Precomputed Bounding Box - + Auto - + Reset - + X: - + Y: - + Z: - + +10 % - + -10 % - + Sharable - + Auto-LOD - + Settings - + Max view dist: - + LOD Ratio: - + Global color - + Force global lighting - + Edit global color - + Wrn: Bypass multitex, not supported by all types - + Life mgt param - + Life mgt presets: - + Environment FX - + Running Environment FX - + Spell FX - + Looping Spell FX - + Minor transitory FX - + User defined - + Moving Looping FX - + Spawned Environment FX - + Ground FX - + Projectile FX - + Model removed when out of range - + PS resource removed when not visible - + Force life time update - + No max nb steps - + Anim type: - + Die on event: - + When visible - + When in visible clusters - + Always - + Disabled - + No more particles - + No more particles/emitters - + Apply after delay: - + s - + Auto delay @@ -1731,27 +1720,27 @@ CParticleTextureAnimWidget - + Form - + Enable texture anim - + Texture grouped - + Multitexturing - + Edit @@ -1759,32 +1748,32 @@ CParticleTextureWidget - + Form - + Choose texture - + Remove - + Name: - + Size: - + Depth: @@ -1792,7 +1781,7 @@ CParticleWorkspaceDialog - + Tree workspace @@ -1915,7 +1904,7 @@ CSettingsDialog - + Settings @@ -1925,151 +1914,151 @@ - + Graphics - + Sound - + Paths - + Vegetable - + Graphics settings - - + + Driver - + Bloom effect - + Bloom density - + Square bloom - + Enable bloom effect - + Qt Style - + Style - + Use style's standard palette - + Sound settings - + SoundAutoLoadSample - + SoundEnableOccludeObstruct - + SoundEnableReverb - + SoundManualRolloff - + SoundForceSoftware - + SoundUseADPCM - + SoundMaxTrack - + Search paths - - - - - - - - - + + + + + + + + + ... - + Setup Landscape - + Tile bank: - + Tile far bank: - + Vegetable texture: - + Landscape zones: @@ -2077,32 +2066,32 @@ CSetupFog - + Setup fog - + Start: - + End: - + Enable fog - + Color - + Apply @@ -2110,86 +2099,86 @@ CSkeletonScaleDialog - + Skeleton scale edition - + Bone scale - - + + X: - - - - - - - - - - - - + + + + + + + + + + + + % - - + + Y: - - + + Z: - + Skin scale (slower) - + Mirror selected - + Undo - + Redo - + Save .skel - + Save as - + Load .scale - + Save .scale @@ -2197,92 +2186,92 @@ CSlotGroupBox - + GroupBox - + Slot _:empty - + Start blend - + End blend - + Offset frame - + Speed x - + Start frame - + End frame - + Smooth - + Wrap mode: - + Clamp - + Repeat - + Disable - + Set anim - + Set skel - + Align blend - + Enable - + Invert skeleton weight @@ -2290,57 +2279,57 @@ CSoundPage - + Form - + General - + Sound name - + Browse - + Play - + Spawn - + Mute - + Keep original pitch - + Emission percent: - + Sound volume - + Sound pitch @@ -2348,22 +2337,22 @@ CSunColorDialog - + Sun color - + Diffuse: - + Ambient - + Specular: @@ -2371,77 +2360,77 @@ CTailParticleWidget - + Form - + Ribbon orientation - + Follow Path - + Follow Path XY - + Identity - + Tail shape - + Triangle - + Quad - + Octogon - + Pentagram - + Simple segment X - + Simple segment Y - + Simple segment Z - + Simple brace - + Tail fading @@ -2449,17 +2438,17 @@ CTuneMRMDialog - + Tune MRM (The maximum faces in scene) - + Max (specify the max value) - + Current (real final max polygon value) @@ -2467,12 +2456,12 @@ CTuneTimerDialog - + Time interval update render - + ms @@ -2480,37 +2469,37 @@ CVegetNoiseValueWidget - + GroupBox - + AbsValue: - + *3 - + 100% - + /3 - + RandValue: - + Frequency: @@ -2518,37 +2507,37 @@ CVegetableApperancePage - + Form - + Bend Phase - + Bend Factor - + Color Noise - + Color setup - + Double cliclk to change color - + Get List from other @@ -2556,77 +2545,77 @@ CVegetableDensityPage - + Form - + Vegetable mesh selection - + Browse - + Distance of creation - + 0 m - + Density - + MaxDensity - + MaxDensity enabled - + Angle setup - + Angle Mode: - + Floor - + Wall - + Ceiling - + AngleMin - + AngleMax @@ -2634,102 +2623,102 @@ CVegetableDialog - + Vegetable editor - + Vegetables: - + List edition - + Add vegetable - + Insert vegetable - + Remove vegetable - + Clear all vegetables - + Copy Vegetable - + Load .vegetdesc - + Save .vegetdesc - + List Save/Load - + Load .vegetset - + Append .vegetset - + Save .vegetset - + Display Vegetables - + Landscape - + General/Density - + Appearance - + Scale - + Rotation @@ -2737,47 +2726,47 @@ CVegetableLandscapePage - + Form - + Setup Wind - + Power: - + Bend Start: - + Frequency - + Ambient color - + Diffuse color - + Show Vegetable Lands - + Snap Camera To Ground @@ -2785,22 +2774,22 @@ CVegetableRotatePage - + Form - + Rotate X - + Rotate Y - + Rotate Z @@ -2808,22 +2797,22 @@ CVegetableScalePage - + Form - + Scale X/Y - + Scale Z - + Bend Frequency Factor @@ -2831,122 +2820,122 @@ CWaterPoolDialog - + Water pool editor - + Pool ID List: - + Add - + Delete - + Name... - + Size: - + 16 - + 32 - + 64 - + 128 - + 256 - + 512 - + Water Unit Size: - + Damping: - + Filter weight: - + Propagation time: - + Enable automatic waves generation - + Waves - + Impulsion strenght: - + Period: - + Impulsion radius: - + Generate on border only - + Load - + Save @@ -2954,53 +2943,53 @@ CWorkspacePage - - + + Particle system editor - + Workspace - + New - + Load - + Save - + Save As - + Particle system - + Insert New - + Create New - + Reset all @@ -3008,32 +2997,32 @@ CZonePage - + Form - + Targets: - + Avaible targets: - + Bounce - + Destroy - + Bounce factor: @@ -3180,63 +3169,63 @@ CurveEditDialog - + Curve edit - + Left click to add points. Right click to remove points. - + Zoom: - + Scale curve - + Translate: - + Position curve - + Num samples: - + Last=First - + First=Last - + Display interpolation - + Smoothing - + Ok @@ -3264,49 +3253,21 @@ Right click to remove points. - - Form - - - AddInstance - - - - - AddCharacter - - - - - Reset - - - - - Play - - - - - Stop - - - NLQT::CAnimationSetDialog - - + + Open NeL anim file - + NeL anim files (*.anim);; - + NeL Skeleton Weight Template files (*.swt);; @@ -3314,27 +3275,27 @@ Right click to remove points. NLQT::CAttribFloatWidget - + value blender - + values gradient - + curve - + value computed from emitter - + binary operator @@ -3342,22 +3303,22 @@ Right click to remove points. NLQT::CAttribIntWidget - + value exact blender - + values gradient - + value computed from emitter - + binary operator @@ -3365,27 +3326,27 @@ Right click to remove points. NLQT::CAttribPlaneBasisWidget - + basis gradient - + follow path - + spinner - + values computed from emitter - + binary operator @@ -3393,27 +3354,27 @@ Right click to remove points. NLQT::CAttribRGBAWidget - + color sampled blender - + color gradient - + color exact blender - + values computed from emitter - + binary operator @@ -3421,22 +3382,22 @@ Right click to remove points. NLQT::CAttribUIntWidget - + value blender - + values gradient - + value computed from emitter - + binary operator @@ -3444,7 +3405,7 @@ Right click to remove points. NLQT::CAttribWidget - + Set user param @@ -3452,17 +3413,17 @@ Right click to remove points. NLQT::CBinOpDialog - + Bin operator - + Arg1 - + Arg2 @@ -3470,107 +3431,107 @@ Right click to remove points. NLQT::CCameraControl - + CameraControl - + Fly - + Set firstPerson camera mode - + Edit - + Set edit3d camera mode - + Render Mode - + Point mode - + Set point render mode - + Line mode - + Set line render mode - + Fill mode - + Set fill render mode - + Speed: - + Create camera - + Create new camera - + Delete camera - + Delete current camera - + defaultCamera - + Reset camera - + Reset current camera - + %1_Camera @@ -3578,7 +3539,7 @@ Right click to remove points. NLQT::CDirectionWidget - + Enter Name @@ -3586,31 +3547,31 @@ Right click to remove points. NLQT::CEmitterPage - - - - + + + + NeL Particle Editor - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX',and thus, should have a finite duration. This operation create a loop in the system, and so is forbidden. - + Loops with emitters are forbidden. - - + + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + no emission @@ -3618,32 +3579,32 @@ Right click to remove points. NLQT::CFollowPathDialog - + Follow path param - + Projection plane: - + No projection - + XY plane - + XZ plane - + YZ plane @@ -3651,12 +3612,12 @@ Right click to remove points. NLQT::CForcePage - + NeL particle system editor - + The target object last forever. Applying a force on such an object may result in instability in the system after a while. Continue ? (clue : you've been warned..) @@ -3664,7 +3625,7 @@ Right click to remove points. NLQT::CGradientDialog - + Num samples: @@ -3672,63 +3633,63 @@ Right click to remove points. NLQT::CLocatedBindablePage - + Material - + Size/Angle 2D - + Rotations - + Look At param - + Shock wave param - + Fan Light param - + Tail param - + Mesh param - - + + Texture param - + Width - + Height - + Size @@ -3736,28 +3697,28 @@ Right click to remove points. NLQT::CLocatedPage - - + + NeL particle system editor - + The object has force(s) applied on it. If it last forever, its motion can become instable after a while. Continue anyway ? (clue : you've been warned ..) - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + Set the extern ID - + 0 means no extern access. @@ -3765,228 +3726,148 @@ Right click to remove points. NLQT::CMainWindow - + Open NeL data file - + All NeL files (*.shape *.ps *.ig);;NeL shape files (*.shape);;NeL particle system files (*.ps)NeL Instance Group files (*.ig) - + Open skeleton file - + NeL skeleton file (*.skel) - + About Object Viewer Qt - + <h2>Object Viewer Qt 8-)</h2><p> Authors: dnk-88, sfb, Kaetemi, kervala <p>Compiled on %1 %2 - + &Open... - + Open an existing file - - E&xit - - - - - Ctrl+Q - - - - - Exit the application - - - - + Set &background color - + Set background color - - Reset camera - - - - - Ctrl+R - - - - - Reset current camera - - - - - Ctrl+M - - - - - Change render mode (Line, Point, Filled) - - - - + &Reset scene - + Reset current scene - - + + Reload textures - + Save &Screenshot - + Make a screenshot of the current viewport and save - + &Settings - + Settings - - &About - - - - - Show the application's About box - - - - - About &Qt - - - - - Show the Qt library's About box - - - - - + + &File - + &View - + &Scene - - + + &Tools - - - &Help - - - - - StatusReady - - - - - Loading canceled - - - - - File loaded - - NLQT::CMeshWidget - + Open NeL data file - + NeL shape file (*.shape) - + Shape loading error - + Error in morph meshes - + Not a mesh - + Shape not loaded - + Too much vertices @@ -3994,26 +3875,26 @@ Right click to remove points. NLQT::CMorphMeshDialog - + vertices - + (%1 vertices) - - - + + + Open NeL data file - - - + + + NeL shape files (*.shape) @@ -4021,60 +3902,45 @@ Right click to remove points. NLQT::CParticleControlDialog - + Num particles: - + Num wanted faces: - + System time: - - - Num particles: %1 - - - - - Num wanted faces: %1 - - - - - System time: %1 - - NLQT::CParticleSystemPage - + Are you sure? - + Load balancing on/off - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + The system must have a finite duration for this setting! Please check that the following object doesn't live forever or doesn't create a loop in the system : - + The system must have a finite duration for this setting! Please check that. @@ -4082,47 +3948,47 @@ Right click to remove points. NLQT::CParticleTextureWidget - + Open texture file - + Image file (*.tga *.png) - + Texture loading error - + Name: - + Size: - + Depth: - + Name: %1 - + Size: %1x%2 - + Depth: %1 @@ -4130,167 +3996,167 @@ Right click to remove points. NLQT::CParticleWorkspaceDialog - + Set as active particle system - + Save - + Save as - + Clear content - + Remove from workspace - + Merge - + New located - + Paste located - + Force ZBias - + Instanciate - + Copy located - + Copy bindable - + Paste bindable - + Delete - + All LOD - + LOD 1 - + LOD 2 - + extern ID - - - - - + + + + + NeL particle system editor - + uses auto count feature, and it has been modified. You should run the system entirely at least once at full detail before saving so that the editor can compute the number of particles in the system. If user params are used to modify system aspect, you should run the system for extreme cases before saving. - + Save as ps file - + ps files (*.ps) - + Clear content ? - - + + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. - + The system is flagged with 'No max Nb steps', or uses the preset 'Spell FX'.System must have finite duration. Can't add object. To solve this, set a limited life time for the father. - + All object force ZBias - + Set the extern ID - + 0 means no extern access. - + Bind particle... - + Bind force... - + Bind zone... - + Bind emitter... @@ -4298,7 +4164,7 @@ Right click to remove points. NLQT::CPropertyDialog - + Property editor @@ -4306,52 +4172,52 @@ Right click to remove points. NLQT::CSettingsDialog - + Settings - + Graphics and sound settings take after restart the program - + Set new tile bank - + Tile Bank file (*.smallbank *.bank);; - + Set new tile far bank - + Tile Far Bank file (*.farbank);; - + Set MicroVegetable texture - + Texture file (*.tga *.png *.jpg *.dds);; - + Add zone files - + Zonel files (*.zonel *.zone);; @@ -4359,62 +4225,62 @@ Right click to remove points. NLQT::CSkeletonScaleDialog - - - - - - - + + + + + + + Skeleton scale editor - - - + + + Failed to open file for write! - + Save As Skeleton File - + Skeleton files (*.skel);; - + Open Skeleton Scale File - - + + SkelScale files (*.scale);; - + Failed to open file for read! - + Save As Skeleton Scale File - - + + Failed to save file! - + Failed to load file! @@ -4422,35 +4288,35 @@ Right click to remove points. NLQT::CSlotGroupBox - - - + + + Slot %1 : - - + + empty - + Select your anim - + Animation: - + Select your skel - + Skeleton weight template: @@ -4458,17 +4324,17 @@ Right click to remove points. NLQT::CSlotManagerDialog - + Slot %1 : empty : empty - + Slot %1 - + Slot manager @@ -4476,12 +4342,12 @@ Right click to remove points. NLQT::CSoundPage - + Select your sound - + Sound: @@ -4489,12 +4355,12 @@ Right click to remove points. NLQT::CSpinnerDialog - + Edit spinner - + Nb samples: @@ -4502,17 +4368,17 @@ Right click to remove points. NLQT::CValueBlenderDialog - + Value blender - + Start value: - + End value: @@ -4520,7 +4386,7 @@ Right click to remove points. NLQT::CValueFromEmitterDialog - + Value from emitter @@ -4528,12 +4394,12 @@ Right click to remove points. NLQT::CVegetableApperancePage - + Select on other vegetables - + Select the other vegetable to copy color. @@ -4541,12 +4407,12 @@ Right click to remove points. NLQT::CVegetableDensityPage - + Open Vegetable Shape - + veget files (*.veget);; @@ -4554,48 +4420,48 @@ Right click to remove points. NLQT::CVegetableDialog - + Load a new vegetset file - - + + vegetset files (*.vegetset);; - + Append vegetset file - + Save Vegetable Set - + VegetSetFiles (*.vegetset);; - + Open Vegetable Descriptor - + vegetdesc files (*.vegetdesc);; - + Save Vegetable Descriptor - + VegetDescFiles (*.vegetdesc);; @@ -4603,56 +4469,56 @@ Right click to remove points. NLQT::CWorkspacePage - + Create new pws file - - + + pws files (*.pws) - - + + Open NeL data file - + Particle Workspace file (*.pws);; - + Save as pws file - + Particle System file (*.ps);; - - - + + + NeL particle system editor - + Create new particle system file - + ps files (*.ps) - + Failed to create new particle system @@ -4660,12 +4526,12 @@ Right click to remove points. Plugin::CCoreListener - + Example close event hook - + Do you want to close window? @@ -4704,35 +4570,6 @@ Right click to remove points. - - Plugin::CSimpleViewer - - - - Open NeL data file - - - - - All NeL files (*.shape *.ps);;NeL shape files (*.shape);;NeL particle system files (*.ps) - - - - - All NeL files (*.shape *.ps);; - - - - - Open skeleton file - - - - - NeL skeleton file (*.skel) - - - Plugin::MyPlugin @@ -4804,7 +4641,7 @@ Right click to remove points. - + Choose output file diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts index e76844b65..af50e543d 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts @@ -4,18 +4,17 @@ Application - + Failed to load Core plugin: %1 Не удалось загрузить плагин: %1 - - + Object Viewer Qt - Plugin loader messages Object Viewer Qt - Сообщения загрузчика плагинов - + Could not find ovqt_plugin_core in %1 Не найден ovqt_plugin_core в %1 @@ -23,42 +22,42 @@ CAnimationDialog - + Animation control - + Loop Повтор - + In place На месте - + Increment pos - + Use the PlayList Использовать плейлист - + Use the Mixer Использовать микшер - + Play/Pause Играть/Пауза - + Stop Стоп @@ -66,57 +65,57 @@ CAnimationSetDialog - + Animation set manager Менеджер анимаций - + Edited object: Текущий объект: - + Animations: Список анимаций: - + Add anim Загрузить *.anim файлы - + Skeleton weight template: Шаблоны весов скелета: - + Add swt Загрузить *.swt файлы - + Animations playlist: Плейлист: - + Unload all anim and swt files Выгрузить все anim и swt файлы - + Add anim in PlayList Добавить анимацию в плейлист - + Delete anim from PlayList Удалить анимацию из плейлиста - + Set duration of time in Animation control Установить продолжительность времени проигрывания @@ -124,102 +123,102 @@ CAttribWidget - + GroupBox - + Constant Константа - + Scheme Схема - + Input mutliplier: Входной множитель: - + Clamp - + E - + Src: Источник: - + Date Время - + Position Позиция - + Inverse Mass Ивертированная масса - + Speed Скорость - + Random Случайные значения - + User param Пользовательский параметр - + LOD - + Square LOD - + Clamped LOD - + Camped square LOD - + U - + P - + G @@ -227,27 +226,27 @@ CAutoLODDialog - + Auto LOD - + Start percent DIST: - + Max dist BIAS: - + Degradation exponent: - + Skip particles Пропускать частицы @@ -255,22 +254,22 @@ CBasicEditWidget - + Form Форма - + Psi - + Theta - + Phi @@ -278,12 +277,12 @@ CColorEditWidget - + Form Форма - + Browse Обзор @@ -291,123 +290,123 @@ CConstraintMeshWidget - + Form Форма - + Force stage modulation - + Stage 0 - + Stage 1 - + Stage 2 - + Stage 3 - + Force vertex color lighting - Принудительное освещение вершин + Принудительное освещение вершин - + Texture anim type: Тип текстурной анимаций: - + None Не использовать - + Global Глобальный - + Reinit when new element is created Заново инициализировать, при созданий нового элемента - + Stage: - + Translation Перенос - - + + V Start: - - + + U Speed: U скорость: - - + + V Speed: V скорость: - - + + U Accel: U Ускорение: - - + + V Accel: V Ускорение: - - + + U Start: - + Scale Шасштаб - + Rotation Поворот - + Speed: Скорость: - + Accel: Ускорение: @@ -415,17 +414,17 @@ CDayNightDialog - + Day/Night День/Ночь - + Day День - + Night Ночь @@ -433,55 +432,55 @@ CDirectionWidget - + Form Форма - + Direction: Направление: - + +I - + +J - + +K - + -I - + -J - + -K - + Global - + Глобальный CEditRangeFloatWidget - + Form Форма @@ -489,7 +488,7 @@ CEditRangeUIntWidget - + Form Форма @@ -497,128 +496,128 @@ CEmitterPage - + Form Форма - + General Основные - + Emitted type: Излучаемые частицы: - + Type of emission: Тип излучения: - + Regular Постоянный - + On death После уничтожения - + Once Одиночный - + On bounce После отскока - + External only - + Direction: Направление: - + Default По умолчанию - + Direction is aligned on the emitter direction - + Direction is in world - + Direction is local to the system - + User Пользовательский - + Force consistent emission - + Bypass Auto-LOD - + Speed inheritance factor: - + Delayed emission: Задержка излучения: - + Max Emission Count: - + Radius: Радиус: - - + + Emission period Период излучения - + Emission quantity/Speed - + Emission quantity - + Strenght modulation Сила излучения @@ -656,47 +655,37 @@ CForcePage - + Form Форма - + Targets: Цели: - + Avaible targets: Доступные цели: - - < - - - - - > - - - - + Parametric factor: Параметрический коэффициент: - + Radial viscosity: Радиальное ускорение: - + Tangential viscosity: Тангенциальное ускорение: - + Force intensity Интенсивность силы @@ -704,12 +693,12 @@ CGlobalWindDialog - + Weather Погода - + Power: Сила ветра: @@ -717,27 +706,27 @@ CLightPage - + Form Форма - + Light color Цвет освещения - + Attenuation start/end Начало/конец затухания - + Attenuation start Начало затухания освещенности - + Attenuation end Конец затухания освещенности @@ -745,219 +734,219 @@ CLocatedBindablePage - + Form Форма - + Blending mode: Режим смешивания: - + Add Сложение - + Modulate Перемножение - + Alpha blend Альфа смешивание - + Alpha test Альфа тест - + No AutoLOD - + Global color lighting Глобальное освещение - + Z-Test Z-Тест - + ZBias: Z- Смещение: - + Color Цвет - + Independent size - + Height Высота - + Width Ширина - + Size Размер - + Angle 2D Угол 2D - + Rotation Вращение - + hint / precomputed rotations Предварительно вычисленные повороты - + Rot speed min: Мин. скорость поворота: - + Rot speed max: Макс. скорость поворота: - + Nb models: Количество моделей: - + Align on motion Выровнять по движению - + Z-Align Z-Выравнивание - + Fake motion blur coeff.: - + Fake motion blur treshold: - + Radius cut: - - + + Number of segments: Количество сегментов: - + Phase smoothness: - + Duration segment: - - + + Texture U factor: - + Number fan light: - + Fan light speed: - + Fan light intensity: - + Texture V factor: - + Non parametric anim only - + Force constant length(m): - + LOD degradation: - + Trail coord. system: - + Local Локальный - + World Мировой - + User Пользовательский - + Father coord. system Родительская система координат - + Use hermitte interpolation Использовать интерполяцию эрмита @@ -965,77 +954,77 @@ CLocatedPage - + Form Форма - + General Основные - + Coord system: Система координат: - + Particles are local to the system - + Particles are in world - + User - + Пользовательский - + Disgrade with lod - + Parametric motion - + Max number of particles: Максимальное количество частиц: - + Set current count particles - + Life time Время жизни - + Limited life time Ограниченное время жизни - + Triger on death Тригер для уничтожения - + Edit Правка - + Particle mass Масса частиц @@ -1089,32 +1078,32 @@ CMeshWidget - + GroupBox - + Shape: Модель: - + Browse Обзор - + Shape not loaded Модель не загружена - + Morph Морфинг - + Edit Правка @@ -1122,42 +1111,42 @@ CMorphMeshDialog - + Morph mesh edit - + Add Добавить - + Change Изменить - + Insert Вставить - + Remove Удалить - + Up Вверх - + Down Вниз - + Warning: Shapes not found and incompatibles !! Внимание: Модель не найдена или несовместима !! @@ -1165,95 +1154,95 @@ CMultiTexDialog - + Multitexturing Мультитекстурирование - + Main tex Главная текстура - - + + U speed 1: U скорость 1: - - + + V speed 1: V скорость 1: - - + + U speed 2: U скорость 2: - - + + V speed 2: V скорость 2: - + Bump factor: Bump фактор: - + Use particle data - - + + Tex op: Режим смешивания: - - + + Add Сложение - - + + Modulate Перемножение - - + + Decal - + EnvBumpMap - + Alternate tex - + Use particle data all - + Force basic caps - + Enable alternate @@ -1261,52 +1250,52 @@ CPSMoverPage - + Form Форма - + Position: Позиция: - + X: - + Y: - + Z: - + Sub component: Субкомпоненты: - + Scale X: Масштаб по X: - + Scale Y: Масштаб по Y: - + Scale Z: Масштаб по Z: - + Scale: Шасштаб: @@ -1314,115 +1303,115 @@ CParticleControlDialog - + Particles system control - + Loop Повтор - + Display helpers - + Enable auto count Включить авто подсчет - + Display box - + All particle system - + Reset auto count Сбросить авто подсчет - + Link play to scene play - + Link to skeleton - + Unlink - + Отсоединить - + Restick all objects - + Set anim Выбрать anim - + Clear anim - + General Основные - + Additional Дополнительные - - Num particles:9999999 - Кол-во частиц:9999999 + + Num particles: + Кол-во частиц: - - Num wanted faces:9999999 + + Num wanted faces: - - System time:99999999999 - Время:99999999999 + + System time: + Время: CParticleLinkDialog - + Link to skeleton - + Choose bone to stick particle system - + Link Присоединить - + Unlink Отсоединить @@ -1430,300 +1419,300 @@ CParticleSystemPage - + Form Форма - + Integration - + Enable load balancing - + Accurate integration - + Enable motion slowDown - + Time threshold: - + Max steps: - + Lock - + User param - + Пользовательский параметр - + User param1: - - - - + + + + Global - + Глобальный - + User param2: - + User param3: - + User param4: - + PBBox / LOD param - + Enable Precomputed Bounding Box - + Auto Авто - + Reset Сбросить - + X: - + Y: - + Z: - + +10 % - + -10 % - + Sharable - + Auto-LOD - + Settings Настройки - + Max view dist: - + LOD Ratio: - + Global color Глобальный цвет - + Force global lighting Принудительное глобальное освещение - + Edit global color - + Wrn: Bypass multitex, not supported by all types - + Life mgt param - + Life mgt presets: - + Environment FX - + Running Environment FX - + Spell FX - + Looping Spell FX - + Minor transitory FX - + User defined - + Moving Looping FX - + Spawned Environment FX - + Ground FX - + Projectile FX - + Model removed when out of range - + PS resource removed when not visible - + Force life time update - + No max nb steps - + Anim type: - + Die on event: - + When visible - + When in visible clusters - + Always - + Disabled Отключить - + No more particles - + No more particles/emitters - + Apply after delay: - + s - + Auto delay @@ -1731,27 +1720,27 @@ CParticleTextureAnimWidget - + Form Форма - + Enable texture anim Включить анимацию текстуры - + Texture grouped Группа текстур - + Multitexturing Мультитекстурирование - + Edit Правка @@ -1759,32 +1748,32 @@ CParticleTextureWidget - + Form Форма - + Choose texture Выбрать - + Remove Удалить - + Name: Имя: - + Size: Размер: - + Depth: Цвет: @@ -1792,7 +1781,7 @@ CParticleWorkspaceDialog - + Tree workspace Испектор объектов редактора частиц @@ -1915,7 +1904,7 @@ CSettingsDialog - + Settings Настройки @@ -1925,151 +1914,151 @@ - + Graphics Графика - + Sound Звук - + Paths Пути - + Vegetable - + Graphics settings Графические настройки - - + + Driver Драйвер - + Bloom effect Блум эффект - + Bloom density Плотность блума - + Square bloom - + Enable bloom effect Включить блум эффект - + Qt Style Qt стиль - + Style Стиль - + Use style's standard palette - + Sound settings Звуковые настройки - + SoundAutoLoadSample - + SoundEnableOccludeObstruct - + SoundEnableReverb - + SoundManualRolloff - + SoundForceSoftware - + SoundUseADPCM - + SoundMaxTrack - + Search paths Пути поиска - - - - - - - - - + + + + + + + + + ... - + Setup Landscape - + Tile bank: - + Tile far bank: - + Vegetable texture: - + Landscape zones: @@ -2077,32 +2066,32 @@ CSetupFog - + Setup fog Настройка тумана - + Start: Начало: - + End: Конец: - + Enable fog Включить туман - + Color Цвет - + Apply Применить @@ -2110,86 +2099,86 @@ CSkeletonScaleDialog - + Skeleton scale edition Редактор размеров скелета - + Bone scale Масштаб кости - - + + X: - - - - - - - - - - - - + + + + + + + + + + + + % - - + + Y: - - + + Z: - + Skin scale (slower) Масштаб оболочки (медленно) - + Mirror selected Зеркалировать выбранное - + Undo Отменить - + Redo Повторить - + Save .skel Сохранить .skel - + Save as Сохранить как - + Load .scale Загрузить .scale - + Save .scale Сохранить .scale @@ -2197,92 +2186,92 @@ CSlotGroupBox - + GroupBox - + Slot _:empty Слот _:пустой - + Start blend Начало смешивания - + End blend Конец смешивания - + Offset frame Смещение кадра - + Speed x Скорость - + Start frame Начальный кадр - + End frame Конечный кадр - + Smooth Плавность - + Wrap mode: Режим: - + Clamp - + Repeat Повтор - + Disable Отключить - + Set anim Выбрать anim - + Set skel Выбрать skel - + Align blend - + Enable Включить - + Invert skeleton weight Ивертировать веса скелета @@ -2290,57 +2279,57 @@ CSoundPage - + Form Форма - + General Основные - + Sound name Имя звука - + Browse Обзор - + Play Играть - + Spawn - + Mute Выключить - + Keep original pitch - + Emission percent: - + Sound volume Громкость - + Sound pitch Высота звука @@ -2348,22 +2337,22 @@ CSunColorDialog - + Sun color Цвет солнца - + Diffuse: - + Ambient - + Specular: @@ -2371,77 +2360,77 @@ CTailParticleWidget - + Form Форма - + Ribbon orientation - + Follow Path - + Follow Path XY - + Identity - + Tail shape - + Triangle - + Quad - + Octogon - + Pentagram - + Simple segment X - + Simple segment Y - + Simple segment Z - + Simple brace - + Tail fading @@ -2449,17 +2438,17 @@ CTuneMRMDialog - + Tune MRM (The maximum faces in scene) - + Max (specify the max value) Макс.(укажите макс. значение) - + Current (real final max polygon value) Текущее(реальное макс.значение количества полигонов) @@ -2467,12 +2456,12 @@ CTuneTimerDialog - + Time interval update render Временной интервал обновления рендера - + ms мсек @@ -2480,37 +2469,37 @@ CVegetNoiseValueWidget - + GroupBox - + AbsValue: - + *3 - + 100% - + /3 - + RandValue: - + Frequency: @@ -2518,37 +2507,37 @@ CVegetableApperancePage - + Form Форма - + Bend Phase - + Bend Factor - + Color Noise Цветовой шум - + Color setup Настройки цвета - + Double cliclk to change color Двойным щелчком мыши выберите цвет - + Get List from other @@ -2556,77 +2545,77 @@ CVegetableDensityPage - + Form Форма - + Vegetable mesh selection - + Browse Обзор - + Distance of creation - + 0 m - + Density - + MaxDensity - + MaxDensity enabled - + Angle setup - + Angle Mode: - + Floor - + Wall - + Ceiling - + AngleMin - + AngleMax @@ -2634,102 +2623,102 @@ CVegetableDialog - + Vegetable editor Редактор растительности - + Vegetables: - + List edition - + Add vegetable - + Insert vegetable - + Remove vegetable - + Clear all vegetables - + Copy Vegetable - + Load .vegetdesc - + Save .vegetdesc - + List Save/Load - + Load .vegetset - + Append .vegetset - + Save .vegetset - + Display Vegetables - + Landscape - + General/Density - + Appearance - + Scale Шасштаб - + Rotation Вращение @@ -2737,47 +2726,47 @@ CVegetableLandscapePage - + Form Форма - + Setup Wind Настройки ветра - + Power: Сила ветра: - + Bend Start: - + Frequency Частота - + Ambient color - + Diffuse color - + Show Vegetable Lands Показать ландшафт - + Snap Camera To Ground @@ -2785,22 +2774,22 @@ CVegetableRotatePage - + Form Форма - + Rotate X - + Rotate Y - + Rotate Z @@ -2808,22 +2797,22 @@ CVegetableScalePage - + Form Форма - + Scale X/Y - + Scale Z - + Bend Frequency Factor @@ -2831,122 +2820,122 @@ CWaterPoolDialog - + Water pool editor - + Pool ID List: - + Add Сложение - + Delete Удалить - + Name... - + Size: Размер: - + 16 - + 32 - + 64 - + 128 - + 256 - + 512 - + Water Unit Size: - + Damping: - + Filter weight: - + Propagation time: - + Enable automatic waves generation - + Waves - + Impulsion strenght: - + Period: - + Impulsion radius: - + Generate on border only - + Load Загрузить - + Save Сохранить @@ -2954,53 +2943,53 @@ CWorkspacePage - - + + Particle system editor Редактор системы частиц - + Workspace - + New Создать - + Load Загрузить - + Save Сохранить - + Save As Сохранить как - + Particle system - + Insert New Вставить - + Create New Создать - + Reset all Сбросить @@ -3008,32 +2997,32 @@ CZonePage - + Form Форма - + Targets: Цели: - + Avaible targets: Доступные цели: - + Bounce Отскок - + Destroy Уничтожение - + Bounce factor: Сила отскока: @@ -3180,63 +3169,63 @@ CurveEditDialog - + Curve edit Редактор кривых - + Left click to add points. Right click to remove points. - + Zoom: - + Scale curve - + Translate: - + Position curve - + Num samples: - + Last=First - + First=Last - + Display interpolation - + Smoothing - + Ok @@ -3264,49 +3253,21 @@ Right click to remove points. Закрыть - - Form - - - AddInstance - - - - - AddCharacter - - - - - Reset - Сбросить - - - - Play - Играть - - - - Stop - Стоп - - NLQT::CAnimationSetDialog - - + + Open NeL anim file - + NeL anim files (*.anim);; - + NeL Skeleton Weight Template files (*.swt);; @@ -3314,27 +3275,27 @@ Right click to remove points. NLQT::CAttribFloatWidget - + value blender - + values gradient - + curve - + value computed from emitter - + binary operator @@ -3342,22 +3303,22 @@ Right click to remove points. NLQT::CAttribIntWidget - + value exact blender - + values gradient - + value computed from emitter - + binary operator @@ -3365,27 +3326,27 @@ Right click to remove points. NLQT::CAttribPlaneBasisWidget - + basis gradient - + follow path - + spinner - + values computed from emitter - + binary operator @@ -3393,27 +3354,27 @@ Right click to remove points. NLQT::CAttribRGBAWidget - + color sampled blender - + color gradient - + color exact blender - + values computed from emitter - + binary operator @@ -3421,22 +3382,22 @@ Right click to remove points. NLQT::CAttribUIntWidget - + value blender - + values gradient - + value computed from emitter - + binary operator @@ -3444,7 +3405,7 @@ Right click to remove points. NLQT::CAttribWidget - + Set user param @@ -3452,17 +3413,17 @@ Right click to remove points. NLQT::CBinOpDialog - + Bin operator - + Arg1 - + Arg2 @@ -3470,107 +3431,107 @@ Right click to remove points. NLQT::CCameraControl - + CameraControl - + Fly - + Set firstPerson camera mode - + Edit - + Правка - + Set edit3d camera mode - + Render Mode Режим отображения - + Point mode - + Set point render mode - + Line mode - + Set line render mode - + Fill mode - + Set fill render mode - + Speed: Скорость: - + Create camera Создать камеру - + Create new camera Создать новую камеру - + Delete camera Удалить камеру - + Delete current camera Удалить текущую камеру - + defaultCamera - + Reset camera Сбросить камеру - + Reset current camera Сбросить текущую камеру - + %1_Camera %1_Камера @@ -3578,7 +3539,7 @@ Right click to remove points. NLQT::CDirectionWidget - + Enter Name Введите название @@ -3586,33 +3547,33 @@ Right click to remove points. NLQT::CEmitterPage - - - - + + + + NeL Particle Editor Редактор системы частиц - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX',and thus, should have a finite duration. This operation create a loop in the system, and so is forbidden. Невозможно выполнить операцию: система частиц помечена флагом "No max nb steps" или использует заданный "Spell FX, и, таким образом, должна иметь конечную длительность. Эта операция создает цикл в системе частиц, и это запрещено. - + Loops with emitters are forbidden. Петли с эмиттерами запрещены. - - + + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. Невозможно выполнить операцию: система частиц помечен флагом "No max nb steps" или использует "Spell FX, и, таким образом, должна иметь конечную длительность. Пожалуйста, удалите этот флаг в первую очередь. - + no emission Не излучать @@ -3620,32 +3581,32 @@ Right click to remove points. NLQT::CFollowPathDialog - + Follow path param - + Projection plane: - + No projection - + XY plane XY плоскость - + XZ plane XZ плоскость - + YZ plane YZ плоскость @@ -3653,12 +3614,12 @@ Right click to remove points. NLQT::CForcePage - + NeL particle system editor Редактор системы частиц - + The target object last forever. Applying a force on such an object may result in instability in the system after a while. Continue ? (clue : you've been warned..) Целевой объект длиться вечно. Применяя силу к такому объекту может привести к нестабильности в системе через некоторое время. Продолжить? @@ -3666,7 +3627,7 @@ Right click to remove points. NLQT::CGradientDialog - + Num samples: @@ -3674,63 +3635,63 @@ Right click to remove points. NLQT::CLocatedBindablePage - + Material Материал - + Size/Angle 2D Размер/Угол 2D - + Rotations Вращение - + Look At param - + Shock wave param - + Fan Light param - + Tail param - + Mesh param Параметры модели - - + + Texture param Параметры текстуры - + Width Ширина - + Height Высота - + Size Размер @@ -3738,29 +3699,29 @@ Right click to remove points. NLQT::CLocatedPage - - + + NeL particle system editor Редактор системы частиц - + The object has force(s) applied on it. If it last forever, its motion can become instable after a while. Continue anyway ? (clue : you've been warned ..) - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. Невозможно выполнить операцию: система помечена "No max nb steps" или использует "Spell FX, и, таким образом, должна иметь конечную длительность. Пожалуйста, удалите этот флаг в первую очередь. - + Set the extern ID - + 0 means no extern access. @@ -3768,228 +3729,148 @@ Right click to remove points. NLQT::CMainWindow - + Open NeL data file Открыть NeL файлы - + All NeL files (*.shape *.ps *.ig);;NeL shape files (*.shape);;NeL particle system files (*.ps)NeL Instance Group files (*.ig) - + Open skeleton file - + NeL skeleton file (*.skel) файл NeL скелета (*.skel) - + About Object Viewer Qt О Object Viewer Qt - + <h2>Object Viewer Qt 8-)</h2><p> Authors: dnk-88, sfb, Kaetemi, kervala <p>Compiled on %1 %2 <h2>Object Viewer Qt 8-)</h2><p> Авторы: dnk-88, sfb, Kaetemi, kervala <p>Compiled on %1 %2 - + &Open... &Открыть... - + Open an existing file Открыть файл - - E&xit - В&ыход - - - - Ctrl+Q - - - - - Exit the application - Выйти из приложения - - - + Set &background color &Установить фоновый цвет - + Set background color Установить фоновый цвет - - Reset camera - Сбросить камеру - - - - Ctrl+R - - - - - Reset current camera - Сбросить текущую камеру - - - - Ctrl+M - - - - - Change render mode (Line, Point, Filled) - Переключить режим рендера - - - + &Reset scene С&бросить сцену - + Reset current scene Сбросить текукщую сцену - - + + Reload textures Перегрузить текстуры - + Save &Screenshot Сохранить с&криншот - + Make a screenshot of the current viewport and save Создать скриншот окна просмотра и сохранить - + &Settings &Настройки - + Settings Настройки - - &About - О программе - - - - Show the application's About box - Открыть диалог О программе - - - - About &Qt - О &Qt - - - - Show the Qt library's About box - Открыть диалог О Qt - - - - + + &File &Файл - + &View &Вид - + &Scene С&цена - - + + &Tools &Иструменты - - - &Help - &Справка - - - - StatusReady - - - - - Loading canceled - Загрузка отменена - - - - File loaded - Файл загружен - NLQT::CMeshWidget - + Open NeL data file Открыть NeL файлы - + NeL shape file (*.shape) - + Shape loading error Ошибка загрузка модели - + Error in morph meshes - + Not a mesh - + Shape not loaded Модель не загружена - + Too much vertices Слишком много вершин @@ -3997,26 +3878,26 @@ Right click to remove points. NLQT::CMorphMeshDialog - + vertices вершины - + (%1 vertices) (%1 вершин) - - - + + + Open NeL data file Открыть NeL файлы - - - + + + NeL shape files (*.shape) @@ -4024,61 +3905,46 @@ Right click to remove points. NLQT::CParticleControlDialog - + Num particles: Кол-во частиц: - + Num wanted faces: - + System time: Время: - - - Num particles: %1 - Кол-во частиц: %1 - - - - Num wanted faces: %1 - - - - - System time: %1 - Время: %1 - NLQT::CParticleSystemPage - + Are you sure? Вы уверены? - + Load balancing on/off - + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. Невозможно выполнить операцию: система помечена "No max nb steps" или использует "Spell FX, и, таким образом, должна иметь конечную длительность. Пожалуйста, удалите этот флаг в первую очередь. - + The system must have a finite duration for this setting! Please check that the following object doesn't live forever or doesn't create a loop in the system : - + The system must have a finite duration for this setting! Please check that. Система частиц должна иметь конечную продолжительность этого параметра! Пожалуйста, проверьте. @@ -4086,47 +3952,47 @@ Right click to remove points. NLQT::CParticleTextureWidget - + Open texture file Открыть файл текстуры - + Image file (*.tga *.png) Файл изображения (*.tga *.png) - + Texture loading error Ошибка загрузки текстуры - + Name: Имя: - + Size: Размер: - + Depth: Цвет: - + Name: %1 Имя: %1 - + Size: %1x%2 Размер: %1x%2 - + Depth: %1 Цвет: %1 @@ -4134,168 +4000,168 @@ Right click to remove points. NLQT::CParticleWorkspaceDialog - + Set as active particle system - + Save Сохранить - + Save as Сохранить как - + Clear content Очистить - + Remove from workspace - + Merge - + New located - + Paste located - + Force ZBias - + Instanciate - + Copy located - + Copy bindable - + Paste bindable - + Delete Удалить - + All LOD - + LOD 1 - + LOD 2 - + extern ID - - - - - + + + + + NeL particle system editor Редактор системы частиц - + uses auto count feature, and it has been modified. You should run the system entirely at least once at full detail before saving so that the editor can compute the number of particles in the system. If user params are used to modify system aspect, you should run the system for extreme cases before saving. - + Save as ps file - + ps files (*.ps) - + Clear content ? Очистить? - - + + Can't perform operation : the system is flagged with 'No max nb steps' or uses the preset 'Spell FX', and thus, should have a finite duration. Please remove that flag first. Невозможно выполнить операцию: система помечена "No max nb steps" или использует "Spell FX, и, таким образом, должна иметь конечную длительность. Пожалуйста, удалите этот флаг в первую очередь. - + The system is flagged with 'No max Nb steps', or uses the preset 'Spell FX'.System must have finite duration. Can't add object. To solve this, set a limited life time for the father. - + All object force ZBias - + Set the extern ID - + 0 means no extern access. - + Bind particle... - + Bind force... - + Bind zone... - + Bind emitter... @@ -4303,7 +4169,7 @@ Right click to remove points. NLQT::CPropertyDialog - + Property editor Редактор свойств @@ -4311,52 +4177,52 @@ Right click to remove points. NLQT::CSettingsDialog - + Settings Настройки - + Graphics and sound settings take after restart the program настройки графики и звука будут применены после перезапуска программы - + Set new tile bank - + Tile Bank file (*.smallbank *.bank);; - + Set new tile far bank - + Tile Far Bank file (*.farbank);; - + Set MicroVegetable texture - + Texture file (*.tga *.png *.jpg *.dds);; - + Add zone files - + Zonel files (*.zonel *.zone);; @@ -4364,62 +4230,62 @@ Right click to remove points. NLQT::CSkeletonScaleDialog - - - - - - - + + + + + + + Skeleton scale editor - - - + + + Failed to open file for write! Не удалось открыть файл для записи! - + Save As Skeleton File - + Skeleton files (*.skel);; - + Open Skeleton Scale File - - + + SkelScale files (*.scale);; - + Failed to open file for read! Не удалось открыть файл для чтения! - + Save As Skeleton Scale File - - + + Failed to save file! Не удалось сохранить файл! - + Failed to load file! Не удалось открыть файл! @@ -4427,35 +4293,35 @@ Right click to remove points. NLQT::CSlotGroupBox - - - + + + Slot %1 : Слот %1 : - - + + empty пусто - + Select your anim - + Animation: - + Select your skel - + Skeleton weight template: Шаблоны весов скелета: @@ -4463,17 +4329,17 @@ Right click to remove points. NLQT::CSlotManagerDialog - + Slot %1 : empty : empty Слот %1 : пусто : пусто - + Slot %1 Слот %1 - + Slot manager Микшер @@ -4481,12 +4347,12 @@ Right click to remove points. NLQT::CSoundPage - + Select your sound Выберите звук - + Sound: Звук: @@ -4494,12 +4360,12 @@ Right click to remove points. NLQT::CSpinnerDialog - + Edit spinner - + Nb samples: @@ -4507,17 +4373,17 @@ Right click to remove points. NLQT::CValueBlenderDialog - + Value blender - + Start value: - + End value: @@ -4525,7 +4391,7 @@ Right click to remove points. NLQT::CValueFromEmitterDialog - + Value from emitter Значение из эмитера @@ -4533,12 +4399,12 @@ Right click to remove points. NLQT::CVegetableApperancePage - + Select on other vegetables - + Select the other vegetable to copy color. @@ -4546,12 +4412,12 @@ Right click to remove points. NLQT::CVegetableDensityPage - + Open Vegetable Shape - + veget files (*.veget);; @@ -4559,48 +4425,48 @@ Right click to remove points. NLQT::CVegetableDialog - + Load a new vegetset file - - + + vegetset files (*.vegetset);; - + Append vegetset file - + Save Vegetable Set - + VegetSetFiles (*.vegetset);; - + Open Vegetable Descriptor - + vegetdesc files (*.vegetdesc);; - + Save Vegetable Descriptor - + VegetDescFiles (*.vegetdesc);; @@ -4608,56 +4474,56 @@ Right click to remove points. NLQT::CWorkspacePage - + Create new pws file Сооздать новый pws файл - - + + pws files (*.pws) - - + + Open NeL data file Открыть NeL файлы - + Particle Workspace file (*.pws);; - + Save as pws file - + Particle System file (*.ps);; - - - + + + NeL particle system editor Редактор системы частиц - + Create new particle system file Создать файл системы частиц - + ps files (*.ps) - + Failed to create new particle system Не удалось создать новую систему частиц @@ -4665,12 +4531,12 @@ Right click to remove points. Plugin::CCoreListener - + Example close event hook - + Do you want to close window? @@ -4709,35 +4575,6 @@ Right click to remove points. Основные - - Plugin::CSimpleViewer - - - - Open NeL data file - Открыть NeL файлы - - - - All NeL files (*.shape *.ps);;NeL shape files (*.shape);;NeL particle system files (*.ps) - - - - - All NeL files (*.shape *.ps);; - - - - - Open skeleton file - - - - - NeL skeleton file (*.skel) - файл NeL скелета (*.skel) - - Plugin::MyPlugin @@ -4809,7 +4646,7 @@ Right click to remove points. - + Choose output file diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/translations.qrc b/code/nel/tools/3d/object_viewer_qt/src/translations/translations.qrc new file mode 100644 index 000000000..bf1d0f9fe --- /dev/null +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/translations.qrc @@ -0,0 +1,8 @@ + + + object_viewer_qt_en.qm + object_viewer_qt_fr.qm + object_viewer_qt_de.qm + object_viewer_qt_ru.qm + +