Further Setter/Getter public API removal from Dali::Actor
[platform/core/uifw/dali-demo.git] / examples / buttons / buttons-example.cpp
index f3c597e..a0fae8d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -18,7 +18,6 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 using namespace Dali;
 
@@ -30,33 +29,27 @@ using namespace Dali;
 namespace
 {
 
-const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";
-const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png";
+const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
+const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
 
 const char* const TOOLBAR_TITLE = "Buttons";
 
-const char* const SMALL_IMAGE_1 = DALI_IMAGE_DIR "gallery-small-14.jpg";
-const char* const BIG_IMAGE_1 = DALI_IMAGE_DIR "gallery-large-4.jpg";
+const char* const SMALL_IMAGE_1 = DEMO_IMAGE_DIR "gallery-small-14.jpg";
+const char* const BIG_IMAGE_1   = DEMO_IMAGE_DIR "gallery-large-4.jpg";
 
-const char* const SMALL_IMAGE_2 = DALI_IMAGE_DIR "gallery-small-20.jpg";
-const char* const BIG_IMAGE_2 = DALI_IMAGE_DIR "gallery-large-11.jpg";
+const char* const SMALL_IMAGE_2 = DEMO_IMAGE_DIR "gallery-small-20.jpg";
+const char* const BIG_IMAGE_2   = DEMO_IMAGE_DIR "gallery-large-11.jpg";
 
-const char* const SMALL_IMAGE_3 = DALI_IMAGE_DIR "gallery-small-25.jpg";
-const char* const BIG_IMAGE_3 = DALI_IMAGE_DIR "gallery-large-13.jpg";
+const char* const SMALL_IMAGE_3 = DEMO_IMAGE_DIR "gallery-small-25.jpg";
+const char* const BIG_IMAGE_3   = DEMO_IMAGE_DIR "gallery-large-13.jpg";
 
-const char* const ENABLED_IMAGE = DALI_IMAGE_DIR "item-select-check.png";
-
-const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
-const char* const PUSHBUTTON_DISABLED_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
-const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
-
-const char* const CHECKBOX_UNSELECTED_IMAGE = DALI_IMAGE_DIR "checkbox-unselected.png";
-const char* const CHECKBOX_SELECTED_IMAGE = DALI_IMAGE_DIR "checkbox-selected.png";
+const char* const ENABLED_IMAGE = DEMO_IMAGE_DIR "item-select-check.png";
 
 const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f );
 
 // Layout sizes
 const int RADIO_LABEL_THUMBNAIL_SIZE = 60;
+const int RADIO_LABEL_THUMBNAIL_SIZE_SMALL = 40;
 const int RADIO_IMAGE_SPACING = 8;
 const int BUTTON_HEIGHT = 48;
 
@@ -112,17 +105,16 @@ class ButtonsController: public ConnectionTracker
     Toolkit::TableView contentTable = Toolkit::TableView::New( 4, 1 );
     contentTable.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
     contentTable.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
-    contentTable.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-    contentTable.SetParentOrigin( ParentOrigin::TOP_LEFT );
+    contentTable.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+    contentTable.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
     contentTable.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE * 0.5f ) );
-//    contentTable.TouchedSignal().Connect( this, &ButtonsController::OnTouchEvent );
 
     for( unsigned int i = 0; i < contentTable.GetRows(); ++i )
     {
       contentTable.SetFitHeight( i );
     }
 
-    contentTable.SetPosition( 0.0f, TOP_MARGIN );
+    contentTable.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, TOP_MARGIN ));
 
     mContentLayer.Add( contentTable );
 
@@ -149,72 +141,81 @@ class ButtonsController: public ConnectionTracker
 
     radioGroup2Background.AddChild( radioButtonsGroup2, Toolkit::TableView::CellPosition( 0, 0 ) );
 
