[dali_1.4.55] Merge branch 'devel/master'

[platform/core/uifw/dali-demo.git] / shared / dali-table-view.cpp

diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 5b65822..9be600d 100644 (file)
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -20,8 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <algorithm>
-#include <sstream>
-#include <unistd.h>
 #include <dali/devel-api/images/distance-field.h>
 #include <dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h>
 #include <dali-toolkit/devel-api/shader-effects/distance-field-effect.h>
@@ -29,8 +27,9 @@
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 // INTERNAL INCLUDES
-#include "shared/view.h"
+#include "shared/execute-process.h"
 #include "shared/utility.h"
+#include "shared/view.h"
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -95,6 +94,7 @@ const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs
 const float BUBBLE_MIN_Z = -1.0;
 const float BUBBLE_MAX_Z = 0.0f;
 
+const char * const DEMO_BUILD_DATE    = __DATE__ " " __TIME__;
 
 /**
  * Creates the background image
@@ -286,10 +286,21 @@ void DaliTableView::Initialize( Application& application )
   ApplyCubeEffectToPages();
 
   Dali::Window winHandle = application.GetWindow();
-  winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT );
-  winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE );
-  winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
-  winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+
+  if( stageSize.width <= stageSize.height )
+  {
+    winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT );
+    winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE );
+    winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
+    winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+  }
+  else
+  {
+    winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
+    winHandle.RemoveAvailableOrientation( Dali::Window::PORTRAIT );
+    winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+    winHandle.RemoveAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
+  }
 
   // Set initial orientation
   unsigned int degrees = 0;
@@ -609,14 +620,8 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation& source )
   {
     std::string name = mPressedActor.GetName();
 
-    std::stringstream stream;
-    stream << DEMO_EXAMPLE_BIN << name.c_str();
-    pid_t pid = fork();
-    if( pid == 0)
-    {
-      execlp( stream.str().c_str(), name.c_str(), NULL );
-      DALI_ASSERT_ALWAYS(false && "exec failed!");
-    }
+    ExecuteProcess( name );
+
     mPressedActor.Reset();
   }
 }
@@ -905,6 +910,7 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap
       stream << "DALi Core: "    << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << std::endl << "(" << CORE_BUILD_DATE << ")\n";
       stream << "DALi Adaptor: " << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << std::endl << "(" << ADAPTOR_BUILD_DATE << ")\n";
       stream << "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << std::endl << "(" << TOOLKIT_BUILD_DATE << ")\n";
+      stream << "DALi Demo:" << "\n(" << DEMO_BUILD_DATE << ")\n";
 
       mVersionPopup = Dali::Toolkit::Popup::New();