X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fpopup%2Fpopup.cpp;h=f3669fae5d81112573742f2f91c9b540029bf8ad;hp=9b74a3d7b101aa5de7c0f1978def527a06d6961e;hb=91b8f5bbaa7d68f5ca8fc94287b8c181a10ba894;hpb=a4aa42975730d13ff47b1a1dbf47549ebd81ff68

diff --git a/dali-toolkit/devel-api/controls/popup/popup.cpp b/dali-toolkit/devel-api/controls/popup/popup.cpp
index 9b74a3d..f3669fa 100644
--- a/dali-toolkit/devel-api/controls/popup/popup.cpp
+++ b/dali-toolkit/devel-api/controls/popup/popup.cpp
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/popup/popup-impl.h>
-#include <dali-toolkit/public-api/controls/buttons/button.h>
 
 using namespace Dali;
 
@@ -77,69 +76,73 @@ Popup Popup::DownCast( BaseHandle handle )
   return Control::DownCast<Popup, Internal::Popup>(handle);
 }
 
-void Popup::SetBackgroundImage( Actor image )
+// Properties:
+
+void Popup::SetTitle( Actor titleActor )
 {
-  GetImpl(*this).SetBackgroundImage( image );
+  GetImpl( *this ).SetTitle( titleActor );
 }
 
-void Popup::SetTitle( const std::string& text )
+Actor Popup::GetTitle() const
 {
-  GetImpl(*this).SetTitle( text );
+  return GetImpl( *this ).GetTitle();
 }
 
-std::string Popup::GetTitle() const
+void Popup::SetContent( Actor content )
 {
-  return GetImpl(*this).GetTitle();
+  GetImpl( *this ).SetContent( content );
 }
 
-void Popup::AddButton( Button button )
+Actor Popup::GetContent() const
 {
-  GetImpl(*this).AddButton( button );
+  return GetImpl( *this ).GetContent();
 }
 
-void Popup::SetState( PopupState state )
+void Popup::SetFooter( Actor footer )
 {
-  GetImpl(*this).SetState( state );
+  GetImpl( *this ).SetFooter( footer );
 }
 
-void Popup::SetState( PopupState state, float duration )
+Actor Popup::GetFooter() const
 {
-  GetImpl(*this).SetState( state, duration );
+  return GetImpl( *this ).GetFooter();
 }
 
-Popup::PopupState Popup::GetState() const
+void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState )
 {
-  return GetImpl(*this).GetState();
+  GetImpl( *this ).SetDisplayState( displayState );
 }
 
-void Popup::Show()
+Toolkit::Popup::DisplayState Popup::GetDisplayState() const
 {
-  GetImpl(*this).SetState( POPUP_SHOW );
+  return GetImpl( *this ).GetDisplayState();
 }
 
-void Popup::Hide()
+// Signals:
+
+Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal()
 {
-  GetImpl(*this).SetState( POPUP_HIDE );
+  return GetImpl( *this ).OutsideTouchedSignal();
 }
 
-void Popup::ShowTail(const Vector3& position)
+Popup::DisplayStateChangeSignalType& Popup::ShowingSignal()
 {
-  GetImpl(*this).ShowTail( position );
+  return GetImpl( *this ).ShowingSignal();
 }
 
-void Popup::HideTail()
+Popup::DisplayStateChangeSignalType& Popup::ShownSignal()
 {
-  GetImpl(*this).HideTail();
+  return GetImpl( *this ).ShownSignal();
 }
 
-Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal()
+Popup::DisplayStateChangeSignalType& Popup::HidingSignal()
 {
-  return GetImpl(*this).OutsideTouchedSignal();
+  return GetImpl( *this ).HidingSignal();
 }
 
-Popup::HiddenSignalType& Popup::HiddenSignal()
+Popup::DisplayStateChangeSignalType& Popup::HiddenSignal()
 {
-  return GetImpl(*this).HiddenSignal();
+  return GetImpl( *this ).HiddenSignal();
 }
 
 } // namespace Toolkit