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
Remove deprecated SetRemoveTime API
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
builder
/
builder-impl.h
diff --git
a/base/dali-toolkit/internal/builder/builder-impl.h
b/base/dali-toolkit/internal/builder/builder-impl.h
index
2ec0e25
..
e82ed93
100644
(file)
--- a/
base/dali-toolkit/internal/builder/builder-impl.h
+++ b/
base/dali-toolkit/internal/builder/builder-impl.h
@@
-128,33
+128,21
@@
public:
*/
BaseHandle Create( const std::string& templateName, const PropertyValueMap& map );
*/
BaseHandle Create( const std::string& templateName, const PropertyValueMap& map );
- /**
- * @copydoc Toolkit::Builder::GetFont
- */
- Font GetFont(const std::string &name) const;
-
- /**
- * @copydoc Toolkit::Builder::GetTextStyle
- */
- TextStyle GetTextStyle(const std::string &name) const;
-
/**
/**
- * @copydoc Toolkit::Builder::
GetImage
+ * @copydoc Toolkit::Builder::
CreateFromJson( const std::string& json );
*/
*/
-
Image GetImage(const std::string &name) const
;
+
BaseHandle CreateFromJson( const std::string& json )
;
/**
/**
- * @copydoc Toolkit::Builder::
GetActor
+ * @copydoc Toolkit::Builder::
ApplyFromJson( Handle& handle, const std::string& json );
*/
*/
-
Actor GetActor( const std::string &name ) const
;
+
bool ApplyFromJson( Handle& handle, const std::string& json )
;
/**
* @copydoc Toolkit::Builder::ApplyStyle
*/
bool ApplyStyle( const std::string& styleName, Handle& handle );
/**
* @copydoc Toolkit::Builder::ApplyStyle
*/
bool ApplyStyle( const std::string& styleName, Handle& handle );
- void AnimateTo( const std::string& styleName, Handle& handle );
-
/**
* @copydoc Toolkit::Builder::AddActors
*/
/**
* @copydoc Toolkit::Builder::AddActors
*/
@@
-166,11
+154,6
@@
public:
void AddActors( const std::string §ionName, Actor toActor );
/**
void AddActors( const std::string §ionName, Actor toActor );
/**
- * @copydoc Toolkit::Builder::GetAnimation
- */
- Animation GetAnimation( const std::string &name ) const;
-
- /**
* @copydoc Toolkit::Builder::CreateRenderTask
*/
void CreateRenderTask( const std::string &name );
* @copydoc Toolkit::Builder::CreateRenderTask
*/
void CreateRenderTask( const std::string &name );
@@
-196,9
+179,14
@@
public:
FrameBufferImage GetFrameBufferImage( const std::string &name, const Replacement& constant );
/**
FrameBufferImage GetFrameBufferImage( const std::string &name, const Replacement& constant );
/**
- * @copydoc Toolkit::Builder::GetTopLevelActors
+ * @copydoc Toolkit::Builder::QuitSignal
+ */
+ Toolkit::Builder::Signal& QuitSignal();
+
+ /**
+ * Emits the quit signal
*/
*/
-
ActorContainer GetTopLevelActors( void ) const
;
+
void EmitQuitSignal()
;
protected:
protected:
@@
-247,6
+235,7
@@
private:
void SetProperties( const TreeNode& node, Handle& handle, const Replacement& constant );
void SetProperties( const TreeNode& node, Handle& handle, const Replacement& constant );
+ Toolkit::Builder::Signal mQuitSignal;
};
} // namespace Internal
};
} // namespace Internal