+    // TableView to lay out 3x Radio buttons on the left, and 3x Image thumbnails on the right.
+    Toolkit::TableView imageSelectTableView = Toolkit::TableView::New( 3, 2 );
+    imageSelectTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+    imageSelectTableView.SetFitHeight( 0 );
+    imageSelectTableView.SetFitHeight( 1 );
+    imageSelectTableView.SetFitHeight( 2 );
+    imageSelectTableView.SetFitWidth( 0 );
+    imageSelectTableView.SetFitWidth( 1 );
+    imageSelectTableView.SetCellPadding( Vector2( 6.0f, 0.0f ) );
+
+    radioButtonsGroup2.Add( imageSelectTableView );
+
     int radioY = 0;
 
     // Radio 1
     {
-      ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_1 ) );
-      imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
-      mRadioButtonImage1 = Dali::Toolkit::RadioButton::New( imageActor );
-      mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      mRadioButtonImage1.SetPosition( 0, DP(radioY) );
-      mRadioButtonImage1.SetSelected( true );
-
-      radioButtonsGroup2.Add( mRadioButtonImage1 );
+      Toolkit::ImageView image = Toolkit::ImageView::New( SMALL_IMAGE_1 );
+      image.SetProperty( Actor::Property::SIZE, Vector2( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ) );
+
+      mRadioButtonImage1 = Dali::Toolkit::RadioButton::New( "1" );
+      mRadioButtonImage1.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+      mRadioButtonImage1.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+      mRadioButtonImage1.SetProperty( Actor::Property::POSITION, Vector2( 0, DP(radioY) ));
+      mRadioButtonImage1.SetProperty( Toolkit::Button::Property::SELECTED, true );
+
+      imageSelectTableView.AddChild( mRadioButtonImage1, Toolkit::TableView::CellPosition( 0, 0 ) );
+      imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 0, 1 ) );
     }
 
     // Radio 2
     {
       radioY += RADIO_LABEL_THUMBNAIL_SIZE + RADIO_IMAGE_SPACING;
 
-      ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_2 ) );
-      imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
+      Toolkit::ImageView image = Toolkit::ImageView::New( SMALL_IMAGE_2 );
+      image.SetProperty( Actor::Property::SIZE, Vector2( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ) );
 
-      mRadioButtonImage2 = Dali::Toolkit::RadioButton::New( imageActor );
-      mRadioButtonImage2.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      mRadioButtonImage2.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      mRadioButtonImage2.SetPosition( 0, DP(radioY) );
+      mRadioButtonImage2 = Dali::Toolkit::RadioButton::New( "2" );
+      mRadioButtonImage2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+      mRadioButtonImage2.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+      mRadioButtonImage2.SetProperty( Actor::Property::POSITION, Vector2( 0, DP(radioY) ));
 
-      radioButtonsGroup2.Add( mRadioButtonImage2 );
+      imageSelectTableView.AddChild( mRadioButtonImage2, Toolkit::TableView::CellPosition( 1, 0 ) );
+      imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 1, 1 ) );
     }
 
     // Radio 3
     {
       radioY += RADIO_LABEL_THUMBNAIL_SIZE + RADIO_IMAGE_SPACING;
 
-      ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_3 ) );
-      imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
+      Toolkit::ImageView image = Toolkit::ImageView::New( SMALL_IMAGE_3 );
+      image.SetProperty( Actor::Property::SIZE, Vector2( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ) );
 
-      mRadioButtonImage3 = Dali::Toolkit::RadioButton::New( imageActor );
-      mRadioButtonImage3.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      mRadioButtonImage3.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      mRadioButtonImage3.SetPosition( 0, DP(radioY) );
+      mRadioButtonImage3 = Dali::Toolkit::RadioButton::New( "3" );
+      mRadioButtonImage3.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+      mRadioButtonImage3.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+      mRadioButtonImage3.SetProperty( Actor::Property::POSITION, Vector2( 0, DP(radioY) ));
 
-      radioButtonsGroup2.Add( mRadioButtonImage3 );
+      imageSelectTableView.AddChild( mRadioButtonImage3, Toolkit::TableView::CellPosition( 2, 0 ) );
+      imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 2, 1 ) );
     }
 
     // Create select button
     mUpdateButton = Toolkit::PushButton::New();
-    mUpdateButton.SetLabel( "Select" );
+    mUpdateButton.SetProperty( Toolkit::Button::Property::LABEL, "Select" );
+    mUpdateButton.SetProperty( Dali::Actor::Property::NAME, "selectButton" );
     mUpdateButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
 
-    mUpdateButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
-    mUpdateButton.SetDisabledImage( Dali::ResourceImage::New( PUSHBUTTON_DISABLED_IMAGE ) );
-    mUpdateButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
-
     mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked );
 
     radioGroup2Background.AddChild( mUpdateButton, Toolkit::TableView::CellPosition( 1, 0 ) );
 
-    // ImageActor to display selected image
-    mBigImage1 = ResourceImage::New( BIG_IMAGE_1 );
-    mBigImage2 = ResourceImage::New( BIG_IMAGE_2 );
-    mBigImage3 = ResourceImage::New( BIG_IMAGE_3 );
-
-    mImage = ImageActor::New( mBigImage1 );
+    // ImageView to display selected image
+    mImage = Toolkit::ImageView::New( BIG_IMAGE_1 );
     mImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    mImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
+    mImage.SetProperty( Actor::Property::SIZE_SCALE_POLICY, SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
     radioGroup2Background.AddChild( mImage, Toolkit::TableView::CellPosition( 0, 1, 2, 1 ) );
 
     // The enable/disable radio group
@@ -239,48 +240,51 @@ class ButtonsController: public ConnectionTracker
 
     radioGroup1Background.Add( radioButtonsGroup1 );
 
+    // TableView to lay out 2x Radio buttons on the left, and 1x Tick image on the right.
+    Toolkit::TableView tableView = Toolkit::TableView::New( 2, 2 );
+    tableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+    tableView.SetFitHeight( 0 );
+    tableView.SetFitHeight( 1 );
+    tableView.SetFitWidth( 0 );
+    tableView.SetFitWidth( 1 );
+
+    Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( "Select enabled" );
+    textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
+    textLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
+    textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
+
+    Toolkit::ImageView image = Toolkit::ImageView::New( ENABLED_IMAGE );
+    image.SetProperty( Actor::Property::SIZE, Vector2( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ) );
+    image.SetProperty( Actor::Property::PADDING, Padding( DP(20.0f), 0.0f, 0.0f, 0.0f ) );
+    tableView.AddChild( image, Toolkit::TableView::CellPosition( 0, 1 ) );
+
+    radioButtonsGroup1.Add( tableView );
+
     // First radio button
     {
-      Toolkit::TableView tableView = Toolkit::TableView::New( 1, 2 );
-      tableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-      tableView.SetFitHeight( 0 );
-      tableView.SetFitWidth( 0 );
-      tableView.SetFitWidth( 1 );
-
-      Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( "Select enabled" );
-      textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
-      textLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
-      textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
-      tableView.AddChild( textLabel, Toolkit::TableView::CellPosition( 0, 0 ) );
-
-      ImageActor imageActor = ImageActor::New( ResourceImage::New( ENABLED_IMAGE ) );
-      imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
-      imageActor.SetPadding( Padding( DP(20.0f), 0.0f, 0.0f, 0.0f ) );
-      tableView.AddChild( imageActor, Toolkit::TableView::CellPosition( 0, 1 ) );
-
-      Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( tableView );
-      radioButton.SetName( "radio-select-enable" );
-      radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      radioButton.SetPosition( 0, 0 );
-      radioButton.SetSelected( true );
+      Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select enabled" );
+      radioButton.SetProperty( Dali::Actor::Property::NAME, "radioSelectEnable" );
+      radioButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+      radioButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+      radioButton.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
+      radioButton.SetProperty( Toolkit::Button::Property::SELECTED, true );
 
       radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButton );
 
-      radioButtonsGroup1.Add( radioButton );
+      tableView.AddChild( radioButton, Toolkit::TableView::CellPosition( 0, 0 ) );
     }
 
     // Second radio button
     {
       Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select disabled" );
-      radioButton.SetName( "radio-select-disable" );
-      radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      radioButton.SetPosition( 0, DP(50) );
+      radioButton.SetProperty( Dali::Actor::Property::NAME, "radioSelectDisable" );
+      radioButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+      radioButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+      radioButton.SetProperty( Actor::Property::POSITION, Vector2( 0, DP(50) ));
 
       radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButton );
 
-      radioButtonsGroup1.Add( radioButton );
+      tableView.AddChild( radioButton, Toolkit::TableView::CellPosition( 1, 0 ) );
     }
 
     // CheckBoxes
@@ -288,7 +292,7 @@ class ButtonsController: public ConnectionTracker
     checkBoxBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
     checkBoxBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
     checkBoxBackground.SetBackgroundColor( BACKGROUND_COLOUR );
-    checkBoxBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE ) );
+    checkBoxBackground.SetCellPadding( Size( MARGIN_SIZE / 2.0f, MARGIN_SIZE / 2.0f ) );
 
     for( unsigned int i = 0; i < checkBoxBackground.GetRows(); ++i )
     {
@@ -297,41 +301,35 @@ class ButtonsController: public ConnectionTracker
 
     contentTable.Add( checkBoxBackground );
 
-    Dali::Image unselected = Dali::ResourceImage::New( CHECKBOX_UNSELECTED_IMAGE );
-    Dali::Image selected = Dali::ResourceImage::New( CHECKBOX_SELECTED_IMAGE );
-
     {
-      Toolkit::CheckBoxButton checkBox = Toolkit::CheckBoxButton::New();
-      checkBox.SetName( "checkbox1" );
-      checkBox.SetBackgroundImage( unselected );
-      checkBox.SetSelectedImage( selected );
-      checkBox.SetLabel( "CheckBox1 is unselected" );
-      checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
-
-      checkBoxBackground.Add( checkBox );
+      mCheckboxButton1 = Toolkit::CheckBoxButton::New();
+      mCheckboxButton1.SetProperty( Dali::Actor::Property::NAME, "checkbox1" );
+      mCheckboxButton1.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox1 is unselected" );
+      mCheckboxButton1.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
+      mCheckboxButton1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+
+      checkBoxBackground.Add( mCheckboxButton1 );
     }
 
     {
-      Toolkit::CheckBoxButton checkBox = Toolkit::CheckBoxButton::New();
-      checkBox.SetName( "checkbox2" );
-      checkBox.SetBackgroundImage( unselected );
-      checkBox.SetSelectedImage( selected );
-      checkBox.SetLabel( "CheckBox2 is selected" );
-      checkBox.SetSelected( true );
-      checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
-
-      checkBoxBackground.Add( checkBox );
+      mCheckboxButton2 = Toolkit::CheckBoxButton::New();
+      mCheckboxButton2.SetProperty( Dali::Actor::Property::NAME, "checkbox2" );
+      mCheckboxButton2.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox2 is selected" );
+      mCheckboxButton2.SetProperty( Toolkit::Button::Property::SELECTED, true );
+      mCheckboxButton2.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
+      mCheckboxButton2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+
+      checkBoxBackground.Add( mCheckboxButton2 );
     }
 
     {
-      Toolkit::CheckBoxButton checkBox = Toolkit::CheckBoxButton::New();
-      checkBox.SetName( "checkbox3" );
-      checkBox.SetBackgroundImage( unselected );
-      checkBox.SetSelectedImage( selected );
-      checkBox.SetLabel( "CheckBox3 is unselected" );
-      checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
-
-      checkBoxBackground.Add( checkBox );
+      mCheckboxButton3 = Toolkit::CheckBoxButton::New();
+      mCheckboxButton3.SetProperty( Dali::Actor::Property::NAME, "checkbox3" );
+      mCheckboxButton3.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox3 is unselected" );
+      mCheckboxButton3.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
+      mCheckboxButton3.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+
+      checkBoxBackground.Add( mCheckboxButton3 );
     }
 
     // Create togglabe button
@@ -348,19 +346,14 @@ class ButtonsController: public ConnectionTracker
 
     contentTable.Add( toggleBackground );
 
-    Toolkit::PushButton toggleButton = Toolkit::PushButton::New();
-    toggleButton.SetTogglableButton( true );
-    toggleButton.SetLabel( "Unselected" );
-    toggleButton.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    toggleButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
+    mToggleButton = Toolkit::PushButton::New();
+    mToggleButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true );
+    mToggleButton.SetProperty( Toolkit::Button::Property::LABEL, "Unselected" );
+    mToggleButton.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+    mToggleButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
+    mToggleButton.StateChangedSignal().Connect( this, &ButtonsController::OnButtonSelected );
 
