projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Text definitions added/modified
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
public-api
/
builder
/
builder.cpp
diff --git
a/base/dali-toolkit/public-api/builder/builder.cpp
b/base/dali-toolkit/public-api/builder/builder.cpp
index
e900e5b
..
bd85719
100644
(file)
--- a/
base/dali-toolkit/public-api/builder/builder.cpp
+++ b/
base/dali-toolkit/public-api/builder/builder.cpp
@@
-54,7
+54,7
@@
void Builder::LoadFromString( const std::string &data, UIFormat rep )
GetImpl(*this).LoadFromString( data );
}
GetImpl(*this).LoadFromString( data );
}
-void Builder::AddConstants( const Property
Value
Map& map )
+void Builder::AddConstants( const Property
::
Map& map )
{
GetImpl(*this).AddConstants( map );
}
{
GetImpl(*this).AddConstants( map );
}
@@
-64,7
+64,7
@@
void Builder::AddConstant( const std::string& key, const Property::Value& value
GetImpl(*this).AddConstant( key, value );
}
GetImpl(*this).AddConstant( key, value );
}
-const Property
Value
Map& Builder::GetConstants() const
+const Property
::
Map& Builder::GetConstants() const
{
return GetImpl(*this).GetConstants();
}
{
return GetImpl(*this).GetConstants();
}
@@
-79,7
+79,7
@@
Animation Builder::CreateAnimation( const std::string& animationName )
return GetImpl(*this).CreateAnimation( animationName );
}
return GetImpl(*this).CreateAnimation( animationName );
}
-Animation Builder::CreateAnimation( const std::string& animationName, const Property
Value
Map& map )
+Animation Builder::CreateAnimation( const std::string& animationName, const Property
::
Map& map )
{
return GetImpl(*this).CreateAnimation( animationName, map );
}
{
return GetImpl(*this).CreateAnimation( animationName, map );
}
@@
-89,7
+89,7
@@
Animation Builder::CreateAnimation( const std::string& animationName, Dali::Acto
return GetImpl(*this).CreateAnimation( animationName, sourceActor );
}
return GetImpl(*this).CreateAnimation( animationName, sourceActor );
}
-Animation Builder::CreateAnimation( const std::string& animationName, const Property
Value
Map& map, Dali::Actor sourceActor )
+Animation Builder::CreateAnimation( const std::string& animationName, const Property
::
Map& map, Dali::Actor sourceActor )
{
return GetImpl(*this).CreateAnimation( animationName, map, sourceActor );
}
{
return GetImpl(*this).CreateAnimation( animationName, map, sourceActor );
}
@@
-99,16
+99,26
@@
BaseHandle Builder::Create( const std::string& templateName )
return GetImpl(*this).Create( templateName );
}
return GetImpl(*this).Create( templateName );
}
-BaseHandle Builder::Create( const std::string& templateName, const Property
Value
Map& map )
+BaseHandle Builder::Create( const std::string& templateName, const Property
::
Map& map )
{
return GetImpl(*this).Create( templateName, map );
}
{
return GetImpl(*this).Create( templateName, map );
}
+BaseHandle Builder::CreateFromJson( const std::string& json )
+{
+ return GetImpl(*this).CreateFromJson( json );
+}
+
bool Builder::ApplyStyle( const std::string& styleName, Handle& handle )
{
return GetImpl(*this).ApplyStyle( styleName, handle );
}
bool Builder::ApplyStyle( const std::string& styleName, Handle& handle )
{
return GetImpl(*this).ApplyStyle( styleName, handle );
}
+bool Builder::ApplyFromJson( Handle& handle, const std::string& json )
+{
+ return GetImpl(*this).ApplyFromJson( handle, json );
+}
+
void Builder::AddActors( Actor toActor )
{
GetImpl(*this).AddActors( toActor );
void Builder::AddActors( Actor toActor )
{
GetImpl(*this).AddActors( toActor );
@@
-134,6
+144,16
@@
FrameBufferImage Builder::GetFrameBufferImage( const std::string &name )
return GetImpl(*this).GetFrameBufferImage( name );
}
return GetImpl(*this).GetFrameBufferImage( name );
}
+Path Builder::GetPath( const std::string &name )
+{
+ return GetImpl(*this).GetPath( name );
+}
+
+Builder::Signal& Builder::QuitSignal()
+{
+ return GetImpl( *this ).QuitSignal();
+}
+
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali