X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fbuilder%2Fbuilder-impl.h;h=e82ed9314aec99c9176616c5f669c5c7d0f7a112;hb=fb7a84118ac4d5ddeb41f9d2d741f6aa51045ee8;hp=eae2f71f6b928d258ffd9ede3ccd2213fd969859;hpb=022b76df6f53c2860f2684ef1ffee81af1805e2e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/base/dali-toolkit/internal/builder/builder-impl.h b/base/dali-toolkit/internal/builder/builder-impl.h index eae2f71..e82ed93 100644 --- a/base/dali-toolkit/internal/builder/builder-impl.h +++ b/base/dali-toolkit/internal/builder/builder-impl.h @@ -1,27 +1,27 @@ #ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_H__ #define __DALI_TOOLKIT_INTERNAL_BUILDER_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // EXTERNAL INCLUDES #include #include #include -#include #include #include @@ -128,33 +128,21 @@ public: */ BaseHandle Create( const std::string& templateName, const PropertyValueMap& map ); - /** - * @copydoc Toolkit::Builder::GetFont - */ - Font GetFont(const std::string &name) const; - /** - * @copydoc Toolkit::Builder::GetTextStyle + * @copydoc Toolkit::Builder::CreateFromJson( const std::string& json ); */ - TextStyle GetTextStyle(const std::string &name) const; + BaseHandle CreateFromJson( const std::string& json ); /** - * @copydoc Toolkit::Builder::GetImage + * @copydoc Toolkit::Builder::ApplyFromJson( Handle& handle, const std::string& json ); */ - Image GetImage(const std::string &name) const; - - /** - * @copydoc Toolkit::Builder::GetActor - */ - 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 ); - void AnimateTo( const std::string& styleName, Handle& handle ); - /** * @copydoc Toolkit::Builder::AddActors */ @@ -166,11 +154,6 @@ public: 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 ); @@ -196,9 +179,14 @@ public: 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: @@ -247,6 +235,7 @@ private: void SetProperties( const TreeNode& node, Handle& handle, const Replacement& constant ); + Toolkit::Builder::Signal mQuitSignal; }; } // namespace Internal