Scripting: Json format changes; style sets, includes

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / builder-impl.h

diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h
index 3378eee..87a35b9 100644 (file)
--- a/dali-toolkit/internal/builder/builder-impl.h
+++ b/dali-toolkit/internal/builder/builder-impl.h
@@ -119,16 +119,16 @@ public:
   Animation CreateAnimation( const std::string& animationName, const PropertyValueMap& map, Dali::Actor sourceActor );
 
   /**
   Animation CreateAnimation( const std::string& animationName, const PropertyValueMap& map, Dali::Actor sourceActor );
 
   /**

-   * @copydoc Toolkit::Builder::CreateFromStyle( const std::string& styleName );
+   * @copydoc Toolkit::Builder::Create( const std::string& templateName );

    */
    */

-  BaseHandle CreateFromStyle( const std::string& styleName );
+  BaseHandle Create( const std::string& templateName );

 
   /**
 
   /**

-   * @copydoc Toolkit::Builder::CreateFromStyle( const std::string& styleName, const PropertyValueMap& map );
+   * @copydoc Toolkit::Builder::Create( const std::string& templateName, const PropertyValueMap& map );

    */
    */

-  BaseHandle CreateFromStyle( const std::string& styleName, 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::GetFont
    */
   Font GetFont(const std::string &name) const;


@@ -153,6 +153,8 @@ public:
    */
   void ApplyStyle( const std::string& styleName, Handle& handle );
 
    */
   void ApplyStyle( const std::string& styleName, Handle& handle );
 

+  void AnimateTo( const std::string& styleName, Handle& handle );
+

   /**
    * @copydoc Toolkit::Builder::AddActors
    */
   /**
    * @copydoc Toolkit::Builder::AddActors
    */


@@ -222,16 +224,29 @@ private:
 
   PropertyValueMap mReplacementMap;
 
 
   PropertyValueMap mReplacementMap;
 

-  BaseHandle Create( const OptionalChild& optionalStyles, const TreeNode& node, const TreeNode& root, Actor parent,
-                     const Replacement& replacement );
+  BaseHandle Create( const std::string& templateName, const Replacement& constant );
+
+  BaseHandle DoCreate( const TreeNode& root, const TreeNode& node, Actor parent, const Replacement& replacements );
+
+  void LoadConstants( const TreeNode& root, PropertyValueMap& intoMap );

 
 

-  void LoadConstants();
+  void LoadIncludes( const std::string& data );

 
   void ApplyStyle( const std::string& styleName, Handle& handle, const Replacement& replacement);
 
   Animation CreateAnimation( const std::string& animationName, const Replacement& replacement, Dali::Actor sourceActor );
 
 
   void ApplyStyle( const std::string& styleName, Handle& handle, const Replacement& replacement);
 
   Animation CreateAnimation( const std::string& animationName, const Replacement& replacement, Dali::Actor sourceActor );
 

-  BaseHandle CreateFromStyle( const std::string& styleName, const Replacement& replacement );
+  void ApplyProperties( const TreeNode& root, const TreeNode& node,
+                        Dali::Handle& handle, const Replacement& constant );
+
+  void ApplyStylesByActor( const TreeNode& root, const TreeNode& node,
+                           Dali::Handle& handle, const Replacement& constant );
+
+  void ApplyAllStyleProperties( const TreeNode& root, const TreeNode& node,
+                                Dali::Handle& handle, const Replacement& constant );
+
+  void SetProperties( const TreeNode& node, Handle& handle, const Replacement& constant );
+

 };
 
 } // namespace Internal
 };
 
 } // namespace Internal