X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Ftransitions%2Ftransition-application.cpp;h=d3acd9831e9b5cc6fb46a73a305b5164f96be042;hb=2c54b5f664a6cab86ce5c857f462ed0448a568b6;hp=03799bf9726afd750af87cdeabbada384bc230f2;hpb=e2ee6baaa8dcfe20f708b17a51e4303b8cfc3824;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/examples/transitions/transition-application.cpp b/examples/transitions/transition-application.cpp
index 03799bf..d3acd98 100644
--- a/examples/transitions/transition-application.cpp
+++ b/examples/transitions/transition-application.cpp
@@ -24,6 +24,7 @@
 
 // External includes
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 #include "shadow-button.h"
@@ -57,6 +58,7 @@ TransitionApplication::TransitionApplication( Application& application )
   mTitle(),
   mShadowButton(),
   mActionButtons(),
+  mVisualIndex( Property::INVALID_INDEX ),
   mActionIndex( Property::INVALID_INDEX )
 {
   application.InitSignal().Connect( this, &TransitionApplication::Create );
@@ -106,10 +108,12 @@ void TransitionApplication::Create( Application& application )
   mShadowButton = ShadowButton::New();
   mShadowButton.SetName("ShadowButton");
   mShadowButton.SetActiveState( false );
-  mShadowButton.SetCheckState( false );
   mShadowButton.SetAnchorPoint( AnchorPoint::CENTER );
   mShadowButton.SetParentOrigin( ParentOrigin::CENTER );
   mShadowButton.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+  mShadowButton.SetProperty( DevelControl::Property::STATE, DevelControl::DISABLED );
+  mShadowButton.SetProperty( DevelControl::Property::SUB_STATE, "UNCHECKED" );
+
   buttonLayout.AddChild( mShadowButton, TableView::CellPosition(1, 1) );
 
   TableView actionButtonLayout = TableView::New( 1, NUMBER_OF_ACTION_BUTTONS+1 );
@@ -135,8 +139,9 @@ void TransitionApplication::Create( Application& application )
     mActionButtons[i].ClickedSignal().Connect( this, &TransitionApplication::OnActionButtonClicked );
     actionButtonLayout.AddChild( mActionButtons[i], TableView::CellPosition( 0, 1+i ) );
   }
-  SetLabelText( mActionButtons[0], "Activate" );
+  SetLabelText( mActionButtons[0], "Enable" );
   SetLabelText( mActionButtons[1], "Check" );
+  mActionButtons[1].SetProperty( Button::Property::DISABLED, true );
 
   contentLayout.Add( actionButtonLayout );
   contentLayout.SetFitHeight(2);
@@ -153,18 +158,31 @@ bool TransitionApplication::OnActionButtonClicked( Button button )
       mShadowButton.SetActiveState( ! activeState );
       if( activeState )
       {
-        SetLabelText( button, "Activate" );
+        SetLabelText( button, "Enable" );
+        mShadowButton.SetProperty( DevelControl::Property::STATE, DevelControl::DISABLED );
       }
       else
       {
-        SetLabelText( button, "Deactivate" );
+        SetLabelText( button, "Disable" );
+        mShadowButton.SetProperty( DevelControl::Property::STATE, DevelControl::NORMAL );
       }
+      mActionButtons[1].SetProperty( Button::Property::DISABLED, activeState );
       break;
     }
     case 1:
     {
       bool checkState = mShadowButton.GetCheckState();
       mShadowButton.SetCheckState( ! checkState );
+      if( checkState )
+      {
+        SetLabelText( button, "Check" );
+        mShadowButton.SetProperty( DevelControl::Property::SUB_STATE, "UNCHECKED" );
+      }
+      else
+      {
+        SetLabelText( button, "Uncheck" );
+        mShadowButton.SetProperty( DevelControl::Property::SUB_STATE, "CHECKED" );
+      }
       break;
     }
     case 2: