Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

CHANGED: #1471 CViewTextFormated and CViewTextID fields can now be serialized.

Browse Source 
--HG--
branch : gsoc2012-gui-editor
hg/feature/sse2
dfighter1985 13 years ago
parent 37c41001aa
commit a957beeb6c
13 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File

1
code/nel/include/nel/gui/view_text_formated.h
Unescape Escape View File

@ -48,6 +48,7 @@ namespace NLGUI
{}
std::string getProperty( const std::string &name ) const;
void setProperty( const std::string &name, const std::string &value );
xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
virtual bool parse(xmlNodePtr cur, CInterfaceGroup * parentGroup);
virtual void checkCoords();
const ucstring &getFormatString() const { return _FormatString; }

1
code/nel/include/nel/gui/view_text_id.h
Unescape Escape View File

@ -93,6 +93,7 @@ namespace NLGUI
std::string getProperty( const std::string &name ) const;
void setProperty( const std::string &name, const std::string &value );
xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
virtual bool parse(xmlNodePtr cur, CInterfaceGroup * parentGroup);
virtual void checkCoords();

4
code/nel/src/gui/ctrl_base_button.cpp
Unescape Escape View File

@ -396,9 +396,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "button" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "button" );
xmlNewProp( node, BAD_CAST "button_type", BAD_CAST getTypeString().c_str() );
xmlNewProp( node, BAD_CAST "pushed", BAD_CAST toString( _Pushed ).c_str() );
xmlNewProp( node, BAD_CAST "over_when_pushed", BAD_CAST toString( _OverWhenPushed ).c_str() );

3
code/nel/src/gui/ctrl_button.cpp
Unescape Escape View File

@ -153,8 +153,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "button" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "button" );
xmlNewProp( node, BAD_CAST "tx_normal",
BAD_CAST CViewRenderer::getInstance()->getTextureNameFromId( _TextureIdNormal ).c_str() );

3
code/nel/src/gui/ctrl_col_pick.cpp
Unescape Escape View File

@ -156,8 +156,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "colpick" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "colpick" );
xmlSetProp( node, BAD_CAST "texture",
BAD_CAST CViewRenderer::getInstance()->getTextureNameFromId( _Texture ).c_str() );

4
code/nel/src/gui/ctrl_scroll.cpp
Unescape Escape View File

@ -398,9 +398,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "scroll" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "scroll" );
xmlSetProp( node, BAD_CAST "tx_bottomleft", BAD_CAST getTextureBottomOrLeft().c_str() );
xmlSetProp( node, BAD_CAST "tx_middle", BAD_CAST getTextureMiddle().c_str() );
xmlSetProp( node, BAD_CAST "tx_topright", BAD_CAST getTextureTopOrRight().c_str() );

3
code/nel/src/gui/ctrl_text_button.cpp
Unescape Escape View File

@ -386,8 +386,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "text_button" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "text_button" );
std::string tex;
tex = CViewRenderer::getInstance()->getTextureNameFromId( _TextureIdNormal[ 0 ] );

3
code/nel/src/gui/ctrl_tooltip.cpp
Unescape Escape View File

@ -51,8 +51,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "tooltip" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "tooltip" );
return node;
}

3
code/nel/src/gui/dbview_digit.cpp
Unescape Escape View File

@ -109,8 +109,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "digit" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "digit" );
if( _Number.getNodePtr() != NULL )
xmlSetProp( node, BAD_CAST "value", BAD_CAST _Number.getNodePtr()->getFullName().c_str() );

4
code/nel/src/gui/group_tab.cpp
Unescape Escape View File

@ -798,9 +798,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "tab" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "tab" );
xmlNewProp( node, BAD_CAST "group", BAD_CAST _AssociatedGroup.c_str() );
return node;

4
code/nel/src/gui/view_text.cpp
Unescape Escape View File

@ -501,9 +501,7 @@ namespace NLGUI
if( node == NULL )
return NULL;
if( xmlGetProp( node, BAD_CAST "type" ) == NULL )
xmlSetProp( node, BAD_CAST "type", BAD_CAST "text" );
xmlSetProp( node, BAD_CAST "type", BAD_CAST "text" );
xmlSetProp( node, BAD_CAST "color", BAD_CAST toString( _Color ).c_str() );
xmlSetProp( node, BAD_CAST "global_color", BAD_CAST toString( _ModulateGlobalColor ).c_str() );
xmlSetProp( node, BAD_CAST "fontsize",

12
code/nel/src/gui/view_text_formated.cpp
Unescape Escape View File

@ -46,6 +46,18 @@ namespace NLGUI
CViewText::setProperty( name, value );
}
xmlNodePtr CViewTextFormated::serialize( xmlNodePtr parentNode, const char *type ) const
{
xmlNodePtr node = CViewText::serialize( parentNode, type );
if( node == NULL )
return NULL;
xmlSetProp( node, BAD_CAST "type", BAD_CAST "text_formated" );
xmlSetProp( node, BAD_CAST "format", BAD_CAST getFormatString().c_str() );
return NULL;
}
// ****************************************************************************
bool CViewTextFormated::parse(xmlNodePtr cur,CInterfaceGroup * parentGroup)
{

23
code/nel/src/gui/view_text_id.cpp
Unescape Escape View File

@ -106,6 +106,29 @@ namespace NLGUI
CViewText::setProperty( name, value );
}
xmlNodePtr CViewTextID::serialize( xmlNodePtr parentNode, const char *type ) const
{
xmlNodePtr node = CViewText::serialize( parentNode, type );
if( node == NULL )
return NULL;
xmlSetProp( node, BAD_CAST "type", BAD_CAST "text_id" );
if( _DBTextId.getNodePtr() != NULL )
xmlSetProp( node, BAD_CAST "textid", BAD_CAST _DBTextId.getNodePtr()->getFullName().c_str() );
else
xmlSetProp( node, BAD_CAST "textid", BAD_CAST "" );
xmlSetProp( node, BAD_CAST "dynamic_string",
BAD_CAST NLMISC::toString( _DynamicString ).c_str() );
xmlSetProp( node, BAD_CAST "format_taged",
BAD_CAST NLMISC::toString( _IsTextFormatTaged ).c_str() );
return node;
}
// ***************************************************************************
bool CViewTextID::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
{

Write Preview
Loading…
Cancel
Save