-    toggleButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
-    toggleButton.SetDisabledImage( Dali::ResourceImage::New( PUSHBUTTON_DISABLED_IMAGE ) );
-    toggleButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
-
-    toggleButton.StateChangedSignal().Connect( this, &ButtonsController::OnButtonSelected );
-
-    toggleBackground.Add( toggleButton );
+    toggleBackground.Add( mToggleButton );
   }
 
   void OnKeyEvent( const KeyEvent& event )
@@ -380,13 +373,14 @@ class ButtonsController: public ConnectionTracker
     Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( button );
     if( pushButton )
     {
-      if( button.IsSelected() )
+      bool isSelected = button.GetProperty( Toolkit::Button::Property::SELECTED ).Get<bool>();
+      if( isSelected )
       {
-        pushButton.SetLabel( "Selected" );
+        pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Selected" );
       }
       else
       {
-        pushButton.SetLabel( "Unselected" );
+        pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Unselected" );
       }
     }
 
@@ -395,13 +389,39 @@ class ButtonsController: public ConnectionTracker
 
   bool EnableSelectButton( Toolkit::Button button )
   {
-    if( button.GetName() == "radio-select-enable" && button.IsSelected() == true )
+    bool isSelected = button.GetProperty( Toolkit::Button::Property::SELECTED ).Get<bool>();
+    if( !isSelected )
     {
-      mUpdateButton.SetDisabled( false );
+      return true;
+    }
+
+    if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "radioSelectEnable" )
+    {
+      mUpdateButton.SetProperty( Toolkit::Button::Property::DISABLED, false );
+
+      mRadioButtonImage1.SetProperty( Toolkit::Button::Property::DISABLED, false );
+      mRadioButtonImage2.SetProperty( Toolkit::Button::Property::DISABLED, false );
+      mRadioButtonImage3.SetProperty( Toolkit::Button::Property::DISABLED, false );
+
+      mCheckboxButton1.SetProperty( Toolkit::Button::Property::DISABLED, false );
+      mCheckboxButton2.SetProperty( Toolkit::Button::Property::DISABLED, false );
+      mCheckboxButton3.SetProperty( Toolkit::Button::Property::DISABLED, false );
+
+      mToggleButton.SetProperty( Toolkit::Button::Property::DISABLED, false );
     }
-    else if( button.GetName() == "radio-select-disable" && button.IsSelected() == true )
+    else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "radioSelectDisable" )
     {
-      mUpdateButton.SetDisabled( true );
+      mUpdateButton.SetProperty( Toolkit::Button::Property::DISABLED, true );
+
+      mRadioButtonImage1.SetProperty( Toolkit::Button::Property::DISABLED, true );
+      mRadioButtonImage2.SetProperty( Toolkit::Button::Property::DISABLED, true );
+      mRadioButtonImage3.SetProperty( Toolkit::Button::Property::DISABLED, true );
+
+      mCheckboxButton1.SetProperty( Toolkit::Button::Property::DISABLED, true );
+      mCheckboxButton2.SetProperty( Toolkit::Button::Property::DISABLED, true );
+      mCheckboxButton3.SetProperty( Toolkit::Button::Property::DISABLED, true );
+
+      mToggleButton.SetProperty( Toolkit::Button::Property::DISABLED, true );
     }
 
     return true;
