aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-30 04:40:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHANGED: #1471 A little cleanup.

Browse source 
--HG--
branch : gsoc2012-gui-editor
This commit is contained in:
dfighter1985 2012-07-18 04:08:53 +02:00
parent 2e1027b282
commit aa1991f13a
2 changed files with 0 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.cpp
View file

@ -35,15 +35,10 @@
#include "link_editor.h" #include "link_editor.h"
#include "proc_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 namespace GUIEditor
{ {
QString _lastDir; QString _lastDir;
std::map< std::string, SWidgetInfo > widgetInfo; std::map< std::string, SWidgetInfo > widgetInfo;
std::set< std::string > hwCurs;
GUIEditorWindow::GUIEditorWindow(QWidget *parent) : GUIEditorWindow::GUIEditorWindow(QWidget *parent) :
QMainWindow(parent) QMainWindow(parent)
@ -75,22 +70,6 @@ namespace GUIEditor
browserCtrl.setup(); browserCtrl.setup();
dock->setWidget( tb ); dock->setWidget( tb );
addDockWidget( Qt::RightDockWidgetArea, dock ); 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() GUIEditorWindow::~GUIEditorWindow()
@ -105,8 +84,6 @@ namespace GUIEditor
delete procEditor; delete procEditor;
procEditor = NULL; procEditor = NULL;
CWidgetManager::release();
} }
QUndoStack *GUIEditorWindow::undoStack() const 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() void GUIEditorWindow::createMenus()
{ {
Core::MenuManager *mm = Core::ICore::instance()->menuManager(); Core::MenuManager *mm = Core::ICore::instance()->menuManager();
@ -166,10 +125,6 @@ namespace GUIEditor
a = new QAction( "Proc Editor", this ); a = new QAction( "Proc Editor", this );
connect( a, SIGNAL( triggered( bool ) ), procEditor, SLOT( show() ) ); connect( a, SIGNAL( triggered( bool ) ), procEditor, SLOT( show() ) );
menu->addAction( a ); menu->addAction( a );
a = new QAction( "parse", this );
connect( a, SIGNAL( triggered( bool ) ), this, SLOT( parse() ) );
menu->addAction( a );
} }
} }

1
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.h
View file

@ -47,7 +47,6 @@ public Q_SLOTS:
void open(); void open();
private Q_SLOTS: private Q_SLOTS:
void parse();
private: private:
void createMenus(); void createMenus();