Move PageTurnView to Devel API

Change-Id: I0e708f9ef21883611507eda5ac712fe3d3495f05

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
index 1142c4c..ab4551f 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -22,12 +22,10 @@
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali/integration-api/events/pan-gesture-event.h>
 #include <dali/public-api/images/buffer-image.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
-
-
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 4f98271..5c6d46c 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -103,6 +103,7 @@ develapibubbleemitterdir =      $(develapicontrolsdir)/bubble-effect
 develapieffectsviewdir =        $(develapicontrolsdir)/effects-view
 develapigaussianblurviewdir =   $(develapicontrolsdir)/gaussian-blur-view
 develapimagnifierdir =          $(develapicontrolsdir)/magnifier
+develapipageturnviewdir =       $(develapicontrolsdir)/page-turn-view
 develapipopupdir =              $(develapicontrolsdir)/popup
 develapiprogressbardir =        $(develapicontrolsdir)/progress-bar
 develapishadowviewdir =         $(develapicontrolsdir)/shadow-view
@@ -127,6 +128,7 @@ develapifocusmanager_HEADERS =      $(devel_api_focus_manager_header_files)
 develapigaussianblurview_HEADERS =  $(devel_api_gaussian_blur_view_header_files)
 develapiimageatlas_HEADERS =        $(devel_api_image_atlas_header_files)
 develapimagnifier_HEADERS =         $(devel_api_magnifier_header_files)
+develapipageturnview_HEADERS =      $(devel_api_page_turn_view_header_files)
 develapipopup_HEADERS =             $(devel_api_popup_header_files)
 develapiprogressbar_HEADERS =       $(devel_api_progress_bar_header_files)
 develapivisualfactory_HEADERS =     $(devel_api_visual_factory_header_files)
@@ -149,7 +151,6 @@ publicapiflexcontainerdir =        $(publicapicontrolsdir)/flex-container
 publicapiimageviewdir =            $(publicapicontrolsdir)/image-view
 publicapivideoviewdir =            $(publicapicontrolsdir)/video-view
 publicapimodel3dviewdir =          $(publicapicontrolsdir)/model3d-view
-publicapipageturnviewdir =         $(publicapicontrolsdir)/page-turn-view
 publicapiscrollbardir =            $(publicapicontrolsdir)/scroll-bar
 publicapiscrollabledir =           $(publicapicontrolsdir)/scrollable
 publicapiscrollviewdir =           $(publicapicontrolsdir)/scrollable/scroll-view
@@ -174,7 +175,6 @@ publicapiimageview_HEADERS =            $(public_api_image_view_header_files)
 publicapivideoview_HEADERS =            $(public_api_video_view_header_files)
 publicapiitemview_HEADERS =             $(public_api_item_view_header_files)
 publicapimodel3dview_HEADERS =          $(public_api_model3d_view_header_files)
-publicapipageturnview_HEADERS =         $(public_api_page_turn_view_header_files)
 publicapiscrollbar_HEADERS =            $(public_api_scroll_bar_header_files)
 publicapiscrollable_HEADERS =           $(public_api_scrollable_header_files)
 publicapiscrollview_HEADERS =           $(public_api_scroll_view_header_files)

diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h
index 0ac408b..4e39d12 100644 (file)
--- a/dali-toolkit/dali-toolkit.h
+++ b/dali-toolkit/dali-toolkit.h
@@ -30,10 +30,6 @@
 #include <dali-toolkit/public-api/controls/flex-container/flex-container.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 #include <dali-toolkit/public-api/controls/model3d-view/model3d-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 #include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-factory.h b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h
similarity index 97%
rename from dali-toolkit/public-api/controls/page-turn-view/page-factory.h
rename to dali-toolkit/devel-api/controls/page-turn-view/page-factory.h
index 2b7cd65..cc12134 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_PAGE_FACTORY_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp
similarity index 93%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp
rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp
index aadbffb..60ffd31 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h>

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h
similarity index 96%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h
index d8503bf..9460b21 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp
similarity index 93%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp
rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp
index bb30f23..9b4825e 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h>

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h
similarity index 96%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h
index 7a95bc0..506c9ad 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp
similarity index 94%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp
rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp
index 93c5c9f..1babe2b 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
similarity index 99%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
index ef4821b..2c71d32 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_PAGE_TURN_VIEW_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.

diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list
index 674b9c7..80e97ee 100755 (executable)
--- a/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@ -8,6 +8,9 @@ devel_api_src_files = \
   $(devel_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
   $(devel_api_src_dir)/controls/effects-view/effects-view.cpp \
   $(devel_api_src_dir)/controls/magnifier/magnifier.cpp \
+  $(devel_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
+  $(devel_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
+  $(devel_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \
   $(devel_api_src_dir)/controls/popup/confirmation-popup.cpp \
   $(devel_api_src_dir)/controls/popup/popup.cpp \
   $(devel_api_src_dir)/controls/progress-bar/progress-bar.cpp \
@@ -49,6 +52,12 @@ devel_api_effects_view_header_files = \
 devel_api_magnifier_header_files = \
   $(devel_api_src_dir)/controls/magnifier/magnifier.h
 
+devel_api_page_turn_view_header_files = \
+  $(devel_api_src_dir)/controls/page-turn-view/page-factory.h \
+  $(devel_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h \
+  $(devel_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
+  $(devel_api_src_dir)/controls/page-turn-view/page-turn-view.h
+
 devel_api_popup_header_files = \
   $(devel_api_src_dir)/controls/popup/confirmation-popup.h \
   $(devel_api_src_dir)/controls/popup/popup.h

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
index 6114f12..c28594b 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h
index 2d07779..1a4b001 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
index 078859d..2d40717 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
@@ -25,8 +25,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
 #include <dali-toolkit/devel-api/controls/shadow-view/shadow-view.h>
 
 namespace Dali

diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
index 7e7268f..de5e006 100755 (executable)
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@ -11,9 +11,6 @@ public_api_src_files = \
   $(public_api_src_dir)/controls/flex-container/flex-container.cpp \
   $(public_api_src_dir)/controls/image-view/image-view.cpp \
   $(public_api_src_dir)/controls/model3d-view/model3d-view.cpp \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \
   $(public_api_src_dir)/controls/scroll-bar/scroll-bar.cpp \
   $(public_api_src_dir)/controls/scrollable/item-view/default-item-layout.cpp \
   $(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \
@@ -64,12 +61,6 @@ public_api_flex_container_header_files = \
 public_api_image_view_header_files = \
   $(public_api_src_dir)/controls/image-view/image-view.h
 
-public_api_page_turn_view_header_files = \
-  $(public_api_src_dir)/controls/page-turn-view/page-factory.h \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-view.h
-
 public_api_item_view_header_files = \
   $(public_api_src_dir)/controls/scrollable/item-view/default-item-layout.h \
   $(public_api_src_dir)/controls/scrollable/item-view/item-factory.h \