Removed Actor API from button. Added Icon properties

[platform/core/uifw/dali-demo.git] / examples / motion-blur / motion-blur-example.cpp

diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp
index b2d14e9..d19e7a6 100644 (file)
--- a/examples/motion-blur/motion-blur-example.cpp
+++ b/examples/motion-blur/motion-blur-example.cpp
@@ -166,23 +166,17 @@ public:
                                             APPLICATION_TITLE );
 
     //Add an effects icon on the right of the title
-    mIconEffectsOff = ResourceImage::New( EFFECTS_OFF_ICON );
-    mIconEffectsOffSelected = ResourceImage::New( EFFECTS_OFF_ICON_SELECTED );
-    mIconEffectsOn = ResourceImage::New( EFFECTS_ON_ICON );
-    mIconEffectsOnSelected = ResourceImage::New( EFFECTS_ON_ICON_SELECTED );
     mActorEffectsButton = Toolkit::PushButton::New();
-    mActorEffectsButton.SetButtonImage( mIconEffectsOff );
-    mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected );
+    mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
+    mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
     mActorEffectsButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnEffectButtonClicked );
     mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
 
     // Creates a mode button.
     // Create a effect toggle button. (right of toolbar)
-    Image imageLayout = ResourceImage::New( LAYOUT_IMAGE );
-    Image imageLayoutSelected = ResourceImage::New( LAYOUT_IMAGE_SELECTED );
     Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
-    layoutButton.SetButtonImage( imageLayout );
-    layoutButton.SetSelectedImage( imageLayoutSelected );
+    layoutButton.SetUnselectedImage( LAYOUT_IMAGE );
+    layoutButton.SetSelectedImage( LAYOUT_IMAGE_SELECTED );
     layoutButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnLayoutButtonClicked);
     layoutButton.SetLeaveRequired( true );
     mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -455,14 +449,14 @@ public:
     if(!mActorEffectsEnabled)
     {
       mActorEffectsEnabled = true;
-      mActorEffectsButton.SetButtonImage( mIconEffectsOn );
-      mActorEffectsButton.SetSelectedImage( mIconEffectsOnSelected );
+      mActorEffectsButton.SetUnselectedImage( EFFECTS_ON_ICON );
+      mActorEffectsButton.SetSelectedImage( EFFECTS_ON_ICON_SELECTED );
     }
     else
     {
       mActorEffectsEnabled = false;
-      mActorEffectsButton.SetButtonImage( mIconEffectsOff );
-      mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected );
+      mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
+      mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
     }
   }
 
@@ -522,10 +516,6 @@ private:
   Application&               mApplication;            ///< Application instance
   Toolkit::Control           mView;
   Toolkit::ToolBar           mToolBar;
-  Image                      mIconEffectsOff;
-  Image                      mIconEffectsOffSelected;
-  Image                      mIconEffectsOn;
-  Image                      mIconEffectsOnSelected;
 
   Layer                      mContentLayer;           ///< Content layer (contains actor for this blur demo)