Merge "Fix behaviour when PreeditStyle is REVERSE" into devel/master

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
index 33a27b5..2ccf2c1 100755 (executable)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
@@ -52,6 +52,7 @@ public:
     mDelayTime(0),
     mDroppedFrames(0),
     mFrameRate( 60.0f ),
+    mTestFrameDrop(false),
     mNeedDroppedFrames(false),
     mEventThreadCallback( new EventThreadCallback( MakeCallback( this, &VectorAnimationRenderer::OnTriggered ) ) )
   {
@@ -79,6 +80,7 @@ public:
     {
       // Change total frame number for test
       mTotalFrameNumber = 200;
+      mTestFrameDrop = true;
     }
     return true;
   }
@@ -112,10 +114,10 @@ public:
 
   bool Render( uint32_t frameNumber )
   {
-    if(mDelayTime != 0)
+    if(mTestFrameDrop)
     {
       std::this_thread::sleep_for(std::chrono::milliseconds(static_cast<int32_t>(mDelayTime)));
-      mDelayTime = 0;
+      mTestFrameDrop = false;
       mNeedDroppedFrames = true;
     }
     else if(mNeedDroppedFrames)
@@ -199,6 +201,7 @@ public:
   uint32_t mDelayTime;
   uint32_t mDroppedFrames;
   float mFrameRate;
+  bool mTestFrameDrop;
   bool mNeedDroppedFrames;
   Dali::VectorAnimationRenderer::UploadCompletedSignalType mUploadCompletedSignal;
   std::unique_ptr< EventThreadCallback > mEventThreadCallback;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
index d2be632..4c5bdad 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
@@ -1596,18 +1596,19 @@ int UtcDaliAnimatedVectorImageVisualFrameDrops(void)
   Property::Map attributes;
   DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
+  // Make delay to drop frames
+  Test::VectorAnimationRenderer::DelayRendering(170); // longer than 16.6 * 10frames
+
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - render the first frame
   DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  // Make delay to drop frames
-  Test::VectorAnimationRenderer::DelayRendering(170); // longer than 16.6 * 10frames
-
-  // Check dropped frame
+  // Wait for calculating frame drops
   DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
+  // Check dropped frame
   uint32_t frames = Test::VectorAnimationRenderer::GetDroppedFrames();
   DALI_TEST_CHECK(frames >= 9);
 

diff --git a/dali-toolkit/devel-api/controls/accessible-impl.cpp b/dali-toolkit/devel-api/controls/accessible-impl.cpp
index fd3e72e..5f2a157 100644 (file)
--- a/dali-toolkit/devel-api/controls/accessible-impl.cpp
+++ b/dali-toolkit/devel-api/controls/accessible-impl.cpp
@@ -19,6 +19,10 @@
 #include "accessible-impl.h"
 
 // EXTERNAL INCLUDES
+#ifdef DGETTEXT_ENABLED
+#include <libintl.h>
+#endif
+
 #include <dali/devel-api/actors/actor-devel.h>
 
 // INTERNAL INCLUDES
@@ -31,6 +35,17 @@
 
 namespace Dali::Toolkit::DevelControl {
 
+static std::string GetLocaleText(std::string string, const char *domain = "dali-toolkit")
+{
+#ifdef DGETTEXT_ENABLED
+    /*TODO: currently non-localized string is used as a key for translation lookup. In case the lookup key formatting is forced
+          consider calling utility function for converting non-localized string into well-formatted key before lookup. */
+    return dgettext(domain, string.c_str());
+#else
+    return string;
+#endif
+}
+
 AccessibleImpl::AccessibleImpl(Dali::Actor self, Dali::Accessibility::Role role, bool modal)
 : self(self),
   modal(modal)
@@ -72,21 +87,31 @@ std::string AccessibleImpl::GetName()
 
   Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
   Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+  std::string name;
 
   if(!controlImpl.mAccessibilityGetNameSignal.Empty())
   {
-    std::string ret;
-    controlImpl.mAccessibilityGetNameSignal.Emit(ret);
-    return ret;
+    controlImpl.mAccessibilityGetNameSignal.Emit(name);
+  }
+  else if(controlImpl.mAccessibilityNameSet)
+  {
+    name = controlImpl.mAccessibilityName;
+  }
+  else if(auto raw = GetNameRaw(); !raw.empty())
+  {
+    name = raw;
+  }
+  else
+  {
+    name = Self().GetProperty<std::string>(Actor::Property::NAME);
   }
 
-  if(controlImpl.mAccessibilityNameSet)
-    return controlImpl.mAccessibilityName;
-
-  if(auto raw = GetNameRaw(); !raw.empty())
-    return raw;
+  if(controlImpl.mAccessibilityTranslationDomainSet)
+  {
+    return GetLocaleText(name, controlImpl.mAccessibilityTranslationDomain.c_str());
+  }
 
-  return Self().GetProperty<std::string>(Actor::Property::NAME);
+  return GetLocaleText(name);
 }
 
 std::string AccessibleImpl::GetNameRaw()
@@ -100,23 +125,31 @@ std::string AccessibleImpl::GetDescription()
 
   Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
   Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+  std::string description;
 
   if(!controlImpl.mAccessibilityGetDescriptionSignal.Empty())
   {
-    std::string ret;
-    controlImpl.mAccessibilityGetDescriptionSignal.Emit(ret);
-    return ret;
+    controlImpl.mAccessibilityGetDescriptionSignal.Emit(description);
+  }
+  else if(controlImpl.mAccessibilityDescriptionSet)
+  {
+    description = controlImpl.mAccessibilityDescription;
+  }
+  else
+  {
+    description = GetDescriptionRaw();
+  }
+  if(controlImpl.mAccessibilityTranslationDomainSet)
+  {
+    return GetLocaleText(description, controlImpl.mAccessibilityTranslationDomain.c_str());
   }
 
-  if(controlImpl.mAccessibilityDescriptionSet)
-    return controlImpl.mAccessibilityDescription;
-
-  return GetDescriptionRaw();
+  return GetLocaleText(description);
 }
 
 std::string AccessibleImpl::GetDescriptionRaw()
 {
-  return "";
+  return {};
 }
 
 Dali::Accessibility::Accessible* AccessibleImpl::GetParent()
