From 2c0f9145edfd91a23aebe2a379db4b807f872186 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 15 Nov 2016 11:36:05 +0900 Subject: [PATCH] Revert "[3.0] Move PageTurnView to Devel API" This reverts commit 74c8426408f4eccdb1520dd4a73d018279be2f23. Change-Id: Ibba7b367a39d7d2268a1ec2f7d2d4f749d109881 --- automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp | 12 +++++++----- build/tizen/dali-toolkit/Makefile.am | 4 ++-- dali-toolkit/dali-toolkit.h | 4 ++++ dali-toolkit/devel-api/file.list | 9 --------- .../controls/page-turn-view/page-turn-landscape-view-impl.h | 4 ++-- .../controls/page-turn-view/page-turn-portrait-view-impl.h | 4 ++-- .../internal/controls/page-turn-view/page-turn-view-impl.h | 4 ++-- .../controls/page-turn-view/page-factory.h | 2 +- .../controls/page-turn-view/page-turn-landscape-view.cpp | 4 ++-- .../controls/page-turn-view/page-turn-landscape-view.h | 4 ++-- .../controls/page-turn-view/page-turn-portrait-view.cpp | 4 ++-- .../controls/page-turn-view/page-turn-portrait-view.h | 4 ++-- .../controls/page-turn-view/page-turn-view.cpp | 4 ++-- .../controls/page-turn-view/page-turn-view.h | 2 +- dali-toolkit/public-api/file.list | 9 +++++++++ 15 files changed, 40 insertions(+), 34 deletions(-) rename dali-toolkit/{devel-api => public-api}/controls/page-turn-view/page-factory.h (97%) rename dali-toolkit/{devel-api => public-api}/controls/page-turn-view/page-turn-landscape-view.cpp (93%) rename dali-toolkit/{devel-api => public-api}/controls/page-turn-view/page-turn-landscape-view.h (96%) rename dali-toolkit/{devel-api => public-api}/controls/page-turn-view/page-turn-portrait-view.cpp (93%) rename dali-toolkit/{devel-api => public-api}/controls/page-turn-view/page-turn-portrait-view.h (96%) rename dali-toolkit/{devel-api => public-api}/controls/page-turn-view/page-turn-view.cpp (94%) rename dali-toolkit/{devel-api => public-api}/controls/page-turn-view/page-turn-view.h (99%) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp index ab4551f..1142c4c 100644 --- 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) 2016 Samsung Electronics Co., Ltd. + * 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. @@ -22,10 +22,12 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include + + using namespace Dali; using namespace Dali::Toolkit; diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index ab272fa..84b0f6e 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -103,7 +103,6 @@ develapibubbleemitterdir = $(develapicontrolsdir)/bubble-effect develapieffectsviewdir = $(develapicontrolsdir)/effects-view develapigaussianblurviewdir = $(develapicontrolsdir)/gaussian-blur-view develapimagnifierdir = $(develapicontrolsdir)/magnifier -develapipageturnviewdir = $(develapicontrolsdir)/page-turn-view develapipopupdir = $(develapicontrolsdir)/popup develapishadowviewdir = $(develapicontrolsdir)/shadow-view develapisuperblurviewdir = $(develapicontrolsdir)/super-blur-view @@ -127,7 +126,6 @@ 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) develapivisualfactory_HEADERS = $(devel_api_visual_factory_header_files) develapiscripting_HEADERS = $(devel_api_scripting_header_files) @@ -149,6 +147,7 @@ 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 @@ -173,6 +172,7 @@ 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 e6f1eaa..b25c853 100644 --- a/dali-toolkit/dali-toolkit.h +++ b/dali-toolkit/dali-toolkit.h @@ -30,6 +30,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index 7e4dde4..0862317 100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -8,9 +8,6 @@ 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/shadow-view/shadow-view.cpp \ @@ -51,12 +48,6 @@ 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 c28594b..6114f12 100644 --- 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) 2016 Samsung Electronics Co., Ltd. + * 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. @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include 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 1a4b001..2d07779 100644 --- 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) 2016 Samsung Electronics Co., Ltd. + * 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. @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include 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 2d40717..078859d 100644 --- 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 -#include -#include +#include +#include #include namespace Dali diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h b/dali-toolkit/public-api/controls/page-turn-view/page-factory.h similarity index 97% rename from dali-toolkit/devel-api/controls/page-turn-view/page-factory.h rename to dali-toolkit/public-api/controls/page-turn-view/page-factory.h index cc12134..2b7cd65 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h +++ b/dali-toolkit/public-api/controls/page-turn-view/page-factory.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PAGE_FACTORY_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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/controls/page-turn-view/page-turn-landscape-view.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp similarity index 93% rename from dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp index 60ffd31..aadbffb 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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 +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h similarity index 96% rename from dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h index 1b4b218..bd34929 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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 +#include namespace Dali { diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp similarity index 93% rename from dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp index 9b4825e..bb30f23 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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 +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h similarity index 96% rename from dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h index 37104a6..dfd9a86 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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 +#include namespace Dali { diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp similarity index 94% rename from dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp index 1babe2b..93c5c9f 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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 +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h similarity index 99% rename from dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h index 3a67428..2f044bd 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PAGE_TURN_VIEW_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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/file.list b/dali-toolkit/public-api/file.list index de5e006..7e7268f 100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@ -11,6 +11,9 @@ 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 \ @@ -61,6 +64,12 @@ 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 \ -- 2.7.4