From: Adeel Kazmi Date: Fri, 8 Aug 2014 14:46:15 +0000 (+0100) Subject: Remove Deprecated APIs X-Git-Tag: dali_1.0.4~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=d9422274305180b56ab8c17fc87c8fda8cfea68b Remove Deprecated APIs Change-Id: Ie94adf60535ad27715d462b88ae9870e481865d8 --- diff --git a/base/dali-toolkit/internal/builder/builder-impl.cpp b/base/dali-toolkit/internal/builder/builder-impl.cpp index dc59a7e..ca4fc97 100644 --- a/base/dali-toolkit/internal/builder/builder-impl.cpp +++ b/base/dali-toolkit/internal/builder/builder-impl.cpp @@ -537,19 +537,6 @@ BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node, return baseHandle; } - -ActorContainer Builder::GetTopLevelActors() const -{ - // deprecated function. - return ActorContainer(); -} - -Animation Builder::GetAnimation( const std::string &name ) const -{ - // deprecated - return Animation(); -} - void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replacement& constant ) { const Stage& stage = Stage::GetCurrent(); @@ -735,31 +722,6 @@ FrameBufferImage Builder::GetFrameBufferImage( const std::string &name, const Re return ret; } -Font Builder::GetFont( const std::string& name ) const -{ - // deprecated function. - Font font; - return font; -} - -TextStyle Builder::GetTextStyle( const std::string& name ) const -{ - // deprecated - return TextStyle(); -} - -Image Builder::GetImage( const std::string& name) const -{ - // deprecated function. - return Image(); -} - -Actor Builder::GetActor( const std::string &name ) const -{ - // deprecated function. - return Actor(); -} - void Builder::AddActors( Actor toActor ) { // 'stage' is the default/by convention section to add from diff --git a/base/dali-toolkit/internal/builder/builder-impl.h b/base/dali-toolkit/internal/builder/builder-impl.h index 2ec0e25..62e3e87 100644 --- a/base/dali-toolkit/internal/builder/builder-impl.h +++ b/base/dali-toolkit/internal/builder/builder-impl.h @@ -128,33 +128,11 @@ 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 - */ - TextStyle GetTextStyle(const std::string &name) const; - - /** - * @copydoc Toolkit::Builder::GetImage - */ - Image GetImage(const std::string &name) const; - - /** - * @copydoc Toolkit::Builder::GetActor - */ - Actor GetActor( const std::string &name ) const; - /** * @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 +144,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 ); @@ -195,11 +168,6 @@ public: */ FrameBufferImage GetFrameBufferImage( const std::string &name, const Replacement& constant ); - /** - * @copydoc Toolkit::Builder::GetTopLevelActors - */ - ActorContainer GetTopLevelActors( void ) const; - protected: virtual ~Builder(); diff --git a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index 6298e7d..dc33722 100755 --- a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -186,35 +186,11 @@ void ScrollBar::OnScrollConnectorSet( Toolkit::ScrollConnector oldConnector ) } } -void ScrollBar::SetBackgroundImage( Image image, const Vector4& border ) -{ - if (!mBackground ) - { - mBackground = ImageActor::New( image ); - mBackground.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mBackground.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - Self().Add(mBackground); - } - else - { - mBackground.SetImage(image); - } - mBackground.SetNinePatchBorder( border ); - mBackground.SetStyle( ImageActor::STYLE_NINE_PATCH ); -} - void ScrollBar::SetIndicatorImage( Image image ) { mIndicator.SetImage(image); } -void ScrollBar::SetIndicatorImage( Image image, const Vector4& border ) -{ - mIndicator.SetImage(image); - mIndicator.SetNinePatchBorder( border ); - mIndicator.SetStyle( ImageActor::STYLE_NINE_PATCH ); -} - Actor ScrollBar::GetScrollIndicator() { return mIndicator; diff --git a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h index fb6786c..dee5479 100755 --- a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h +++ b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h @@ -48,7 +48,7 @@ public: // Properties enum { - SCROLLBAR_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1, + SCROLLBAR_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, SCROLLBAR_PROPERTY_END_INDEX = SCROLLBAR_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices }; @@ -78,21 +78,11 @@ public: void OnScrollConnectorSet( Toolkit::ScrollConnector connector ); /** - * @copydoc Toolkit::ScrollBar::SetBackgroundImage() - */ - void SetBackgroundImage( Image image, const Vector4& border ); - - /** * @copydoc Toolkit::ScrollBar::SetIndicatorImage() */ void SetIndicatorImage( Image image ); /** - * @copydoc Toolkit::ScrollBar::SetIndicatorImage() - */ - void SetIndicatorImage( Image image, const Vector4& border ); - - /** * @copydoc Toolkit::ScrollBar::GetScrollIndicator() */ Actor GetScrollIndicator(); diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp index dc5a456..7aca7ff 100644 --- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -323,7 +323,6 @@ ItemView::ItemView(ItemFactory& factory) : Scrollable(), mItemFactory(factory), mActiveLayout(NULL), - mDefaultAlphaFunction(Dali::Constraint::DEFAULT_ALPHA_FUNCTION), mAnimatingOvershootOn(false), mAnimateOvershootOff(false), mAnchoringEnabled(true), @@ -548,16 +547,6 @@ void ItemView::DeactivateCurrentLayout() } } -void ItemView::SetDefaultAlphaFunction(AlphaFunction func) -{ - mDefaultAlphaFunction = func; -} - -AlphaFunction ItemView::GetDefaultAlphaFunction() const -{ - return mDefaultAlphaFunction; -} - void ItemView::OnRefreshNotification(PropertyNotification& source) { if(mRefreshEnabled || mScrollAnimation) diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h index 164bd8c..94a98bb 100644 --- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h +++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h @@ -99,16 +99,6 @@ public: void ActivateLayout(unsigned int layoutIndex, const Vector3& targetSize, float durationSeconds); /** - * @copydoc Toolkit::ItemView::SetDefaultAlphaFunction - */ - void SetDefaultAlphaFunction(AlphaFunction func); - - /** - * @copydoc Toolkit::ItemView::GetDefaultAlphaFunction - */ - AlphaFunction GetDefaultAlphaFunction() const; - - /** * @copydoc Toolkit::ItemView::DeactivateCurrentLayout */ void DeactivateCurrentLayout(); @@ -558,8 +548,6 @@ private: ItemLayout* mActiveLayout; Vector3 mActiveLayoutTargetSize; - AlphaFunction mDefaultAlphaFunction; - Animation mResizeAnimation; Animation mScrollAnimation; Animation mScrollOvershootAnimation; diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp index 96a9c84..ccf141a 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -1093,16 +1093,6 @@ void ScrollView::SetWrapMode(bool enable) Self().SetProperty(mPropertyWrap, enable); } -int ScrollView::GetRefreshInterval() const -{ - return mScrollUpdateDistance; -} - -void ScrollView::SetRefreshInterval(int milliseconds) -{ - mScrollUpdateDistance = milliseconds; -} - int ScrollView::GetScrollUpdateDistance() const { return mScrollUpdateDistance; diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h index eeec6d5..5f2569d 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h @@ -250,18 +250,6 @@ public: void SetWrapMode(bool enable); /** - * @deprecated - * @copydoc Toolkit::ScrollView::GetRefreshInterval - */ - int GetRefreshInterval() const; - - /** - * @deprecated - * @copydoc Toolkit::ScrollView::SetRefreshInterval - */ - void SetRefreshInterval(int milliseconds); - - /** * @copydoc Toolkit::ScrollView::GetScrollupdateDistance */ int GetScrollUpdateDistance() const; diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp index ed842c3..3919c6d 100644 --- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp @@ -1932,10 +1932,6 @@ void TextView::OnWidthExceedPolicyPropertySet( Property::Value propertyValue ) { SetWidthExceedPolicy(Toolkit::TextView::Original); } - else if(policyName == "Truncate") - { - SetWidthExceedPolicy(Toolkit::TextView::Truncate); - } else if(policyName == "Fade") { SetWidthExceedPolicy(Toolkit::TextView::Fade); @@ -1965,10 +1961,6 @@ void TextView::OnHeightExceedPolicyPropertySet( Property::Value propertyValue ) { SetHeightExceedPolicy(Toolkit::TextView::Original); } - else if(policyName == "Truncate") - { - SetHeightExceedPolicy(Toolkit::TextView::Truncate); - } else if(policyName == "Fade") { SetHeightExceedPolicy(Toolkit::TextView::Fade); diff --git a/base/dali-toolkit/public-api/builder/builder.cpp b/base/dali-toolkit/public-api/builder/builder.cpp index c5f7eef..e900e5b 100644 --- a/base/dali-toolkit/public-api/builder/builder.cpp +++ b/base/dali-toolkit/public-api/builder/builder.cpp @@ -94,16 +94,6 @@ Animation Builder::CreateAnimation( const std::string& animationName, const Prop return GetImpl(*this).CreateAnimation( animationName, map, sourceActor ); } -BaseHandle Builder::CreateFromStyle( const std::string& styleName ) -{ - return BaseHandle(); -} - -BaseHandle Builder::CreateFromStyle( const std::string& styleName, const PropertyValueMap& map ) -{ - return BaseHandle(); -} - BaseHandle Builder::Create( const std::string& templateName ) { return GetImpl(*this).Create( templateName ); @@ -129,31 +119,6 @@ void Builder::AddActors( const std::string §ionName, Actor toActor ) GetImpl(*this).AddActors( sectionName, toActor ); } -Font Builder::GetFont( const std::string &name ) const -{ - return GetImpl(*this).GetFont( name ); -} - -TextStyle Builder::GetTextStyle( const std::string &name ) const -{ - return GetImpl(*this).GetTextStyle( name ); -} - -Image Builder::GetImage( const std::string &name ) const -{ - return GetImpl(*this).GetImage( name ); -} - -Actor Builder::GetActor( const std::string &name ) const -{ - return GetImpl(*this).GetActor( name ); -} - -Animation Builder::GetAnimation( const std::string &name ) const -{ - return GetImpl(*this).GetAnimation( name ); -} - void Builder::CreateRenderTask( const std::string &name ) { GetImpl(*this).CreateRenderTask( name ); @@ -169,11 +134,6 @@ FrameBufferImage Builder::GetFrameBufferImage( const std::string &name ) return GetImpl(*this).GetFrameBufferImage( name ); } -ActorContainer Builder::GetTopLevelActors( void ) const -{ - return GetImpl(*this).GetTopLevelActors(); -} - } // namespace Toolkit } // namespace Dali diff --git a/base/dali-toolkit/public-api/builder/builder.h b/base/dali-toolkit/public-api/builder/builder.h index cee1458..5f33075 100644 --- a/base/dali-toolkit/public-api/builder/builder.h +++ b/base/dali-toolkit/public-api/builder/builder.h @@ -253,16 +253,6 @@ typedef std::map PropertyValueMap; Animation CreateAnimation( const std::string& animationName, const PropertyValueMap& map, Dali::Actor sourceActor ); /** - * @deprecated Use Create() - */ - BaseHandle CreateFromStyle( const std::string& styleName ); - - /** - * @deprecated Use Create() - */ - BaseHandle CreateFromStyle( const std::string& styleName, const PropertyValueMap& map ); - - /** * @brief Creates an object (e.g. an actor) from the set of known style templates * * e.g. @@ -328,54 +318,6 @@ typedef std::map PropertyValueMap; void AddActors( const std::string §ionName, Actor toActor ); /** - * @deprecated Font as a separate asset is no longer supported - * Get's a Font asset previously created at load time - * An empty handle is returned otherwise. - * @pre The Builder has been initialized. - * @param name The name given to a Font in the loaded representation - * @return A handle to a Font if found, otherwise empty. - */ - Font GetFont( const std::string &name ) const; - - /** - * Get's a TextStyle asset previously created at load time - * @pre The Builder has been initialized. - * @param name The name given to a TextStyle in the loaded representation - * @return a Created TextStyle if found, otherwise return a TextStyle created by Default constructor - */ - TextStyle GetTextStyle( const std::string &name ) const; - - /** - * @deprecated Images as a separate asset is no longer supported - * Get's an Image asset previously created at load time - * An empty handle is returned otherwise. - * @pre The Builder has been initialized. - * @param name The name given to an Image in the loaded representation - * @return A handle to an Image if found, otherwise empty - */ - Image GetImage( const std::string &name ) const; - - /** - * @deprecated Actors no longer held by builder - * Get's an Actor previously created at load time - * An empty handle is returned otherwise. - * @pre The Builder has been initialized. - * @param name The name given to an Actor in the loaded representation - * @return A handle to an Actor if found, otherwise empty - */ - Actor GetActor( const std::string &name ) const; - - /** - * @deprecated Animations no longer held by builder - * Get's an Animation previously created at load time - * An empty handle is returned otherwise. - * @pre The Builder has been initialized. - * @param name The name given to an Animation in the loaded representation - * @return A handle to an Animation if found, otherwise empty - */ - Animation GetAnimation( const std::string &name ) const; - - /** * Create a render task set. * @pre The Builder has been initialized. * @param name The library name of the render task set. @@ -400,13 +342,6 @@ typedef std::map PropertyValueMap; */ FrameBufferImage GetFrameBufferImage( const std::string &name ); - /** - * @deprecated. Builder no longer holds actor handles/references - * Provides a list of the top level actors previously created at load time - * @return A container of Actors found at the top level of the loaded representation - */ - ActorContainer GetTopLevelActors( void ) const; - private: Builder(Internal::Builder *impl); diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp index bc97f30..975152e 100644 --- a/base/dali-toolkit/public-api/controls/control-impl.cpp +++ b/base/dali-toolkit/public-api/controls/control-impl.cpp @@ -604,7 +604,7 @@ void Control::Initialize() Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &ControlImpl::DoStyleChange ); + styleManager.StyleChangeSignal().Connect( this, &Control::DoStyleChange ); // SetTheme GetImpl( styleManager ).ApplyThemeStyle( GetOwner() ); @@ -953,9 +953,6 @@ void Control::DoStyleChange( Toolkit::StyleManager styleManager, StyleChange cha } else if( change.defaultFontChange || change.defaultFontSizeChange ) { - // This OnStyleChange(StyleChange change ) is deprecated, use OnFontChange instead - OnStyleChange( change ); - OnFontChange( change.defaultFontChange, change.defaultFontSizeChange ); } } @@ -1288,12 +1285,6 @@ std::size_t Control::GetConnectionCount() const return mImpl->GetConnectionCount(); } -Control::Control( bool requiresTouchEvents ) -: CustomActorImpl( requiresTouchEvents ), - mImpl(new Impl(*this)) -{ -} - Control::Control( ControlBehaviour behaviourFlags ) : CustomActorImpl( behaviourFlags & REQUIRES_TOUCH_EVENTS ), mImpl(new Impl(*this)) diff --git a/base/dali-toolkit/public-api/controls/control-impl.h b/base/dali-toolkit/public-api/controls/control-impl.h index bf58ce7..df822ef 100644 --- a/base/dali-toolkit/public-api/controls/control-impl.h +++ b/base/dali-toolkit/public-api/controls/control-impl.h @@ -315,17 +315,6 @@ private: // For derived classes to override virtual void OnFontChange( bool defaultFontChange, bool defaultFontSizeChange ){ } /** - * @deprecated Use OnFontChange() instead. - * Before the using of StyleManager, the StyleChange only deals with font change. - * - * @brief This method should be overridden by deriving classes when - * they wish to be notified when the style changes. - * - * @param[in] change Information denoting what has changed. - */ - virtual void OnStyleChange( StyleChange change ) { } - - /** * @brief Called whenever a pinch gesture is detected on this control. * * This can be overridden by deriving classes when pinch detection @@ -553,14 +542,6 @@ protected: // Construction }; /** - * @deprecated Use the constructor taking flags instead - * @brief Create a Control. - * - * @param[in] requiresTouchEvents True if the OnTouchEvent() callback is required. - */ - Control(bool requiresTouchEvents); - - /** * @brief Create a Control. * * @param[in] behaviourFlags Behavioural flags from ControlBehaviour enum @@ -746,8 +727,6 @@ private: } // namespace Internal -typedef Internal::Control ControlImpl; ///< @deprecated, Use Internal::Control - } // namespace Toolkit } // namespace Dali diff --git a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp index 7d84f28..ed08541 100755 --- a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp +++ b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp @@ -69,21 +69,11 @@ ScrollBar::~ScrollBar() { } -void ScrollBar::SetBackgroundImage( Image image, const Vector4& border ) -{ - GetImpl(*this).SetBackgroundImage(image, border); -} - void ScrollBar::SetIndicatorImage( Image image ) { GetImpl(*this).SetIndicatorImage(image); } -void ScrollBar::SetIndicatorImage( Image image, const Vector4& border ) -{ - GetImpl(*this).SetIndicatorImage(image, border); -} - Actor ScrollBar::GetScrollIndicator() { return GetImpl(*this).GetScrollIndicator(); diff --git a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h index d67b9c0..ad13fee 100755 --- a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h +++ b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h @@ -104,21 +104,6 @@ public: static ScrollBar DownCast( BaseHandle handle ); /** - * @brief Sets the image for the background of scroll indicator. - * - * @pre The scroll bar actor has been initialised. - * - * The background image is resized (stretched according to scale settings), - * to the size of the ScrollBar. - * - * @param[in] image The image to cover background - * @param[in] border The nine patch border for the image. - * - * @deprecated Use Control::SetBackground() - */ - void SetBackgroundImage( Image image, const Vector4& border ); - - /** * @brief Sets the image for the indicator of scroll bar. * * @pre The scroll bar actor has been initialised. @@ -132,22 +117,6 @@ public: void SetIndicatorImage( Image image ); /** - * @brief Sets the image for the indicator of scroll bar. - * - * @pre The scroll bar actor has been initialised. - * - * The indicator image is resized (stretched according to scale settings), - * to reflect the size of the scroll indicator and minimum/maximum limits - * of the scroll position. - * - * @param[in] image The image of indicator that moves to indicate the current scroll position. - * @param[in] border The nine patch border for the image. - * - * @deprecated Use the new 9-patch API - */ - void SetIndicatorImage( Image image, const Vector4& border ); - - /** * @brief Gets the indicator of scroll bar. * * @pre The scroll bar actor has been initialised. diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp index 4bd1ac3..da7863c 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp +++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp @@ -330,12 +330,6 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast( itemViewActor ); if(itemView && scrollPositionObject) { - ///!ToDo: Remove this once AlphaFunction in itemview is removed - if( itemView.GetDefaultAlphaFunction() != Constraint::DEFAULT_ALPHA_FUNCTION ) - { - mAlphaFunction = itemView.GetDefaultAlphaFunction(); - } - Property::Index scrollSpeedProperty = itemView.GetPropertyIndex("item-view-scroll-speed"); Property::Index scrollPositionProperty = scrollPositionObject.GetPropertyIndex("scroll-position"); diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp index 3eb3866..0bb8842 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp +++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp @@ -113,16 +113,6 @@ void ItemView::DeactivateCurrentLayout() GetImpl(*this).DeactivateCurrentLayout(); } -void ItemView::SetDefaultAlphaFunction(AlphaFunction func) -{ - GetImpl(*this).SetDefaultAlphaFunction(func); -} - -AlphaFunction ItemView::GetDefaultAlphaFunction() const -{ - return GetImpl(*this).GetDefaultAlphaFunction(); -} - void ItemView::SetMinimumSwipeSpeed(float speed) { GetImpl(*this).SetMinimumSwipeSpeed(speed); diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h index 4f05f31..68d6bcc 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h +++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h @@ -172,22 +172,6 @@ public: void DeactivateCurrentLayout(); /** - * @brief Set default the alpha function used when applying constraints e.g. during ActivateLayout(). - * - * @deprecated Use SetAlphaFunction() in the layout - * @param[in] func The default alpha function to use. - */ - void SetDefaultAlphaFunction(AlphaFunction func); - - /** - * @brief Retrieve the default alpha function used when applying constraints - * - * @deprecated Use GetAlphaFunction() in the layout - * @return The default alpha function. - */ - AlphaFunction GetDefaultAlphaFunction() const; - - /** * @brief Set the minimum swipe speed in pixels per second; A pan * gesture must exceed this to trigger a swipe. * diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp index 088bddd..f492280 100755 --- a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp +++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp @@ -348,8 +348,6 @@ struct NavigationLayout::Impl ItemLayout::QuaternionFunction mRotationConstraint[4]; ItemLayout::Vector4Function mColorConstraint; - - NavigationLayout::NavigationSignalV2 mSignalPanV2;/*the signal to notify the application the selected item*/ }; NavigationLayoutPtr NavigationLayout::New() @@ -468,7 +466,6 @@ ItemRange NavigationLayout::GetItemsWithinArea(float firstItemPosition, Vector3 int firstItemIndex = std::max(0.0f, -firstItemPosition -1.0f ); int lastItemIndex = std::max(0.0f, -(firstItemPosition) + itemsPerPage ); - mImpl->mSignalPanV2.Emit(lastItemIndex - mImpl->mNumberOfColumns); return ItemRange(firstItemIndex , lastItemIndex ); } @@ -542,11 +539,6 @@ bool NavigationLayout::GetVisibilityConstraint(unsigned int itemId, ItemLayout:: return true; } -NavigationLayout::NavigationSignalV2& NavigationLayout::PanSignal() -{ - return mImpl->mSignalPanV2; -} - Degree NavigationLayout::GetScrollDirection() const { Degree scrollDirection(0); diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h index 6ca182c..8fe02cc 100755 --- a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h +++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h @@ -44,11 +44,6 @@ public: const float sideMargin)> ResizeFunction; /** - * @deprecated This should not have been added to an ItemLayout - */ - typedef SignalV2< void (int) > NavigationSignalV2; - - /** * Create a new navigation layout */ static NavigationLayoutPtr New(); @@ -59,11 +54,6 @@ public: virtual ~NavigationLayout(); /** - * Get the pan signal - */ - NavigationSignalV2& PanSignal(); - - /** * Set the number of columns in the layout. * @param[in] columns The number of columns. */ diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp index 8c37842..30e95d0 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp +++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp @@ -391,16 +391,6 @@ void ScrollView::SetRulerY(RulerPtr ruler) GetImpl(*this).SetRulerY(ruler); } -void ScrollView::SetRulerScaleX(RulerPtr ruler) -{ - DALI_LOG_ERROR( "Deprecated" ); -} - -void ScrollView::SetRulerScaleY(RulerPtr ruler) -{ - DALI_LOG_ERROR( "Deprecated" ); -} - void ScrollView::SetScrollSensitive(bool sensitive) { GetImpl(*this).SetScrollSensitive(sensitive); @@ -436,16 +426,6 @@ void ScrollView::SetWrapMode(bool enable) GetImpl(*this).SetWrapMode(enable); } -int ScrollView::GetRefreshInterval() const -{ - return GetImpl(*this).GetRefreshInterval(); -} - -void ScrollView::SetRefreshInterval(int milliseconds) -{ - GetImpl(*this).SetRefreshInterval(milliseconds); -} - int ScrollView::GetScrollUpdateDistance() const { return GetImpl(*this).GetScrollUpdateDistance(); @@ -546,31 +526,11 @@ void ScrollView::SetScrollPosition(const Vector3& position) GetImpl(*this).SetScrollPosition(position); } -Vector3 ScrollView::GetCurrentScrollScale() const -{ - DALI_LOG_ERROR( "Deprecated" ); - return Vector3::ONE; -} - unsigned int ScrollView::GetCurrentPage() const { return GetImpl(*this).GetCurrentPage(); } -void ScrollView::TransformTo(const Vector3& position, const Vector3& scale, float rotation) -{ - DALI_LOG_ERROR( "Deprecated" ); - - GetImpl(*this).TransformTo(position); -} - -void ScrollView::TransformTo(const Vector3& position, const Vector3& scale, float rotation, float duration) -{ - DALI_LOG_ERROR( "Deprecated" ); - - GetImpl(*this).TransformTo(position, duration); -} - void ScrollView::ScrollTo(const Vector3 &position) { GetImpl(*this).ScrollTo(position); @@ -617,16 +577,6 @@ bool ScrollView::ScrollToSnapPoint() return GetImpl(*this).ScrollToSnapPoint(); } -void ScrollView::ScaleTo(const Vector3 &scale) -{ - DALI_LOG_ERROR( "Deprecated" ); -} - -void ScrollView::ScaleTo(const Vector3 &scale, float duration) -{ - DALI_LOG_ERROR( "Deprecated" ); -} - void ScrollView::ApplyConstraintToChildren(Constraint constraint) { GetImpl(*this).ApplyConstraintToChildren(constraint); diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h index e0d0e4b..e09c8ed 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -594,30 +594,6 @@ public: void SetRulerY(RulerPtr ruler); /** - * @brief Set Scale-X axis ruler. - * - * Defines how scaling horizontally is snapped, and the extent - * (domain) to which scaling can be performed e.g. 10% to 200% - * - * @param[in] ruler The ruler to be used for the Scale-X axis - * - * @deprecated Scaling not supported - */ - void SetRulerScaleX(RulerPtr ruler); - - /** - * @brief Set Scale-Y axis ruler. - * - * Defines how scaling vertically is snapped, and the extent - * (domain) to which scaling can be performed e.g. 10% to 200% - * - * @param[in] ruler The ruler to be used for the Scale-Y axis - * - * @deprecated Scaling not supported - */ - void SetRulerScaleY(RulerPtr ruler); - - /** * @brief Set Scroll's touch sensitivity. * * @note Unlike SetSensitive(), this determines whether this ScrollView @@ -698,28 +674,6 @@ public: void SetWrapMode(bool enable); /** - * @deprecated - * @brief Gets the current refresh interval in milliseconds. - * - * @return Current refresh interval in milliseconds - */ - int GetRefreshInterval() const; - - /** - * @deprecated - * @brief Sets the refresh interval in milliseconds. - * - * The refresh interval is a notification signal - * (SignalScrollUpdate), that is periodically fired when scrolling - * animation is occuring. - * - * When set to 0. No update signals are sent. - * - * @param[in] milliseconds The frequency of the event in milliseconds - */ - void SetRefreshInterval(int milliseconds); - - /** * @brief Gets the current distance needed to scroll for ScrollUpdatedSignal to be emitted * * @return Current scroll update distance @@ -913,15 +867,6 @@ public: void SetScrollPosition(const Vector3& position); /** - * @brief Retrieves current scroll scale. - * - * @returns The current scroll scale. - * - * @deprecated Scaling not supported - */ - Vector3 GetCurrentScrollScale() const; - - /** * @brief Retrieves current scroll page based on ScrollView * dimensions being the size of one page, and all pages laid out in * a grid fashion, increasing from left to right until the end of @@ -934,29 +879,6 @@ public: unsigned int GetCurrentPage() const; /** - * @brief Transforms View to position, scale and rotation specified. - * - * @param[in] position The position to transform to. - * @param[in] scale The scale to transform to. - * @param[in] rotation The rotation to transform to. - * - * @deprecated Scaling or rotation not supported, use ScrollTo(const Vector3&) - */ - void TransformTo(const Vector3& position, const Vector3& scale, float rotation); - - /** - * @brief Transforms View to position, scale and rotation specified in the duration specified. - * - * @param[in] position The position to transform to. - * @param[in] scale The scale to transform to. - * @param[in] rotation The rotation to transform to. - * @param[in] duration The duration for this animation in seconds. - * - * @deprecated Scaling or rotation not supported, use ScrollTo(const Vector3&, float) - */ - void TransformTo(const Vector3& position, const Vector3& scale, float rotation, float duration); - - /** * @brief Scrolls View to position specified (contents will scroll to this position). * * Position 0,0 is the origin. Increasing X scrolls contents left, while @@ -1074,25 +996,6 @@ public: bool ScrollToSnapPoint(); /** - * @brief Scales View to (scale). - * - * @param[in] scale The scale factor the animate to. - * - * @deprecated Scaling not supported - */ - void ScaleTo(const Vector3& scale); - - /** - * @brief Scales View to (scale). - * - * @param[in] scale The scale factor the animate to. - * @param[in] duration The duration of the animation in seconds. - * - * @deprecated Scaling not supported - */ - void ScaleTo(const Vector3& scale, float duration); - - /** * @brief Applies a constraint that will affect the children of ScrollView. * * @note this affects all existing and future Actors that are added to scrollview. diff --git a/base/dali-toolkit/public-api/controls/text-view/text-view.h b/base/dali-toolkit/public-api/controls/text-view/text-view.h index f98607a..f589d2b 100644 --- a/base/dali-toolkit/public-api/controls/text-view/text-view.h +++ b/base/dali-toolkit/public-api/controls/text-view/text-view.h @@ -223,7 +223,6 @@ public: enum ExceedPolicy { Original, ///< Will display the text in its original size. If a line, a word or a character is bigger than the TextView size it may exceed its boundary. - Truncate, ///< @deprecated. Use Fade instead. Fade, ///< Will display the text in its original size. It won't display the text which exceeds the TextView boundary. It fades the text out. Split, ///< Will split the text in a new line. ShrinkToFit, ///< Will shrink the text to fit the TextView boundary. diff --git a/docs/content/programming-guide/properties.h b/docs/content/programming-guide/properties.h index 9c0b701..a8d452b 100644 --- a/docs/content/programming-guide/properties.h +++ b/docs/content/programming-guide/properties.h @@ -10,8 +10,8 @@ shows the index range of the different properties in place. Default Properties defined within DALi Core, e.g. Dali::Actor, Dali::ShaderEffect default properties etc. 0 to 9999999 Registered Properties registered using Dali::PropertyRegistration 10000000 to 19999999 Control Property range reserved by Dali::Toolkit::Control 10000000 to 10001000
- \link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_START_INDEX CONTROL_PROPERTY_START_INDEX\endlink - to \link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX CONTROL_PROPERTY_END_INDEX\endlink + \link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_START_INDEX CONTROL_PROPERTY_START_INDEX\endlink + to \link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX CONTROL_PROPERTY_END_INDEX\endlink Derived Control Property range for control deriving directly from Dali::Toolkit::Control 10001001 to 19999999 Custom Custom properties added to instance using Dali::Handle::RegisterProperty 50000000 onwards diff --git a/docs/content/programming-guide/type-registration.h b/docs/content/programming-guide/type-registration.h index 43fe731..3f3663f 100644 --- a/docs/content/programming-guide/type-registration.h +++ b/docs/content/programming-guide/type-registration.h @@ -30,8 +30,8 @@ A type can be registered using Dali::TypeRegistration. This is normally done in within the source file of the deriving control as shown in the code below. Please note: This snippet assumes knowledge of the \link Dali::Toolkit::Control Control -\endlink / \link Dali::Toolkit::ControlImpl ControlImpl \endlink creation process where -MyControl derives from a Control and MyControlImpl derives from ControlImpl. +\endlink / \link Dali::Toolkit::Internal::Control Internal::Control \endlink creation process where +MyControl derives from a Control and MyControlImpl derives from Internal::Control. @code namespace @@ -193,10 +193,10 @@ Dali::PROPERTY_REGISTRATION_MAX_INDEX. Furthermore, if deriving from \link Dali::Toolkit::Control Control\endlink, the control writer needs to be aware of their parent class's property range. Control reserves a property range between -\link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_START_INDEX ControlImpl::CONTROL_PROPERTY_START_INDEX\endlink -and \link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX ControlImpl::CONTROL_PROPERTY_END_INDEX\endlink. +\link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_START_INDEX ControlImpl::CONTROL_PROPERTY_START_INDEX\endlink +and \link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX Internal::Control::CONTROL_PROPERTY_END_INDEX\endlink. Any deriving control should start their property indices from -\link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX ControlImpl::CONTROL_PROPERTY_END_INDEX\endlink + 1. +\link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX Internal::Control::CONTROL_PROPERTY_END_INDEX\endlink + 1. Please have a look at \ref property-indices for more information. @@ -204,9 +204,9 @@ The following code shows how a property can be added to a type. @code // Define the indices we will use for the properties -static const int PROPERTY_ONE( Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX + 1 ); -static const int PROPERTY_TWO( Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX + 2 ); -static const int PROPERTY_THREE( Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX + 3 ); +static const int PROPERTY_ONE( Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX + 1 ); +static const int PROPERTY_TWO( Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX + 2 ); +static const int PROPERTY_THREE( Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX + 3 ); Dali::PropertyRegistration property1( type, // Reference to type registration object (see above) diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h index c0381e3..e5e04e3 100644 --- a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h +++ b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h @@ -131,14 +131,6 @@ public: ImageRotation GetSourceRotation() const; /** - * @copydoc Dali::Toolkit::MaskedImageView::RenderFinishedSignal - */ - Dali::RenderTask::RenderTaskSignalV2& RenderFinishedSignal() - { - return mRenderTask.FinishedSignal(); - } - - /** * @copydoc Dali::Toolkit::MaskedImageView::MaskFinishedSignal */ Dali::Toolkit::MaskedImageView::MaskedImageViewSignal& MaskFinishedSignal(); diff --git a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp index 665100b..0ccc83f 100644 --- a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp +++ b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp @@ -142,11 +142,6 @@ MaskedImageView::ImageRotation MaskedImageView::GetSourceRotation() const return GetImpl(*this).GetSourceRotation(); } -Dali::RenderTask::RenderTaskSignalV2& MaskedImageView::RenderFinishedSignal() -{ - return GetImpl(*this).RenderFinishedSignal(); -} - MaskedImageView::MaskedImageViewSignal& MaskedImageView::MaskFinishedSignal() { return GetImpl(*this).MaskFinishedSignal(); diff --git a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h index e160cbc..bd5447f 100644 --- a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h +++ b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h @@ -277,13 +277,6 @@ public: /* Signals */ */ MaskedImageViewSignal& MaskFinishedSignal(); - /** - * @deprecated Use MaskFinishedSignal() instead. - * Signal emitted when the render task which targets the frame buffer of the masked image has finished. - * @return the signal. - */ - Dali::RenderTask::RenderTaskSignalV2& RenderFinishedSignal(); - public: // Not intended for application developers /**