EOL
This commit is contained in:
parent
02e8f6e956
commit
46aa5cef29
5 changed files with 392 additions and 392 deletions
|
@ -31,7 +31,7 @@
|
||||||
#include <nel/georges/u_form.h>
|
#include <nel/georges/u_form.h>
|
||||||
#include <nel/georges/u_type.h>
|
#include <nel/georges/u_type.h>
|
||||||
|
|
||||||
namespace GeorgesQt
|
namespace GeorgesQt
|
||||||
{
|
{
|
||||||
|
|
||||||
CUndoFormArrayRenameCommand::CUndoFormArrayRenameCommand(CGeorgesFormModel *model, CFormItem *item, const QVariant &value, QUndoCommand *parent)
|
CUndoFormArrayRenameCommand::CUndoFormArrayRenameCommand(CGeorgesFormModel *model, CFormItem *item, const QVariant &value, QUndoCommand *parent)
|
||||||
|
@ -41,63 +41,63 @@ namespace GeorgesQt
|
||||||
}
|
}
|
||||||
|
|
||||||
void CUndoFormArrayRenameCommand::redo()
|
void CUndoFormArrayRenameCommand::redo()
|
||||||
{
|
{
|
||||||
update(true);
|
update(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CUndoFormArrayRenameCommand::undo()
|
void CUndoFormArrayRenameCommand::undo()
|
||||||
{
|
{
|
||||||
update(false);
|
update(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CUndoFormArrayRenameCommand::update(bool redo)
|
void CUndoFormArrayRenameCommand::update(bool redo)
|
||||||
{
|
{
|
||||||
// Get the parent node
|
// Get the parent node
|
||||||
const NLGEORGES::CFormDfn *parentDfn;
|
const NLGEORGES::CFormDfn *parentDfn;
|
||||||
uint indexDfn;
|
uint indexDfn;
|
||||||
const NLGEORGES::CFormDfn *nodeDfn;
|
const NLGEORGES::CFormDfn *nodeDfn;
|
||||||
const NLGEORGES::CType *nodeType;
|
const NLGEORGES::CType *nodeType;
|
||||||
NLGEORGES::CFormElm *node;
|
NLGEORGES::CFormElm *node;
|
||||||
NLGEORGES::UFormDfn::TEntryType type;
|
NLGEORGES::UFormDfn::TEntryType type;
|
||||||
bool isArray;
|
bool isArray;
|
||||||
bool vdfnArray;
|
bool vdfnArray;
|
||||||
NLGEORGES::CForm *form=static_cast<NLGEORGES::CForm*>(m_item->form());
|
NLGEORGES::CForm *form=static_cast<NLGEORGES::CForm*>(m_item->form());
|
||||||
NLGEORGES::CFormElm *elm = static_cast<NLGEORGES::CFormElm*>(&form->Elements);
|
NLGEORGES::CFormElm *elm = static_cast<NLGEORGES::CFormElm*>(&form->Elements);
|
||||||
|
|
||||||
nlverify ( elm->getNodeByName (m_item->formName().c_str (), &parentDfn, indexDfn, &nodeDfn, &nodeType, &node, type, isArray, vdfnArray, true, NLGEORGES_FIRST_ROUND) );
|
nlverify ( elm->getNodeByName (m_item->formName().c_str (), &parentDfn, indexDfn, &nodeDfn, &nodeType, &node, type, isArray, vdfnArray, true, NLGEORGES_FIRST_ROUND) );
|
||||||
if (node)
|
if (node)
|
||||||
{
|
{
|
||||||
std::string tmpName;
|
std::string tmpName;
|
||||||
node->getFormName(tmpName);
|
node->getFormName(tmpName);
|
||||||
|
|
||||||
NLGEORGES::CFormElmArray* array = static_cast<NLGEORGES::CFormElmArray*> (node->getParent ());
|
NLGEORGES::CFormElmArray* array = static_cast<NLGEORGES::CFormElmArray*> (node->getParent ());
|
||||||
|
|
||||||
// In the redo stage save the old value, just in case.
|
// In the redo stage save the old value, just in case.
|
||||||
if(redo)
|
if(redo)
|
||||||
{
|
{
|
||||||
// If the name of the element is empty then give it a nice default.
|
// If the name of the element is empty then give it a nice default.
|
||||||
if(array->Elements[m_item->structId()].Name.empty())
|
if(array->Elements[m_item->structId()].Name.empty())
|
||||||
{
|
{
|
||||||
m_oldValue.append("#");
|
m_oldValue.append("#");
|
||||||
m_oldValue.append(QString("%1").arg(m_item->structId()));
|
m_oldValue.append(QString("%1").arg(m_item->structId()));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_oldValue = QString(array->Elements[m_item->structId()].Name.c_str());
|
m_oldValue = QString(array->Elements[m_item->structId()].Name.c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString value;
|
QString value;
|
||||||
if(redo)
|
if(redo)
|
||||||
value = m_newValue;
|
value = m_newValue;
|
||||||
else
|
else
|
||||||
value = m_oldValue;
|
value = m_oldValue;
|
||||||
|
|
||||||
|
|
||||||
array->Elements[m_item->structId()].Name = value.toAscii().data();
|
array->Elements[m_item->structId()].Name = value.toAscii().data();
|
||||||
m_item->setName(value.toAscii().data());
|
m_item->setName(value.toAscii().data());
|
||||||
|
|
||||||
m_model->emitDataChanged(m_model->index(m_item->row(), 0, m_item));
|
m_model->emitDataChanged(m_model->index(m_item->row(), 0, m_item));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,31 +1,31 @@
|
||||||
#include "browser_ctrl.h"
|
#include "browser_ctrl.h"
|
||||||
#include "3rdparty/qtpropertybrowser/qttreepropertybrowser.h"
|
#include "3rdparty/qtpropertybrowser/qttreepropertybrowser.h"
|
||||||
#include "3rdparty/qtpropertybrowser/qtvariantproperty.h"
|
#include "3rdparty/qtpropertybrowser/qtvariantproperty.h"
|
||||||
#include <QModelIndex>
|
#include <QModelIndex>
|
||||||
|
|
||||||
#include "nel/georges/form.h"
|
#include "nel/georges/form.h"
|
||||||
|
|
||||||
#include "formitem.h"
|
#include "formitem.h"
|
||||||
|
|
||||||
#include "browser_ctrl_pvt.h"
|
#include "browser_ctrl_pvt.h"
|
||||||
|
|
||||||
BrowserCtrl::BrowserCtrl( QtTreePropertyBrowser *browser ) :
|
BrowserCtrl::BrowserCtrl( QtTreePropertyBrowser *browser ) :
|
||||||
QObject( browser )
|
QObject( browser )
|
||||||
{
|
{
|
||||||
m_pvt = new BrowserCtrlPvt();
|
m_pvt = new BrowserCtrlPvt();
|
||||||
m_pvt->setBrowser( browser );
|
m_pvt->setBrowser( browser );
|
||||||
|
|
||||||
connect( m_pvt, SIGNAL( arrayResized( const QString&, int ) ), this, SLOT( onArrayResized( const QString&, int ) ) );
|
connect( m_pvt, SIGNAL( arrayResized( const QString&, int ) ), this, SLOT( onArrayResized( const QString&, int ) ) );
|
||||||
connect( m_pvt, SIGNAL( modified() ), this, SLOT( onModified() ) );
|
connect( m_pvt, SIGNAL( modified() ), this, SLOT( onModified() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
BrowserCtrl::~BrowserCtrl()
|
BrowserCtrl::~BrowserCtrl()
|
||||||
{
|
{
|
||||||
delete m_pvt;
|
delete m_pvt;
|
||||||
m_pvt = NULL;
|
m_pvt = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrl::clicked( const QModelIndex &idx )
|
void BrowserCtrl::clicked( const QModelIndex &idx )
|
||||||
{
|
{
|
||||||
disableMgrConnections();
|
disableMgrConnections();
|
||||||
m_pvt->clear();
|
m_pvt->clear();
|
||||||
|
@ -42,40 +42,40 @@ void BrowserCtrl::clicked( const QModelIndex &idx )
|
||||||
if( !b || ( node == NULL ) )
|
if( !b || ( node == NULL ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_pvt->setupNode( node );
|
m_pvt->setupNode( node );
|
||||||
|
|
||||||
enableMgrConnections();
|
enableMgrConnections();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrl::onValueChanged( QtProperty *p, const QVariant &value )
|
void BrowserCtrl::onValueChanged( QtProperty *p, const QVariant &value )
|
||||||
{
|
{
|
||||||
m_pvt->onValueChanged( p, value );
|
m_pvt->onValueChanged( p, value );
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrl::onArrayResized( const QString &name, int size )
|
void BrowserCtrl::onArrayResized( const QString &name, int size )
|
||||||
{
|
{
|
||||||
Q_EMIT arrayResized( name, size );
|
Q_EMIT arrayResized( name, size );
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrl::onModified()
|
void BrowserCtrl::onModified()
|
||||||
{
|
{
|
||||||
Q_EMIT modified();
|
Q_EMIT modified();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrl::enableMgrConnections()
|
void BrowserCtrl::enableMgrConnections()
|
||||||
{
|
{
|
||||||
QtVariantPropertyManager *mgr = m_pvt->manager();
|
QtVariantPropertyManager *mgr = m_pvt->manager();
|
||||||
|
|
||||||
connect( mgr, SIGNAL( valueChanged( QtProperty*, const QVariant & ) ),
|
connect( mgr, SIGNAL( valueChanged( QtProperty*, const QVariant & ) ),
|
||||||
this, SLOT( onValueChanged( QtProperty*, const QVariant & ) ) );
|
this, SLOT( onValueChanged( QtProperty*, const QVariant & ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrl::disableMgrConnections()
|
void BrowserCtrl::disableMgrConnections()
|
||||||
{
|
{
|
||||||
QtVariantPropertyManager *mgr = m_pvt->manager();
|
QtVariantPropertyManager *mgr = m_pvt->manager();
|
||||||
|
|
||||||
disconnect( mgr, SIGNAL( valueChanged( QtProperty*, const QVariant & ) ),
|
disconnect( mgr, SIGNAL( valueChanged( QtProperty*, const QVariant & ) ),
|
||||||
this, SLOT( onValueChanged( QtProperty*, const QVariant & ) ) );
|
this, SLOT( onValueChanged( QtProperty*, const QVariant & ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,205 +1,205 @@
|
||||||
#include "browser_ctrl_pvt.h"
|
#include "browser_ctrl_pvt.h"
|
||||||
#include "3rdparty/qtpropertybrowser/qttreepropertybrowser.h"
|
#include "3rdparty/qtpropertybrowser/qttreepropertybrowser.h"
|
||||||
#include "3rdparty/qtpropertybrowser/qtvariantproperty.h"
|
#include "3rdparty/qtpropertybrowser/qtvariantproperty.h"
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
|
||||||
QVariant::Type getValueType( const NLGEORGES::UType *typ )
|
QVariant::Type getValueType( const NLGEORGES::UType *typ )
|
||||||
{
|
{
|
||||||
QVariant::Type t = QVariant::String;
|
QVariant::Type t = QVariant::String;
|
||||||
|
|
||||||
NLGEORGES::UType::TType ttyp = NLGEORGES::UType::String;
|
NLGEORGES::UType::TType ttyp = NLGEORGES::UType::String;
|
||||||
if( typ != NULL )
|
if( typ != NULL )
|
||||||
ttyp = typ->getType();
|
ttyp = typ->getType();
|
||||||
|
|
||||||
switch( ttyp )
|
switch( ttyp )
|
||||||
{
|
{
|
||||||
case NLGEORGES::UType::UnsignedInt: t = QVariant::UInt; break;
|
case NLGEORGES::UType::UnsignedInt: t = QVariant::UInt; break;
|
||||||
case NLGEORGES::UType::SignedInt: t = QVariant::Int; break;
|
case NLGEORGES::UType::SignedInt: t = QVariant::Int; break;
|
||||||
case NLGEORGES::UType::Double: t = QVariant::Double; break;
|
case NLGEORGES::UType::Double: t = QVariant::Double; break;
|
||||||
case NLGEORGES::UType::Color: t = QVariant::Color; break;
|
case NLGEORGES::UType::Color: t = QVariant::Color; break;
|
||||||
case NLGEORGES::UType::String: t = QVariant::String; break;
|
case NLGEORGES::UType::String: t = QVariant::String; break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BrowserCtrlPvt::BrowserCtrlPvt( QObject *parent ) :
|
BrowserCtrlPvt::BrowserCtrlPvt( QObject *parent ) :
|
||||||
QObject( parent )
|
QObject( parent )
|
||||||
{
|
{
|
||||||
mgr = new QtVariantPropertyManager();
|
mgr = new QtVariantPropertyManager();
|
||||||
factory = new QtVariantEditorFactory();
|
factory = new QtVariantEditorFactory();
|
||||||
m_currentNode = NULL;
|
m_currentNode = NULL;
|
||||||
m_rootNode = NULL;
|
m_rootNode = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
BrowserCtrlPvt::~BrowserCtrlPvt()
|
BrowserCtrlPvt::~BrowserCtrlPvt()
|
||||||
{
|
{
|
||||||
delete mgr;
|
delete mgr;
|
||||||
mgr = NULL;
|
mgr = NULL;
|
||||||
delete factory;
|
delete factory;
|
||||||
factory = NULL;
|
factory = NULL;
|
||||||
m_browser = NULL;
|
m_browser = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrlPvt::setupAtom( NLGEORGES::CFormElmStruct::CFormElmStructElm &elm )
|
void BrowserCtrlPvt::setupAtom( NLGEORGES::CFormElmStruct::CFormElmStructElm &elm )
|
||||||
{
|
{
|
||||||
QString key = elm.Name.c_str();
|
QString key = elm.Name.c_str();
|
||||||
QString value = "";
|
QString value = "";
|
||||||
QVariant::Type t = QVariant::String;
|
QVariant::Type t = QVariant::String;
|
||||||
|
|
||||||
if( elm.Element != NULL )
|
if( elm.Element != NULL )
|
||||||
{
|
{
|
||||||
t = getValueType( elm.Element->getType() );
|
t = getValueType( elm.Element->getType() );
|
||||||
|
|
||||||
std::string formName;
|
std::string formName;
|
||||||
elm.Element->getFormName( formName, NULL );
|
elm.Element->getFormName( formName, NULL );
|
||||||
|
|
||||||
std::string v;
|
std::string v;
|
||||||
m_rootNode->getValueByName( v, formName.c_str(), NLGEORGES::UFormElm::NoEval, NULL, 0 );
|
m_rootNode->getValueByName( v, formName.c_str(), NLGEORGES::UFormElm::NoEval, NULL, 0 );
|
||||||
value = v.c_str();
|
value = v.c_str();
|
||||||
}
|
}
|
||||||
|
|
||||||
QtVariantProperty *p = mgr->addProperty( t, key );
|
QtVariantProperty *p = mgr->addProperty( t, key );
|
||||||
p->setValue( value );
|
p->setValue( value );
|
||||||
m_browser->addProperty( p );
|
m_browser->addProperty( p );
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrlPvt::setupArray( NLGEORGES::UFormElm *node )
|
void BrowserCtrlPvt::setupArray( NLGEORGES::UFormElm *node )
|
||||||
{
|
{
|
||||||
NLGEORGES::CFormElmArray *arr = static_cast< NLGEORGES::CFormElmArray* >( node );
|
NLGEORGES::CFormElmArray *arr = static_cast< NLGEORGES::CFormElmArray* >( node );
|
||||||
uint size = 0;
|
uint size = 0;
|
||||||
arr->getArraySize( size );
|
arr->getArraySize( size );
|
||||||
|
|
||||||
QString key = QObject::tr( "Array size" );
|
QString key = QObject::tr( "Array size" );
|
||||||
QtVariantProperty *p = mgr->addProperty( QVariant::Int, key );
|
QtVariantProperty *p = mgr->addProperty( QVariant::Int, key );
|
||||||
p->setValue( size );
|
p->setValue( size );
|
||||||
m_browser->addProperty( p );
|
m_browser->addProperty( p );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrlPvt::setupStruct( NLGEORGES::UFormElm *node )
|
void BrowserCtrlPvt::setupStruct( NLGEORGES::UFormElm *node )
|
||||||
{
|
{
|
||||||
NLGEORGES::CFormElmStruct *st = static_cast< NLGEORGES::CFormElmStruct* >( node );
|
NLGEORGES::CFormElmStruct *st = static_cast< NLGEORGES::CFormElmStruct* >( node );
|
||||||
|
|
||||||
for( int i = 0; i < st->Elements.size(); i++ )
|
for( int i = 0; i < st->Elements.size(); i++ )
|
||||||
{
|
{
|
||||||
NLGEORGES::CFormElmStruct::CFormElmStructElm &elm = st->Elements[ i ];
|
NLGEORGES::CFormElmStruct::CFormElmStructElm &elm = st->Elements[ i ];
|
||||||
if( ( elm.Element != NULL ) && !elm.Element->isAtom() )
|
if( ( elm.Element != NULL ) && !elm.Element->isAtom() )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( elm.Element == NULL )
|
if( elm.Element == NULL )
|
||||||
{
|
{
|
||||||
NLGEORGES::CFormDfn::CEntry &entry = st->FormDfn->getEntry( i );
|
NLGEORGES::CFormDfn::CEntry &entry = st->FormDfn->getEntry( i );
|
||||||
if( entry.getArrayFlag() )
|
if( entry.getArrayFlag() )
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
setupAtom( elm );
|
setupAtom( elm );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrlPvt::setupNode( NLGEORGES::UFormElm *node )
|
void BrowserCtrlPvt::setupNode( NLGEORGES::UFormElm *node )
|
||||||
{
|
{
|
||||||
if( node->isStruct() )
|
if( node->isStruct() )
|
||||||
setupStruct( node );
|
setupStruct( node );
|
||||||
else
|
else
|
||||||
if( node->isArray() )
|
if( node->isArray() )
|
||||||
setupArray( node );
|
setupArray( node );
|
||||||
else
|
else
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_currentNode = node;
|
m_currentNode = node;
|
||||||
m_browser->setFactoryForManager( mgr, factory );
|
m_browser->setFactoryForManager( mgr, factory );
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrlPvt::clear()
|
void BrowserCtrlPvt::clear()
|
||||||
{
|
{
|
||||||
m_browser->clear();
|
m_browser->clear();
|
||||||
m_currentNode = NULL;
|
m_currentNode = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void BrowserCtrlPvt::onStructValueChanged( QtProperty *p, const QVariant &value )
|
void BrowserCtrlPvt::onStructValueChanged( QtProperty *p, const QVariant &value )
|
||||||
{
|
{
|
||||||
std::string k = p->propertyName().toUtf8().constData();
|
std::string k = p->propertyName().toUtf8().constData();
|
||||||
std::string v = value.toString().toUtf8().constData();
|
std::string v = value.toString().toUtf8().constData();
|
||||||
|
|
||||||
bool created = false;
|
bool created = false;
|
||||||
m_currentNode->setValueByName( v.c_str(), k.c_str(), &created );
|
m_currentNode->setValueByName( v.c_str(), k.c_str(), &created );
|
||||||
|
|
||||||
Q_EMIT modified();
|
Q_EMIT modified();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrlPvt::onArrayValueChanged( QtProperty *p, const QVariant &value )
|
void BrowserCtrlPvt::onArrayValueChanged( QtProperty *p, const QVariant &value )
|
||||||
{
|
{
|
||||||
NLGEORGES::CFormElmArray *arr = static_cast< NLGEORGES::CFormElmArray* >( m_currentNode );
|
NLGEORGES::CFormElmArray *arr = static_cast< NLGEORGES::CFormElmArray* >( m_currentNode );
|
||||||
std::string formName;
|
std::string formName;
|
||||||
arr->getFormName( formName, NULL );
|
arr->getFormName( formName, NULL );
|
||||||
|
|
||||||
int newSize = value.toInt();
|
int newSize = value.toInt();
|
||||||
int oldSize = arr->Elements.size();
|
int oldSize = arr->Elements.size();
|
||||||
|
|
||||||
if( newSize == oldSize )
|
if( newSize == oldSize )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if( newSize < oldSize )
|
if( newSize < oldSize )
|
||||||
{
|
{
|
||||||
for( int i = newSize; i < oldSize; i++ )
|
for( int i = newSize; i < oldSize; i++ )
|
||||||
{
|
{
|
||||||
delete arr->Elements[ i ].Element;
|
delete arr->Elements[ i ].Element;
|
||||||
}
|
}
|
||||||
|
|
||||||
arr->Elements.resize( newSize );
|
arr->Elements.resize( newSize );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
arr->Elements.resize( newSize );
|
arr->Elements.resize( newSize );
|
||||||
|
|
||||||
|
|
||||||
const NLGEORGES::CFormDfn *parentDfn;
|
const NLGEORGES::CFormDfn *parentDfn;
|
||||||
const NLGEORGES::CFormDfn *nodeDfn;
|
const NLGEORGES::CFormDfn *nodeDfn;
|
||||||
uint indexDfn;
|
uint indexDfn;
|
||||||
const NLGEORGES::CType *type;
|
const NLGEORGES::CType *type;
|
||||||
NLGEORGES::UFormDfn::TEntryType entryType;
|
NLGEORGES::UFormDfn::TEntryType entryType;
|
||||||
NLGEORGES::CFormElm *node;
|
NLGEORGES::CFormElm *node;
|
||||||
bool created;
|
bool created;
|
||||||
bool isArray;
|
bool isArray;
|
||||||
|
|
||||||
QString idx;
|
QString idx;
|
||||||
|
|
||||||
for( int i = oldSize; i < newSize; i++ )
|
for( int i = oldSize; i < newSize; i++ )
|
||||||
{
|
{
|
||||||
idx.clear();
|
idx.clear();
|
||||||
idx += "[";
|
idx += "[";
|
||||||
idx += QString::number( i );
|
idx += QString::number( i );
|
||||||
idx += "]";
|
idx += "]";
|
||||||
|
|
||||||
bool b;
|
bool b;
|
||||||
b = arr->createNodeByName( idx.toUtf8().constData(), &parentDfn, indexDfn, &nodeDfn, &type, &node, entryType, isArray, created );
|
b = arr->createNodeByName( idx.toUtf8().constData(), &parentDfn, indexDfn, &nodeDfn, &type, &node, entryType, isArray, created );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString name = formName.c_str();
|
QString name = formName.c_str();
|
||||||
Q_EMIT arrayResized( name, newSize );
|
Q_EMIT arrayResized( name, newSize );
|
||||||
Q_EMIT modified();
|
Q_EMIT modified();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserCtrlPvt::onValueChanged( QtProperty *p, const QVariant &value )
|
void BrowserCtrlPvt::onValueChanged( QtProperty *p, const QVariant &value )
|
||||||
{
|
{
|
||||||
if( m_currentNode == NULL )
|
if( m_currentNode == NULL )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if( m_currentNode->isStruct() )
|
if( m_currentNode->isStruct() )
|
||||||
onStructValueChanged( p, value );
|
onStructValueChanged( p, value );
|
||||||
else
|
else
|
||||||
if( m_currentNode->isArray() )
|
if( m_currentNode->isArray() )
|
||||||
onArrayValueChanged( p, value );
|
onArrayValueChanged( p, value );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -70,9 +70,9 @@ namespace GeorgesQt
|
||||||
CFormItem *addArray(CFormItem *parent, NLGEORGES::CFormElmArray *array, NLGEORGES::CFormDfn *rootDfn,
|
CFormItem *addArray(CFormItem *parent, NLGEORGES::CFormElmArray *array, NLGEORGES::CFormDfn *rootDfn,
|
||||||
const char *name, uint structId, const char *formName, uint slot);
|
const char *name, uint structId, const char *formName, uint slot);
|
||||||
|
|
||||||
void emitDataChanged(const QModelIndex &index)
|
void emitDataChanged(const QModelIndex &index)
|
||||||
{
|
{
|
||||||
Q_EMIT dataChanged(index, index);
|
Q_EMIT dataChanged(index, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
void arrayResized( const QString &name, int size );
|
void arrayResized( const QString &name, int size );
|
||||||
|
|
|
@ -1,78 +1,78 @@
|
||||||
// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
|
// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
|
||||||
// Copyright (C) 2010 Winch Gate Property Limited
|
// Copyright (C) 2010 Winch Gate Property Limited
|
||||||
//
|
//
|
||||||
// This program is free software: you can redistribute it and/or modify
|
// This program is free software: you can redistribute it and/or modify
|
||||||
// it under the terms of the GNU Affero General Public License as
|
// it under the terms of the GNU Affero General Public License as
|
||||||
// published by the Free Software Foundation, either version 3 of the
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
// License, or (at your option) any later version.
|
// License, or (at your option) any later version.
|
||||||
//
|
//
|
||||||
// This program is distributed in the hope that it will be useful,
|
// This program is distributed in the hope that it will be useful,
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
// GNU Affero General Public License for more details.
|
// GNU Affero General Public License for more details.
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU Affero General Public License
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
// Project includes
|
// Project includes
|
||||||
#include "tile_editor_plugin.h"
|
#include "tile_editor_plugin.h"
|
||||||
#include "tile_editor_main_window.h"
|
#include "tile_editor_main_window.h"
|
||||||
#include "../core/icore.h"
|
#include "../core/icore.h"
|
||||||
#include "../core/menu_manager.h"
|
#include "../core/menu_manager.h"
|
||||||
#include "../core/core_constants.h"
|
#include "../core/core_constants.h"
|
||||||
|
|
||||||
// Qt includes
|
// Qt includes
|
||||||
#include <QtCore/QObject>
|
#include <QtCore/QObject>
|
||||||
#include <QtGui/QMessageBox>
|
#include <QtGui/QMessageBox>
|
||||||
#include <QtGui/QMainWindow>
|
#include <QtGui/QMainWindow>
|
||||||
#include <QtGui/QMenu>
|
#include <QtGui/QMenu>
|
||||||
#include <QtGui/QAction>
|
#include <QtGui/QAction>
|
||||||
#include <QtGui/QMenuBar>
|
#include <QtGui/QMenuBar>
|
||||||
|
|
||||||
// NeL includes
|
// NeL includes
|
||||||
#include "nel/misc/debug.h"
|
#include "nel/misc/debug.h"
|
||||||
|
|
||||||
using namespace TileEditorPluginQt;
|
using namespace TileEditorPluginQt;
|
||||||
|
|
||||||
TileEditorPlugin::~TileEditorPlugin()
|
TileEditorPlugin::~TileEditorPlugin()
|
||||||
{
|
{
|
||||||
Q_FOREACH(QObject *obj, m_autoReleaseObjects)
|
Q_FOREACH(QObject *obj, m_autoReleaseObjects)
|
||||||
{
|
{
|
||||||
m_plugMan->removeObject(obj);
|
m_plugMan->removeObject(obj);
|
||||||
}
|
}
|
||||||
qDeleteAll(m_autoReleaseObjects);
|
qDeleteAll(m_autoReleaseObjects);
|
||||||
m_autoReleaseObjects.clear();
|
m_autoReleaseObjects.clear();
|
||||||
|
|
||||||
delete m_LibContext;
|
delete m_LibContext;
|
||||||
m_LibContext = NULL;
|
m_LibContext = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TileEditorPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
|
bool TileEditorPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
|
||||||
{
|
{
|
||||||
Q_UNUSED(errorString);
|
Q_UNUSED(errorString);
|
||||||
m_plugMan = pluginManager;
|
m_plugMan = pluginManager;
|
||||||
addAutoReleasedObject(new TileEditorContext());
|
addAutoReleasedObject(new TileEditorContext());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TileEditorPlugin::extensionsInitialized()
|
void TileEditorPlugin::extensionsInitialized()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void TileEditorPlugin::setNelContext(NLMISC::INelContext *nelContext)
|
void TileEditorPlugin::setNelContext(NLMISC::INelContext *nelContext)
|
||||||
{
|
{
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
// Ensure that a context doesn't exist yet.
|
// Ensure that a context doesn't exist yet.
|
||||||
// This only applies to platforms without PIC, e.g. Windows.
|
// This only applies to platforms without PIC, e.g. Windows.
|
||||||
nlassert(!NLMISC::INelContext::isContextInitialised());
|
nlassert(!NLMISC::INelContext::isContextInitialised());
|
||||||
#endif // NL_OS_WINDOWS
|
#endif // NL_OS_WINDOWS
|
||||||
m_LibContext = new NLMISC::CLibraryContext(*nelContext);
|
m_LibContext = new NLMISC::CLibraryContext(*nelContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TileEditorPlugin::addAutoReleasedObject(QObject *obj)
|
void TileEditorPlugin::addAutoReleasedObject(QObject *obj)
|
||||||
{
|
{
|
||||||
m_plugMan->addObject(obj);
|
m_plugMan->addObject(obj);
|
||||||
m_autoReleaseObjects.prepend(obj);
|
m_autoReleaseObjects.prepend(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
Q_EXPORT_PLUGIN(TileEditorPlugin)
|
Q_EXPORT_PLUGIN(TileEditorPlugin)
|
||||||
|
|
Loading…
Reference in a new issue