CHANGED: #1471 the GUI library starts up from the GUI editor, altough can't exactly say yet that it works.
This commit is contained in:
parent
9e9399a592
commit
1fccbbf351
3 changed files with 61 additions and 4 deletions
|
@ -50,7 +50,18 @@ ADD_LIBRARY(ovqt_plugin_gui_editor MODULE ${SRC}
|
||||||
${OVQT_PLUGIN_GUI_EDITOR_RC_SRCS}
|
${OVQT_PLUGIN_GUI_EDITOR_RC_SRCS}
|
||||||
)
|
)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(ovqt_plugin_gui_editor ovqt_plugin_core nelmisc nel3d ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} qt_property_browser)
|
TARGET_LINK_LIBRARIES(
|
||||||
|
ovqt_plugin_gui_editor
|
||||||
|
ovqt_plugin_core
|
||||||
|
nelmisc
|
||||||
|
nel3d
|
||||||
|
nelgui
|
||||||
|
${QT_LIBRARIES}
|
||||||
|
${QT_QTOPENGL_LIBRARY}
|
||||||
|
qt_property_browser
|
||||||
|
${LUA_LIBRARIES}
|
||||||
|
${LUABIND_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
NL_DEFAULT_PROPS(ovqt_plugin_gui_editor "NeL, Tools, 3D: Object Viewer Qt Plugin: GUI Editor")
|
NL_DEFAULT_PROPS(ovqt_plugin_gui_editor "NeL, Tools, 3D: Object Viewer Qt Plugin: GUI Editor")
|
||||||
NL_ADD_RUNTIME_FLAGS(ovqt_plugin_gui_editor)
|
NL_ADD_RUNTIME_FLAGS(ovqt_plugin_gui_editor)
|
||||||
|
|
|
@ -35,10 +35,15 @@
|
||||||
#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)
|
||||||
|
@ -71,6 +76,21 @@ namespace GUIEditor
|
||||||
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()
|
||||||
|
@ -85,6 +105,8 @@ namespace GUIEditor
|
||||||
|
|
||||||
delete procEditor;
|
delete procEditor;
|
||||||
procEditor = NULL;
|
procEditor = NULL;
|
||||||
|
|
||||||
|
CWidgetManager::release();
|
||||||
}
|
}
|
||||||
|
|
||||||
QUndoStack *GUIEditorWindow::undoStack() const
|
QUndoStack *GUIEditorWindow::undoStack() const
|
||||||
|
@ -108,6 +130,25 @@ namespace GUIEditor
|
||||||
setCursor(Qt::ArrowCursor);
|
setCursor(Qt::ArrowCursor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
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();
|
||||||
|
@ -125,6 +166,10 @@ 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 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,7 @@ public Q_SLOTS:
|
||||||
void open();
|
void open();
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
|
void parse();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void createMenus();
|
void createMenus();
|
||||||
|
|
Loading…
Reference in a new issue