@@ -155,6 +188,11 @@ Dali::Accessibility::Role AccessibleImpl::GetRole()
   return Self().GetProperty<Dali::Accessibility::Role>(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE);
 }
 
+std::string AccessibleImpl::GetLocalizedRoleName()
+{
+  return GetLocaleText(GetRoleName());
+}
+
 Dali::Accessibility::States AccessibleImpl::CalculateStates()
 {
   Dali::Actor self = Self();
@@ -260,7 +298,7 @@ static Dali::Actor CreateHighlightIndicatorActor()
   // keyboard focusable actors
   auto actor = Toolkit::ImageView::New(focusBorderImagePath);
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  DevelControl::AppendAccessibilityAttribute(actor, "highlight", "");
+  DevelControl::AppendAccessibilityAttribute(actor, "highlight", std::string());
   actor.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, false);
 
   return actor;
@@ -339,7 +377,7 @@ bool AccessibleImpl::ClearHighlight()
 
 std::string AccessibleImpl::GetActionName(size_t index)
 {
-  if(index >= GetActionCount()) return "";
+  if(index >= GetActionCount()) return {};
   Dali::TypeInfo type;
   Self().GetTypeInfo(type);
   DALI_ASSERT_ALWAYS(type && "no TypeInfo object");
@@ -348,13 +386,12 @@ std::string AccessibleImpl::GetActionName(size_t index)
 
 std::string AccessibleImpl::GetLocalizedActionName(size_t index)
 {
-  // TODO: add localization
-  return GetActionName(index);
+  return GetLocaleText(GetActionName(index));
 }
 
 std::string AccessibleImpl::GetActionDescription(size_t index)
 {
-  return "";
+  return {};
 }
 
 size_t AccessibleImpl::GetActionCount()
@@ -367,7 +404,7 @@ size_t AccessibleImpl::GetActionCount()
 
 std::string AccessibleImpl::GetActionKeyBinding(size_t index)
 {
-  return "";
+  return {};
 }
 
 bool AccessibleImpl::DoAction(size_t index)

diff --git a/dali-toolkit/devel-api/controls/accessible-impl.h b/dali-toolkit/devel-api/controls/accessible-impl.h
index ab168c6..2a8ca3c 100644 (file)
--- a/dali-toolkit/devel-api/controls/accessible-impl.h
+++ b/dali-toolkit/devel-api/controls/accessible-impl.h
@@ -113,6 +113,11 @@ public:
   Dali::Accessibility::Role GetRole() override;
 
   /**
+   * @copydoc Dali::Accessibility::Accessible::GetLocalizedRoleName()
+   */
+  std::string GetLocalizedRoleName() override;
+
+  /**
    * @copydoc Dali::Accessibility::Accessible::GetStates()
    */
   Dali::Accessibility::States GetStates() override;

diff --git a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
index 342784a..6d310cf 100644 (file)
--- a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
+++ b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
@@ -91,8 +91,6 @@ void CanvasView::OnInitialize()
       new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::IMAGE));
   });
 
-  Self().SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
-
   Adaptor::Get().RegisterProcessor(*this);
 }
 

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 556711f..f49f82d 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -97,9 +97,6 @@ void ImageView::OnInitialize()
     return std::unique_ptr<Dali::Accessibility::Accessible>(
       new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::IMAGE));
   });
