CHANGED: #1471 Widget definition inheritance is now supported in the GUI editor. www.youtube.com/watch?v=VG_TnZiGjBk

This commit is contained in:
dfighter1985 2012-07-06 03:15:15 +02:00
parent 691e35db28
commit 264e0fe16c
5 changed files with 98 additions and 1 deletions

View file

@ -43,11 +43,19 @@ namespace GUIEditor
{
std::string name;
std::string GUIName;
std::string ancestor;
std::string description;
bool isAbstract;
std::string icon;
bool resolved;
std::vector< SPropEntry > props;
SWidgetInfo()
{
resolved = false;
isAbstract = true;
}
};
}

View file

@ -47,6 +47,8 @@ namespace GUIEditor
while( itr.hasNext() )
parseGUIWidget( "widgets/" + itr.next() );
resolveInheritance();
widgetInfo = NULL;
}
@ -119,6 +121,9 @@ namespace GUIEditor
if( key == "guiname" )
info.GUIName = value.toStdString();
else
if( key == "ancestor" )
info.ancestor = value.toStdString();
else
if( key == "description" )
info.description = value.toStdString();
else
@ -203,6 +208,65 @@ namespace GUIEditor
reader.readNext();
}
}
bool propCompare( const SPropEntry &left, const SPropEntry &right )
{
return left.propName < right.propName;
}
void CWidgetPropParser::resolveInheritance()
{
for( std::map< std::string, SWidgetInfo >::iterator itr = widgetInfo->begin(); itr != widgetInfo->end(); ++itr )
{
resolveInheritanceFor( itr->first );
std::sort( itr->second.props.begin(), itr->second.props.end(), propCompare );
}
}
void CWidgetPropParser::resolveInheritanceFor( const std::string name )
{
if( name.empty() )
return;
std::map< std::string, SWidgetInfo >::iterator itr =
widgetInfo->find( name );
if( itr == widgetInfo->end() )
return;
SWidgetInfo *info = &(itr->second);
if( info->resolved )
return;
if( info->ancestor.empty() )
return;
std::vector< SPropEntry > &props = info->props;
std::map< std::string, SWidgetInfo >::iterator itr2 =
widgetInfo->find( info->ancestor );
if( itr2 == widgetInfo->end() )
return;
SWidgetInfo *info2 = &(itr2->second);
do
{
for( std::vector< SPropEntry >::iterator propItr = info2->props.begin(); propItr != info2->props.end(); ++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() );
info->resolved = true;
}
}

View file

@ -41,6 +41,8 @@ namespace GUIEditor
void parseGUIWidgetXML( QFile &file );
QString parseGUIWidgetHeader( QXmlStreamReader &reader );
void parseGUIWidgetProperties( QXmlStreamReader &reader, const QString &widgetName );
void resolveInheritance();
void resolveInheritanceFor( const std::string name );
std::map< std::string, SWidgetInfo > *widgetInfo;
};

View file

@ -2,6 +2,7 @@
<header>
<name>CtrlBase</name>
<guiname>cb</guiname>
<ancestor>InterfaceElement</ancestor>
<description></description>
<abstract>true</abstract>
<icon></icon>

View file

@ -0,0 +1,22 @@
<widget>
<header>
<name>InterfaceGroup</name>
<guiname>ig</guiname>
<ancestor>CtrlBase</ancestor>
<description></description>
<abstract>false</abstract>
<icon></icon>
</header>
<properties>
<property>
<name>on_enter</name>
<type>string</type>
<default>handler</default>
</property>
<property>
<name>on_enter_params</name>
<type>string</type>
<default>params</default>
</property>
</properties>
</widget>