aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-25 16:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHANGED: #1471 Implemented property querying for CCtrlTabButton.

Browse source
This commit is contained in:
dfighter1985 2012-07-30 05:17:33 +02:00
parent ea8ed3fcf5
commit c89b3a26cc
4 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/gui/group_tab.h
View file

@ -152,6 +152,8 @@ namespace NLGUI
CCtrlTabButton(const TCtorParam &param); CCtrlTabButton(const TCtorParam &param);
std::string getProperty( const std::string &name ) const;
virtual bool parse (xmlNodePtr cur, CInterfaceGroup *parentGroup); virtual bool parse (xmlNodePtr cur, CInterfaceGroup *parentGroup);
virtual void setActive(bool state); virtual void setActive(bool state);

8
code/nel/src/gui/group_tab.cpp
View file

@ -729,6 +729,14 @@ namespace NLGUI
_BlinkState = false; _BlinkState = false;
} }
std::string CCtrlTabButton::getProperty( const std::string &name ) const
{
if( name == "group" )
return _AssociatedGroup;
else
return CCtrlTextButton::getProperty( name );
}
// *************************************************************************** // ***************************************************************************
bool CCtrlTabButton::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup) bool CCtrlTabButton::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
{ {

26
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties_parser.cpp
View file

@ -243,27 +243,25 @@ namespace GUIEditor
std::vector< SPropEntry > &props = info->props; std::vector< SPropEntry > &props = info->props;
std::map< std::string, SWidgetInfo >::iterator itr2 = SWidgetInfo *info2 = info;
widgetInfo->find( info->ancestor );
if( itr2 == widgetInfo->end() )
return;
SWidgetInfo *info2 = &(itr2->second);
do do
{ {
if( info2->ancestor.empty() )
break;
std::map< std::string, SWidgetInfo >::iterator itr2 =
widgetInfo->find( info2->ancestor );
if( itr2 == widgetInfo->end() )
break;
info2 = &( itr2->second );
for( std::vector< SPropEntry >::iterator propItr = info2->props.begin(); propItr != info2->props.end(); ++propItr ) for( std::vector< SPropEntry >::iterator propItr = info2->props.begin(); propItr != info2->props.end(); ++propItr )
props.push_back( *propItr ); props.push_back( *propItr );
if( !info2->resolved && !info2->ancestor.empty() )
{
itr2 = widgetInfo->find( info2->ancestor );
if( itr2 != widgetInfo->end() )
info2 = &(itr2->second);
else
info2 = NULL;
}
} }
while( ( info2 != NULL ) && !info2->resolved && !info2->ancestor.empty() ); while( !info2->resolved );
info->resolved = true; info->resolved = true;
} }

17
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTabButton.xml Normal file
View file

@ -0,0 +1,17 @@
<widget>
<header>
<name>CtrlTabButton</name>
<guiname>CCtrlTabButton</guiname>
<ancestor>CtrlTextButton</ancestor>
<description></description>
<abstract>false</abstract>
<icon></icon>
</header>
<properties>
<property>
<name>group</name>
<type>string</type>
<default></default>
</property>
</properties>
</widget>