-
-  //Enable highightability
-  Self().SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
 }
 
 void ImageView::SetImage(const Property::Map& map)

diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
old mode 100755 (executable)
new mode 100644 (file)
index bf85d8d..4a0219d
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@ -286,23 +286,12 @@ void WebView::LoadUrl(const std::string& url)
   mUrl = url;
   if(mWebEngine)
   {
-    Texture           texture        = Dali::Texture::New(*mWebEngine.GetNativeImageSource());
-    const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture(texture);
-    mVisual                          = Toolkit::VisualFactory::Get().CreateVisual(
-      {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
-       {Toolkit::ImageVisual::Property::URL, nativeImageUrl}});
-
-    if(mVisual)
+    if(!mVisual)
     {
-      // Clean up previously registered visual and add new one.
-      DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
-      mWebEngine.LoadUrl(url);
+      mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered);
     }
 
-    if(mVideoHoleEnabled)
-    {
-      EnableBlendMode(false);
-    }
+    mWebEngine.LoadUrl(url);
   }
 }
 
@@ -310,22 +299,12 @@ void WebView::LoadHtmlString(const std::string& htmlString)
 {
   if(mWebEngine)
   {
-    Texture           texture        = Dali::Texture::New(*mWebEngine.GetNativeImageSource());
-    const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture(texture);
-    mVisual                          = Toolkit::VisualFactory::Get().CreateVisual(
-      {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
-       {Toolkit::ImageVisual::Property::URL, nativeImageUrl}});
-
-    if(mVisual)
+    if(!mVisual)
     {
-      DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
-      mWebEngine.LoadHtmlString(htmlString);
+      mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered);
     }
 
-    if(mVideoHoleEnabled)
-    {
-      EnableBlendMode(false);
-    }
+    mWebEngine.LoadHtmlString(htmlString);
   }
 }
 
@@ -334,24 +313,12 @@ bool WebView::LoadHtmlStringOverrideCurrentEntry(const std::string& html, const
   if(!mWebEngine)
     return false;
 
-  Texture           texture        = Dali::Texture::New(*mWebEngine.GetNativeImageSource());
-  const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture(texture);
-  mVisual                          = Toolkit::VisualFactory::Get().CreateVisual(
-    {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
-     {Toolkit::ImageVisual::Property::URL, nativeImageUrl}});
-
-  bool result = false;
-  if(mVisual)
+  if(!mVisual)
   {
-    DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
-    result = mWebEngine.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl);
+    mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered);
   }
 
-  if(mVideoHoleEnabled)
-  {
-    EnableBlendMode(false);
-  }
-  return result;
+  return mWebEngine.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl);
 }
 
 bool WebView::LoadContents(const std::string& contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
@@ -359,24 +326,12 @@ bool WebView::LoadContents(const std::string& contents, uint32_t contentSize, co
   if(!mWebEngine)
     return false;
 
-  Texture           texture        = Dali::Texture::New(*mWebEngine.GetNativeImageSource());
-  const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture(texture);
-  mVisual                          = Toolkit::VisualFactory::Get().CreateVisual(
-    {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
-     {Toolkit::ImageVisual::Property::URL, nativeImageUrl}});
-
-  bool result = false;
-  if(mVisual)
+  if(!mVisual)
   {
-    DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
-    result = mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri);
+    mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered);
   }
 
-  if(mVideoHoleEnabled)
-  {
-    EnableBlendMode(false);
-  }
-  return result;
+  return mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri);
 }
 
 void WebView::Reload()
@@ -874,6 +829,21 @@ void WebView::OnFrameRendered()
   }
 }
 
