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 7747b49..87a35b9 100644 (file)
--- a/dali-toolkit/internal/builder/builder-impl.h
+++ b/dali-toolkit/internal/builder/builder-impl.h
@@ -84,6 +84,21 @@ public:
   void AddConstants( const PropertyValueMap& map );
 
   /**
+   * @copydoc Toolkit::Builder::AddConstant
+   */
+  void AddConstant( const std::string& key, const Property::Value& value );
+
+  /**
+   * @copydoc Toolkit::Builder::GetConstants
+   */
+  const PropertyValueMap& GetConstants() const;
+
+  /**
+   * @copydoc Toolkit::Builder::GetConstant
+   */
+  const Property::Value& GetConstant( const std::string& key ) const;
+
+  /**
    * @copydoc Toolkit::Builder::CreateAnimation( const std::string& animationName );
    */
   Animation CreateAnimation( const std::string& animationName );
@@ -94,26 +109,26 @@ public:
   Animation CreateAnimation( const std::string& animationName, const PropertyValueMap& map );
 
   /**
-   * @copydoc Toolkit::Builder::CreateAnimation( const std::string& animationName, Dali::Actor searchRoot );
+   * @copydoc Toolkit::Builder::CreateAnimation( const std::string&,Dali::Actor);
    */
-  Animation CreateAnimation( const std::string& animationName, Dali::Actor searchRoot );
+  Animation CreateAnimation( const std::string& animationName, Dali::Actor sourceActor );
 
   /**
-   * @copydoc Toolkit::Builder::CreateAnimation( const std::string& animationName, const PropertyValueMap& map, Dali::Actor searchRoot );
+   * @copydoc Toolkit::Builder::CreateAnimation( const std::string&,const PropertyValueMap&,Dali::Actor);
    */
-  Animation CreateAnimation( const std::string& animationName, const PropertyValueMap& map, Dali::Actor searchRoot );
+  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;
@@ -138,6 +153,8 @@ public:
    */
   void ApplyStyle( const std::string& styleName, Handle& handle );
 
+  void AnimateTo( const std::string& styleName, Handle& handle );
+
   /**
    * @copydoc Toolkit::Builder::AddActors
    */
@@ -207,16 +224,29 @@ private:
 
   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 searchRoot );
+  Animation CreateAnimation( const std::string& animationName, const Replacement& replacement, Dali::Actor sourceActor );
+
+  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 );
 
-  BaseHandle CreateFromStyle( const std::string& styleName, const Replacement& replacement );
 };
 
 } // namespace Internal