From a41d47a3c1e6b0734a59ff8cc5ee1940368b4e66 Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Wed, 18 Jul 2012 04:08:53 +0200 Subject: [PATCH] CHANGED: #1471 A little cleanup. --- .../plugins/gui_editor/gui_editor_window.cpp | 45 ------------------- .../plugins/gui_editor/gui_editor_window.h | 1 - 2 files changed, 46 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.cpp index 7a6867910..566e86fd2 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.cpp @@ -35,15 +35,10 @@ #include "link_editor.h" #include "proc_editor.h" -#include "nel/gui/interface_group.h" -#include "nel/gui/widget_manager.h" -#include "nel/gui/view_renderer.h" - namespace GUIEditor { QString _lastDir; std::map< std::string, SWidgetInfo > widgetInfo; - std::set< std::string > hwCurs; GUIEditorWindow::GUIEditorWindow(QWidget *parent) : QMainWindow(parent) @@ -75,22 +70,6 @@ namespace GUIEditor browserCtrl.setup(); dock->setWidget( tb ); addDockWidget( Qt::RightDockWidgetArea, dock ); - - CWidgetManager::getInstance(); - NLMISC::CPath::addSearchPath( "z:/ryzom/data", true, false, NULL ); - NLMISC::CPath::remapExtension ("dds", "tga", true); - NLMISC::CPath::remapExtension ("dds", "png", true); - NLMISC::CPath::remapExtension ("png", "tga", true); - - NLGUI::_UIStringMapper = - NLMISC::CStringMapper::createLocalMapper(); - - NL3D::UDriver *driver = NL3D::UDriver::createDriver(); - CViewRenderer::setDriver( driver ); - CViewRenderer::setTextContext( driver->createTextContext( NLMISC::CPath::lookup( "ryzom.ttf" ) ) ); - hwCurs.insert( "curs_default.tga" ); - CViewRenderer::hwCursors = &hwCurs; - CViewRenderer::getInstance(); } GUIEditorWindow::~GUIEditorWindow() @@ -105,8 +84,6 @@ namespace GUIEditor delete procEditor; procEditor = NULL; - - CWidgetManager::release(); } QUndoStack *GUIEditorWindow::undoStack() const @@ -131,24 +108,6 @@ namespace GUIEditor } - void GUIEditorWindow::parse() - { - std::vector< std::string > files; - files.push_back( "login_config.xml" ); - files.push_back( "login_widgets.xml" ); - files.push_back( "login_main.xml" ); - files.push_back( "login_keys.xml" ); - - CViewRenderer::getInstance()->loadTextures( - "texture_interfaces_v3_login.tga", - "texture_interfaces_v3_login.txt", - false ); - - setCursor( Qt::WaitCursor ); - CWidgetManager::getInstance()->getParser()->parseInterface( files, false ); - setCursor( Qt::ArrowCursor ); - } - void GUIEditorWindow::createMenus() { Core::MenuManager *mm = Core::ICore::instance()->menuManager(); @@ -166,10 +125,6 @@ namespace GUIEditor a = new QAction( "Proc Editor", this ); connect( a, SIGNAL( triggered( bool ) ), procEditor, SLOT( show() ) ); menu->addAction( a ); - - a = new QAction( "parse", this ); - connect( a, SIGNAL( triggered( bool ) ), this, SLOT( parse() ) ); - menu->addAction( a ); } } diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.h index 8ddb4de5a..25f454fb4 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.h @@ -47,7 +47,6 @@ public Q_SLOTS: void open(); private Q_SLOTS: - void parse(); private: void createMenus();