+void WebView::OnInitialFrameRendered()
+{
+  mWebEngine.FrameRenderedSignal().Disconnect(this, &WebView::OnInitialFrameRendered);
+
+  Texture           texture        = Dali::Texture::New(*mWebEngine.GetNativeImageSource());
+  const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture(texture);
+  mVisual                          = Toolkit::VisualFactory::Get().CreateVisual({{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, {Toolkit::ImageVisual::Property::URL, nativeImageUrl}});
+
+  if(mVisual)
+  {
+    DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
+    EnableBlendMode(!mVideoHoleEnabled);
+  }
+}
+
 void WebView::OnVisibilityChanged(Actor actor, bool isVisible, Dali::DevelActor::VisibilityChange::Type type)
 {
   if(type == Dali::DevelActor::VisibilityChange::Type::SELF)

diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.h b/dali-toolkit/internal/controls/web-view/web-view-impl.h
index a5cefa4..8cc532f 100755 (executable)
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.h
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.h
@@ -683,6 +683,11 @@ private:
   void OnFrameRendered();
 
   /**
+   * @brief Callback function to be called when frame is rendered. This is to check initial buffer is ready.
+   */
+  void OnInitialFrameRendered();
+
+  /**
    * @brief Callback function to be called when visibility is changed.
    * @param[in] actor The actor, or child of actor, whose visibility has changed
    * @param[in] isVisible Whether the actor is now visible or not

diff --git a/dali-toolkit/internal/transition/fade-impl.cpp b/dali-toolkit/internal/transition/fade-impl.cpp
index 30edc3e..33bee66 100644 (file)
--- a/dali-toolkit/internal/transition/fade-impl.cpp
+++ b/dali-toolkit/internal/transition/fade-impl.cpp
@@ -87,17 +87,20 @@ void Fade::OnPlay()
   Property::Map startPropertyMap;
   Property::Map finishPropertyMap;
 
+  float targetOpacity                              = GetWorldColor(targetControl).a;
+  targetControl[Dali::Actor::Property::COLOR_MODE] = Dali::ColorMode::USE_OWN_COLOR;
+
   if(IsAppearingTransition())
   {
     initialPropertyMap.Insert(Dali::Actor::Property::OPACITY, 0.0f);
-    startPropertyMap.Insert(Dali::Actor::Property::OPACITY, mOpacity);
-    finishPropertyMap.Insert(Dali::Actor::Property::OPACITY, targetControl[Dali::Actor::Property::OPACITY]);
+    startPropertyMap.Insert(Dali::Actor::Property::OPACITY, mOpacity * targetOpacity);
+    finishPropertyMap.Insert(Dali::Actor::Property::OPACITY, targetOpacity);
   }
   else
   {
-    initialPropertyMap.Insert(Dali::Actor::Property::OPACITY, targetControl[Dali::Actor::Property::OPACITY]);
-    startPropertyMap.Insert(Dali::Actor::Property::OPACITY, targetControl[Dali::Actor::Property::OPACITY]);
-    finishPropertyMap.Insert(Dali::Actor::Property::OPACITY, mOpacity);
+    initialPropertyMap.Insert(Dali::Actor::Property::OPACITY, targetOpacity);
+    startPropertyMap.Insert(Dali::Actor::Property::OPACITY, targetOpacity);
+    finishPropertyMap.Insert(Dali::Actor::Property::OPACITY, mOpacity * targetOpacity);
   }
 
   SetInitialPropertyMap(initialPropertyMap);

diff --git a/dali-toolkit/po/ar.po b/dali-toolkit/po/ar.po
index 414fb07..20fcb02 100755 (executable)
--- a/dali-toolkit/po/ar.po
+++ b/dali-toolkit/po/ar.po
@@ -20,3 +20,5 @@ msgstr "لصق"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "الحافظة"
 
+msgid "slider"
+msgstr ""

diff --git a/dali-toolkit/po/az.po b/dali-toolkit/po/az.po
index 6581e52..cfd4a80 100755 (executable)
--- a/dali-toolkit/po/az.po
+++ b/dali-toolkit/po/az.po
@@ -16,3 +16,8 @@ msgstr "Yapışdır"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Mübadilə buferi"
 
+msgid "icon"
+msgstr "Piktoqram"
+
+msgid "slider"
+msgstr "Sürüngəc"

diff --git a/dali-toolkit/po/bg.po b/dali-toolkit/po/bg.po
index 52a2d78..4b13de1 100755 (executable)
--- a/dali-toolkit/po/bg.po
+++ b/dali-toolkit/po/bg.po
@@ -16,3 +16,8 @@ msgstr "Поставяне"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Системен буфер"
 
+msgid "icon"
+msgstr "Икона"
+
+msgid "slider"
+msgstr "Плъзгач"

diff --git a/dali-toolkit/po/bn_BD.po b/dali-toolkit/po/bn_BD.po
index c29c744..a6191a8 100644 (file)
--- a/dali-toolkit/po/bn_BD.po
+++ b/dali-toolkit/po/bn_BD.po
@@ -16,3 +16,8 @@ msgstr "পেস্ট করুন"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "ক্লিপবোর্ড"
 
+msgid "icon"
+msgstr "Icon"
+
+msgid "slider"
+msgstr "স্লাইডার"

diff --git a/dali-toolkit/po/ca.po b/dali-toolkit/po/ca.po
index 34c6125..ba85f18 100755 (executable)
--- a/dali-toolkit/po/ca.po
+++ b/dali-toolkit/po/ca.po
@@ -16,3 +16,5 @@ msgstr "Enganxar"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Porta-retalls"
 
+msgid "slider"
+msgstr "control lliscant"

diff --git a/dali-toolkit/po/cs.po b/dali-toolkit/po/cs.po
index c8c68f9..3e4f477 100755 (executable)
--- a/dali-toolkit/po/cs.po
+++ b/dali-toolkit/po/cs.po
@@ -16,3 +16,5 @@ msgstr "Vložit"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Schránka"
 
+msgid "slider"
+msgstr "šoupátko"

diff --git a/dali-toolkit/po/da.po b/dali-toolkit/po/da.po
index 0898d64..fea998c 100755 (executable)
--- a/dali-toolkit/po/da.po
+++ b/dali-toolkit/po/da.po
@@ -16,3 +16,8 @@ msgstr "Indsæt"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Udklipsholder"
 
+msgid "icon"
+msgstr "Ikon"
+
+msgid "slider"
+msgstr "skyder"

diff --git a/dali-toolkit/po/de.po b/dali-toolkit/po/de.po
index 3082bbb..f1b0020 100755 (executable)
--- a/dali-toolkit/po/de.po
+++ b/dali-toolkit/po/de.po
@@ -16,3 +16,5 @@ msgstr "Einfügen"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Zwischenablage"
 
+msgid "slider"
+msgstr ""

diff --git a/dali-toolkit/po/el_GR.po b/dali-toolkit/po/el_GR.po
index 8f93b05..3ed1056 100755 (executable)
--- a/dali-toolkit/po/el_GR.po
+++ b/dali-toolkit/po/el_GR.po
@@ -16,3 +16,8 @@ msgstr "Επικόλληση"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Πρόχειρο"
 
+msgid "icon"
+msgstr "Εικονίδιο"
+
+msgid "slider"
+msgstr "Ρυθμιστικό"

diff --git a/dali-toolkit/po/en.po b/dali-toolkit/po/en.po
index 2579c1c..9945b39 100755 (executable)
--- a/dali-toolkit/po/en.po
+++ b/dali-toolkit/po/en.po
@@ -16,3 +16,8 @@ msgstr "Paste"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Clipboard"
 
+msgid "icon"
+msgstr "Icon"
+
+msgid "slider"
+msgstr "Slider"

diff --git a/dali-toolkit/po/en_US.po b/dali-toolkit/po/en_US.po
index 2579c1c..9945b39 100755 (executable)
--- a/dali-toolkit/po/en_US.po
+++ b/dali-toolkit/po/en_US.po
@@ -16,3 +16,8 @@ msgstr "Paste"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Clipboard"
 
+msgid "icon"
+msgstr "Icon"
+
+msgid "slider"
+msgstr "Slider"

diff --git a/dali-toolkit/po/es_ES.po b/dali-toolkit/po/es_ES.po
index 5fed085..b0b516e 100755 (executable)
--- a/dali-toolkit/po/es_ES.po
+++ b/dali-toolkit/po/es_ES.po
@@ -16,3 +16,8 @@ msgstr "Pegar"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Portapapeles"
 
+msgid "icon"
+msgstr "Icono"
+
+msgid "slider"
+msgstr "Controlador deslizante"

diff --git a/dali-toolkit/po/es_US.po b/dali-toolkit/po/es_US.po
index fdb40d8..5e7ec49 100755 (executable)
--- a/dali-toolkit/po/es_US.po
+++ b/dali-toolkit/po/es_US.po
@@ -16,3 +16,8 @@ msgstr "Pegar"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Portapapeles"
 
+msgid "icon"
+msgstr "Icono"
+
+msgid "slider"
+msgstr "Controlador deslizante"

diff --git a/dali-toolkit/po/et.po b/dali-toolkit/po/et.po
index 361b88a..a68fc27 100755 (executable)
--- a/dali-toolkit/po/et.po
+++ b/dali-toolkit/po/et.po
@@ -16,3 +16,8 @@ msgstr "Kleebi"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Lõikelaud"
 
+msgid "icon"
+msgstr "Ikoon"
+
+msgid "slider"
+msgstr "Liugur"

diff --git a/dali-toolkit/po/eu.po b/dali-toolkit/po/eu.po
index 86fe6e5..616c68f 100755 (executable)
--- a/dali-toolkit/po/eu.po
+++ b/dali-toolkit/po/eu.po
@@ -16,3 +16,8 @@ msgstr "Itsatsi"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Arbela"
 
+msgid "icon"
+msgstr "Ikonoa"
+
+msgid "slider"
+msgstr "Irristagailua"

diff --git a/dali-toolkit/po/fa.po b/dali-toolkit/po/fa.po
index 5e8369b..5ac66a0 100644 (file)
--- a/dali-toolkit/po/fa.po
+++ b/dali-toolkit/po/fa.po
@@ -20,3 +20,5 @@ msgstr "الحاق"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "کلیپ بورد"
 
+msgid "slider"
+msgstr ""

diff --git a/dali-toolkit/po/fi.po b/dali-toolkit/po/fi.po
index fd23422..f6c7931 100755 (executable)
--- a/dali-toolkit/po/fi.po
+++ b/dali-toolkit/po/fi.po
@@ -16,3 +16,5 @@ msgstr "Liitä"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Leikepöytä"
 
+msgid "slider"
+msgstr "liukusäädin"

diff --git a/dali-toolkit/po/fr.po b/dali-toolkit/po/fr.po
index e217eef..dfff479 100755 (executable)
--- a/dali-toolkit/po/fr.po
+++ b/dali-toolkit/po/fr.po
@@ -16,3 +16,5 @@ msgstr "Coller"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Presse-papier"
 
+msgid "slider"
+msgstr "curseur"

diff --git a/dali-toolkit/po/fr_CA.po b/dali-toolkit/po/fr_CA.po
index 0a8fdd2..7902515 100755 (executable)
--- a/dali-toolkit/po/fr_CA.po
+++ b/dali-toolkit/po/fr_CA.po
@@ -16,3 +16,8 @@ msgstr "Coller"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Presse-papier"
 
+msgid "icon"
+msgstr "Icône"
+
+msgid "slider"
+msgstr "Curseur"

diff --git a/dali-toolkit/po/gl.po b/dali-toolkit/po/gl.po
index 3e66cbf..4b08c18 100755 (executable)
--- a/dali-toolkit/po/gl.po
+++ b/dali-toolkit/po/gl.po
@@ -16,3 +16,5 @@ msgstr "Pegar"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Portapapeis"
 
+msgid "slider"
+msgstr "Barra de desprazamento"

diff --git a/dali-toolkit/po/hr.po b/dali-toolkit/po/hr.po
index 6c8a251..436f894 100755 (executable)
--- a/dali-toolkit/po/hr.po
+++ b/dali-toolkit/po/hr.po
@@ -16,3 +16,8 @@ msgstr "Zalijepi"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Međuspremnik"
 
+msgid "icon"
+msgstr "Ikona"
+
+msgid "slider"
+msgstr "Klizač"

diff --git a/dali-toolkit/po/hu.po b/dali-toolkit/po/hu.po
index accab91..367144c 100755 (executable)
--- a/dali-toolkit/po/hu.po
+++ b/dali-toolkit/po/hu.po
@@ -16,3 +16,5 @@ msgstr "Beilleszt"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Vágólap"
 
+msgid "slider"
+msgstr "csúszka"

diff --git a/dali-toolkit/po/hy.po b/dali-toolkit/po/hy.po
index 9892948..42a66e1 100755 (executable)
--- a/dali-toolkit/po/hy.po
+++ b/dali-toolkit/po/hy.po
@@ -16,3 +16,8 @@ msgstr "Տեղադրել"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Գզրոց"
 
+msgid "icon"
+msgstr "Պատկերակ"
+
+msgid "slider"
+msgstr "Սողանիկ"

diff --git a/dali-toolkit/po/is.po b/dali-toolkit/po/is.po
index bd1952e..fe0b00d 100755 (executable)
--- a/dali-toolkit/po/is.po
+++ b/dali-toolkit/po/is.po
@@ -16,3 +16,8 @@ msgstr "Líma"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Klippiborð"
 
+msgid "icon"
+msgstr "Tákn"
+
+msgid "slider"
+msgstr "Skyggna"

diff --git a/dali-toolkit/po/it_IT.po b/dali-toolkit/po/it_IT.po
index f68a4f9..0f578de 100755 (executable)
--- a/dali-toolkit/po/it_IT.po
+++ b/dali-toolkit/po/it_IT.po
@@ -16,3 +16,8 @@ msgstr "Incolla"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Appunti"
 
+msgid "icon"
+msgstr "Icona"
+
+msgid "slider"
+msgstr "Dispositivo di scorrimento"

diff --git a/dali-toolkit/po/ka.po b/dali-toolkit/po/ka.po
index 5dd6d53..28f1b73 100755 (executable)
--- a/dali-toolkit/po/ka.po
+++ b/dali-toolkit/po/ka.po
@@ -16,3 +16,8 @@ msgstr "ჩასმა"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "ბუფერული მეხს."
 
+msgid "icon"
+msgstr "ნიშანი"
+
+msgid "slider"
+msgstr "სლაიდერი"

diff --git a/dali-toolkit/po/kk.po b/dali-toolkit/po/kk.po
index 6de1a32..20845c9 100755 (executable)
--- a/dali-toolkit/po/kk.po
+++ b/dali-toolkit/po/kk.po
@@ -16,3 +16,8 @@ msgstr "Қою"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Буфер"
 
+msgid "icon"
+msgstr "Белгіше"
+
+msgid "slider"
+msgstr "Сырғытпа"

diff --git a/dali-toolkit/po/ko_KR.po b/dali-toolkit/po/ko_KR.po
index 8ecb8d3..dadd773 100755 (executable)
--- a/dali-toolkit/po/ko_KR.po
+++ b/dali-toolkit/po/ko_KR.po
@@ -16,3 +16,5 @@ msgstr "붙여넣기"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "클립보드"
 
+msgid "slider"
+msgstr "슬라이더"

diff --git a/dali-toolkit/po/lt.po b/dali-toolkit/po/lt.po
index d403fcc..4163cd3 100755 (executable)
--- a/dali-toolkit/po/lt.po
+++ b/dali-toolkit/po/lt.po
@@ -16,3 +16,5 @@ msgstr "Įklijuoti"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Iškarpinė"
 
+msgid "slider"
+msgstr "šliaužiklis"

diff --git a/dali-toolkit/po/lv.po b/dali-toolkit/po/lv.po
index 519597b..9698938 100755 (executable)
--- a/dali-toolkit/po/lv.po
+++ b/dali-toolkit/po/lv.po
@@ -16,3 +16,8 @@ msgstr "Ielīmēt"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Starpliktuve"
 
+msgid "icon"
+msgstr "Ikona"
+
+msgid "slider"
+msgstr "Slīdnis"

diff --git a/dali-toolkit/po/mn_MN.po b/dali-toolkit/po/mn_MN.po
index cc2b51b..ee6fc24 100644 (file)
--- a/dali-toolkit/po/mn_MN.po
+++ b/dali-toolkit/po/mn_MN.po
@@ -16,3 +16,8 @@ msgstr "Буулгах"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Түр санах ой"
 
+msgid "icon"
+msgstr "Дүрс"
+
+msgid "slider"
+msgstr "Slider"

diff --git a/dali-toolkit/po/nb.po b/dali-toolkit/po/nb.po
index 0c15456..ae6d545 100755 (executable)
--- a/dali-toolkit/po/nb.po
+++ b/dali-toolkit/po/nb.po
@@ -16,3 +16,8 @@ msgstr "Lim inn"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Utklippstavle"
 
+msgid "icon"
+msgstr "Ikon"
+
+msgid "slider"
+msgstr "Glidebryter"

diff --git a/dali-toolkit/po/nl.po b/dali-toolkit/po/nl.po
index 48645c4..16e7bd4 100755 (executable)
--- a/dali-toolkit/po/nl.po
+++ b/dali-toolkit/po/nl.po
@@ -16,3 +16,5 @@ msgstr "Plakken"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Klembord"
 
+msgid "slider"
+msgstr ""

diff --git a/dali-toolkit/po/pl.po b/dali-toolkit/po/pl.po
index c87ec62..b1a99b5 100755 (executable)
--- a/dali-toolkit/po/pl.po
+++ b/dali-toolkit/po/pl.po
@@ -16,3 +16,5 @@ msgstr "Wklej"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Schowek"
 
+msgid "slider"
+msgstr "slajder"

diff --git a/dali-toolkit/po/pt_BR.po b/dali-toolkit/po/pt_BR.po
index 9c6743a..eb86f8e 100755 (executable)
--- a/dali-toolkit/po/pt_BR.po
+++ b/dali-toolkit/po/pt_BR.po
@@ -16,3 +16,8 @@ msgstr "Colar"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Área de transferência"
 
+msgid "icon"
+msgstr "Ícone"
+
+msgid "slider"
+msgstr "Controle deslizante"

diff --git a/dali-toolkit/po/pt_PT.po b/dali-toolkit/po/pt_PT.po
index e1a21da..b6c820e 100755 (executable)
--- a/dali-toolkit/po/pt_PT.po
+++ b/dali-toolkit/po/pt_PT.po
@@ -16,3 +16,8 @@ msgstr "Colar"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Área transferência"
 
+msgid "icon"
+msgstr "Ícone"
+
+msgid "slider"
+msgstr "Cursor de deslocamento"

diff --git a/dali-toolkit/po/ro.po b/dali-toolkit/po/ro.po
index 0d78703..4e5278e 100755 (executable)
--- a/dali-toolkit/po/ro.po
+++ b/dali-toolkit/po/ro.po
@@ -16,3 +16,8 @@ msgstr "Lipire"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Clipboard"
 
+msgid "icon"
+msgstr "Pictogr."
+
+msgid "slider"
+msgstr "Cursor"

diff --git a/dali-toolkit/po/ru_RU.po b/dali-toolkit/po/ru_RU.po
index 8134f66..c7dc38c 100755 (executable)
--- a/dali-toolkit/po/ru_RU.po
+++ b/dali-toolkit/po/ru_RU.po
@@ -16,3 +16,8 @@ msgstr "Вставить"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Буфер обмена"
 
+msgid "icon"
+msgstr "Значок"
+
+msgid "slider"
+msgstr "Ползунок"

diff --git a/dali-toolkit/po/sk.po b/dali-toolkit/po/sk.po
index 1944646..327899d 100755 (executable)
--- a/dali-toolkit/po/sk.po
+++ b/dali-toolkit/po/sk.po
@@ -16,3 +16,8 @@ msgstr "Vložiť"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Schránka"
 
+msgid "icon"
+msgstr "Ikona"
+
+msgid "slider"
+msgstr "Posuvný ovládač"

diff --git a/dali-toolkit/po/sl.po b/dali-toolkit/po/sl.po
index 4c8ad23..6de5ccd 100755 (executable)
--- a/dali-toolkit/po/sl.po
+++ b/dali-toolkit/po/sl.po
@@ -16,3 +16,5 @@ msgstr "Prilepi"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Odložišče"
 
+msgid "slider"
+msgstr "drsnik"

diff --git a/dali-toolkit/po/sr.po b/dali-toolkit/po/sr.po
index 1be1832..d792061 100755 (executable)
--- a/dali-toolkit/po/sr.po
+++ b/dali-toolkit/po/sr.po
@@ -16,3 +16,5 @@ msgstr "Zalepi"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Privremena memorija"
 
+msgid "slider"
+msgstr "клизач"

diff --git a/dali-toolkit/po/sv.po b/dali-toolkit/po/sv.po
index 13c587d..573dd6a 100755 (executable)
--- a/dali-toolkit/po/sv.po
+++ b/dali-toolkit/po/sv.po
@@ -16,3 +16,8 @@ msgstr "Klistra in"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Urklipp"
 
+msgid "icon"
+msgstr "Ikon"
+
+msgid "slider"
+msgstr "Slider"

diff --git a/dali-toolkit/po/tr_TR.po b/dali-toolkit/po/tr_TR.po
index a360194..e116eec 100755 (executable)
--- a/dali-toolkit/po/tr_TR.po
+++ b/dali-toolkit/po/tr_TR.po
@@ -16,3 +16,8 @@ msgstr "Yapıştır"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Pano"
 
+msgid "icon"
+msgstr "Simge"
+
+msgid "slider"
+msgstr "Kaydırıcı"

diff --git a/dali-toolkit/po/uk.po b/dali-toolkit/po/uk.po
index c41b559..baab2fa 100755 (executable)
--- a/dali-toolkit/po/uk.po
+++ b/dali-toolkit/po/uk.po
@@ -16,3 +16,8 @@ msgstr "Вставити"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Буфер обміну"
 
+msgid "icon"
+msgstr "Значок"
+
+msgid "slider"
+msgstr "Слайдер"

diff --git a/dali-toolkit/po/ur.po b/dali-toolkit/po/ur.po
index b4bf3be..b663b28 100644 (file)
--- a/dali-toolkit/po/ur.po
+++ b/dali-toolkit/po/ur.po
@@ -20,3 +20,5 @@ msgstr "جوڑ دیں"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "کلپ بورڈ"
 
+msgid "slider"
+msgstr ""

diff --git a/dali-toolkit/po/uz.po b/dali-toolkit/po/uz.po
index bcad8b0..bdce823 100755 (executable)
--- a/dali-toolkit/po/uz.po
+++ b/dali-toolkit/po/uz.po
@@ -16,3 +16,8 @@ msgstr "Qo‘shib qo‘yish"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Bufer"
 
+msgid "icon"
+msgstr "Ikoncha"
+
+msgid "slider"
+msgstr "Slider"

diff --git a/dali-toolkit/po/vi.po b/dali-toolkit/po/vi.po
index e22211f..5c1e515 100644 (file)
--- a/dali-toolkit/po/vi.po
+++ b/dali-toolkit/po/vi.po
@@ -16,3 +16,5 @@ msgstr "Dán"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "Bộ nhớ tạm"
 
+msgid "slider"
+msgstr "Thanh Trượt"

diff --git a/dali-toolkit/po/zh_CN.po b/dali-toolkit/po/zh_CN.po
index b80e9d9..603d05f 100755 (executable)
--- a/dali-toolkit/po/zh_CN.po
+++ b/dali-toolkit/po/zh_CN.po
@@ -16,3 +16,5 @@ msgstr "粘贴"
 msgid "IDS_COM_BODY_CLIPBOARD"
 msgstr "剪贴板"
 
+msgid "slider"
+msgstr "滑块"

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 1010fe1..02d0628 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -29,7 +29,7 @@ namespace Toolkit
 {
 const unsigned int TOOLKIT_MAJOR_VERSION = 2;
 const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 32;
+const unsigned int TOOLKIT_MICRO_VERSION = 33;
 const char* const  TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 2c852c4..d4c7bdc 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    2.0.32
+Version:    2.0.33
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT