Updated demos following StyleManager move to the public API

Change-Id: I988e00a3a2d36ec6f9f9341443c500f03aa70c72
Signed-off-by: David Steele <david.steele@samsung.com>

diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index 7f60345..00e1c7f 100644 (file)
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -299,8 +299,6 @@ void DaliTableView::Initialize( Application& application )
   unsigned int degrees = 0;
   Rotate( degrees );
 
-  //orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged );
-
   winHandle.ShowIndicator( Dali::Window::INVISIBLE );
 
   // Background animation
@@ -415,11 +413,6 @@ void DaliTableView::Populate()
   mScrollView.SetRulerY( mScrollRulerY );
 }
 
-void DaliTableView::OrientationChanged( Orientation orientation )
-{
-  // TODO: Implement if orientation change required
-}
-
 void DaliTableView::Rotate( unsigned int degrees )
 {
   // Resize the root actor

diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index 2c4060b..aeb1d2e 100644 (file)
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -209,8 +209,6 @@ public:
                                              TOOLBAR_IMAGE,
                                              "" );
 
-    //app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged );
-
     // Create an edit mode button. (left of toolbar)
     Toolkit::PushButton editButton = Toolkit::PushButton::New();
     editButton.SetUnselectedImage( EDIT_IMAGE );
@@ -380,24 +378,6 @@ public:
     mItemView.ActivateLayout( layoutId, Vector3(stageSize.x, stageSize.y, stageSize.x), 0.0f );
   }
 
-  /**
-   * Orientation changed signal callback
-   * @param orientation
-   */
-  void OnOrientationChanged( Orientation orientation )
-  {
-    const unsigned int angle = orientation.GetDegrees();
-
-    // If orientation really changed
-    if( mOrientation != angle )
-    {
-      // Remember orientation
-      mOrientation = angle;
-
-      SetLayout( mCurrentLayout );
-    }
-  }
-
   bool OnLayoutButtonClicked( Toolkit::Button button )
   {
     // Switch to the next layout

diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp
index 33972b1..37b0626 100644 (file)
--- a/examples/motion-blur/motion-blur-example.cpp
+++ b/examples/motion-blur/motion-blur-example.cpp
@@ -193,7 +193,6 @@ public:
     winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
 
     // set initial orientation
-   // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged );
     unsigned int degrees = 0;
     Rotate( static_cast< DeviceOrientation >( degrees ) );
 
@@ -289,18 +288,6 @@ public:
 #endif //#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
   }
 
-  //////////////////////////////////////////////////////////////
-  //
-  // Device Orientation Support
-  //
-  //
-
-  void OnOrientationChanged( Orientation orientation )
-  {
-    unsigned int degrees = orientation.GetDegrees();
-    Rotate( static_cast< DeviceOrientation >( degrees ) );
-  }
-
   void Rotate( DeviceOrientation orientation )
   {
     // Resize the root actor

diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp
index 9a04340..b055b4f 100644 (file)
--- a/examples/motion-stretch/motion-stretch-example.cpp
+++ b/examples/motion-stretch/motion-stretch-example.cpp
@@ -167,7 +167,6 @@ public:
     winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE  );
     winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
 
-   // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged );
     unsigned int degrees = 0;
     Rotate( static_cast< DeviceOrientation >( degrees ) );
 
@@ -196,12 +195,6 @@ public:
   //
   //
 
-  void OnOrientationChanged( Orientation orientation )
-  {
-    unsigned int degrees = orientation.GetDegrees();
-    Rotate( static_cast< DeviceOrientation >( degrees ) );
-  }
-
   void Rotate( DeviceOrientation orientation )
   {
     // Resize the root actor

diff --git a/shared/view.h b/shared/view.h
index 3ac52a6..6af3324 100644 (file)
--- a/shared/view.h
+++ b/shared/view.h
@@ -20,7 +20,6 @@
 
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
-#include <dali-toolkit/devel-api/styling/style-manager.h>
 
 
 namespace DemoHelper