[dali_1.0.2] Merge branch 'tizen' 08/25308/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:16:39 +0000 (16:16 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:16:49 +0000 (16:16 +0100)
Change-Id: Ib3be166e07ab411da4f3b339ba83467a15df4078

79 files changed:
.gitignore
automated-tests/.gitignore
automated-tests/coverage.sh
automated-tests/execute.sh
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView.cpp
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-JsonParser.cpp
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-KeyInputFocusManager.cpp
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-TextInput.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
base/dali-toolkit/public-api/controls/alignment/alignment.h [moved from capi/dali-toolkit/public-api/controls/alignment/alignment.h with 98% similarity]
base/dali-toolkit/public-api/controls/buttons/button.h [moved from capi/dali-toolkit/public-api/controls/buttons/button.h with 98% similarity]
base/dali-toolkit/public-api/controls/buttons/push-button.h [moved from capi/dali-toolkit/public-api/controls/buttons/push-button.h with 99% similarity]
base/dali-toolkit/public-api/controls/control-impl.h [moved from capi/dali-toolkit/public-api/controls/control-impl.h with 99% similarity]
base/dali-toolkit/public-api/controls/control.h [moved from capi/dali-toolkit/public-api/controls/control.h with 99% similarity]
base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h [moved from capi/dali-toolkit/public-api/controls/default-controls/push-button-factory.h with 97% similarity]
base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h [moved from capi/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h with 95% similarity]
base/dali-toolkit/public-api/controls/popup/popup.h [moved from capi/dali-toolkit/public-api/controls/popup/popup.h with 98% similarity]
base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h [moved from capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h with 100% similarity]
base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h [moved from capi/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h with 98% similarity]
base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h [moved from capi/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h with 96% similarity]
base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h [moved from capi/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h with 99% similarity]
base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h [moved from capi/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h with 94% similarity]
base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h [moved from capi/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h with 99% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-component.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-component.h with 100% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-connector.h with 98% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h with 98% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h with 99% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h with 96% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h with 97% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h with 98% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h with 98% similarity]
base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h with 99% similarity]
base/dali-toolkit/public-api/controls/scrollable/scrollable.h [moved from capi/dali-toolkit/public-api/controls/scrollable/scrollable.h with 98% similarity]
base/dali-toolkit/public-api/controls/text-input/text-input.h [moved from capi/dali-toolkit/public-api/controls/text-input/text-input.h with 99% similarity]
base/dali-toolkit/public-api/controls/text-view/text-view.h [moved from capi/dali-toolkit/public-api/controls/text-view/text-view.h with 99% similarity]
base/dali-toolkit/public-api/enums.h [moved from capi/dali-toolkit/public-api/enums.h with 96% similarity]
base/dali-toolkit/public-api/factory/localized-control-factory.h [moved from capi/dali-toolkit/public-api/factory/localized-control-factory.h with 97% similarity]
base/dali-toolkit/public-api/file.list
base/dali-toolkit/public-api/focus-manager/focus-manager.h [moved from capi/dali-toolkit/public-api/focus-manager/focus-manager.h with 99% similarity]
base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h [moved from capi/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h with 99% similarity]
base/dali-toolkit/public-api/markup-processor/markup-processor.h [moved from capi/dali-toolkit/public-api/markup-processor/markup-processor.h with 98% similarity]
base/dali-toolkit/public-api/shader-effects/dissolve-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/dissolve-effect.h with 97% similarity]
base/dali-toolkit/public-api/shader-effects/image-region-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/image-region-effect.h with 97% similarity]
base/dali-toolkit/public-api/shader-effects/iris-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/iris-effect.h with 97% similarity]
base/dali-toolkit/public-api/shader-effects/mask-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/mask-effect.h with 95% similarity]
base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h with 96% similarity]
base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h with 97% similarity]
base/dali-toolkit/public-api/shader-effects/page-turn-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/page-turn-effect.h with 98% similarity]
base/dali-toolkit/public-api/shader-effects/ripple-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/ripple-effect.h with 97% similarity]
base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/ripple2d-effect.h with 96% similarity]
base/dali-toolkit/public-api/shader-effects/swirl-effect.h [moved from capi/dali-toolkit/public-api/shader-effects/swirl-effect.h with 96% similarity]
build/tizen/.gitignore [moved from build/slp/.gitignore with 100% similarity]
build/tizen/Makefile.am [moved from build/slp/Makefile.am with 100% similarity]
build/tizen/README [moved from build/slp/README with 100% similarity]
build/tizen/configure.ac [moved from build/slp/configure.ac with 98% similarity]
build/tizen/dali-toolkit.pc.in [moved from build/slp/dali-toolkit.pc.in with 100% similarity]
build/tizen/dali-toolkit/Makefile.am [moved from build/slp/dali-toolkit/Makefile.am with 65% similarity]
build/tizen/docs/.gitignore [moved from build/slp/docs/.gitignore with 100% similarity]
build/tizen/docs/Makefile.am [moved from build/slp/docs/Makefile.am with 100% similarity]
build/tizen/docs/dali.doxy.in [moved from build/slp/docs/dali.doxy.in with 99% similarity]
capi/dali-toolkit/public-api/dali-toolkit-capi-internal.h [deleted file]
capi/dali-toolkit/public-api/file.list [deleted file]
capi/dali_toolkit_doc.h [deleted file]
docs/README
optional/dali-toolkit/dali-toolkit.h
optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h [moved from capi/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h with 98% similarity]
optional/dali-toolkit/public-api/controls/cluster/cluster-style.h [moved from capi/dali-toolkit/public-api/controls/cluster/cluster-style.h with 98% similarity]
optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h [moved from capi/dali-toolkit/public-api/controls/image-view/masked-image-view.h with 99% similarity]
optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h [moved from capi/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h with 98% similarity]
optional/dali-toolkit/public-api/dali-toolkit-version.cpp [new file with mode: 0644]
optional/dali-toolkit/public-api/dali-toolkit-version.h [new file with mode: 0644]
optional/dali-toolkit/public-api/file.list
packaging/dali-toolkit.spec

index cb5662f..96a5860 100644 (file)
@@ -31,27 +31,7 @@ dali.doxy
 .libs
 *.swp
 /docs/generated/*
-/build/slp/doc
-/build/slp/.cov
+/build/tizen/doc
+/build/tizen/.cov
 /build/desktop
-/debian/build-stamp
-/debian/config.status
-/debian/libdali-toolkit-dbg.debhelper.log
-/debian/libdali-toolkit-dbg
-/debian/libdali-toolkit-dev.debhelper.log
-/debian/libdali-toolkit-dev
-/debian/libdali-toolkit.debhelper.log
-/debian/libdali-toolkit.postinst.debhelper
-/debian/libdali-toolkit.postrm.debhelper
-/debian/libdali-toolkit.substvars
-/debian/libdali-toolkit
-/debian/tmp
-/debian/files
-/debian/libdali-toolkit-dbg.substvars
-/debian/libdali-toolkit-dev.substvars
-/debian/libdali-nsplugin.debhelper.log
-/debian/libdali-nsplugin.postinst.debhelper
-/debian/libdali-nsplugin.postrm.debhelper
-/debian/libdali-nsplugin.substvars
-/debian/libdali-nsplugin
 /packaging/home*
index bbee9ff..f039d8a 100644 (file)
@@ -1,4 +1,4 @@
-/*.xml
-/build
-/build.log
+*.xml
+build
+build.log
 tct*core.h
index 98131bf..e6106ef 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-( cd ../build/slp ; make cov_data )
+( cd ../build/tizen ; make cov_data )
 
 
 for i in `find . -name "*.dir"` ; do
@@ -18,7 +18,7 @@ done
 
 (
     cd .. ;
-    genhtml -o build/slp/doc/coverage `find . -name dali.info`
+    genhtml -o build/tizen/doc/coverage `find . -name dali.info`
 )
 
-echo "Coverage output: ../build/slp/doc/coverage/index.html"
+echo "Coverage output: ../build/tizen/doc/coverage/index.html"
index 3bd6b06..aedd933 100755 (executable)
@@ -11,9 +11,7 @@ function execute
 rm -f tct*core-tests.xml
 
 # Clean up old coverage data
-if [ -d ../build/slp ] ; then
-    rm -f ../build/slp/dali-core/.libs/*.gcda
-elif [ -d ../build/tizen ] ; then
+if [ -d ../build/tizen ] ; then
     rm -f ../build/tizen/dali-core/.libs/*.gcda
 fi
 
index f9744cc..7d39047 100644 (file)
@@ -236,16 +236,16 @@ void Print( const TextStyle& style )
   std::cout << " : " << style.GetFontPointSize() << std::endl;
   std::cout << " : " << style.GetWeight() << std::endl;
   std::cout << " : " << style.GetTextColor() << std::endl;
-  std::cout << " : " << style.GetItalics() << std::endl;
-  std::cout << " : " << style.GetUnderline() << std::endl;
-  std::cout << " : " << style.GetShadow() << std::endl;
+  std::cout << " : " << style.IsItalicsEnabled() << std::endl;
+  std::cout << " : " << style.IsUnderlineEnabled() << std::endl;
+  std::cout << " : " << style.IsShadowEnabled() << std::endl;
   std::cout << " : " << style.GetShadowColor() << std::endl;
   std::cout << " : " << style.GetShadowOffset() << std::endl;
-  std::cout << " : " << style.GetGlow() << std::endl;
+  std::cout << " : " << style.IsGlowEnabled() << std::endl;
   std::cout << " : " << style.GetGlowColor() << std::endl;
   std::cout << " : " << style.GetGlowIntensity() << std::endl;
   std::cout << " : " << style.GetSmoothEdge() << std::endl;
-  std::cout << " : " << style.GetOutline() << std::endl;
+  std::cout << " : " << style.IsOutlineEnabled() << std::endl;
   std::cout << " : " << style.GetOutlineThickness() << std::endl;
 }
 
index 8a85198..a1ebacd 100644 (file)
@@ -90,6 +90,10 @@ void CompareTrees(const TreeNode& a, const TreeNode& b)
       DALI_TEST_CHECK( a.GetBoolean() == b.GetBoolean() );
       break;
     }
+    default:
+    {
+      break;
+    }
   }
 }
 
index d004365..2e087c3 100644 (file)
@@ -296,7 +296,7 @@ int UtcDaliKeyInputFocusManagerSignalUnhandledKeyEvent(void)
   DALI_TEST_CHECK(event.keyName == data.receivedKeyEvent.keyPressedName );
   DALI_TEST_CHECK(event.keyCode == data.receivedKeyEvent.keyCode);
   DALI_TEST_CHECK(event.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK(event.state == data.receivedKeyEvent.state );
+  DALI_TEST_CHECK(static_cast<int>( event.state ) == static_cast<int>( data.receivedKeyEvent.state ) );
 
   data.Reset();
 
index d554677..267e811 100644 (file)
@@ -143,9 +143,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 static bool gOnScrollStartCalled;                       ///< Whether the OnScrollStart signal was invoked.
 static bool gOnScrollUpdateCalled;                      ///< Whether the OnScrollUpdate signal was invoked.
 static bool gOnScrollCompleteCalled;                    ///< Whether the OnScrollComplete signal was invoked.
-static bool gOnScrollClampedCalled;                     ///< Whether the OnScrollClamped signal was invoked.
 static bool gOnSnapStartCalled;                         ///< Whether the OnSnapStart signal was invoked.
-static ClampState3 gLastClampPosition;                  ///< Clamping information from OnScrollClampedEvent.
 static SnapType gLastSnapType;                          ///< Snaping information from SnapEvent.
 static Vector3 gConstraintResult;                       ///< Result from constraint.
 
@@ -180,17 +178,6 @@ static void OnScrollComplete( const Vector3& position )
 }
 
 /**
- * Invoked when scrolling clamped.
- *
- * @param[in] event The position/scale/rotation axes that were clamped.
- */
-static void OnScrollClamped( const ScrollView::ClampEvent& event )
-{
-  gOnScrollClampedCalled = true;
-  gLastClampPosition = event.position;
-}
-
-/**
  * Invoked when a snap or flick started.
  *
  * @param[in] event The type of snap and the target position/scale/rotation.
index 244e936..52d91f4 100644 (file)
@@ -182,7 +182,7 @@ int UtcDaliTextInputGetStyleAtCursor(void)
   TextStyle retreivedStyleAtCursor = textInput.GetStyleAtCursor();
 
   DALI_TEST_CHECK( style == retreivedStyleAtCursor );
-  DALI_TEST_CHECK( !retreivedStyleAtCursor.GetItalics() );
+  DALI_TEST_CHECK( !retreivedStyleAtCursor.IsItalicsEnabled() );
 
   tet_infoline("Set style before adding new character");
   style.SetItalics( true );
@@ -196,10 +196,10 @@ int UtcDaliTextInputGetStyleAtCursor(void)
   tet_infoline("Confirm style at cursor is correct style");
   retreivedStyleAtCursor = textInput.GetStyleAtCursor();
 
-  DALI_TEST_CHECK( retreivedStyleAtCursor.GetItalics() );
+  DALI_TEST_CHECK( retreivedStyleAtCursor.IsItalicsEnabled() );
 
   tet_infoline("Confirm style at cursor is not a style that was not set");
-  DALI_TEST_CHECK( !retreivedStyleAtCursor.GetUnderline() );
+  DALI_TEST_CHECK( !retreivedStyleAtCursor.IsUnderlineEnabled() );
 
   tet_infoline("Confirm markup text is correct");
   DALI_TEST_EQUALS( styledString, textInput.GetMarkupText(), TEST_LOCATION);
index dee880b..082c2dd 100644 (file)
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
-#include <dali/public-api/dali-core-capi-internal.h>
 #include <stdarg.h>
 
 void tet_infoline(const char*str);
index c17fa22..efd8a5b 100644 (file)
@@ -24,7 +24,6 @@
 #include <map>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/dali-core-capi-internal.h>
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/gl-abstraction.h>
index 723d35d..79c39d7 100644 (file)
@@ -73,9 +73,6 @@ const Dali::TouchPoint pointMotionOut( 0, TouchPoint::Motion, 10, 10 );
 const Dali::TouchPoint pointDownOutside( 0, TouchPoint::Down, 10, 10 );
 const Dali::TouchPoint pointUpOutside( 0, TouchPoint::Up, 10, 10 );
 
-static bool gOnTouchPointInterrupted = false;
-
-
 Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
 {
   BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 );
index 9c89b59..553dc7a 100644 (file)
@@ -42,12 +42,6 @@ void utc_dali_toolkit_scroll_view_effect_cleanup(void)
 
 namespace
 {
-static bool gObjectCreatedCallBackCalled;
-
-static void TestCallback(BaseHandle handle)
-{
-  gObjectCreatedCallBackCalled = true;
-}
 
 const int MILLISECONDS_PER_SECOND = 1000;
 const int RENDER_FRAME_INTERVAL = 16;                           ///< Duration of each frame in ms. (at approx 60FPS)
@@ -100,10 +94,6 @@ RulerPtr CreateRuler(float gridSize = 0.0f)
 static bool gOnScrollStartCalled;                       ///< Whether the OnScrollStart signal was invoked.
 static bool gOnScrollUpdateCalled;                      ///< Whether the OnScrollUpdate signal was invoked.
 static bool gOnScrollCompleteCalled;                    ///< Whether the OnScrollComplete signal was invoked.
-static bool gOnScrollClampedCalled;                     ///< Whether the OnScrollClamped signal was invoked.
-static bool gOnSnapStartCalled;                         ///< Whether the OnSnapStart signal was invoked.
-static ClampState3 gLastClampPosition;                  ///< Clamping information from OnScrollClampedEvent.
-static SnapType gLastSnapType;                          ///< Snaping information from SnapEvent.
 static Vector3 gConstraintResult;                       ///< Result from constraint.
 
 static ActorContainer gPages;                                ///< Keeps track of all the pages for applying effects.
@@ -145,28 +135,6 @@ static void OnScrollComplete( const Vector3& position )
   gOnScrollCompleteCalled = true;
 }
 
-/**
- * Invoked when scrolling clamped.
- *
- * @param[in] event The position/scale/rotation axes that were clamped.
- */
-static void OnScrollClamped( const ScrollView::ClampEvent& event )
-{
-  gOnScrollClampedCalled = true;
-  gLastClampPosition = event.position;
-}
-
-/**
- * Invoked when a snap or flick started.
- *
- * @param[in] event The type of snap and the target position/scale/rotation.
- */
-static void OnSnapStart( const ScrollView::SnapEvent& event )
-{
-  gOnSnapStartCalled = true;
-  gLastSnapType = event.type;
-}
-
 ScrollView SetupTestScrollView(int rows, int columns, Vector2 size)
 {
   ScrollView scrollView = ScrollView::New();
index 87f0984..6c7dd1c 100644 (file)
@@ -1982,7 +1982,8 @@ RenderableActor CreateGlyphActor( const Text& text, const TextStyle& style, Text
   else
   {
     // The text-actor cache is empty. Create a new one.
-    textActor = TextActor::New( text, style, false, true );
+    TextActorParameters parameters( style, TextActorParameters::FONT_DETECTION_OFF );
+    textActor = TextActor::New( text, parameters );
   }
 
   return textActor;
index 28ebb83..8d33877 100644 (file)
@@ -1176,7 +1176,8 @@ void InitializeTextActorInfo( TextView::RelayoutData& relayoutData )
                     // If still there is no text-actor, create one.
                     if( !textActor )
                     {
-                      textActor = TextActor::New( Text(), characterLayout.mStyledText.mStyle, false, true );
+                      TextActorParameters parameters( characterLayout.mStyledText.mStyle, TextActorParameters::FONT_DETECTION_OFF );
+                      textActor = TextActor::New( NULL, parameters );
                     }
                     else
                     {
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_ALIGNMENT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
@@ -236,7 +231,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_LAYOUT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_BUTTONS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
@@ -161,7 +156,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_BUTTON_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_BUTTONS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include "button.h"
 
@@ -383,7 +378,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_PUSH_BUTTON_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 
@@ -757,7 +752,4 @@ typedef Internal::Control ControlImpl; ///< @deprecated, Use Internal::Control
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_CONTROL_IMPL_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -446,7 +441,4 @@ public: // Templates for Deriving Classes
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_CONTROL_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_DEFAULT_CONTROLS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
@@ -92,7 +87,4 @@ PushButton CreatePushButton( Actor backgroundImageActor );
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_PUSH_BUTTON_FACTORY_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_DEFAULT_CONTROLS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/math/vector4.h>
 #include <dali/public-api/actors/image-actor.h>
@@ -51,7 +46,4 @@ ImageActor CreateSolidColorActor( const Vector4& color, bool border = false, con
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SOLID_COLOR_ACTOR_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_POPUP_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
@@ -276,7 +271,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_POPUP_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -309,7 +304,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_GRID_LAYOUT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -74,7 +69,4 @@ public:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_ITEM_FACTORY_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 #include <dali-toolkit/public-api/enums.h>
@@ -453,7 +448,4 @@ protected:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_ITEM_LAYOUT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <utility> // std::pair
 #include <dali/dali.h>
@@ -52,7 +47,4 @@ class ItemLayout;
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_ITEM_VIEW_DECLARATIONS_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -443,7 +438,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_ITEM_VIEW_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -178,8 +173,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
-
 #endif // __DALI_TOOLKIT_SCROLL_CONNECTOR_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
@@ -141,7 +136,4 @@ protected:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_VIEW_CUBE_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
@@ -474,7 +469,4 @@ protected:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_VIEW_CUSTOM_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -86,7 +81,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_VIEW_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
@@ -113,7 +108,4 @@ protected:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_VIEW_PAGE_SPIRAL_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 
 // INTERNAL INCLUDES
@@ -165,7 +160,4 @@ protected:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_VIEW_SLIDE_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
@@ -166,7 +161,4 @@ protected:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_VIEW_TWIST_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
@@ -1199,7 +1194,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_VIEW_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
@@ -245,7 +240,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLLABLE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_TEXT_INPUT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
@@ -650,7 +645,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_TEXT_INPUT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_TEXT_VIEW_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -657,7 +652,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_ITEM_VIEW_H__
similarity index 96%
rename from capi/dali-toolkit/public-api/enums.h
rename to base/dali-toolkit/public-api/enums.h
index 66d0dd4..a62dbf9 100644 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -74,7 +69,4 @@ bool IsHorizontal(ControlOrientation::Type orientation);
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_ENUMS_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_FACTORY_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
@@ -101,7 +96,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_LOCALIZED_CONTROL_FACTORY_H__
index 089896c..a5e5fea 100755 (executable)
@@ -56,29 +56,49 @@ public_api_base_src_files = \
 
 # Add public header files here
 
-public_api_base_header_files =
+public_api_base_header_files = \
+  $(public_api_base_src_dir)/enums.h
 
-public_api_base_controls_header_files =
+public_api_base_controls_header_files = \
+  $(public_api_base_src_dir)/controls/control.h \
+  $(public_api_base_src_dir)/controls/control-impl.h
 
-public_api_base_alignment_header_files =
+public_api_base_alignment_header_files = \
+  $(public_api_base_src_dir)/controls/alignment/alignment.h
 
 public_api_base_buttons_header_files = \
-  $(public_api_base_src_dir)/controls/buttons/check-box-button.h
+  $(public_api_base_src_dir)/controls/buttons/check-box-button.h \
+  $(public_api_base_src_dir)/controls/buttons/button.h \
+  $(public_api_base_src_dir)/controls/buttons/push-button.h
 
 public_api_base_default_controls_header_files = \
-  $(public_api_base_src_dir)/controls/default-controls/check-button-factory.h
+  $(public_api_base_src_dir)/controls/default-controls/check-button-factory.h \
+  $(public_api_base_src_dir)/controls/default-controls/solid-color-actor.h \
+  $(public_api_base_src_dir)/controls/default-controls/push-button-factory.h
 
 public_api_base_item_view_header_files = \
   $(public_api_base_src_dir)/controls/scrollable/item-view/depth-layout.h \
   $(public_api_base_src_dir)/controls/scrollable/item-view/roll-layout.h \
   $(public_api_base_src_dir)/controls/scrollable/item-view/spiral-layout.h \
   $(public_api_base_src_dir)/controls/scrollable/item-view/navigation-layout.h \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/album-layout.h
+  $(public_api_base_src_dir)/controls/scrollable/item-view/album-layout.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/grid-layout.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/item-factory.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/item-layout.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/item-view.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/item-view-declarations.h 
 
-public_api_base_popup_header_files =
+public_api_base_popup_header_files = \
+  $(public_api_base_src_dir)/controls/popup/popup.h
 
 public_api_base_scrollable_header_files = \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.h
+  $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.h \
+  $(public_api_base_src_dir)/controls/scrollable/scrollable.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-connector.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-component.h
+
+public_api_base_scroll_bar_header_files = \
+  $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.h
 
 public_api_base_scroll_view_header_files = \
   $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
@@ -86,24 +106,47 @@ public_api_base_scroll_view_header_files = \
   $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \
   $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \
   $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-custom-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-twist-effect.h
 
 public_api_base_table_view_header_files = \
   $(public_api_base_src_dir)/controls/table-view/table-view.h
 
-public_api_base_text_input_header_files =
+public_api_base_text_input_header_files = \
+  $(public_api_base_src_dir)/controls/text-input/text-input.h
 
-public_api_base_text_view_header_files =
+public_api_base_text_view_header_files = \
+  $(public_api_base_src_dir)/controls/text-view/text-view.h
 
-public_api_base_factory_header_files =
+public_api_base_factory_header_files = \
+  $(public_api_base_src_dir)/factory/localized-control-factory.h
 
 public_api_base_focus_manager_header_files = \
-  $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.h
+  $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.h \
+  $(public_api_base_src_dir)/focus-manager/focus-manager.h \
+  $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.h
 
-public_api_base_markup_processor_header_files =
+public_api_base_markup_processor_header_files = \
+  $(public_api_base_src_dir)/markup-processor/markup-processor.h
 
 public_api_base_shader_effects_header_files = \
-  $(public_api_base_src_dir)/shader-effects/bouncing-effect.h
+  $(public_api_base_src_dir)/shader-effects/bouncing-effect.h \
+  $(public_api_base_src_dir)/shader-effects/dissolve-effect.h \
+  $(public_api_base_src_dir)/shader-effects/image-region-effect.h \
+  $(public_api_base_src_dir)/shader-effects/iris-effect.h \
+  $(public_api_base_src_dir)/shader-effects/mask-effect.h \
+  $(public_api_base_src_dir)/shader-effects/nine-patch-mask-effect.h \
+  $(public_api_base_src_dir)/shader-effects/page-turn-book-spine-effect.h \
+  $(public_api_base_src_dir)/shader-effects/page-turn-effect.h \
+  $(public_api_base_src_dir)/shader-effects/ripple-effect.h \
+  $(public_api_base_src_dir)/shader-effects/ripple2d-effect.h \
+  $(public_api_base_src_dir)/shader-effects/swirl-effect.h
 
 public_api_base_styling_header_files = \
   $(public_api_base_src_dir)/styling/style-manager.h
@@ -113,4 +156,3 @@ public_api_base_builder_header_files = \
   $(public_api_base_src_dir)/builder/json-parser.h \
   $(public_api_base_src_dir)/builder/tree-node.h
 
-
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_FOCUS_MANAGER_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -415,7 +410,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_FOCUS_MANAGER_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_FOCUS_MANAGER_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/control.h>
@@ -281,7 +276,4 @@ public: // Signals
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_MARKUP_PROCESSOR_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 
@@ -155,7 +150,4 @@ void SetTextStyleToRange( StyledTextArray& styledTextArray, const TextStyle& sty
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_MARKUP_PROCESSOR_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -96,7 +91,4 @@ private: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -99,7 +94,4 @@ private: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_IMAGE_REGION_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -121,7 +116,4 @@ private: // Not intended for application developers
 }
 }
 
-/**
- * @}
- */
 #endif
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -76,7 +71,4 @@ private: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_MASK_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -75,7 +70,4 @@ void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskB
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_NINE_PATCH_MASK_EFFECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -106,7 +101,4 @@ private:// Helper for New()
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif /* __DALI_PAGE_TURN_BOOK_SPINE_EFFECT_H__ */
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -175,7 +170,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif /* __DALI_TOOLKIT_SC_CURVE_EFFECT_H_ */
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -113,7 +108,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SHADER_EFFECT_RIPPLE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -98,7 +93,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SHADER_EFFECT_RIPPLE2D_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 
@@ -111,7 +106,4 @@ private: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SHADER_EFFECT_SWIRL_H__
similarity index 100%
rename from build/slp/.gitignore
rename to build/tizen/.gitignore
similarity index 100%
rename from build/slp/README
rename to build/tizen/README
similarity index 98%
rename from build/slp/configure.ac
rename to build/tizen/configure.ac
index ed3d8bb..20810b3 100644 (file)
@@ -33,7 +33,7 @@ PKG_CHECK_MODULES(DALI, dali)
 PKG_CHECK_MODULES(DLOG, dlog)
 PKG_CHECK_MODULES(FRIBIDI, fribidi)
 
-DALI_TOOLKIT_CFLAGS=-DPLATFORM_SLP
+DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
 
 AC_ARG_ENABLE(exportall,
               [AC_HELP_STRING([--enable-exportall],
similarity index 65%
rename from build/slp/dali-toolkit/Makefile.am
rename to build/tizen/dali-toolkit/Makefile.am
index 2c9dd9d..3168719 100644 (file)
@@ -38,11 +38,6 @@ include ../../../optional/dali-toolkit/images/file.list
 include ../../../optional/dali-toolkit/internal/file.list
 include ../../../optional/dali-toolkit/public-api/file.list
 
-# CAPI headers
-capi_devel_src_dir = ../../../capi/dali-toolkit/public-api
-
-include ../../../capi/dali-toolkit/public-api/file.list
-
 resources_dir = ../../../resources
 daliimagedir = ${dataReadOnlyDir}/toolkit/images/
 if TOOLKIT_BASIC_VERSION
@@ -75,8 +70,7 @@ dalistyle_DATA = ${dali_toolkit_style_files}
 
 libdali_toolkit_la_DEPENDENCIES =
 
-toolkit_basic_includes = -I../../../base \
-                         -I../../../capi
+toolkit_basic_includes = -I../../../base
 
 if ! TOOLKIT_BASIC_VERSION
 toolkit_optional_includes = -I../../../optional
@@ -196,86 +190,3 @@ publicapioptionalnavigationframe_HEADERS = $(public_api_optional_navigation_fram
 publicapioptionalshadereffects_HEADERS = $(public_api_optional_shader_effects_header_files)
 publicapioptionalbubbleeffect_HEADERS = $(public_api_optional_bubble_effect_header_files)
 publicapioptionaltransitioneffects_HEADERS = $(public_api_optional_transition_effects_header_files)
-
-# Install CAPI headers
-
-capideveldir = $(devincludepath)/dali-toolkit/public-api
-capidevelcontrolsdir = $(capideveldir)/controls
-capidevelalignmentdir = $(capideveldir)/controls/alignment
-capidevelbloomviewdir = $(capideveldir)/controls/bloom-view
-capidevelbuttonsdir = $(capideveldir)/controls/buttons
-capidevelclusterdir = $(capideveldir)/controls/cluster
-capideveldefaultcontrolsdir = $(capideveldir)/controls/default-controls
-capideveleffectsviewdir = $(capideveldir)/controls/effects-view
-capidevelgaussianblurviewdir = $(capideveldir)/controls/gaussian-blur-view
-capidevelimageviewdir = $(capideveldir)/controls/image-view
-capidevelitemviewdir = $(capideveldir)/controls/scrollable/item-view
-capidevelmagnifierdir = $(capideveldir)/controls/magnifier
-capidevelpopupdir = $(capideveldir)/controls/popup
-capidevelpageturnviewdir = $(capideveldir)/controls/page-turn-view
-capidevelscrollcomponentdir = $(capideveldir)/controls/scroll-component
-capidevelscrollbardir = $(capideveldir)/controls/scroll-bar
-capidevelscrollabledir = $(capideveldir)/controls/scrollable
-capidevelscrollviewdir = $(capideveldir)/controls/scrollable/scroll-view
-capidevelsliderdir = $(capideveldir)/controls/slider
-capideveltableviewdir = $(capideveldir)/controls/table-view
-capideveltextviewdir = $(capideveldir)/controls/text-view
-capideveltextinputdir = $(capideveldir)/controls/text-input
-capideveltoolbardir = $(capideveldir)/controls/tool-bar
-capidevelselectorsdir = $(capideveldir)/controls/selectors
-capidevelshadowviewdir = $(capideveldir)/controls/shadow-view
-capidevelbubbleemitterdir = $(capideveldir)/controls/bubble-effect
-capidevelsuperblurviewdir = $(capideveldir)/controls/super-blur-view
-capidevelviewdir = $(capideveldir)/controls/view
-capidevelnavigationframedir = $(capideveldir)/controls/navigation-frame
-capidevelfactorydir = $(capideveldir)/factory
-capidevelfocusmanagerdir = $(capideveldir)/focus-manager
-capidevelmarkupprocessordir = $(capideveldir)/markup-processor
-capidevelshadereffectsdir = $(capideveldir)/shader-effects
-capidevelbubbleeffectdir = $(capideveldir)/shader-effects/bubble-effect
-capidevelstyledtextutilitiesdir = $(capideveldir)/styled-text-utilities
-capidevelbuilderdir = $(capideveldir)/builder
-capidevelutilitiesdir = $(capideveldir)/utilities
-capideveltransitioneffectsdir = $(capideveldir)/transition-effects
-capidevelstylingdir = $(capideveldir)/styling
-
-capidevel_HEADERS = $(capi_devel_header_files)
-capidevelcontrols_HEADERS = $(capi_devel_controls_header_files)
-capidevelalignment_HEADERS = $(capi_devel_alignment_header_files)
-capidevelbloomview_HEADERS = $(capi_devel_bloom_view_header_files)
-capidevelbuttons_HEADERS = $(capi_devel_buttons_header_files)
-capidevelcluster_HEADERS = $(capi_devel_cluster_header_files)
-capideveldefaultcontrols_HEADERS = $(capi_devel_default_controls_header_files)
-capideveleffectsview_HEADERS = $(capi_devel_effects_view_header_files)
-capidevelgaussianblurview_HEADERS = $(capi_devel_gaussian_blur_view_header_files)
-capidevelimageview_HEADERS = $(capi_devel_image_view_header_files)
-capidevelitemview_HEADERS = $(capi_devel_item_view_header_files)
-capidevelmagnifier_HEADERS = $(capi_devel_magnifier_header_files)
-capidevelpopup_HEADERS = $(capi_devel_popup_header_files)
-capidevelpageturnview_HEADERS = $(capi_devel_page_turn_view_header_files)
-capidevelscrollcomponent_HEADERS = $(capi_devel_scroll_component_header_files)
-capidevelscrollable_HEADERS = $(capi_devel_scrollable_header_files)
-capidevelscrollbar_HEADERS = $(capi_devel_scroll_bar_header_files)
-capidevelscrollview_HEADERS = $(capi_devel_scroll_view_header_files)
-capidevelslider_HEADERS = $(capi_devel_slider_header_files)
-capideveltableview_HEADERS = $(capi_devel_table_view_header_files)
-capideveltextview_HEADERS = $(capi_devel_text_view_header_files)
-capideveltextinput_HEADERS = $(capi_devel_text_input_header_files)
-capideveltoolbar_HEADERS = $(capi_devel_tool_bar_header_files)
-capidevelselectors_HEADERS = $(capi_devel_selectors_header_files)
-capidevelshadowview_HEADERS = $(capi_devel_shadow_view_header_files)
-capidevelbubbleemitter_HEADERS = $(capi_devel_bubble_emitter_header_files)
-capidevelsuperblurview_HEADERS = $(capi_devel_super_blur_view_header_files)
-capidevelview_HEADERS = $(capi_devel_view_header_files)
-capidevelnavigationframe_HEADERS = $(capi_devel_navigation_frame_header_files)
-capidevelfactory_HEADERS = $(capi_devel_factory_header_files)
-capidevelfocusmanager_HEADERS = $(capi_devel_focus_manager_header_files)
-capidevelmarkupprocessor_HEADERS = $(capi_devel_markup_processor_header_files)
-capidevelshadereffects_HEADERS = $(capi_devel_shader_effects_header_files)
-capidevelbubbleeffect_HEADERS = $(capi_devel_bubble_effect_header_files)
-capidevelstyledtextutilities_HEADERS = $(capi_devel_styled_text_utilities_header_files)
-capidevelbuilder_HEADERS = $(capi_devel_builder_header_files)
-capidevelutilities_HEADERS = $(capi_devel_utilities_header_files)
-capideveltransitioneffects_HEADERS = $(capi_devel_transition_effects_header_files)
-capidevelstyling_HEADERS = $(capi_devel_styling_header_files)
-
similarity index 99%
rename from build/slp/docs/dali.doxy.in
rename to build/tizen/docs/dali.doxy.in
index f3379c1..8b84033 100644 (file)
@@ -576,7 +576,6 @@ WARN_LOGFILE           =
 INPUT                  = @DOXYGEN_DOCS_DIR@/content \
                          ../../../../dali-toolkit/base/dali-toolkit/public-api \
                          ../../../../dali-toolkit/optional/dali-toolkit/public-api \
-                         ../../../../dali-toolkit/capi/dali-toolkit/public-api \
                          @prefix@/include/dali
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/capi/dali-toolkit/public-api/dali-toolkit-capi-internal.h b/capi/dali-toolkit/public-api/dali-toolkit-capi-internal.h
deleted file mode 100644 (file)
index deb02ae..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef __DALI_TOOLKIT_CAPI_INTERNAL_H__
-#define __DALI_TOOLKIT_CAPI_INTERNAL_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
-#include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
-#include <dali-toolkit/public-api/controls/buttons/button.h>
-#include <dali-toolkit/public-api/controls/buttons/push-button.h>
-#include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
-#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
-#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
-#include <dali-toolkit/public-api/controls/popup/popup.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
-#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
-#include <dali-toolkit/public-api/controls/text-input/text-input.h>
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
-#include <dali-toolkit/public-api/enums.h>
-#include <dali-toolkit/public-api/factory/localized-control-factory.h>
-#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
-#include <dali-toolkit/public-api/shader-effects/dissolve-effect.h>
-#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
-#include <dali-toolkit/public-api/shader-effects/iris-effect.h>
-#include <dali-toolkit/public-api/shader-effects/mask-effect.h>
-#include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
-#include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
-#include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
-#include <dali-toolkit/public-api/shader-effects/ripple-effect.h>
-#include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
-#include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
-
-#endif // __DALI_TOOLKIT_CAPI_INTERNAL_H__
diff --git a/capi/dali-toolkit/public-api/file.list b/capi/dali-toolkit/public-api/file.list
deleted file mode 100644 (file)
index a878f04..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-capi_devel_header_files = \
-  $(capi_devel_src_dir)/enums.h \
-  $(capi_devel_src_dir)/dali-toolkit-capi-internal.h
-
-capi_devel_controls_header_files = \
-  $(capi_devel_src_dir)/controls/control.h \
-  $(capi_devel_src_dir)/controls/control-impl.h
-
-capi_devel_alignment_header_files = \
-  $(capi_devel_src_dir)/controls/alignment/alignment.h
-
-capi_devel_bubble_emitter_header_files =  \
-  $(capi_devel_src_dir)/controls/bubble-effect/bubble-emitter.h
-
-capi_devel_buttons_header_files = \
-  $(capi_devel_src_dir)/controls/buttons/button.h \
-  $(capi_devel_src_dir)/controls/buttons/push-button.h
-
-capi_devel_cluster_header_files = \
-  $(capi_devel_src_dir)/controls/cluster/cluster-style.h
-
-capi_devel_default_controls_header_files = \
-  $(capi_devel_src_dir)/controls/default-controls/solid-color-actor.h \
-  $(capi_devel_src_dir)/controls/default-controls/push-button-factory.h
-
-capi_devel_image_view_header_files = \
-  $(capi_devel_src_dir)/controls/image-view/masked-image-view.h
-
-capi_devel_popup_header_files = \
-  $(capi_devel_src_dir)/controls/popup/popup.h
-
-capi_devel_scroll_component_header_files =
-
-capi_devel_scrollable_header_files = \
-  $(capi_devel_src_dir)/controls/scrollable/scrollable.h \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-connector.h \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-component.h
-
-capi_devel_scroll_bar_header_files = \
-  $(capi_devel_src_dir)/controls/scroll-bar/scroll-bar.h
-
-capi_devel_item_view_header_files = \
-  $(capi_devel_src_dir)/controls/scrollable/item-view/grid-layout.h \
-  $(capi_devel_src_dir)/controls/scrollable/item-view/item-factory.h \
-  $(capi_devel_src_dir)/controls/scrollable/item-view/item-layout.h \
-  $(capi_devel_src_dir)/controls/scrollable/item-view/item-view.h \
-  $(capi_devel_src_dir)/controls/scrollable/item-view/item-view-declarations.h
-
-capi_devel_scroll_view_header_files = \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-view/scroll-view.h \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.h \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-view/scroll-view-custom-effect.h \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.h \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-effect.h \
-  $(capi_devel_src_dir)/controls/scrollable/scroll-view/scroll-view-twist-effect.h
-
-capi_devel_super_blur_view_header_files = \
-  $(capi_devel_src_dir)/controls/super-blur-view/super-blur-view.h
-
-capi_devel_text_input_header_files = \
-  $(capi_devel_src_dir)/controls/text-input/text-input.h
-
-capi_devel_text_view_header_files = \
-  $(capi_devel_src_dir)/controls/text-view/text-view.h
-
-capi_devel_factory_header_files = \
-  $(capi_devel_src_dir)/factory/localized-control-factory.h
-
-capi_devel_focus_manager_header_files = \
-  $(capi_devel_src_dir)/focus-manager/focus-manager.h \
-  $(capi_devel_src_dir)/focus-manager/keyboard-focus-manager.h
-
-capi_devel_markup_processor_header_files =               \
-  $(capi_devel_src_dir)/markup-processor/markup-processor.h
-
-capi_devel_shader_effects_header_files =               \
-  $(capi_devel_src_dir)/shader-effects/dissolve-effect.h \
-  $(capi_devel_src_dir)/shader-effects/image-region-effect.h \
-  $(capi_devel_src_dir)/shader-effects/iris-effect.h \
-  $(capi_devel_src_dir)/shader-effects/mask-effect.h \
-  $(capi_devel_src_dir)/shader-effects/nine-patch-mask-effect.h \
-  $(capi_devel_src_dir)/shader-effects/page-turn-book-spine-effect.h \
-  $(capi_devel_src_dir)/shader-effects/page-turn-effect.h \
-  $(capi_devel_src_dir)/shader-effects/ripple-effect.h \
-  $(capi_devel_src_dir)/shader-effects/ripple2d-effect.h \
-  $(capi_devel_src_dir)/shader-effects/swirl-effect.h
-
diff --git a/capi/dali_toolkit_doc.h b/capi/dali_toolkit_doc.h
deleted file mode 100644 (file)
index 8a67233..0000000
+++ /dev/null
@@ -1,318 +0,0 @@
-#ifndef __DALI_TOOLKIT_DOC_H__
-#define __DALI_TOOLKIT_DOC_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/**
- * @ingroup CAPI_DALI_FRAMEWORK
- * @defgroup CAPI_DALI_TOOLKIT_MODULE Dali Toolkit
- * @brief A library to provide a user interface toolkit on top of Dali.
- * @section CAPI_DALI_TOOLKIT_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_MODULE_OVERVIEW Overview
- *   A library to provide a user interface toolkit running on top of Dali.
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_CONTROLS_MODULE</td><td>User interface controls</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_FACTORY_MODULE</td><td>Factory methods for creating controls</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_FOCUS_MANAGER_MODULE</td><td>Classes for managing focus between controls and actors</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_MARKUP_PROCESSOR_MODULE</td><td>Text markup classes</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE</td><td>Shader effects classes</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE Controls
- * @brief
- * @section  CAPI_DALI_TOOLKIT_CONTROLS_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section  CAPI_DALI_TOOLKIT_CONTROLS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_ALIGNMENT_MODULE </td><td>Layout class</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_BUBBLE_EFFECT_MODULE </td><td>Particle emitter</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_BUTTONS_MODULE </td><td>Button</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_CLUSTER_MODULE </td><td>Styles for clusters of actors</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_DEFAULT_CONTROLS_MODULE </td><td>Factory methods for generating controls</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_IMAGE_VIEW_MODULE </td><td>Classes for displaying images</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_POPUP_MODULE </td><td></td>Popup control</tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE </td><td>Scrollable containers</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_SUPER_BLUR_VIEW_MODULE </td><td>Control to perform blurring on an image</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_TEXT_INPUT_MODULE </td><td>Input control using the virtual keyboard</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_TEXT_VIEW_MODULE </td><td>Control to display text in different styles</td></tr>
- * <tr><td>@ref Dali::Toolkit::Control </td><td>Control is the base class for all controls.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ControlImpl </td><td>This is the internal base class for all controls.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_ALIGNMENT_MODULE Alignment
- * @brief
- * @section CAPI_DALI_TOOLKIT_ALIGNMENT_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_ALIGNMENT_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::Alignment </td><td>Alignment is a container which provides an easy way to align other actors inside its boundary.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_BUBBLE_EFFECT_MODULE Bubble Effect
- * @brief
- * @section  CAPI_DALI_TOOLKIT_BUBBLE_EFFECT_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_BUBBLE_EFFECT_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::BubbleEmitter </td><td>BubbleEmitter is used to display lots of moving bubbles on the stage.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_BUTTONS_MODULE Buttons
- * @brief
- * @section  CAPI_DALI_TOOLKIT_BUTTONS_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_BUTTONS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::Button </td><td>Button is a base class for different kind of buttons.</td></tr>
- * <tr><td>@ref Dali::Toolkit::PushButton </td><td>A PushButton changes its appearance when is pressed and returns to its original when is released.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_CLUSTER_MODULE Cluster
- * @brief
- * @section CAPI_DALI_TOOLKIT_CLUSTER_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_CLUSTER_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::ClusterStyle </td><td>A ClusterStyle describes the constraints, which are imposed on the child actors in the cluster.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_DEFAULT_CONTROLS_MODULE Default Controls
- * @brief
- * @section CAPI_DALI_TOOLKIT_DEFAULT_CONTROLS_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_DEFAULT_CONTROLS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td> Factory methods </td><td>Dali::Toolkit::CreateSolidColorActor(), Dali::Toolkit::CreatePushButton()</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_IMAGE_VIEW_MODULE Image View
- * @brief
- * @section  CAPI_DALI_TOOLKIT_IMAGE_VIEW_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_IMAGE_VIEW_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::MaskedImageView </td><td>MaskedImageView displays the result of an image created from a masking operation.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_POPUP_MODULE Popup
- * @brief
- * @section  CAPI_DALI_TOOLKIT_POPUP_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_POPUP_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::Popup </td><td>Popup contains content that can come into focus when activated, and out of focus when deactivated.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE Scrollable
- * @brief
- * @section  CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * (via touch) or automatically. </td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE</td><td> Item view </td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE</td><td> Scroll view </td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE</td><td> Scroll Connector </td></tr>
- * <tr><td>@ref Dali::Toolkit::Scrollable </td><td>Base class for derived Scrollables that contains actors that can be scrolled manually
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE   Item view
- * @brief
- * @section  CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_ITEM_VIEW_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::GridLayout </td><td>An ItemView layout which arranges items in a grid.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ItemFactory </td><td>ItemFactory is an abstract interface for providing actors to ItemView.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ItemRange </td><td>A support class for managing ranges of items.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ItemLayout </td><td>An ItemLayout describes the constraints which are imposed on items in the layout.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ItemView </td><td>ItemView is a scrollable layout container.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE   Scroll Connector
- * @brief
- * @section  CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_SCROLL_CONNECTOR_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::ScrollConnector </td><td>ScrollConnector is used to connect scrollable containers with components such as scroll bars, indicators etc.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_SCROLLABLE_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE Scroll view
- * @brief
- * @section  CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_SCROLL_VIEW_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::ScrollViewCubeEffect </td><td>This effect causes Actors to appear to rotate around a 3D cube.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ScrollViewCustomEffect </td><td>This class has many transition effects for use when scrolling pages, e.g opacity, rotation, swing, translation.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ScrollViewEffect </td><td>ScrollView Effect base class, used to apply custom effects to a ScrollView instance.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ScrollViewPageSpiralEffect </td><td>This effect cause each page in a scroll-view to move along a spiral.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ScrollViewSlideEffect </td><td>ScrollView effect that uses slides for transitioning pages.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ScrollViewTwistEffect </td><td>ScrollView effect that twists pages onto screen when transitioning.</td></tr>
- * <tr><td>@ref Dali::Toolkit::RulerDomain </td><td>Used for specifying minimum/maximum extents of a ruler.</td></tr>
- * <tr><td>@ref Dali::Toolkit::Ruler </td><td>Abstract class to define scroll axes.</td></tr>
- * <tr><td>@ref Dali::Toolkit::DefaultRuler </td><td>Concrete implementation of Dali::Toolkit::Ruler that has no snapping and has one single page.</td></tr>
- * <tr><td>@ref Dali::Toolkit::FixedRuler </td><td>Concrete implementation of Ruler that has fixed snapping.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ScrollView </td><td>ScrollView contains actors that can be scrolled manually (via touch) or automatically.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_SUPER_BLUR_VIEW_MODULE Super Blur View
- * @brief
- * @section  CAPI_DALI_TOOLKIT_SUPER_BLUR_VIEW_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_SUPER_BLUR_VIEW_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::SuperBlurView </td><td>SuperBlurView accepts an image as input, and displays/animates it with various blur strengths.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_TEXT_INPUT_MODULE Text Input
- * @brief
- * @section  CAPI_DALI_TOOLKIT_TEXT_INPUT_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_TEXT_INPUT_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::TextInput </td><td>TextInput Actor takes input one character at a time and displays it as a string within an input box.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_CONTROLS_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_TEXT_VIEW_MODULE Text view
- * @brief
- * @section CAPI_DALI_TOOLKIT_TEXT_VIEW_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_TEXT_VIEW_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::TextView </td><td>TextView is a layout container for text with alignment, multi-line wrapping and formatting support.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_FACTORY_MODULE Factory
- * @brief
- * @section CAPI_DALI_TOOLKIT_FACTORY_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_FACTORY_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::LocalizedControlFactory </td><td>This class provides functionality for creating controls which have localized text.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_FOCUS_MANAGER_MODULE Focus Manager
- * @brief
- * @section  CAPI_DALI_TOOLKIT_FOCUS_MANAGER_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_FOCUS_MANAGER_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::FocusManager </td><td>Manages registration of actors in a focus chain and changing the focused
- * actor within that chain.</td></tr>
- * <tr><td>@ref Dali::Toolkit::KeyboardFocusManager </td><td>Provides the functionality of handling keyboard navigation and maintaining the two dimensional keyboard focus chain.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_MARKUP_PROCESSOR_MODULE Markup Processor
- * @brief
- * @section CAPI_DALI_TOOLKIT_MARKUP_PROCESSOR_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_MARKUP_PROCESSOR_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::MarkupProcessor::StyledText </td><td>A pair of Dali::Text and Dali::TextStyle.</td></tr>
- * <tr><td>@ref Dali::Toolkit::MarkupProcessor::StyledTextArray </td><td> Vector of StyledText </td></tr>
- * <tr><td>@ref Dali::Toolkit::MarkupProcessor </td><td>
-Dali::Toolkit::MarkupProcessor::GetStyledTextArray()
-Dali::Toolkit::MarkupProcessor::GetPlainString()
-Dali::Toolkit::MarkupProcessor::GetMarkupString()
-Dali::Toolkit::MarkupProcessor::SetTextStyle()
-Dali::Toolkit::MarkupProcessor::SetTextStyle()
-Dali::Toolkit::MarkupProcessor::SetTextStyleToRange()
-</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_TOOLKIT_MODULE
- * @defgroup CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE Shader Effects
- * @brief
- * @section  CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE_HEADER Required Header
- *  \#include <dali-toolkit/dali-toolkit.h>
- * @section CAPI_DALI_TOOLKIT_SHADER_EFFECTS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Toolkit::DissolveEffect </td><td>DissolveEffect is a custom shader effect to achieve Dissolve effects in Image actors.</td></tr>
- * <tr><td>@ref Dali::Toolkit::ImageRegionEffect </td><td>ImageRegionEffect is a custom shader effect to show only a region of an Image actor.</td></tr>
- * <tr><td>@ref Dali::Toolkit::IrisEffect </td><td>IrisEffect is a custom shader effect to achieve iris effects in Image actors.</td></tr>
- * <tr><td>@ref Dali::Toolkit::MaskEffect </td><td>MaskEffect is used to control which parts of an image are visible, using the alpha channel of a separate mask image.</td></tr>
- * <tr><td>@ref Dali::Toolkit::NinePatchMaskEffect </td><td>NinePatchMaskEffect is used to control which parts of an image are visible, using the alpha channel of a separate mask image.</td></tr>
- * <tr><td>@ref Dali::Toolkit::PageTurnBookSpineEffect </td><td>This is an assisting effect of PageTurnEffect to display a book spine on _static_ pages, and also to flip the image horizontally when needed.</td></tr>
- * <tr><td>@ref Dali::Toolkit::PageTurnEffect </td><td>PageTurnEffect is a custom shader effect to achieve a page turn effect for Image actors.</td></tr>
- * <tr><td>@ref Dali::Toolkit::RippleEffect </td><td>RippleEffect is a custom shader effect to achieve ripple effects on Image actors</td></tr>
- * <tr><td>@ref Dali::Toolkit::Ripple2DEffect </td><td>Ripple2DEffect is a custom shader effect to achieve 2d ripple effects on Image actors</td></tr>
- * <tr><td>@ref Dali::Toolkit::SwirlEffect </td><td>SwirlEffect is a custom shader effect to achieve swirl effects in Image actors.</td></tr>
- * </table>
- */
-
-
-#endif //__DALI_TOOLKIT_DOC_H__
index 2baf18b..7acb25f 100644 (file)
@@ -1,7 +1,7 @@
 To build the documentation from a Desktop build environment
 
 On the desktop:
-- cd dali-toolkit/build/slp/docs
+- cd dali-toolkit/build/tizen/docs
 - doxygen dali.doxy
   or
   make
index 6013b34..ff72f77 100644 (file)
  *
  */
 
-#include <dali-toolkit/public-api/dali-toolkit-capi-internal.h>
+#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/public-api/controls/buttons/button.h>
+#include <dali-toolkit/public-api/controls/buttons/push-button.h>
+#include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
+#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
+#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
+#include <dali-toolkit/public-api/controls/popup/popup.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
+#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
+#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
+#include <dali-toolkit/public-api/controls/text-input/text-input.h>
+#include <dali-toolkit/public-api/controls/text-view/text-view.h>
+#include <dali-toolkit/public-api/enums.h>
+#include <dali-toolkit/public-api/factory/localized-control-factory.h>
+#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
+#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
+#include <dali-toolkit/public-api/shader-effects/dissolve-effect.h>
+#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
+#include <dali-toolkit/public-api/shader-effects/iris-effect.h>
+#include <dali-toolkit/public-api/shader-effects/mask-effect.h>
+#include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
+#include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
+#include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
+#include <dali-toolkit/public-api/shader-effects/ripple-effect.h>
+#include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
+#include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
 
 // INTERNAL INCLUDES
 
 #include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
+#include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 #include <dali-toolkit/public-api/controls/cluster/cluster.h>
 
 #include <dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h>
 #include <dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h>
 
+#include <dali-toolkit/public-api/dali-toolkit-version.h>
 
 #endif // __DALI_TOOLKIT_EXT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_BUBBLE_EFFECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/control.h>
@@ -196,7 +191,5 @@ public: // Not intended for developer use
 } // namespace Toolkit
 
 } // namespace Dali
-/**
- * @}
- */
+
 #endif /* __DALI_TOOLKIT_BUBBLE_EMMITER_H__ */
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_CLUSTER_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 #include <dali-toolkit/public-api/enums.h>
@@ -180,7 +175,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_CLUSTER_STYLE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_IMAGE_VIEW_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
@@ -310,7 +305,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_MASKED_IMAGE_VIEW_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TOOLKIT_SUPER_BLUR_VIEW_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 
 // INTERNAL INCLUDES
@@ -184,8 +179,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-
-/**
- * @}
- */
 #endif /* __DALI_TOOLKIT_SUPER_BLUR_VIEW_H__ */
diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp b/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
new file mode 100644 (file)
index 0000000..83d728e
--- /dev/null
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// HEADER
+#include <dali-toolkit/public-api/dali-toolkit-version.h>
+
+// EXTERNAL INCLUDES
+#ifdef DEBUG_ENABLED
+#include <iostream>
+#endif
+
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+const unsigned int TOOLKIT_MAJOR_VERSION = 1;
+const unsigned int TOOLKIT_MINOR_VERSION = 0;
+const unsigned int TOOLKIT_MICRO_VERSION = 2;
+const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
+
+#ifdef DEBUG_ENABLED
+namespace
+{
+/// Allows the printing of the version number ONLY when debug is enabled
+struct PrintVersion
+{
+  PrintVersion()
+  {
+    std::cout << "DALi Toolkit:   " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << " (" << TOOLKIT_BUILD_DATE << ")" << std::endl;
+  }
+};
+PrintVersion TOOLKIT_VERSION;
+} // unnamed namespace
+#endif
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.h b/optional/dali-toolkit/public-api/dali-toolkit-version.h
new file mode 100644 (file)
index 0000000..e2813bf
--- /dev/null
@@ -0,0 +1,32 @@
+#ifndef __DALI_TOOLKIT_VERSION_H__
+#define __DALI_TOOLKIT_VERSION_H__
+
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Toolkit
+{
+extern const unsigned int TOOLKIT_MAJOR_VERSION; ///< The major version number of the Toolkit.
+extern const unsigned int TOOLKIT_MINOR_VERSION; ///< The minor version number of the Toolkit.
+extern const unsigned int TOOLKIT_MICRO_VERSION; ///< The micro version number of the Toolkit.
+extern const char * const TOOLKIT_BUILD_DATE;    ///< The date/time the Toolkit library was built.
+} // namespace Toolkit
+} // namespace Dali
+
+#endif // __DALI_TOOLKIT_VERSION_H__
index ba93b35..31ea4c7 100755 (executable)
@@ -52,19 +52,25 @@ public_api_optional_src_files = \
   $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.cpp \
   $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
   $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
-  $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.cpp
-  
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
+  $(public_api_optional_src_dir)/dali-toolkit-version.cpp
+
 # Add public header files here
 
-public_api_optional_header_files =
+public_api_optional_header_files = \
+  $(public_api_optional_src_dir)/dali-toolkit-version.h
 
 public_api_optional_controls_header_files =
 
+public_api_optional_bubble_emitter_header_files = \
+  $(public_api_optional_src_dir)/controls/bubble-effect/bubble-emitter.h
+
 public_api_optional_bloom_view_header_files = \
   $(public_api_optional_src_dir)/controls/bloom-view/bloom-view.h
 
 public_api_optional_cluster_header_files = \
-  $(public_api_optional_src_dir)/controls/cluster/cluster.h
+  $(public_api_optional_src_dir)/controls/cluster/cluster.h \
+  $(public_api_optional_src_dir)/controls/cluster/cluster-style.h
 
 public_api_optional_effects_view_header_files = \
   $(public_api_optional_src_dir)/controls/effects-view/effects-view.h
@@ -73,7 +79,8 @@ public_api_optional_gaussian_blur_view_header_files = \
   $(public_api_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
 
 public_api_optional_image_view_header_files = \
-  $(public_api_optional_src_dir)/controls/image-view/image-view.h
+  $(public_api_optional_src_dir)/controls/image-view/image-view.h \
+  $(public_api_optional_src_dir)/controls/image-view/masked-image-view.h
 
 public_api_optional_magnifier_header_files = \
   $(public_api_optional_src_dir)/controls/magnifier/magnifier.h
@@ -93,7 +100,8 @@ public_api_optional_selectors_header_files = \
 public_api_optional_shadow_view_header_files = \
   $(public_api_optional_src_dir)/controls/shadow-view/shadow-view.h
 
-public_api_optional_super_blur_view_header_files =
+public_api_optional_super_blur_view_header_files = \
+  $(public_api_optional_src_dir)/controls/super-blur-view/super-blur-view.h
 
 public_api_optional_tool_bar_header_files = \
   $(public_api_optional_src_dir)/controls/tool-bar/tool-bar.h
@@ -130,8 +138,6 @@ public_api_optional_bubble_effect_header_files =  \
   $(public_api_optional_src_dir)/shader-effects/bubble-effect/bubble-effect.h \
   $(public_api_optional_src_dir)/shader-effects/bubble-effect/color-adjuster.h
 
-public_api_optional_bubble_emitter_header_files =
-
 public_api_optional_transition_effects_header_files = \
   $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.h \
   $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.h \
index 0ae01d7..12d71b5 100644 (file)
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.0.1
+Version:    1.0.2
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -61,7 +61,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
 libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/slp
+cd %{_builddir}/dali-toolkit-%{version}/build/tizen
 autoreconf --install
 DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
 DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
@@ -73,7 +73,7 @@ make %{?jobs:-j%jobs}
 ##############################
 %install
 rm -rf %{buildroot}
-cd build/slp
+cd build/tizen
 %make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
 
 # LICENSE