Merge branch 'devel/master' into tizen

Change-Id: I067934873e273060a2ff0f787aa1366cac5e8f6d

diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
index fe29875..1e67df8 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.cpp
+++ b/dali/internal/adaptor/common/application-impl.cpp
@@ -48,6 +48,13 @@ namespace Internal
 namespace Adaptor
 {
 
+namespace
+{
+
+const float DEFAULT_STEREO_BASE( 65.0f );
+
+} // unnamed namespace
+
 ApplicationPtr Application::gPreInitializedApplication( NULL );
 
 ApplicationPtr Application::New(
@@ -101,7 +108,9 @@ Application::Application( int* argc, char** argv[], const std::string& styleshee
   mEnvironmentOptions(),
   mWindowPositionSize( positionSize ),
   mLaunchpadState( Launchpad::NONE ),
-  mSlotDelegate( this )
+  mSlotDelegate( this ),
+  mViewMode( MONO ),
+  mStereoBase( DEFAULT_STEREO_BASE )
 {
   // Get mName from environment options
   mMainWindowName = mEnvironmentOptions.GetWindowName();
@@ -396,6 +405,28 @@ Dali::Window Application::GetWindow()
   return mMainWindow;
 }
 
+// Stereoscopy
+
+void Application::SetViewMode( ViewMode viewMode )
+{
+  mViewMode = viewMode;
+}
+
+ViewMode Application::GetViewMode() const
+{
+  return mViewMode;
+}
+
+void Application::SetStereoBase( float stereoBase )
+{
+  mStereoBase = stereoBase;
+}
+
+float Application::GetStereoBase() const
+{
+  return mStereoBase;
+}
+
 void Application::ReplaceWindow( const PositionSize& positionSize, const std::string& name )
 {
   Dali::Window newWindow = Dali::Window::New( positionSize, name, mMainWindowMode == Dali::Application::TRANSPARENT );

diff --git a/dali/internal/adaptor/common/application-impl.h b/dali/internal/adaptor/common/application-impl.h
index d8d1fce..8c8f726 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.h
+++ b/dali/internal/adaptor/common/application-impl.h
@@ -154,6 +154,28 @@ public:
    */
   static ApplicationPtr GetPreInitializedApplication();
 
+public: // Stereoscopy
+
+  /**
+   * @copydoc Dali::Application::SetViewMode()
+   */
+  void SetViewMode( ViewMode viewMode );
+
+  /**
+   * @copydoc Dali::Application::GetViewMode()
+   */
+  ViewMode GetViewMode() const;
+
+  /**
+   * @copydoc Dali::Application::SetStereoBase()
+   */
+  void SetStereoBase( float stereoBase );
+
+  /**
+   * @copydoc Dali::Application::GetStereoBase()
+   */
+  float GetStereoBase() const;
+
 public: // Lifecycle functionality
 
   /**
@@ -402,9 +424,12 @@ private:
   Launchpad::State                         mLaunchpadState;
   bool                                     mUseRemoteSurface;
 
-  SlotDelegate< Application >           mSlotDelegate;
+  SlotDelegate< Application >              mSlotDelegate;
+
+  ViewMode                                 mViewMode;
+  float                                    mStereoBase;
 
-  static ApplicationPtr                 gPreInitializedApplication;
+  static ApplicationPtr                    gPreInitializedApplication;
 };
 
 inline Application& GetImplementation(Dali::Application& application)

diff --git a/dali/internal/system/common/locale-utils.cpp b/dali/internal/system/common/locale-utils.cpp
old mode 100644 (file)
new mode 100755 (executable)
index d9f906a..04b3a44
--- a/dali/internal/system/common/locale-utils.cpp
+++ b/dali/internal/system/common/locale-utils.cpp
@@ -46,7 +46,7 @@ const LocaleDirectionInfo LOCALE_DIRECTION_LOOKUP_TABLE[] =
   { "am", "Amharic",            Locale::LeftToRight },
   { "ar", "Arabic",             Locale::RightToLeft },
   { "as", "Assamese",           Locale::LeftToRight },
-  { "az", "Azerbaijani",        Locale::RightToLeft },
+  { "az", "Azerbaijani",        Locale::LeftToRight },
   { "be", "Belarusian",         Locale::LeftToRight },
   { "bg", "Bulgarian",          Locale::LeftToRight },
   { "bn", "Bengali",            Locale::LeftToRight },
@@ -72,6 +72,7 @@ const LocaleDirectionInfo LOCALE_DIRECTION_LOOKUP_TABLE[] =
   { "gl", "Galician",           Locale::LeftToRight },
   { "gn", "Guarani",            Locale::LeftToRight },
   { "gu", "Gujarati",           Locale::LeftToRight },
+  { "ha", "Hausa",              Locale::RightToLeft },
   { "he", "Hebrew",             Locale::RightToLeft },
   { "hi", "Hindi",              Locale::LeftToRight },
   { "hr", "Croatian",           Locale::LeftToRight },
@@ -86,7 +87,8 @@ const LocaleDirectionInfo LOCALE_DIRECTION_LOOKUP_TABLE[] =
   { "km", "Khmer",              Locale::LeftToRight },
   { "kn", "Kannada",            Locale::LeftToRight },
   { "ko", "Korean",             Locale::LeftToRight },
-  { "ks", "Kashmiri",           Locale::RightToLeft },
+  { "ks", "Kashmiri",           Locale::LeftToRight },
+  { "ku", "Kurdish",            Locale::RightToLeft },
   { "la", "Latin",              Locale::LeftToRight },
   { "lo", "Lao",                Locale::LeftToRight },
   { "lt", "Lithuanian",         Locale::LeftToRight },
@@ -123,7 +125,7 @@ const LocaleDirectionInfo LOCALE_DIRECTION_LOOKUP_TABLE[] =
   { "sw", "Swahili",            Locale::LeftToRight },
   { "ta", "Tamil",              Locale::LeftToRight },
   { "te", "Telugu",             Locale::LeftToRight },
-  { "tg", "Tajik",              Locale::RightToLeft },
+  { "tg", "Tajik",              Locale::LeftToRight },
   { "th", "Thai",               Locale::LeftToRight },
   { "tk", "Turkmen",            Locale::LeftToRight },
   { "tn", "Setsuana",           Locale::LeftToRight },

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
index 55409ea..e3b6be3 100644 (file)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
@@ -72,6 +72,12 @@ public:
    */
   uint32_t GetTotalFrameNumber();
 
+  // Not copyable or movable
+  VectorAnimationRendererPluginProxy( const VectorAnimationRendererPluginProxy& ) = delete; ///< Deleted copy constructor
+  VectorAnimationRendererPluginProxy( VectorAnimationRendererPluginProxy&& ) = delete; ///< Deleted move constructor
+  VectorAnimationRendererPluginProxy& operator=( const VectorAnimationRendererPluginProxy& ) = delete; ///< Deleted copy assignment operator
+  VectorAnimationRendererPluginProxy& operator=( VectorAnimationRendererPluginProxy&& ) = delete; ///< Deleted move assignment operator
+
 private:
 
   /**

diff --git a/dali/public-api/adaptor-framework/application.cpp b/dali/public-api/adaptor-framework/application.cpp
index 188e382..3405faf 100644 (file)
--- a/dali/public-api/adaptor-framework/application.cpp
+++ b/dali/public-api/adaptor-framework/application.cpp
@@ -192,22 +192,24 @@ std::string Application::GetLanguage() const
   return Internal::Adaptor::GetImplementation(*this).GetLanguage();
 }
 
-void Application::SetViewMode( ViewMode /*viewMode*/ )
+void Application::SetViewMode( ViewMode viewMode )
 {
+  Internal::Adaptor::GetImplementation(*this).SetViewMode( viewMode );
 }
 
 ViewMode Application::GetViewMode() const
 {
-  return ViewMode::MONO;
+  return Internal::Adaptor::GetImplementation(*this).GetViewMode();
 }
 
-void Application::SetStereoBase( float /*stereoBase*/ )
+void Application::SetStereoBase( float stereoBase )
 {
+  Internal::Adaptor::GetImplementation(*this).SetStereoBase( stereoBase );
 }
 
 float Application::GetStereoBase() const
 {
-  return 0.f;
+  return Internal::Adaptor::GetImplementation(*this).GetStereoBase();
 }
 
 Application::AppSignalType& Application::InitSignal()

diff --git a/dali/public-api/adaptor-framework/application.h b/dali/public-api/adaptor-framework/application.h
index e9449ad..96eaedf 100644 (file)
--- a/dali/public-api/adaptor-framework/application.h
+++ b/dali/public-api/adaptor-framework/application.h
@@ -324,7 +324,7 @@ public: // Stereoscopy
    * @brief Sets the viewing mode for the application.
    * @SINCE_1_0.0
    * @param[in] viewMode The new viewing mode
-   * @DEPRECATED_1_3.39
+   * @DEPRECATED_1_3.51
    */
   void SetViewMode( ViewMode viewMode );
 
@@ -332,7 +332,7 @@ public: // Stereoscopy
    * @brief Gets the current viewing mode.
    * @SINCE_1_0.0
    * @return The current viewing mode
-   * @DEPRECATED_1_3.39
+   * @DEPRECATED_1_3.51
    */
   ViewMode GetViewMode() const;
 
@@ -343,7 +343,7 @@ public: // Stereoscopy
    * between 50mm and 70mm. The default value is 65mm.
    * @SINCE_1_0.0
    * @param[in] stereoBase The stereo base (eye separation) for Stereoscopic 3D
-   * @DEPRECATED_1_3.39
+   * @DEPRECATED_1_3.51
    */
   void SetStereoBase( float stereoBase );
 
@@ -352,7 +352,7 @@ public: // Stereoscopy
    *
    * @SINCE_1_0.0
    * @return The stereo base (eye separation) for Stereoscopic 3D
-   * @DEPRECATED_1_3.39
+   * @DEPRECATED_1_3.51
    */
   float GetStereoBase() const;
 

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index 0f5ca5a..d3bf349 100644 (file)
--- a/dali/public-api/dali-adaptor-version.cpp
+++ b/dali/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 3;
-const unsigned int ADAPTOR_MICRO_VERSION = 51;
+const unsigned int ADAPTOR_MICRO_VERSION = 52;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index d0afeeb..2ce5d12 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -19,7 +19,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.3.51
+Version:    1.3.52
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT