From 281a17d7426aee5d03e5808ad1dbda77561e43be Mon Sep 17 00:00:00 2001 From: aquiles Date: Sun, 20 Feb 2011 18:52:56 +0100 Subject: [PATCH] Changed: #1193 adapted log plugin to latest interface changes; removed obsolete translation entries and added few german sample translations --- .../src/plugins/log/CMakeLists.txt | 14 +- .../src/plugins/log/log_plugin.cpp | 13 + .../src/plugins/log/log_plugin.h | 1 + .../src/translations/object_viewer_qt_de.ts | 234 +++++++----------- .../src/translations/object_viewer_qt_en.ts | 158 ++++-------- .../src/translations/object_viewer_qt_fr.ts | 158 ++++-------- .../src/translations/object_viewer_qt_ru.ts | 211 ++++------------ 7 files changed, 266 insertions(+), 523 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt index f58775bd5..d1caa1ead 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt @@ -5,11 +5,15 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} 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) + ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h) -SET(OVQT_PLUG_LOG_HDR log_plugin.h) -SET(OVQT_PLUG_LOG_UIS log_form.ui) +SET(OVQT_PLUG_LOG_HDR log_plugin.h + log_settings_page.h + ${CMAKE_CURRENT_SOURCE_DIR}/../core/iapp_page.h) + +SET(OVQT_PLUG_LOG_UIS log_form.ui + log_settings_page.ui) SET(QT_USE_QTGUI TRUE) SET(QT_USE_QTOPENGL TRUE) @@ -25,7 +29,7 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC}) ADD_LIBRARY(ovqt_plugin_log MODULE ${SRC} ${OVQT_PLUG_LOG_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUG_LOG_UI_HDRS}) -TARGET_LINK_LIBRARIES(ovqt_plugin_log nelmisc ${QT_LIBRARIES}) +TARGET_LINK_LIBRARIES(ovqt_plugin_log ovqt_plugin_core nelmisc ${QT_LIBRARIES}) NL_DEFAULT_PROPS(ovqt_plugin_log "NeL, Tools, 3D: Object Viewer Qt Plugin: Log") NL_ADD_RUNTIME_FLAGS(ovqt_plugin_log) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp index 427f81af4..936192a28 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp @@ -18,6 +18,7 @@ along with this program. If not, see . */ #include "log_plugin.h" +#include "log_settings_page.h" // Qt includes #include @@ -39,6 +40,11 @@ along with this program. If not, see . #include "qt_displayer.h" using namespace Plugin; + +namespace ExtensionSystem +{ + class IPluginSpec; +} CLogPlugin::CLogPlugin(QWidget *parent): QDockWidget(parent) { @@ -59,6 +65,13 @@ bool CLogPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QStr { Q_UNUSED(errorString); _plugMan = pluginManager; + QMainWindow *wnd = qobject_cast(objectByName("CMainWindow")); + if (!wnd) + { + *errorString = tr("Not found QMainWindow Object Viewer Qt."); + return false; + } + _plugMan->addObject(new CLogSettingsPage(this)); return true; } diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h index 3ec4f6620..46ce9c28f 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h @@ -60,6 +60,7 @@ namespace Plugin void extensionsInitialized(); void setNelContext(NLMISC::INelContext *nelContext); + NLQT::CQtDisplayer* displayer() { return _displayer; } QString name() const; QString version() const; 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 abb41a9f0..db0b55429 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 @@ -1034,6 +1034,44 @@ Log + Log + + + + CLogSettingsPage + + + Form + + + + + NeL Displayers + + + + + Error Log + + + + + Warning Log + + + + + Debug Log + + + + + Assert Log + + + + + Info Log @@ -3016,112 +3054,112 @@ Object Viewer Qt - + Object Viewer Qt About Object Viewer Qt - + Über Object Viewer Qt <h2>Object Viewer Qt NG</h2><p> Author: dnk-88 <p>Compiled on %1 %2 - + <h2>Object Viewer Qt NG</h2><p> Autor: dnk-88 <p>Kompliert 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 &Settings - + Ein&stellungen Open the settings dialog - + Öffnet das Konfigurationsmenü &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 About &Plugins - + Über &Plugins Show the plugin view dialog - + Zeigt Informationen über Plugins &File - + &Datei &Edit - + &Editieren &View - + &Ansicht &Tools - + &Werkzeuge &Help - + &Hilfe StatusReady - + Status Fertig @@ -3214,108 +3252,6 @@ Right click to remove points. - - Dialog - - - Dialog - - - - - Browse - - - - - Reload - - - - - End - - - - - Form - - - Form - - - - - Graphics settings - - - - - - Driver - - - - - Qt Style - - - - - Style - - - - - Use style's standard palette - - - - - Use WinAero - - - - - Sound settings - - - - - SoundAutoLoadSample - - - - - SoundEnableOccludeObstruct - - - - - SoundEnableReverb - - - - - SoundManualRolloff - - - - - SoundForceSoftware - - - - - SoundUseADPCM - - - - - SoundMaxTrack - - - NLQT::CAnimationSetDialog @@ -3863,7 +3799,7 @@ Right click to remove points. About Object Viewer Qt - + Über Object Viewer Qt @@ -3873,27 +3809,27 @@ Right click to remove points. &Open... - + &Öffnen... Open an existing file - + Datei öffnen E&xit - + B&eenden Ctrl+Q - + Ctrl+Q Exit the application - + Object Viewer verlassen @@ -3959,7 +3895,7 @@ Right click to remove points. &Settings - + Ein&stellungen @@ -3969,33 +3905,33 @@ Right click to remove points. &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 @@ -4006,17 +3942,17 @@ Right click to remove points. &Tools - + &Werkzeuge &Help - + &Hilfe StatusReady - + Status Fertig @@ -4792,15 +4728,23 @@ Right click to remove points. - Plugin::MyPlugin + Plugin::CLogPlugin - + Not found QMainWindow Object Viewer Qt. + + + Plugin::CLogSettingsPage - - Not found QMenu Help. + + Log + Log + + + + General @@ -4867,7 +4811,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 af528c687..c941fc29d 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 @@ -1037,6 +1037,44 @@ + + CLogSettingsPage + + + Form + + + + + NeL Displayers + + + + + Error Log + + + + + Warning Log + + + + + Debug Log + + + + + Assert Log + + + + + Info Log + + + CMeshWidget @@ -3214,108 +3252,6 @@ Right click to remove points. - - Dialog - - - Dialog - - - - - Browse - - - - - Reload - - - - - End - - - - - Form - - - Form - - - - - Graphics settings - - - - - - Driver - - - - - Qt Style - - - - - Style - - - - - Use style's standard palette - - - - - Use WinAero - - - - - Sound settings - - - - - SoundAutoLoadSample - - - - - SoundEnableOccludeObstruct - - - - - SoundEnableReverb - - - - - SoundManualRolloff - - - - - SoundForceSoftware - - - - - SoundUseADPCM - - - - - SoundMaxTrack - - - NLQT::CAnimationSetDialog @@ -4792,15 +4728,23 @@ Right click to remove points. - Plugin::MyPlugin + Plugin::CLogPlugin - + Not found QMainWindow Object Viewer Qt. + + + Plugin::CLogSettingsPage - - Not found QMenu Help. + + Log + + + + + General @@ -4867,7 +4811,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 73aa384c0..cf3cb08ed 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 @@ -1037,6 +1037,44 @@ + + CLogSettingsPage + + + Form + + + + + NeL Displayers + + + + + Error Log + + + + + Warning Log + + + + + Debug Log + + + + + Assert Log + + + + + Info Log + + + CMeshWidget @@ -3214,108 +3252,6 @@ Right click to remove points. - - Dialog - - - Dialog - - - - - Browse - - - - - Reload - - - - - End - - - - - Form - - - Form - - - - - Graphics settings - - - - - - Driver - - - - - Qt Style - - - - - Style - - - - - Use style's standard palette - - - - - Use WinAero - - - - - Sound settings - - - - - SoundAutoLoadSample - - - - - SoundEnableOccludeObstruct - - - - - SoundEnableReverb - - - - - SoundManualRolloff - - - - - SoundForceSoftware - - - - - SoundUseADPCM - - - - - SoundMaxTrack - - - NLQT::CAnimationSetDialog @@ -4792,15 +4728,23 @@ Right click to remove points. - Plugin::MyPlugin + Plugin::CLogPlugin - + Not found QMainWindow Object Viewer Qt. + + + Plugin::CLogSettingsPage - - Not found QMenu Help. + + Log + + + + + General @@ -4867,7 +4811,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 edfbc59b2..fa6b0af74 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 @@ -1037,6 +1037,44 @@ Лог + + CLogSettingsPage + + + Form + Форма + + + + NeL Displayers + + + + + Error Log + + + + + Warning Log + + + + + Debug Log + + + + + Assert Log + + + + + Info Log + + + CMeshWidget @@ -3214,159 +3252,6 @@ Right click to remove points. - - Dialog - - - Dialog - - - - - Browse - Обзор - - - - Reload - Перегрузить - - - - End - Выход - - - - Form - - - Form - Форма - - - - Graphics settings - Графические настройки - - - - - Driver - Драйвер - - - - Qt Style - Qt стиль - - - - Style - Стиль - - - - Use style's standard palette - - - - - Use WinAero - - - - - Sound settings - Звуковые настройки - - - - SoundAutoLoadSample - - - - - SoundEnableOccludeObstruct - - - - - SoundEnableReverb - - - - - SoundManualRolloff - - - - - SoundForceSoftware - - - - - SoundUseADPCM - - - - - SoundMaxTrack - - - - - NLQT - - Point - Точка - - - Ribbon - Лента - - - Mesh - Модель - - - ConstraintMesh - Ограниченная модель - - - Face - Грань - - - Gravity - Гравитация - - - Spring - Пружина - - - Plane - Плоскость - - - Sphere - Сфера - - - Rectangle - Прямоугольник - - - Disc - Диск - - - Cylinder - Цилиндр - - NLQT::CAnimationSetDialog @@ -4848,16 +4733,24 @@ Right click to remove points. - Plugin::MyPlugin + Plugin::CLogPlugin - + Not found QMainWindow Object Viewer Qt. + + + Plugin::CLogSettingsPage - - Not found QMenu Help. - + + Log + Лог + + + + General + Главное @@ -4923,7 +4816,7 @@ Right click to remove points. - + Choose output file