@@ -409,91 +429,64 @@ class ButtonsController: public ConnectionTracker
 
   bool OnButtonClicked(Toolkit::Button button)
   {
-    if( mRadioButtonImage1.IsSelected() )
+    if( mRadioButtonImage1.GetProperty( Toolkit::Button::Property::SELECTED ).Get<bool>() )
     {
-      mImage.SetImage( mBigImage1 );
+      mImage.SetImage( BIG_IMAGE_1 );
     }
-    else if( mRadioButtonImage2.IsSelected() )
+    else if( mRadioButtonImage2.GetProperty( Toolkit::Button::Property::SELECTED ).Get<bool>() )
     {
-      mImage.SetImage( mBigImage2 );
+      mImage.SetImage( BIG_IMAGE_2 );
     }
-    else if( mRadioButtonImage3.IsSelected() )
+    else if( mRadioButtonImage3.GetProperty( Toolkit::Button::Property::SELECTED ).Get<bool>() )
     {
-      mImage.SetImage( mBigImage3 );
+      mImage.SetImage( BIG_IMAGE_3 );
     }
     return true;
   }
 
   bool OnCheckBoxesSelected( Toolkit::Button button )
   {
-    if( button.GetName() == "checkbox1" )
+    bool isSelected = button.GetProperty( Toolkit::Button::Property::SELECTED ).Get<bool>();
+    if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "checkbox1" )
     {
-      if( button.IsSelected() )
+      if( isSelected )
       {
-        button.SetLabel("CheckBox1 is selected");
+        button.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox1 is selected");
       }
       else
       {
-        button.SetLabel("CheckBox1 is unselected");
+        button.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox1 is unselected");
       }
     }
 
-    if( button.GetName() == "checkbox2" )
+    if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "checkbox2" )
     {
-      if( button.IsSelected() )
+      if( isSelected )
       {
-        button.SetLabel("CheckBox2 is selected");
+        button.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox2 is selected");
       }
       else
       {
-        button.SetLabel("CheckBox2 is unselected");
+        button.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox2 is unselected");
       }
     }
 
-    if( button.GetName() == "checkbox3" )
+    if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "checkbox3" )
     {
-      if( button.IsSelected() )
+      if( isSelected )
       {
-        button.SetLabel("CheckBox3 is selected");
+        button.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox3 is selected");
       }
       else
       {
-        button.SetLabel("CheckBox3 is unselected");
+        button.SetProperty( Toolkit::Button::Property::LABEL, "CheckBox3 is unselected");
       }
     }
 
     return true;
   }
 
-  bool OnTouchEvent( Actor actor, const TouchEvent& event )
-  {
-    if( 1u == event.GetPointCount() )
-    {
-      const TouchPoint::State state = event.GetPoint(0u).state;
-
-      // Clamp to integer values; this is to reduce flicking due to pixel misalignment
-      const float localPoint = static_cast<float>( static_cast<int>( event.GetPoint( 0 ).local.y ) );
-
-      if( TouchPoint::Down == state )
-      {
-        mLastPoint = localPoint;
-        mAnimation = Animation::New( 0.25f );
-      }
-      else if( TouchPoint::Motion == state )
-      {
-        if( mAnimation )
-        {
-          mAnimation.AnimateBy( Property(actor, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunction::LINEAR );
-          mAnimation.Play();
-          mLastPoint = localPoint;
-        }
-      }
-    }
-
-    return true;
-  }
-
- private:
+private:
 
   Application&      mApplication;
   Toolkit::Control  mView;                              ///< The View instance.
@@ -505,30 +498,21 @@ class ButtonsController: public ConnectionTracker
   Toolkit::RadioButton mRadioButtonImage3;
 
   Toolkit::PushButton mUpdateButton;
+  Toolkit::PushButton mToggleButton;
+
+  Toolkit::CheckBoxButton mCheckboxButton1;
+  Toolkit::CheckBoxButton mCheckboxButton2;
+  Toolkit::CheckBoxButton mCheckboxButton3;
 
   Animation      mAnimation;
-  float          mLastPoint;
 
-  Image mBigImage1;
-  Image mBigImage2;
-  Image mBigImage3;
-  ImageActor mImage;
+  Toolkit::ImageView mImage;
 };
 
-void RunTest( Application& application )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
+  Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
   ButtonsController test( application );
-
   application.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
-int main( int argc, char **argv )
-{
-  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
-
-  RunTest( application );
-
   return 0;
 }