Merge remote-tracking branch 'origin/tizen' into new_text 33/35433/3
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Feb 2015 17:36:36 +0000 (17:36 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Feb 2015 17:55:58 +0000 (17:55 +0000)
Conflicts:
base/dali-toolkit/internal/file.list
base/dali-toolkit/public-api/file.list
build/tizen/dali-toolkit/Makefile.am
dali-toolkit/dali-toolkit.h
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-handles-impl.h
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.h
dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
dali-toolkit/internal/controls/text-view/relayout-utilities.h
dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
dali-toolkit/internal/controls/text-view/split-by-char-policies.h
dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h
dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
dali-toolkit/internal/controls/text-view/split-by-word-policies.h
dali-toolkit/internal/controls/text-view/text-actor-cache.cpp
dali-toolkit/internal/controls/text-view/text-actor-cache.h
dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp
dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h
dali-toolkit/internal/controls/text-view/text-processor.cpp
dali-toolkit/internal/controls/text-view/text-processor.h
dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.h
dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp
dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h
dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h
dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp
dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h
dali-toolkit/internal/controls/text-view/text-view-processor-types.h
dali-toolkit/internal/controls/text-view/text-view-processor.cpp
dali-toolkit/internal/controls/text-view/text-view-processor.h
dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
dali-toolkit/internal/controls/text-view/text-view-word-processor.h
dali-toolkit/public-api/controls/text-input/text-input.cpp
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.cpp
dali-toolkit/public-api/controls/text-view/text-view.h
dali-toolkit/public-api/markup-processor/markup-processor.cpp
dali-toolkit/public-api/markup-processor/markup-processor.h

Change-Id: I9f3dcc5bba104f4cac0589eddad4ad1de31cc740

468 files changed:
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
base/dali-toolkit/images/file.list [deleted file]
base/dali-toolkit/internal/file.list [deleted file]
base/dali-toolkit/public-api/file.list [deleted file]
base/dali-toolkit/sounds/file.list [deleted file]
build/tizen/configure.ac
build/tizen/dali-toolkit/Makefile.am
build/tizen/docs-internal/.gitignore [new file with mode: 0644]
build/tizen/docs-internal/build.sh [new file with mode: 0755]
build/tizen/docs-internal/dali_internal.doxy [new file with mode: 0644]
build/tizen/docs/dali.doxy.in
dali-toolkit/dali-toolkit.h [moved from optional/dali-toolkit/dali-toolkit.h with 96% similarity]
dali-toolkit/images/00_popup_bg.png [moved from base/dali-toolkit/images/00_popup_bg.png with 100% similarity]
dali-toolkit/images/00_popup_bottom_bg.png [moved from optional/dali-toolkit/images/00_popup_bottom_bg.png with 100% similarity]
dali-toolkit/images/00_popup_bubble_bg.png [moved from optional/dali-toolkit/images/00_popup_bubble_bg.png with 100% similarity]
dali-toolkit/images/00_popup_bubble_tail_bottom.png [moved from optional/dali-toolkit/images/00_popup_bubble_tail_bottom.png with 100% similarity]
dali-toolkit/images/00_popup_button_bg.png [moved from base/dali-toolkit/images/00_popup_button_bg.png with 100% similarity]
dali-toolkit/images/00_popup_button_pressed.png [moved from optional/dali-toolkit/images/00_popup_button_pressed.png with 100% similarity]
dali-toolkit/images/B16-8_TTS_focus.png [moved from base/dali-toolkit/images/B16-8_TTS_focus.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_clipboard.png [moved from base/dali-toolkit/images/copy_paste_icon_clipboard.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_copy.png [moved from base/dali-toolkit/images/copy_paste_icon_copy.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_cut.png [moved from base/dali-toolkit/images/copy_paste_icon_cut.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_paste.png [moved from base/dali-toolkit/images/copy_paste_icon_paste.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_select.png [moved from base/dali-toolkit/images/copy_paste_icon_select.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_select_all.png [moved from base/dali-toolkit/images/copy_paste_icon_select_all.png with 100% similarity]
dali-toolkit/images/file.list [new file with mode: 0644]
dali-toolkit/images/insertpoint-icon.png [moved from base/dali-toolkit/images/insertpoint-icon.png with 100% similarity]
dali-toolkit/images/keyboard_focus.png [moved from base/dali-toolkit/images/keyboard_focus.png with 100% similarity]
dali-toolkit/images/magnifier-image-frame.png [moved from optional/dali-toolkit/images/magnifier-image-frame.png with 100% similarity]
dali-toolkit/images/magnifier.png [moved from optional/dali-toolkit/images/magnifier.png with 100% similarity]
dali-toolkit/images/popup_bg.png [moved from base/dali-toolkit/images/popup_bg.png with 100% similarity]
dali-toolkit/images/popup_bubble_bg.#.png [moved from base/dali-toolkit/images/popup_bubble_bg.#.png with 100% similarity]
dali-toolkit/images/popup_bubble_bg_ef.#.png [moved from base/dali-toolkit/images/popup_bubble_bg_ef.#.png with 100% similarity]
dali-toolkit/images/popup_bubble_bg_line.#.png [moved from base/dali-toolkit/images/popup_bubble_bg_line.#.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_bottom.png [moved from base/dali-toolkit/images/popup_bubble_tail_bottom.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_bottom_ef.png [moved from base/dali-toolkit/images/popup_bubble_tail_bottom_ef.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_bottom_line.png [moved from base/dali-toolkit/images/popup_bubble_tail_bottom_line.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_top.png [moved from base/dali-toolkit/images/popup_bubble_tail_top.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_top_ef.png [moved from base/dali-toolkit/images/popup_bubble_tail_top_ef.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_top_line.png [moved from base/dali-toolkit/images/popup_bubble_tail_top_line.png with 100% similarity]
dali-toolkit/images/popup_scroll.png [moved from optional/dali-toolkit/images/popup_scroll.png with 100% similarity]
dali-toolkit/images/popup_tail_down.png [moved from optional/dali-toolkit/images/popup_tail_down.png with 100% similarity]
dali-toolkit/images/popup_tail_left.png [moved from optional/dali-toolkit/images/popup_tail_left.png with 100% similarity]
dali-toolkit/images/popup_tail_right.png [moved from optional/dali-toolkit/images/popup_tail_right.png with 100% similarity]
dali-toolkit/images/popup_tail_up.png [moved from optional/dali-toolkit/images/popup_tail_up.png with 100% similarity]
dali-toolkit/images/radio-button-selected.png [moved from base/dali-toolkit/images/radio-button-selected.png with 100% similarity]
dali-toolkit/images/radio-button-unselected.png [moved from base/dali-toolkit/images/radio-button-unselected.png with 100% similarity]
dali-toolkit/images/slider-popup-arrow.png [moved from optional/dali-toolkit/images/slider-popup-arrow.png with 100% similarity]
dali-toolkit/images/slider-popup.9.png [moved from optional/dali-toolkit/images/slider-popup.9.png with 100% similarity]
dali-toolkit/images/slider-popup.png [moved from optional/dali-toolkit/images/slider-popup.png with 100% similarity]
dali-toolkit/images/slider-skin-handle.png [moved from optional/dali-toolkit/images/slider-skin-handle.png with 100% similarity]
dali-toolkit/images/slider-skin-progress.9.png [moved from optional/dali-toolkit/images/slider-skin-progress.9.png with 100% similarity]
dali-toolkit/images/slider-skin-progress.png [moved from optional/dali-toolkit/images/slider-skin-progress.png with 100% similarity]
dali-toolkit/images/slider-skin.9.png [moved from optional/dali-toolkit/images/slider-skin.9.png with 100% similarity]
dali-toolkit/images/slider-skin.png [moved from optional/dali-toolkit/images/slider-skin.png with 100% similarity]
dali-toolkit/images/text-input-selection-handle-left-press.png [moved from base/dali-toolkit/images/text-input-selection-handle-left-press.png with 100% similarity]
dali-toolkit/images/text-input-selection-handle-left.png [moved from base/dali-toolkit/images/text-input-selection-handle-left.png with 100% similarity]
dali-toolkit/images/text-input-selection-handle-right-press.png [moved from base/dali-toolkit/images/text-input-selection-handle-right-press.png with 100% similarity]
dali-toolkit/images/text-input-selection-handle-right.png [moved from base/dali-toolkit/images/text-input-selection-handle-right.png with 100% similarity]
dali-toolkit/internal/builder/builder-actor.cpp [moved from base/dali-toolkit/internal/builder/builder-actor.cpp with 100% similarity]
dali-toolkit/internal/builder/builder-animations.cpp [moved from base/dali-toolkit/internal/builder/builder-animations.cpp with 100% similarity]
dali-toolkit/internal/builder/builder-declarations.h [moved from base/dali-toolkit/internal/builder/builder-declarations.h with 100% similarity]
dali-toolkit/internal/builder/builder-filesystem.h [moved from base/dali-toolkit/internal/builder/builder-filesystem.h with 100% similarity]
dali-toolkit/internal/builder/builder-get-is.inl.h [moved from base/dali-toolkit/internal/builder/builder-get-is.inl.h with 100% similarity]
dali-toolkit/internal/builder/builder-impl.cpp [moved from base/dali-toolkit/internal/builder/builder-impl.cpp with 100% similarity]
dali-toolkit/internal/builder/builder-impl.h [moved from base/dali-toolkit/internal/builder/builder-impl.h with 100% similarity]
dali-toolkit/internal/builder/builder-set-property.cpp [moved from base/dali-toolkit/internal/builder/builder-set-property.cpp with 100% similarity]
dali-toolkit/internal/builder/builder-signals.cpp [moved from base/dali-toolkit/internal/builder/builder-signals.cpp with 100% similarity]
dali-toolkit/internal/builder/json-parser-impl.cpp [moved from base/dali-toolkit/internal/builder/json-parser-impl.cpp with 100% similarity]
dali-toolkit/internal/builder/json-parser-impl.h [moved from base/dali-toolkit/internal/builder/json-parser-impl.h with 100% similarity]
dali-toolkit/internal/builder/json-parser-state.cpp [moved from base/dali-toolkit/internal/builder/json-parser-state.cpp with 100% similarity]
dali-toolkit/internal/builder/json-parser-state.h [moved from base/dali-toolkit/internal/builder/json-parser-state.h with 100% similarity]
dali-toolkit/internal/builder/optional-value.h [moved from base/dali-toolkit/internal/builder/optional-value.h with 100% similarity]
dali-toolkit/internal/builder/replacement.cpp [moved from base/dali-toolkit/internal/builder/replacement.cpp with 100% similarity]
dali-toolkit/internal/builder/replacement.h [moved from base/dali-toolkit/internal/builder/replacement.h with 100% similarity]
dali-toolkit/internal/builder/tree-node-manipulator.cpp [moved from base/dali-toolkit/internal/builder/tree-node-manipulator.cpp with 100% similarity]
dali-toolkit/internal/builder/tree-node-manipulator.h [moved from base/dali-toolkit/internal/builder/tree-node-manipulator.h with 100% similarity]
dali-toolkit/internal/controls/alignment/alignment-impl.cpp [moved from base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp with 84% similarity]
dali-toolkit/internal/controls/alignment/alignment-impl.h [moved from base/dali-toolkit/internal/controls/alignment/alignment-impl.h with 100% similarity]
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h [moved from optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp [moved from optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h [moved from optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/button-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/button-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/button-impl.h [moved from base/dali-toolkit/internal/controls/buttons/button-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/button-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/button-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-impl.h [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-impl.h [moved from base/dali-toolkit/internal/controls/buttons/push-button-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/radio-button-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/radio-button-impl.h [moved from base/dali-toolkit/internal/controls/buttons/radio-button-impl.h with 100% similarity]
dali-toolkit/internal/controls/cluster/cluster-impl.cpp [moved from optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/cluster/cluster-impl.h [moved from optional/dali-toolkit/internal/controls/cluster/cluster-impl.h with 100% similarity]
dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp [moved from optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/cluster/cluster-style-impl.h [moved from optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h with 100% similarity]
dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/effects-view/effects-view-impl.h [moved from optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h [moved from optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/image-view/masked-image-view-impl.h [moved from optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp [moved from optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/magnifier/magnifier-impl.h [moved from optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-bar.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/page-impl.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/page-impl.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/popup/popup-impl.cpp [moved from base/dali-toolkit/internal/controls/popup/popup-impl.cpp with 90% similarity]
dali-toolkit/internal/controls/popup/popup-impl.h [moved from base/dali-toolkit/internal/controls/popup/popup-impl.h with 98% similarity]
dali-toolkit/internal/controls/popup/popup-style-impl.cpp [moved from base/dali-toolkit/internal/controls/popup/popup-style-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/popup/popup-style-impl.h [moved from base/dali-toolkit/internal/controls/popup/popup-style-impl.h with 100% similarity]
dali-toolkit/internal/controls/relayout-controller-impl.cpp [moved from base/dali-toolkit/internal/controls/relayout-controller-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/relayout-controller-impl.h [moved from base/dali-toolkit/internal/controls/relayout-controller-impl.h with 100% similarity]
dali-toolkit/internal/controls/relayout-controller.cpp [moved from base/dali-toolkit/internal/controls/relayout-controller.cpp with 100% similarity]
dali-toolkit/internal/controls/relayout-controller.h [moved from base/dali-toolkit/internal/controls/relayout-controller.h with 100% similarity]
dali-toolkit/internal/controls/relayout-helper.cpp [moved from base/dali-toolkit/internal/controls/relayout-helper.cpp with 100% similarity]
dali-toolkit/internal/controls/relayout-helper.h [moved from base/dali-toolkit/internal/controls/relayout-helper.h with 100% similarity]
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp [moved from base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp with 90% similarity]
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h [moved from base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h with 98% similarity]
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp [moved from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h [moved from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h with 100% similarity]
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp [moved from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp with 100% similarity]
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h [moved from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp [moved from base/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h [moved from base/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scrollable-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h with 100% similarity]
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h [moved from optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/slider/slider-impl.cpp [moved from optional/dali-toolkit/internal/controls/slider/slider-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/slider/slider-impl.h [moved from optional/dali-toolkit/internal/controls/slider/slider-impl.h with 100% similarity]
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h [moved from optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/table-view/array-2d.h [moved from base/dali-toolkit/internal/controls/table-view/array-2d.h with 100% similarity]
dali-toolkit/internal/controls/table-view/table-view-impl.cpp [moved from base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp with 90% similarity]
dali-toolkit/internal/controls/table-view/table-view-impl.h [moved from base/dali-toolkit/internal/controls/table-view/table-view-impl.h with 97% similarity]
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp [moved from base/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/text-controls/text-label-impl.h [moved from base/dali-toolkit/internal/controls/text-controls/text-label-impl.h with 100% similarity]
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp [moved from optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h [moved from optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h with 100% similarity]
dali-toolkit/internal/controls/view/view-impl.cpp [moved from optional/dali-toolkit/internal/controls/view/view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/view/view-impl.h [moved from optional/dali-toolkit/internal/controls/view/view-impl.h with 100% similarity]
dali-toolkit/internal/file.list [new file with mode: 0644]
dali-toolkit/internal/filters/blur-two-pass-filter.cpp [moved from optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp with 100% similarity]
dali-toolkit/internal/filters/blur-two-pass-filter.h [moved from optional/dali-toolkit/internal/filters/blur-two-pass-filter.h with 100% similarity]
dali-toolkit/internal/filters/emboss-filter.cpp [moved from optional/dali-toolkit/internal/filters/emboss-filter.cpp with 100% similarity]
dali-toolkit/internal/filters/emboss-filter.h [moved from optional/dali-toolkit/internal/filters/emboss-filter.h with 100% similarity]
dali-toolkit/internal/filters/image-filter.cpp [moved from optional/dali-toolkit/internal/filters/image-filter.cpp with 100% similarity]
dali-toolkit/internal/filters/image-filter.h [moved from optional/dali-toolkit/internal/filters/image-filter.h with 100% similarity]
dali-toolkit/internal/filters/spread-filter.cpp [moved from optional/dali-toolkit/internal/filters/spread-filter.cpp with 100% similarity]
dali-toolkit/internal/filters/spread-filter.h [moved from optional/dali-toolkit/internal/filters/spread-filter.h with 100% similarity]
dali-toolkit/internal/focus-manager/focus-manager-impl.cpp [moved from base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp with 100% similarity]
dali-toolkit/internal/focus-manager/focus-manager-impl.h [moved from base/dali-toolkit/internal/focus-manager/focus-manager-impl.h with 100% similarity]
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp [moved from base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp with 100% similarity]
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h [moved from base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h with 100% similarity]
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp [moved from base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp with 100% similarity]
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h [moved from base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h with 100% similarity]
dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp [moved from optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/shader-effects/page-turn-effect-impl.h [moved from optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h with 100% similarity]
dali-toolkit/internal/shader-effects/water-effect-impl.cpp [moved from optional/dali-toolkit/internal/shader-effects/water-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/shader-effects/water-effect-impl.h [moved from optional/dali-toolkit/internal/shader-effects/water-effect-impl.h with 100% similarity]
dali-toolkit/internal/styling/style-manager-impl.cpp [moved from base/dali-toolkit/internal/styling/style-manager-impl.cpp with 100% similarity]
dali-toolkit/internal/styling/style-manager-impl.h [moved from base/dali-toolkit/internal/styling/style-manager-impl.h with 100% similarity]
dali-toolkit/internal/text/multi-language-support-impl.cpp [moved from base/dali-toolkit/internal/text/multi-language-support-impl.cpp with 100% similarity]
dali-toolkit/internal/text/multi-language-support-impl.h [moved from base/dali-toolkit/internal/text/multi-language-support-impl.h with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h with 100% similarity]
dali-toolkit/public-api/builder/builder.cpp [moved from base/dali-toolkit/public-api/builder/builder.cpp with 100% similarity]
dali-toolkit/public-api/builder/builder.h [moved from base/dali-toolkit/public-api/builder/builder.h with 100% similarity]
dali-toolkit/public-api/builder/json-parser.cpp [moved from base/dali-toolkit/public-api/builder/json-parser.cpp with 100% similarity]
dali-toolkit/public-api/builder/json-parser.h [moved from base/dali-toolkit/public-api/builder/json-parser.h with 100% similarity]
dali-toolkit/public-api/builder/tree-node.cpp [moved from base/dali-toolkit/public-api/builder/tree-node.cpp with 100% similarity]
dali-toolkit/public-api/builder/tree-node.h [moved from base/dali-toolkit/public-api/builder/tree-node.h with 100% similarity]
dali-toolkit/public-api/controls/alignment/alignment.cpp [moved from base/dali-toolkit/public-api/controls/alignment/alignment.cpp with 100% similarity]
dali-toolkit/public-api/controls/alignment/alignment.h [moved from base/dali-toolkit/public-api/controls/alignment/alignment.h with 100% similarity]
dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp [moved from optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/bloom-view/bloom-view.h [moved from optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h with 100% similarity]
dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp [moved from optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp with 100% similarity]
dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h [moved from optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h with 100% similarity]
dali-toolkit/public-api/controls/buttons/button.cpp [moved from base/dali-toolkit/public-api/controls/buttons/button.cpp with 100% similarity]
dali-toolkit/public-api/controls/buttons/button.h [moved from base/dali-toolkit/public-api/controls/buttons/button.h with 100% similarity]
dali-toolkit/public-api/controls/buttons/check-box-button.cpp [moved from base/dali-toolkit/public-api/controls/buttons/check-box-button.cpp with 100% similarity]
dali-toolkit/public-api/controls/buttons/check-box-button.h [moved from base/dali-toolkit/public-api/controls/buttons/check-box-button.h with 100% similarity]
dali-toolkit/public-api/controls/buttons/push-button.cpp [moved from base/dali-toolkit/public-api/controls/buttons/push-button.cpp with 100% similarity]
dali-toolkit/public-api/controls/buttons/push-button.h [moved from base/dali-toolkit/public-api/controls/buttons/push-button.h with 100% similarity]
dali-toolkit/public-api/controls/buttons/radio-button.cpp [moved from base/dali-toolkit/public-api/controls/buttons/radio-button.cpp with 100% similarity]
dali-toolkit/public-api/controls/buttons/radio-button.h [moved from base/dali-toolkit/public-api/controls/buttons/radio-button.h with 100% similarity]
dali-toolkit/public-api/controls/cluster/cluster-style.cpp [moved from optional/dali-toolkit/public-api/controls/cluster/cluster-style.cpp with 100% similarity]
dali-toolkit/public-api/controls/cluster/cluster-style.h [moved from optional/dali-toolkit/public-api/controls/cluster/cluster-style.h with 100% similarity]
dali-toolkit/public-api/controls/cluster/cluster.cpp [moved from optional/dali-toolkit/public-api/controls/cluster/cluster.cpp with 100% similarity]
dali-toolkit/public-api/controls/cluster/cluster.h [moved from optional/dali-toolkit/public-api/controls/cluster/cluster.h with 100% similarity]
dali-toolkit/public-api/controls/control-impl.cpp [moved from base/dali-toolkit/public-api/controls/control-impl.cpp with 100% similarity]
dali-toolkit/public-api/controls/control-impl.h [moved from base/dali-toolkit/public-api/controls/control-impl.h with 100% similarity]
dali-toolkit/public-api/controls/control.cpp [moved from base/dali-toolkit/public-api/controls/control.cpp with 100% similarity]
dali-toolkit/public-api/controls/control.h [moved from base/dali-toolkit/public-api/controls/control.h with 100% similarity]
dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp [moved from base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp with 100% similarity]
dali-toolkit/public-api/controls/default-controls/check-button-factory.h [moved from base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h with 100% similarity]
dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp [moved from base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp with 100% similarity]
dali-toolkit/public-api/controls/default-controls/push-button-factory.h [moved from base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h with 100% similarity]
dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp [moved from base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp with 100% similarity]
dali-toolkit/public-api/controls/default-controls/solid-color-actor.h [moved from base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h with 100% similarity]
dali-toolkit/public-api/controls/effects-view/effects-view.cpp [moved from optional/dali-toolkit/public-api/controls/effects-view/effects-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/effects-view/effects-view.h [moved from optional/dali-toolkit/public-api/controls/effects-view/effects-view.h with 100% similarity]
dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp [moved from optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h [moved from optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h with 100% similarity]
dali-toolkit/public-api/controls/image-view/masked-image-view.cpp [moved from optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/image-view/masked-image-view.h [moved from optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h with 100% similarity]
dali-toolkit/public-api/controls/magnifier/magnifier.cpp [moved from optional/dali-toolkit/public-api/controls/magnifier/magnifier.cpp with 100% similarity]
dali-toolkit/public-api/controls/magnifier/magnifier.h [moved from optional/dali-toolkit/public-api/controls/magnifier/magnifier.h with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h [moved from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp [moved from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/navigation-control.h [moved from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/page.cpp [moved from optional/dali-toolkit/public-api/controls/navigation-frame/page.cpp with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/page.h [moved from optional/dali-toolkit/public-api/controls/navigation-frame/page.h with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-factory.h [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h with 100% similarity]
dali-toolkit/public-api/controls/popup/popup.cpp [moved from base/dali-toolkit/public-api/controls/popup/popup.cpp with 100% similarity]
dali-toolkit/public-api/controls/popup/popup.h [moved from base/dali-toolkit/public-api/controls/popup/popup.h with 100% similarity]
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp [moved from base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp with 100% similarity]
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h [moved from base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-view.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-component.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-component.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-component.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-component.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-connector.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scrollable.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scrollable.h [moved from base/dali-toolkit/public-api/controls/scrollable/scrollable.h with 100% similarity]
dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp [moved from optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/shadow-view/shadow-view.h [moved from optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h with 100% similarity]
dali-toolkit/public-api/controls/slider/slider.cpp [moved from optional/dali-toolkit/public-api/controls/slider/slider.cpp with 100% similarity]
dali-toolkit/public-api/controls/slider/slider.h [moved from optional/dali-toolkit/public-api/controls/slider/slider.h with 100% similarity]
dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp [moved from optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h [moved from optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h with 100% similarity]
dali-toolkit/public-api/controls/table-view/table-view.cpp [moved from base/dali-toolkit/public-api/controls/table-view/table-view.cpp with 95% similarity]
dali-toolkit/public-api/controls/table-view/table-view.h [moved from base/dali-toolkit/public-api/controls/table-view/table-view.h with 95% similarity]
dali-toolkit/public-api/controls/text-controls/text-label.cpp [moved from base/dali-toolkit/public-api/controls/text-controls/text-label.cpp with 100% similarity]
dali-toolkit/public-api/controls/text-controls/text-label.h [moved from base/dali-toolkit/public-api/controls/text-controls/text-label.h with 100% similarity]
dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp [moved from optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp with 100% similarity]
dali-toolkit/public-api/controls/tool-bar/tool-bar.h [moved from optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h with 100% similarity]
dali-toolkit/public-api/controls/view/view.cpp [moved from optional/dali-toolkit/public-api/controls/view/view.cpp with 100% similarity]
dali-toolkit/public-api/controls/view/view.h [moved from optional/dali-toolkit/public-api/controls/view/view.h with 100% similarity]
dali-toolkit/public-api/dali-toolkit-version.cpp [moved from optional/dali-toolkit/public-api/dali-toolkit-version.cpp with 96% similarity]
dali-toolkit/public-api/dali-toolkit-version.h [moved from optional/dali-toolkit/public-api/dali-toolkit-version.h with 100% similarity]
dali-toolkit/public-api/enums.cpp [moved from base/dali-toolkit/public-api/enums.cpp with 100% similarity]
dali-toolkit/public-api/enums.h [moved from base/dali-toolkit/public-api/enums.h with 100% similarity]
dali-toolkit/public-api/file.list [new file with mode: 0755]
dali-toolkit/public-api/focus-manager/focus-manager.cpp [moved from base/dali-toolkit/public-api/focus-manager/focus-manager.cpp with 100% similarity]
dali-toolkit/public-api/focus-manager/focus-manager.h [moved from base/dali-toolkit/public-api/focus-manager/focus-manager.h with 100% similarity]
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp [moved from base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp with 100% similarity]
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h [moved from base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h with 100% similarity]
dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp [moved from base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp with 100% similarity]
dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h [moved from base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h with 100% similarity]
dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/alpha-discard-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/bendy-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/bendy-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/bendy-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/bendy-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/blind-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/blind-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/blind-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/blind-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/bouncing-effect.cpp [moved from base/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/bouncing-effect.h [moved from base/dali-toolkit/public-api/shader-effects/bouncing-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp [moved from optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h [moved from optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h with 100% similarity]
dali-toolkit/public-api/shader-effects/carousel-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/carousel-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/carousel-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/displacement-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/displacement-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/displacement-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/dissolve-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/dissolve-effect.h [moved from base/dali-toolkit/public-api/shader-effects/dissolve-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/dissolve-local-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/distance-field-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/distance-field-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/image-region-effect.cpp [moved from base/dali-toolkit/public-api/shader-effects/image-region-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/image-region-effect.h [moved from base/dali-toolkit/public-api/shader-effects/image-region-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/iris-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/iris-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/iris-effect.h [moved from base/dali-toolkit/public-api/shader-effects/iris-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/mask-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/mask-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/mask-effect.h [moved from base/dali-toolkit/public-api/shader-effects/mask-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/mirror-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/mirror-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/mirror-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/mirror-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/motion-blur-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/motion-stretch-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h [moved from base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/overlay-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/overlay-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/overlay-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/overlay-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h [moved from base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/page-turn-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/page-turn-effect.h [moved from base/dali-toolkit/public-api/shader-effects/page-turn-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/ripple-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/ripple-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/ripple-effect.h [moved from base/dali-toolkit/public-api/shader-effects/ripple-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/ripple2d-effect.h [moved from base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/shear-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/shear-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/shear-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/shear-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/soft-button-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/soft-button-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/spot-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/spot-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/spot-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/spot-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/square-dissolve-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/swirl-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/swirl-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/swirl-effect.h [moved from base/dali-toolkit/public-api/shader-effects/swirl-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/water-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/water-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/water-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/water-effect.h with 100% similarity]
dali-toolkit/public-api/styling/style-manager.cpp [moved from base/dali-toolkit/public-api/styling/style-manager.cpp with 100% similarity]
dali-toolkit/public-api/styling/style-manager.h [moved from base/dali-toolkit/public-api/styling/style-manager.h with 100% similarity]
dali-toolkit/public-api/text/bidirectional-line-info-run.h [moved from base/dali-toolkit/public-api/text/bidirectional-line-info-run.h with 100% similarity]
dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h [moved from base/dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h with 100% similarity]
dali-toolkit/public-api/text/bidirectional-support.cpp [moved from base/dali-toolkit/public-api/text/bidirectional-support.cpp with 100% similarity]
dali-toolkit/public-api/text/bidirectional-support.h [moved from base/dali-toolkit/public-api/text/bidirectional-support.h with 100% similarity]
dali-toolkit/public-api/text/character-run.h [moved from base/dali-toolkit/public-api/text/character-run.h with 100% similarity]
dali-toolkit/public-api/text/character-set-conversion.cpp [moved from base/dali-toolkit/public-api/text/character-set-conversion.cpp with 100% similarity]
dali-toolkit/public-api/text/character-set-conversion.h [moved from base/dali-toolkit/public-api/text/character-set-conversion.h with 100% similarity]
dali-toolkit/public-api/text/font-run.h [moved from base/dali-toolkit/public-api/text/font-run.h with 100% similarity]
dali-toolkit/public-api/text/layouts/layout-engine.cpp [moved from base/dali-toolkit/public-api/text/layouts/layout-engine.cpp with 100% similarity]
dali-toolkit/public-api/text/layouts/layout-engine.h [moved from base/dali-toolkit/public-api/text/layouts/layout-engine.h with 100% similarity]
dali-toolkit/public-api/text/logical-model.cpp [moved from base/dali-toolkit/public-api/text/logical-model.cpp with 100% similarity]
dali-toolkit/public-api/text/logical-model.h [moved from base/dali-toolkit/public-api/text/logical-model.h with 100% similarity]
dali-toolkit/public-api/text/multi-language-support.cpp [moved from base/dali-toolkit/public-api/text/multi-language-support.cpp with 100% similarity]
dali-toolkit/public-api/text/multi-language-support.h [moved from base/dali-toolkit/public-api/text/multi-language-support.h with 100% similarity]
dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp [moved from base/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp with 100% similarity]
dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h [moved from base/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h with 100% similarity]
dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.cpp [moved from base/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.cpp with 100% similarity]
dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h [moved from base/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h with 100% similarity]
dali-toolkit/public-api/text/rendering/text-renderer.cpp [moved from base/dali-toolkit/public-api/text/rendering/text-renderer.cpp with 100% similarity]
dali-toolkit/public-api/text/rendering/text-renderer.h [moved from base/dali-toolkit/public-api/text/rendering/text-renderer.h with 100% similarity]
dali-toolkit/public-api/text/script-run.h [moved from base/dali-toolkit/public-api/text/script-run.h with 100% similarity]
dali-toolkit/public-api/text/script.cpp [moved from base/dali-toolkit/public-api/text/script.cpp with 100% similarity]
dali-toolkit/public-api/text/script.h [moved from base/dali-toolkit/public-api/text/script.h with 100% similarity]
dali-toolkit/public-api/text/segmentation.cpp [moved from base/dali-toolkit/public-api/text/segmentation.cpp with 100% similarity]
dali-toolkit/public-api/text/segmentation.h [moved from base/dali-toolkit/public-api/text/segmentation.h with 100% similarity]
dali-toolkit/public-api/text/text-controller.cpp [moved from base/dali-toolkit/public-api/text/text-controller.cpp with 100% similarity]
dali-toolkit/public-api/text/text-controller.h [moved from base/dali-toolkit/public-api/text/text-controller.h with 100% similarity]
dali-toolkit/public-api/text/text-definitions.h [moved from base/dali-toolkit/public-api/text/text-definitions.h with 100% similarity]
dali-toolkit/public-api/text/text-view-interface.cpp [moved from base/dali-toolkit/public-api/text/text-view-interface.cpp with 100% similarity]
dali-toolkit/public-api/text/text-view-interface.h [moved from base/dali-toolkit/public-api/text/text-view-interface.h with 100% similarity]
dali-toolkit/public-api/text/text-view.cpp [moved from base/dali-toolkit/public-api/text/text-view.cpp with 100% similarity]
dali-toolkit/public-api/text/text-view.h [moved from base/dali-toolkit/public-api/text/text-view.h with 100% similarity]
dali-toolkit/public-api/text/visual-model.cpp [moved from base/dali-toolkit/public-api/text/visual-model.cpp with 100% similarity]
dali-toolkit/public-api/text/visual-model.h [moved from base/dali-toolkit/public-api/text/visual-model.h with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-effect.h [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h with 100% similarity]
dali-toolkit/sounds/End_of_List.ogg [moved from base/dali-toolkit/sounds/End_of_List.ogg with 100% similarity]
dali-toolkit/sounds/Focus.ogg [moved from base/dali-toolkit/sounds/Focus.ogg with 100% similarity]
dali-toolkit/sounds/List_scroll.ogg [moved from base/dali-toolkit/sounds/List_scroll.ogg with 100% similarity]
dali-toolkit/sounds/file.list [new file with mode: 0644]
dali-toolkit/styles/file.list [moved from base/dali-toolkit/styles/file.list with 58% similarity]
dali-toolkit/styles/tizen-dark-theme.json [moved from base/dali-toolkit/styles/tizen-dark-theme.json with 100% similarity]
dali-toolkit/styles/tizen-default-theme.json [moved from base/dali-toolkit/styles/tizen-default-theme.json with 100% similarity]
docs/generated-internal/.gitignore [new file with mode: 0644]
docs/generated-internal/README.md [new file with mode: 0644]
optional/dali-toolkit/images/file.list [deleted file]
optional/dali-toolkit/internal/file.list [deleted file]
optional/dali-toolkit/public-api/file.list [deleted file]
packaging/dali-toolkit.spec

index d63dc57..e7dc7cb 100644 (file)
@@ -50,8 +50,7 @@ ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 INCLUDE_DIRECTORIES(
     ${${CAPI_LIB}_INCLUDE_DIRS}
     ../dali-toolkit/dali-toolkit-test-utils
-    ../../../base
-    ../../../optional
+    ../../../
 )
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
index 7f784b6..e2b419e 100644 (file)
@@ -50,10 +50,9 @@ DummyControl& DummyControl::operator=(const DummyControl& control)
 }
 
 // Used to test signal connections
-void DummyControlImpl::CustomSlot1( Actor actor, const Vector3& value )
+void DummyControlImpl::CustomSlot1( Actor actor )
 {
   mCustomSlot1Called = true;
-  mCustomSlot1Value = value;
 }
 
 DummyControl DummyControlImpl::New()
@@ -66,8 +65,7 @@ DummyControl DummyControlImpl::New()
 
 DummyControlImpl::DummyControlImpl()
 : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
-  mCustomSlot1Called(false),
-  mCustomSlot1Value(Vector3::ZERO)
+  mCustomSlot1Called(false)
 {
 }
 
index 96f10b2..d923ac1 100644 (file)
@@ -72,10 +72,9 @@ public:
   inline LongPressGestureDetector GetLongPressGestureDetector() const { return Internal::Control::GetLongPressGestureDetector(); }
 
   // Used to test signal connections
-  void CustomSlot1( Actor actor, const Vector3& value );
+  void CustomSlot1( Actor actor );
 
   bool mCustomSlot1Called;
-  Vector3 mCustomSlot1Value;
 
 protected:
 
index c58bb83..95136ce 100644 (file)
@@ -271,28 +271,24 @@ int UtcDaliControlSignalConnectDisconnect(void)
     DummyControl dummy = DummyControlImpl::New();
 
     Actor actor = Actor::New();
-    DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION );
     Toolkit::Internal::Control& control = dummy.GetImplementation();
     DummyControlImpl* dummyImpl = dynamic_cast<DummyControlImpl*>(&control);
     DALI_TEST_CHECK( dummyImpl );
 
-    actor.SetSizeSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+    actor.OnStageSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
+    DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 1u, TEST_LOCATION );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Value,  Vector3::ZERO, TEST_LOCATION );
 
-    const Vector3 newSize( 10, 10, 0 );
-    actor.SetSize( newSize );
+    Stage::GetCurrent().Add( actor );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, true, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Value,  newSize, TEST_LOCATION );
 
     dummyImpl->mCustomSlot1Called = false;
-    actor.SetSizeSignal().Disconnect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 0u, TEST_LOCATION );
-    const Vector3 ignoredSize( 20, 20, 0 );
-    actor.SetSize( ignoredSize );
+    actor.OnStageSignal().Disconnect( dummyImpl, &DummyControlImpl::CustomSlot1 );
+    DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION );
+    Stage::GetCurrent().Remove( actor );
+    Stage::GetCurrent().Add( actor );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Value,  newSize/*not ignoredSize*/, TEST_LOCATION );
   }
   END_TEST;
 }
@@ -309,19 +305,17 @@ int UtcDaliControlSignalAutomaticDisconnect(void)
     DummyControlImpl* dummyImpl = dynamic_cast<DummyControlImpl*>(&control);
     DALI_TEST_CHECK( dummyImpl );
 
-    actor.SetSizeSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+    actor.OnStageSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
+    DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 1u, TEST_LOCATION );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Value,  Vector3::ZERO, TEST_LOCATION );
 
-    const Vector3 newSize( 10, 10, 0 );
-    actor.SetSize( newSize );
+    Stage::GetCurrent().Add( actor );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, true, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Value,  newSize, TEST_LOCATION );
+    Stage::GetCurrent().Remove( actor );
   }
   // dummyControl automatically disconnects
 
-  DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION );
 
   const Vector3 ignoredSize( 20, 20, 0 );
   actor.SetSize( ignoredSize );
index 7fe943a..b32c92e 100644 (file)
@@ -39,7 +39,6 @@ namespace
 const char* const PROPERTY_NAME_ROWS = "rows";
 const char* const PROPERTY_NAME_COLUMNS = "columns";
 const char* const PROPERTY_NAME_CELL_PADDING = "cell-padding";
-const char* const PROPERTY_NAME_LAYOUT_ANIMATION_DURATION = "layout-animation-duration";
 const char* const PROPERTY_NAME_LAYOUT_ROWS = "layout-rows";
 const char* const PROPERTY_NAME_LAYOUT_COLUMNS = "layout-columns";
 
@@ -74,8 +73,7 @@ static void SetupTableViewAndActors(TableView& tableView, Actor& actor1, Actor&
   DALI_TEST_CHECK(tableView);
 
   Stage::GetCurrent().Add( tableView );
-  tableView.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, Constraint100() ) );
-  tableView.SetLayoutAnimationDuration(0.0f);
+  tableView.SetSize( Dali::Vector3( 100.0f, 100.0f, 100.0f ) );
 
   actor1 = Actor::New();
   actor2 = Actor::New();
@@ -220,23 +218,6 @@ int UtcDaliTableViewMetricsRelative(void)
 }
 
 
-// Test animation duration setting.
-int UtcDaliTableViewAnimation(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline("UtcDaliTableViewAnimation");
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK(tableView);
-
-  tableView.SetLayoutAnimationDuration(5.0f);
-  DALI_TEST_EQUALS(tableView.GetLayoutAnimationDuration(), 5.0f, TEST_LOCATION);
-
-  tableView.SetLayoutAnimationDuration(2.5f);
-  DALI_TEST_EQUALS(tableView.GetLayoutAnimationDuration(), 2.5f, TEST_LOCATION);
-  END_TEST;
-}
-
 // Test Adding/Removing/Finding Children.
 int UtcDaliTableViewChild(void)
 {
@@ -585,14 +566,6 @@ int UtcDaliTableViewSetGetProperty(void)
   DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(6.f, 8.f), TEST_LOCATION );
   DALI_TEST_EQUALS( tableView.GetProperty(TableView::PROPERTY_CELL_PADDING).Get<Vector2>(), Vector2(6.f,8.f), TEST_LOCATION );
 
-  // Test "layout-animation-duration" property
-  DALI_TEST_CHECK( tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_ANIMATION_DURATION) == TableView::PROPERTY_LAYOUT_ANIMATION_DURATION );
-
-  tableView.SetProperty( TableView::PROPERTY_LAYOUT_ANIMATION_DURATION, 1.5f );
-
-  DALI_TEST_EQUALS( tableView.GetLayoutAnimationDuration(), 1.5f, TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.GetProperty(TableView::PROPERTY_LAYOUT_ANIMATION_DURATION).Get<float>(), 1.5f, TEST_LOCATION );
-
   //{ "policy": "fixed", "value": 30.0 },
   Property::Map item1;
   item1[ "policy" ] = "fixed";
diff --git a/base/dali-toolkit/images/file.list b/base/dali-toolkit/images/file.list
deleted file mode 100644 (file)
index 2eec674..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Files to install here
-
-dali_toolkit_base_image_files =\
-    $(toolkit_base_images_dir)/*.png
diff --git a/base/dali-toolkit/internal/file.list b/base/dali-toolkit/internal/file.list
deleted file mode 100644 (file)
index 621ffbc..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# Add local source files here
-
-toolkit_base_src_files = \
-   $(toolkit_base_src_dir)/controls/relayout-controller.cpp \
-   $(toolkit_base_src_dir)/controls/relayout-controller-impl.cpp \
-   $(toolkit_base_src_dir)/controls/relayout-helper.cpp \
-   $(toolkit_base_src_dir)/controls/alignment/alignment-impl.cpp \
-   $(toolkit_base_src_dir)/controls/buttons/button-impl.cpp \
-   $(toolkit_base_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \
-   $(toolkit_base_src_dir)/controls/buttons/check-box-button-impl.cpp \
-   $(toolkit_base_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \
-   $(toolkit_base_src_dir)/controls/buttons/push-button-impl.cpp \
-   $(toolkit_base_src_dir)/controls/buttons/radio-button-impl.cpp \
-   $(toolkit_base_src_dir)/controls/popup/popup-impl.cpp \
-   $(toolkit_base_src_dir)/controls/popup/popup-style-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/bouncing-effect-actor.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scrollable-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-connector-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
-   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
-   $(toolkit_base_src_dir)/controls/table-view/table-view-impl.cpp \
-   $(toolkit_base_src_dir)/controls/text-controls/text-label-impl.cpp \
-   $(toolkit_base_src_dir)/focus-manager/focus-manager-impl.cpp \
-   $(toolkit_base_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
-   $(toolkit_base_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \
-   $(toolkit_base_src_dir)/styling/style-manager-impl.cpp \
-   $(toolkit_base_src_dir)/text/multi-language-support-impl.cpp \
-   $(toolkit_base_src_dir)/builder/builder-impl.cpp \
-   $(toolkit_base_src_dir)/builder/builder-animations.cpp \
-   $(toolkit_base_src_dir)/builder/builder-set-property.cpp \
-   $(toolkit_base_src_dir)/builder/builder-signals.cpp \
-   $(toolkit_base_src_dir)/builder/builder-actor.cpp \
-   $(toolkit_base_src_dir)/builder/json-parser-state.cpp \
-   $(toolkit_base_src_dir)/builder/json-parser-impl.cpp \
-   $(toolkit_base_src_dir)/builder/tree-node-manipulator.cpp \
-   $(toolkit_base_src_dir)/builder/replacement.cpp
diff --git a/base/dali-toolkit/public-api/file.list b/base/dali-toolkit/public-api/file.list
deleted file mode 100755 (executable)
index 80bef3c..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-# Add local source files here
-
-public_api_base_src_files = \
-  $(public_api_base_src_dir)/enums.cpp \
-  $(public_api_base_src_dir)/controls/control.cpp \
-  $(public_api_base_src_dir)/controls/control-impl.cpp \
-  $(public_api_base_src_dir)/controls/alignment/alignment.cpp \
-  $(public_api_base_src_dir)/controls/buttons/button.cpp \
-  $(public_api_base_src_dir)/controls/buttons/check-box-button.cpp \
-  $(public_api_base_src_dir)/controls/buttons/push-button.cpp \
-  $(public_api_base_src_dir)/controls/buttons/radio-button.cpp \
-  $(public_api_base_src_dir)/controls/default-controls/solid-color-actor.cpp \
-  $(public_api_base_src_dir)/controls/default-controls/check-button-factory.cpp \
-  $(public_api_base_src_dir)/controls/default-controls/push-button-factory.cpp \
-  $(public_api_base_src_dir)/controls/popup/popup.cpp \
-  $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/item-factory.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/item-layout.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/item-view.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/depth-layout.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/grid-layout.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scrollable.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-connector.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-component.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
-  $(public_api_base_src_dir)/controls/table-view/table-view.cpp \
-  $(public_api_base_src_dir)/controls/text-controls/text-label.cpp \
-  $(public_api_base_src_dir)/text/bidirectional-support.cpp \
-  $(public_api_base_src_dir)/text/character-set-conversion.cpp \
-  $(public_api_base_src_dir)/text/logical-model.cpp \
-  $(public_api_base_src_dir)/text/multi-language-support.cpp \
-  $(public_api_base_src_dir)/text/script.cpp \
-  $(public_api_base_src_dir)/text/segmentation.cpp \
-  $(public_api_base_src_dir)/text/text-controller.cpp \
-  $(public_api_base_src_dir)/text/text-view.cpp \
-  $(public_api_base_src_dir)/text/text-view-interface.cpp \
-  $(public_api_base_src_dir)/text/visual-model.cpp \
-  $(public_api_base_src_dir)/text/layouts/layout-engine.cpp \
-  $(public_api_base_src_dir)/text/rendering/text-renderer.cpp \
-  $(public_api_base_src_dir)/text/rendering/basic/text-basic-renderer.cpp \
-  $(public_api_base_src_dir)/text/rendering/shaders/text-basic-shader.cpp \
-  $(public_api_base_src_dir)/focus-manager/focus-manager.cpp \
-  $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.cpp \
-  $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.cpp \
-  $(public_api_base_src_dir)/shader-effects/image-region-effect.cpp \
-  $(public_api_base_src_dir)/shader-effects/bouncing-effect.cpp \
-  $(public_api_base_src_dir)/styling/style-manager.cpp \
-  $(public_api_base_src_dir)/builder/builder.cpp \
-  $(public_api_base_src_dir)/builder/json-parser.cpp \
-  $(public_api_base_src_dir)/builder/tree-node.cpp
-
-# Add public header files here
-
-public_api_base_header_files = \
-  $(public_api_base_src_dir)/enums.h
-
-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_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/button.h \
-  $(public_api_base_src_dir)/controls/buttons/push-button.h \
-  $(public_api_base_src_dir)/controls/buttons/radio-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/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/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_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/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 \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \
-  $(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.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-cube-effect.h \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h
-
-public_api_base_table_view_header_files = \
-  $(public_api_base_src_dir)/controls/table-view/table-view.h
-
-public_api_base_text_controls_header_files = \
-  $(public_api_base_src_dir)/controls/text-controls/text-label.h
-
-public_api_base_text_header_files = \
-  $(public_api_base_src_dir)/text/bidirectional-support.h \
-  $(public_api_base_src_dir)/text/character-run.h \
-  $(public_api_base_src_dir)/text/character-set-conversion.h \
-  $(public_api_base_src_dir)/text/font-run.h \
-  $(public_api_base_src_dir)/text/logical-model.h \
-  $(public_api_base_src_dir)/text/multi-language-support.h \
-  $(public_api_base_src_dir)/text/script.h \
-  $(public_api_base_src_dir)/text/script-run.h \
-  $(public_api_base_src_dir)/text/segmentation.h \
-  $(public_api_base_src_dir)/text/text-controller.h \
-  $(public_api_base_src_dir)/text/text-definitions.h \
-  $(public_api_base_src_dir)/text/text-view.h \
-  $(public_api_base_src_dir)/text/text-view-interface.h \
-  $(public_api_base_src_dir)/text/visual-model.h
-
-public_api_base_text_layouts_header_files = \
-  $(public_api_base_src_dir)/text/layouts/layout-engine.h
-
-public_api_base_text_rendering_header_files = \
-  $(public_api_base_src_dir)/text/rendering/text-renderer.h
-
-public_api_base_text_rendering_basic_header_files = \
-  $(public_api_base_src_dir)/text/rendering/basic/text-basic-renderer.h
-
-public_api_base_text_rendering_shaders_header_files = \
-  $(public_api_base_src_dir)/text/rendering/shaders/text-basic-shader.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/focus-manager.h \
-  $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.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/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
-
-public_api_base_builder_header_files = \
-  $(public_api_base_src_dir)/builder/builder.h \
-  $(public_api_base_src_dir)/builder/json-parser.h \
-  $(public_api_base_src_dir)/builder/tree-node.h
diff --git a/base/dali-toolkit/sounds/file.list b/base/dali-toolkit/sounds/file.list
deleted file mode 100644 (file)
index 74ee1c1..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Files to install here
-
-dali_toolkit_base_sound_files =\
-       $(toolkit_base_sounds_dir)/*.ogg
index 995dfa1..03b1b42 100644 (file)
@@ -60,10 +60,6 @@ AC_ARG_ENABLE([profile],
               [dali_profile=$enableval],
               [dali_profile=COMMON])
 
-# Different platforms use either the full Toolkit or the basic version
-# The basic version excludes components under dali-toolkit/optional
-AM_CONDITIONAL([TOOLKIT_BASIC_VERSION], [test x$dali_profile = xLITE])
-
 if test x$DALI_DATA_RW_DIR != x; then
   dataReadWriteDir=${DALI_DATA_RW_DIR}/
 else
index 3be1007..7f49efa 100644 (file)
 
 # Build the Dali Toolkit library
 
-# Base files
-toolkit_base_images_dir = ../../../base/dali-toolkit/images
-toolkit_base_sounds_dir = ../../../base/dali-toolkit/sounds
-toolkit_base_styles_dir = ../../../base/dali-toolkit/styles
-toolkit_base_src_dir    = ../../../base/dali-toolkit/internal
-public_api_base_src_dir = ../../../base/dali-toolkit/public-api
-
-include ../../../base/dali-toolkit/images/file.list
-include ../../../base/dali-toolkit/sounds/file.list
-include ../../../base/dali-toolkit/styles/file.list
-include ../../../base/dali-toolkit/internal/file.list
-include ../../../base/dali-toolkit/public-api/file.list
-
-# Optional files
-toolkit_optional_images_dir = ../../../optional/dali-toolkit/images
-toolkit_optional_src_dir    = ../../../optional/dali-toolkit/internal
-public_api_optional_src_dir = ../../../optional/dali-toolkit/public-api
-
-include ../../../optional/dali-toolkit/images/file.list
-include ../../../optional/dali-toolkit/internal/file.list
-include ../../../optional/dali-toolkit/public-api/file.list
+toolkit_images_dir = ../../../dali-toolkit/images
+toolkit_sounds_dir = ../../../dali-toolkit/sounds
+toolkit_styles_dir = ../../../dali-toolkit/styles
+toolkit_src_dir    = ../../../dali-toolkit/internal
+public_api_src_dir = ../../../dali-toolkit/public-api
+
+include ../../../dali-toolkit/images/file.list
+include ../../../dali-toolkit/sounds/file.list
+include ../../../dali-toolkit/styles/file.list
+include ../../../dali-toolkit/internal/file.list
+include ../../../dali-toolkit/public-api/file.list
 
 resources_dir = ../../../resources
 daliimagedir = ${dataReadOnlyDir}/toolkit/images/
-if TOOLKIT_BASIC_VERSION
-daliimage_DATA = ${dali_toolkit_base_image_files}
-else
-daliimage_DATA = ${dali_toolkit_base_image_files} \
-                 ${dali_toolkit_optional_image_files}
-endif # TOOLKIT_BASIC_VERSION
+daliimage_DATA = ${dali_toolkit_image_files}
 
 dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
-dalisound_DATA = ${dali_toolkit_base_sound_files}
+dalisound_DATA = ${dali_toolkit_sound_files}
 
 # The library
 lib_LTLIBRARIES = libdali-toolkit.la
 
-if TOOLKIT_BASIC_VERSION
 libdali_toolkit_la_SOURCES = \
-                     $(toolkit_base_src_files) \
-                     $(public_api_base_src_files)
-else
-libdali_toolkit_la_SOURCES = \
-                     $(toolkit_base_src_files) \
-                     $(public_api_base_src_files) \
-                     $(toolkit_optional_src_files) \
-                     $(public_api_optional_src_files)
-endif # TOOLKIT_BASIC_VERSION
+                     $(toolkit_src_files) \
+                     $(public_api_src_files)
 
 dalistyledir = ${dataReadOnlyDir}/toolkit/styles/
 dalistyle_DATA = ${dali_toolkit_style_files}
 
 libdali_toolkit_la_DEPENDENCIES =
 
-toolkit_basic_includes = -I../../../base
-
-if ! TOOLKIT_BASIC_VERSION
-toolkit_optional_includes = -I../../../optional
-endif
-
 libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
                       -DDALI_SOUND_DIR="\"${dalisounddir}\"" \
                       -DDALI_STYLE_DIR="\"${dalistyledir}\"" \
                       -DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \
                       -Werror -Wall \
-                      $(toolkit_basic_includes) \
-                      $(toolkit_optional_includes) \
+                      -I../../../ \
                       $(DALI_TOOLKIT_CFLAGS) \
                       $(DALICORE_CFLAGS) \
                       $(DALI_CFLAGS) \
@@ -98,102 +68,89 @@ libdali_toolkit_la_LIBADD = \
                       $(FRIBIDI_LIBS) \
                       $(HTMLCXX_LIBS)
 
-# Install Base headers
-
-toplevelbasedir = $(devincludepath)/dali-toolkit
-
-publicapibasedir = $(toplevelbasedir)/public-api
-publicapibasecontrolsdir = $(publicapibasedir)/controls
-publicapibasealignmentdir = $(publicapibasedir)/controls/alignment
-publicapibasebuttonsdir = $(publicapibasedir)/controls/buttons
-publicapibasedefaultcontrolsdir = $(publicapibasedir)/controls/default-controls
-publicapibaseitemviewdir = $(publicapibasedir)/controls/scrollable/item-view
-publicapibasepopupdir = $(publicapibasedir)/controls/popup
-publicapibasescrollbardir = $(publicapibasedir)/controls/scroll-bar
-publicapibasescrollcomponentdir = $(publicapibasedir)/controls/scroll-component
-publicapibasescrollabledir = $(publicapibasedir)/controls/scrollable
-publicapibasescrollviewdir = $(publicapibasedir)/controls/scrollable/scroll-view
-publicapibasetableviewdir = $(publicapibasedir)/controls/table-view
-publicapibasetextcontrolsdir = $(publicapibasedir)/controls/text-controls
-publicapibasetextdir = $(publicapibasedir)/text
-publicapibasetextlayoutsdir = $(publicapibasedir)/text/layouts
-publicapibasetextrenderingdir = $(publicapibasedir)/text/rendering
-publicapibasetextrenderingbasicdir = $(publicapibasedir)/text/rendering/basic
-publicapibasetextrenderingshadersdir = $(publicapibasedir)/text/rendering/shaders
-publicapibasefactorydir = $(publicapibasedir)/factory
-publicapibasefocusmanagerdir = $(publicapibasedir)/focus-manager
-publicapibasemarkupprocessordir = $(publicapibasedir)/markup-processor
-publicapibaseshadereffectsdir = $(publicapibasedir)/shader-effects
-publicapibasestylingdir = $(publicapibasedir)/styling
-publicapibasebuilderdir = $(publicapibasedir)/builder
-
-publicapibase_HEADERS = $(public_api_base_header_files)
-publicapibasecontrols_HEADERS = $(public_api_base_controls_header_files)
-publicapibasealignment_HEADERS = $(public_api_base_alignment_header_files)
-publicapibasebuttons_HEADERS = $(public_api_base_buttons_header_files)
-publicapibasedefaultcontrols_HEADERS = $(public_api_base_default_controls_header_files)
-publicapibaseitemview_HEADERS = $(public_api_base_item_view_header_files)
-publicapibasepopup_HEADERS = $(public_api_base_popup_header_files)
-publicapibasescrollbar_HEADERS = $(public_api_base_scroll_bar_header_files)
-publicapibasescrollcomponent_HEADERS = $(public_api_base_scroll_component_header_files)
-publicapibasescrollable_HEADERS = $(public_api_base_scrollable_header_files)
-publicapibasescrollview_HEADERS = $(public_api_base_scroll_view_header_files)
-publicapibasetableview_HEADERS = $(public_api_base_table_view_header_files)
-publicapibasetextcontrols_HEADERS = $(public_api_base_text_controls_header_files)
-publicapibasetext_HEADERS = $(public_api_base_text_header_files)
-publicapibasetextlayouts_HEADERS = $(public_api_base_text_layouts_header_files)
-publicapibasetextrendering_HEADERS = $(public_api_base_text_rendering_header_files)
-publicapibasetextrenderingbasic_HEADERS = $(public_api_base_text_rendering_basic_header_files)
-publicapibasetextrenderingshaders_HEADERS = $(public_api_base_text_rendering_shaders_header_files)
-publicapibasefocusmanager_HEADERS = $(public_api_base_focus_manager_header_files)
-publicapibasemarkupprocessor_HEADERS = $(public_api_base_markup_processor_header_files)
-publicapibaseshadereffects_HEADERS = $(public_api_base_shader_effects_header_files)
-publicapibasestyling_HEADERS = $(public_api_base_styling_header_files)
-publicapibasebuilder_HEADERS = $(public_api_base_builder_header_files)
-
-# Install Optional headers
-
-topleveloptionaldir = $(devincludepath)/dali-toolkit
-topleveloptional_HEADERS = ../../../optional/dali-toolkit/dali-toolkit.h
-
-publicapioptionaldir = $(topleveloptionaldir)/public-api
-publicapioptionalcontrolsdir = $(publicapioptionaldir)/controls
-publicapioptionalbloomviewdir = $(publicapioptionaldir)/controls/bloom-view
-publicapioptionalclusterdir = $(publicapioptionaldir)/controls/cluster
-publicapioptionaleffectsviewdir = $(publicapioptionaldir)/controls/effects-view
-publicapioptionalgaussianblurviewdir = $(publicapioptionaldir)/controls/gaussian-blur-view
-publicapioptionalimageviewdir = $(publicapioptionaldir)/controls/image-view
-publicapioptionalmagnifierdir = $(publicapioptionaldir)/controls/magnifier
-publicapioptionalpageturnviewdir = $(publicapioptionaldir)/controls/page-turn-view
-publicapioptionalsliderdir = $(publicapioptionaldir)/controls/slider
-publicapioptionaltoolbardir = $(publicapioptionaldir)/controls/tool-bar
-publicapioptionalselectorsdir = $(publicapioptionaldir)/controls/selectors
-publicapioptionalshadowviewdir = $(publicapioptionaldir)/controls/shadow-view
-publicapioptionalbubbleemitterdir = $(publicapioptionaldir)/controls/bubble-effect
-publicapioptionalsuperblurviewdir = $(publicapioptionaldir)/controls/super-blur-view
-publicapioptionalviewdir = $(publicapioptionaldir)/controls/view
-publicapioptionalnavigationframedir = $(publicapioptionaldir)/controls/navigation-frame
-publicapioptionalshadereffectsdir = $(publicapioptionaldir)/shader-effects
-publicapioptionalbubbleeffectdir = $(publicapioptionaldir)/shader-effects/bubble-effect
-publicapioptionaltransitioneffectsdir = $(publicapioptionaldir)/transition-effects
-
-publicapioptional_HEADERS = $(public_api_optional_header_files)
-publicapioptionalcontrols_HEADERS = $(public_api_optional_controls_header_files)
-publicapioptionalbloomview_HEADERS = $(public_api_optional_bloom_view_header_files)
-publicapioptionalcluster_HEADERS = $(public_api_optional_cluster_header_files)
-publicapioptionaleffectsview_HEADERS = $(public_api_optional_effects_view_header_files)
-publicapioptionalgaussianblurview_HEADERS = $(public_api_optional_gaussian_blur_view_header_files)
-publicapioptionalimageview_HEADERS = $(public_api_optional_image_view_header_files)
-publicapioptionalmagnifier_HEADERS = $(public_api_optional_magnifier_header_files)
-publicapioptionalpageturnview_HEADERS = $(public_api_optional_page_turn_view_header_files)
-publicapioptionalslider_HEADERS = $(public_api_optional_slider_header_files)
-publicapioptionaltoolbar_HEADERS = $(public_api_optional_tool_bar_header_files)
-publicapioptionalselectors_HEADERS = $(public_api_optional_selectors_header_files)
-publicapioptionalshadowview_HEADERS = $(public_api_optional_shadow_view_header_files)
-publicapioptionalbubbleemitter_HEADERS = $(public_api_optional_bubble_emitter_header_files)
-publicapioptionalsuperblurview_HEADERS = $(public_api_optional_super_blur_view_header_files)
-publicapioptionalview_HEADERS = $(public_api_optional_view_header_files)
-publicapioptionalnavigationframe_HEADERS = $(public_api_optional_navigation_frame_header_files)
-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 headers
+
+topleveldir = $(devincludepath)/dali-toolkit
+toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h
+
+publicapidir = $(topleveldir)/public-api
+
+publicapicontrolsdir = $(publicapidir)/controls
+publicapialignmentdir = $(publicapicontrolsdir)/alignment
+publicapibloomviewdir = $(publicapicontrolsdir)/bloom-view
+publicapibubbleemitterdir = $(publicapicontrolsdir)/bubble-effect
+publicapibuttonsdir = $(publicapicontrolsdir)/buttons
+publicapiclusterdir = $(publicapicontrolsdir)/cluster
+publicapidefaultcontrolsdir = $(publicapicontrolsdir)/default-controls
+publicapieffectsviewdir = $(publicapicontrolsdir)/effects-view
+publicapigaussianblurviewdir = $(publicapicontrolsdir)/gaussian-blur-view
+publicapiimageviewdir = $(publicapicontrolsdir)/image-view
+publicapiitemviewdir = $(publicapicontrolsdir)/scrollable/item-view
+publicapimagnifierdir = $(publicapicontrolsdir)/magnifier
+publicapinavigationframedir = $(publicapicontrolsdir)/navigation-frame
+publicapipageturnviewdir = $(publicapicontrolsdir)/page-turn-view
+publicapipopupdir = $(publicapicontrolsdir)/popup
+publicapiscrollbardir = $(publicapicontrolsdir)/scroll-bar
+publicapiscrollcomponentdir = $(publicapicontrolsdir)/scroll-component
+publicapiscrollabledir = $(publicapicontrolsdir)/scrollable
+publicapiscrollviewdir = $(publicapicontrolsdir)/scrollable/scroll-view
+publicapiselectorsdir = $(publicapicontrolsdir)/selectors
+publicapishadowviewdir = $(publicapicontrolsdir)/shadow-view
+publicapisliderdir = $(publicapicontrolsdir)/slider
+publicapisuperblurviewdir = $(publicapicontrolsdir)/super-blur-view
+publicapitableviewdir = $(publicapicontrolsdir)/table-view
+publicapitextcontrolsdir = $(publicapidir)/controls/text-controls
+publicapitextdir = $(publicapidir)/text
+publicapitextlayoutsdir = $(publicapidir)/text/layouts
+publicapitextrenderingdir = $(publicapidir)/text/rendering
+publicapitextrenderingbasicdir = $(publicapidir)/text/rendering/basic
+publicapitextrenderingshadersdir = $(publicapidir)/text/rendering/shaders
+publicapitoolbardir = $(publicapicontrolsdir)/tool-bar
+publicapiviewdir = $(publicapicontrolsdir)/view
+publicapibuilderdir = $(publicapidir)/builder
+publicapifocusmanagerdir = $(publicapidir)/focus-manager
+publicapishadereffectsdir = $(publicapidir)/shader-effects
+publicapibubbleeffectdir = $(publicapidir)/shader-effects/bubble-effect
+publicapistylingdir = $(publicapidir)/styling
+publicapitransitioneffectsdir = $(publicapidir)/transition-effects
+
+publicapi_HEADERS = $(public_api_header_files)
+publicapicontrols_HEADERS = $(public_api_controls_header_files)
+publicapialignment_HEADERS = $(public_api_alignment_header_files)
+publicapibloomview_HEADERS = $(public_api_bloom_view_header_files)
+publicapibubbleemitter_HEADERS = $(public_api_bubble_emitter_header_files)
+publicapibuttons_HEADERS = $(public_api_buttons_header_files)
+publicapicluster_HEADERS = $(public_api_cluster_header_files)
+publicapidefaultcontrols_HEADERS = $(public_api_default_controls_header_files)
+publicapieffectsview_HEADERS = $(public_api_effects_view_header_files)
+publicapigaussianblurview_HEADERS = $(public_api_gaussian_blur_view_header_files)
+publicapiimageview_HEADERS = $(public_api_image_view_header_files)
+publicapiitemview_HEADERS = $(public_api_item_view_header_files)
+publicapimagnifier_HEADERS = $(public_api_magnifier_header_files)
+publicapinavigationframe_HEADERS = $(public_api_navigation_frame_header_files)
+publicapipageturnview_HEADERS = $(public_api_page_turn_view_header_files)
+publicapipopup_HEADERS = $(public_api_popup_header_files)
+publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files)
+publicapiscrollcomponent_HEADERS = $(public_api_scroll_component_header_files)
+publicapiscrollable_HEADERS = $(public_api_scrollable_header_files)
+publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files)
+publicapiselectors_HEADERS = $(public_api_selectors_header_files)
+publicapishadowview_HEADERS = $(public_api_shadow_view_header_files)
+publicapislider_HEADERS = $(public_api_slider_header_files)
+publicapisuperblurview_HEADERS = $(public_api_super_blur_view_header_files)
+publicapitableview_HEADERS = $(public_api_table_view_header_files)
+publicapitextcontrols_HEADERS = $(public_api_text_controls_header_files)
+publicapitext_HEADERS = $(public_api_text_header_files)
+publicapitextlayouts_HEADERS = $(public_api_text_layouts_header_files)
+publicapitextrendering_HEADERS = $(public_api_text_rendering_header_files)
+publicapitextrenderingbasic_HEADERS = $(public_api_text_rendering_basic_header_files)
+publicapitextrenderingshaders_HEADERS = $(public_api_text_rendering_shaders_header_files)
+publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files)
+publicapiview_HEADERS = $(public_api_view_header_files)
+publicapibuilder_HEADERS = $(public_api_builder_header_files)
+publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files)
+publicapishadereffects_HEADERS = $(public_api_shader_effects_header_files)
+publicapibubbleeffect_HEADERS = $(public_api_bubble_effect_header_files)
+publicapistyling_HEADERS = $(public_api_styling_header_files)
+publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files)
+
diff --git a/build/tizen/docs-internal/.gitignore b/build/tizen/docs-internal/.gitignore
new file mode 100644 (file)
index 0000000..412a27f
--- /dev/null
@@ -0,0 +1 @@
+build.*.log
diff --git a/build/tizen/docs-internal/build.sh b/build/tizen/docs-internal/build.sh
new file mode 100755 (executable)
index 0000000..d995272
--- /dev/null
@@ -0,0 +1,16 @@
+# Run doxygen to generate extremely verbose documentation and print the time it took to do so.
+
+LOG_FILE="build.`date +%Y_%m_%d_%H_%M_%S`.log"
+
+export START_TIME=`date +%s`
+ionice -c 3 nice doxygen ./dali_internal.doxy  2>&1 | tee "$LOG_FILE"
+export END_TIME=`date +%s`
+
+let "BUILD_TIME = $END_TIME - $START_TIME"
+let "BUILD_TIME_MINS = $BUILD_TIME / 60"
+let "BUILD_TIME_EXTRA_SECONDS = $BUILD_TIME % 60"
+BUILD_TIME_MSG="Build ran from $START_TIME until $END_TIME, $BUILD_TIME_MINS minutes and $BUILD_TIME_EXTRA_SECONDS seconds, finishing: `date`."
+echo "$BUILD_TIME_MSG"
+
+WARNINGS=`egrep ": warning: " < $LOG_FILE | wc -l`
+echo -e "\nWARNING COUNT: $WARNINGS"
diff --git a/build/tizen/docs-internal/dali_internal.doxy b/build/tizen/docs-internal/dali_internal.doxy
new file mode 100644 (file)
index 0000000..65c3807
--- /dev/null
@@ -0,0 +1,1458 @@
+# Doxyfile 1.5.6
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = "Dali Internal Documentation"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../../../docs/generated-internal
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = YES
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
+# and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+#! ToTRY:
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 2
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = Yes
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = YES
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+# Previous: GENERATE_DEPRECATEDLIST= YES
+GENERATE_DEPRECATEDLIST = NO
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+#! ToDo: Fiddle with this (default=NO)
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = ../../../docs/DaliLayout.xml
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = NO
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = ../../../docs/content \
+                         ../../../../dali/dali \
+                         ../../../../dali-core/dali \
+                         ../../../../dali-adaptor/adaptors/public-api \
+                         ../../../../dali-adaptor/adaptors/base \
+                         ../../../../dali-adaptor/adaptors/common \
+                         ../../../../dali-adaptor/plugins \
+                         ../../../../dali-adaptor/platform-abstractions/interfaces \
+                         ../../../../dali-adaptor/platform-abstractions/portable \
+                         ../../../../dali-adaptor/platform-abstractions/slp \
+                         ../../../dali-toolkit \
+                         ../../../texture-atlas-exporter \
+                         ../../../../dali/automated-tests \
+                         ../../../../dali-core/automated-tests \
+                         ../../../../dali-adaptor/automated-tests \
+                         ../../../automated-tests \
+
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             = ../../../docs/content/images
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.  Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.  The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+#HTML_HEADER            = header.html
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+# HTML_FOOTER            = footer.html
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to FRAME, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature. Other possible values
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
+# and Class Hiererachy pages using a tree view instead of an ordered list;
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
+# disables this behavior completely. For backwards compatibility with previous
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
+# respectively.
+
+GENERATE_TREEVIEW      = TRUE
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.  This is useful
+# if you want to understand what is going on.  On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           = ../../../../dali/dali \
+                         ../../../../dali-adaptor/adaptors \
+                         ../../../../dali-adaptor/plugins \
+                         ../../../../dali-adaptor/platform-abstractions \
+                         ../../../texture-atlas-exporter/dali-exporter \
+                         ../../../dali-toolkit \
+                         /usr/local/include \
+                         /usr/include
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#   TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#   TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = YES
+
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This
+# font does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME           =
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = YES
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 500 # 50 is default
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 8
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is enabled by default, which results in a transparent
+# background. Warning: Depending on the platform used, enabling this option
+# may lead to badly anti-aliased labels on the edges of a graph (i.e. they
+# become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
index 33e5418..92ff833 100644 (file)
@@ -754,8 +754,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @DOXYGEN_DOCS_DIR@/content \
-                         ../../../../dali-toolkit/base/dali-toolkit/public-api \
-                         ../../../../dali-toolkit/optional/dali-toolkit/public-api \
+                         ../../../../dali-toolkit/dali-toolkit/public-api \
                          ../../../automated-tests/README.md \
                          @prefix@/include/dali
 
similarity index 96%
rename from optional/dali-toolkit/dali-toolkit.h
rename to dali-toolkit/dali-toolkit.h
index 772bb85..350043e 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_H__
-#define __DALI_TOOLKIT_INTERNAL_H__
+#ifndef __DALI_TOOLKIT_H__
+#define __DALI_TOOLKIT_H__
 
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
 // Toolkit
 
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#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/button.h>
+#include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>
 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
+#include <dali-toolkit/public-api/controls/cluster/cluster.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-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.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-controls/text-label.h>
-#include <dali-toolkit/public-api/enums.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/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>
-#include <dali-toolkit/public-api/text/character-run.h>
-#include <dali-toolkit/public-api/text/character-set-conversion.h>
-#include <dali-toolkit/public-api/text/font-run.h>
-#include <dali-toolkit/public-api/text/logical-model.h>
-#include <dali-toolkit/public-api/text/script.h>
-#include <dali-toolkit/public-api/text/segmentation.h>
-#include <dali-toolkit/public-api/text/multi-language-support.h>
-#include <dali-toolkit/public-api/text/text-controller.h>
-#include <dali-toolkit/public-api/text/text-definitions.h>
-#include <dali-toolkit/public-api/text/text-view.h>
-#include <dali-toolkit/public-api/text/text-view-interface.h>
-#include <dali-toolkit/public-api/text/visual-model.h>
-#include <dali-toolkit/public-api/text/layouts/layout-engine.h>
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
-#include <dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h>
-#include <dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.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/controls/default-controls/check-button-factory.h>
-
+#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
+#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 #include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
 #include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
+#include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
+#include <dali-toolkit/public-api/controls/navigation-frame/page.h>
+#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-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-landscape-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-portrait-view.h>
+#include <dali-toolkit/public-api/controls/popup/popup.h>
 #include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.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/item-view/navigation-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.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-depth-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-carousel-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-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-wobble-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/shadow-view/shadow-view.h>
 #include <dali-toolkit/public-api/controls/slider/slider.h>
+#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 #include <dali-toolkit/public-api/controls/tool-bar/tool-bar.h>
 #include <dali-toolkit/public-api/controls/view/view.h>
 
-#include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
-#include <dali-toolkit/public-api/controls/navigation-frame/page.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/focus-manager/keyinput-focus-manager.h>
 
 #include <dali-toolkit/public-api/shader-effects/alpha-discard-effect.h>
 #include <dali-toolkit/public-api/shader-effects/water-effect.h>
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h>
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.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>
+
+#include <dali-toolkit/public-api/text/bidirectional-line-info-run.h>
+#include <dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h>
+#include <dali-toolkit/public-api/text/bidirectional-support.h>
+#include <dali-toolkit/public-api/text/character-run.h>
+#include <dali-toolkit/public-api/text/character-set-conversion.h>
+#include <dali-toolkit/public-api/text/font-run.h>
+#include <dali-toolkit/public-api/text/logical-model.h>
+#include <dali-toolkit/public-api/text/multi-language-support.h>
+#include <dali-toolkit/public-api/text/script.h>
+#include <dali-toolkit/public-api/text/segmentation.h>
+#include <dali-toolkit/public-api/text/text-controller.h>
+#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/public-api/text/text-view.h>
+#include <dali-toolkit/public-api/text/text-view-interface.h>
+#include <dali-toolkit/public-api/text/visual-model.h>
+#include <dali-toolkit/public-api/text/layouts/layout-engine.h>
+#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
+#include <dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h>
+#include <dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h>
 
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 #include <dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h>
 #include <dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h>
 
 #include <dali-toolkit/public-api/dali-toolkit-version.h>
+#include <dali-toolkit/public-api/enums.h>
 
-#endif // __DALI_TOOLKIT_EXT_H__
+#endif // __DALI_TOOLKIT_H__
diff --git a/dali-toolkit/images/file.list b/dali-toolkit/images/file.list
new file mode 100644 (file)
index 0000000..dbc5012
--- /dev/null
@@ -0,0 +1,4 @@
+# Files to install here
+
+dali_toolkit_image_files =\
+    $(toolkit_images_dir)/*.png
@@ -301,60 +301,65 @@ struct PositionConstraint
     const Vector3& currentSize( currentSizeProperty.GetVector3() );
     const Vector3& parentSize( parentSizeProperty.GetVector3() );
 
+    return GetPosition( currentSize, parentSize );
+  }
+
+  inline Vector3 GetPosition( const Vector3& currentSize, const Vector3& parentSize )
+  {
     Vector3 position( 0.f, 0.f, 0.f );
 
     switch( mHorizontalAlignment )
     {
-      case Dali::Toolkit::Alignment::HorizontalLeft:
-      {
-        position.x += mPadding.left;
-        break;
-      }
-      case Dali::Toolkit::Alignment::HorizontalCenter:
-      {
-        if( currentSize.width + mPadding.left + mPadding.right >= parentSize.width )
-        {
-          position.x += 0.5f * ( mPadding.left - mPadding.right );
-        }
-        break;
-      }
-      case Dali::Toolkit::Alignment::HorizontalRight:
-      {
-        position.x -= mPadding.right;
-        break;
-      }
-      default:
+    case Dali::Toolkit::Alignment::HorizontalLeft:
+    {
+      position.x += mPadding.left;
+      break;
+    }
+    case Dali::Toolkit::Alignment::HorizontalCenter:
+    {
+      if( currentSize.width + mPadding.left + mPadding.right >= parentSize.width )
       {
-        DALI_ASSERT_ALWAYS( !"Wrong horizontal alignment value" );
-        break;
+        position.x += 0.5f * ( mPadding.left - mPadding.right );
       }
+      break;
+    }
+    case Dali::Toolkit::Alignment::HorizontalRight:
+    {
+      position.x -= mPadding.right;
+      break;
+    }
+    default:
+    {
+      DALI_ASSERT_ALWAYS( !"Wrong horizontal alignment value" );
+      break;
+    }
     }
 
     switch( mVerticalAlignment )
     {
-      case Dali::Toolkit::Alignment::VerticalTop:
-      {
-        position.y += mPadding.top;
-        break;
-      }
-      case Dali::Toolkit::Alignment::VerticalCenter:
-      {
-        if( currentSize.height + mPadding.top + mPadding.bottom >= parentSize.height )
-        {
-          position.y += 0.5f * ( mPadding.top - mPadding.bottom );
-        }
-        break;
-      }
-      case Dali::Toolkit::Alignment::VerticalBottom:
-      {
-        position.y -= mPadding.bottom;
-        break;
-      }
-      default:
+    case Dali::Toolkit::Alignment::VerticalTop:
+    {
+      position.y += mPadding.top;
+      break;
+    }
+    case Dali::Toolkit::Alignment::VerticalCenter:
+    {
+      if( currentSize.height + mPadding.top + mPadding.bottom >= parentSize.height )
       {
-        DALI_ASSERT_ALWAYS( !"Wrong vertical alignment value" );
-        break;
+        position.y += 0.5f * ( mPadding.top - mPadding.bottom );
       }
+      break;
+    }
+    case Dali::Toolkit::Alignment::VerticalBottom:
+    {
+      position.y -= mPadding.bottom;
+      break;
+    }
+    default:
+    {
+      DALI_ASSERT_ALWAYS( !"Wrong vertical alignment value" );
+      break;
+    }
     }
 
     return position;
@@ -364,15 +369,6 @@ struct PositionConstraint
   const Toolkit::Alignment::Type mHorizontalAlignment;
   const Toolkit::Alignment::Type mVerticalAlignment;
 };
-
-void SetPositionConstraint( Actor actor, const Toolkit::Alignment::Padding& padding, Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )
-{
-  Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
-                                                    LocalSource( Actor::SIZE ),
-                                                    ParentSource( Actor::SIZE ),
-                                                    PositionConstraint( padding, horizontal, vertical ) );
-  actor.ApplyConstraint( constraint );
-}
 } // namespace
 
 Toolkit::Alignment Alignment::New( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )
@@ -486,61 +482,51 @@ void Alignment::OnRelayout( const Vector2& size, ActorSizeContainer& container )
     actor.SetAnchorPoint( anchorPointAndParentOrigin );
     actor.SetParentOrigin( anchorPointAndParentOrigin );
 
-    if( Toolkit::Alignment::ScaleNone != mScaling )
-    {
-      actor.RemoveConstraints();
-    }
-
-    Vector3 actorSize ( actor.GetCurrentSize() );
+    Vector3 actorSize ( actor.GetSize() );
     Toolkit::Control control( Toolkit::Control::DownCast( actor ) );
     if ( actorSize == Vector3::ZERO && control )
     {
       actorSize = control.GetNaturalSize();
     }
 
-    Vector2 childSize;
+    Vector3 childSize;
 
     switch( mScaling )
     {
       case Toolkit::Alignment::ScaleNone:
       {
         // Nothing to do but needed just to not to jump to the default.
-        childSize = size;
+        childSize = actorSize;
         break;
       }
       case Toolkit::Alignment::ScaleToFill:
       {
         ScaleToFillConstraint constraint( mPadding );
-        childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
-        SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+        childSize = constraint.GetSize( actorSize, Vector3(size) ) ;
         break;
       }
       case Toolkit::Alignment::ScaleToFitKeepAspect:
       {
         ScaleToFitKeepAspectConstraint constraint( mPadding );
-        childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
-        SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+        childSize = constraint.GetSize( actorSize, Vector3(size) ) ;
         break;
       }
       case Toolkit::Alignment::ScaleToFillKeepAspect:
       {
         ScaleToFillKeepAspectConstraint constraint( mPadding );
-        childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
-        SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+        childSize = constraint.GetSize( actorSize, Vector3(size) );
         break;
       }
       case Toolkit::Alignment::ShrinkToFit:
       {
         ShrinkToFitConstraint constraint( mPadding );
-        childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
-        SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+        childSize = constraint.GetSize( actorSize, Vector3(size) );
         break;
       }
       case Toolkit::Alignment::ShrinkToFitKeepAspect:
       {
         ShrinkToFitKeepAspectConstraint constraint( mPadding );
-        childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
-        SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+        childSize = constraint.GetSize( actorSize, Vector3(size) );
         break;
       }
       default:
@@ -550,7 +536,15 @@ void Alignment::OnRelayout( const Vector2& size, ActorSizeContainer& container )
       }
     }
 
-    Relayout( actor, childSize, container );
+    PositionConstraint positionConstraint(mPadding, mHorizontal, mVertical);
+    actor.SetPosition( positionConstraint.GetPosition(childSize, actorSize) );
+
+    if( !control )
+    {
+      actor.SetScale(childSize / actorSize);
+    }
+
+    Relayout( actor, Vector2(childSize), container );
   }
 }
 
@@ -55,78 +55,39 @@ const Vector3 DEFAULT_BOTTOM_SIZE = Vector3(1.0f, 0.2f, 0.0f);
 const char* const PROPERTY_TITLE = "title";
 const char* const PROPERTY_STATE = "state";
 
-// Constraints ///////////////////////////////////////////////////////////////////////////
-
 /**
- * BackgroundSizeConstraint
- *
  * The background size should be at least as big as the Dialog.
  * In some cases a background may have graphics which are visible
  * outside of the Dialog, e.g. A Shadow. For this we need to alter
  * the size of Background.
+ *
+ * @param[in] outerBorder The border to extend beyond parent's Size.
+ * @param[in] parentSize  The parent's size
  */
-struct BackgroundSizeConstraint
+Vector3 BackgroundSize(const Vector4& outerBoarder, const Vector3& parentSize)
 {
-  /**
-   * Constraint that sets size to parent's size plus a border.
-   *
-   * @param[in] outerBorder The border to extend beyond parent's Size.
-   */
-  BackgroundSizeConstraint( Vector4 outerBorder )
-  : mOuterBorder( outerBorder )
-  {
-  }
+  Vector3 size( parentSize );
+  size.width += outerBoarder.x + outerBoarder.y;
+  size.height += outerBoarder.z + outerBoarder.w;
 
-  /**
-   * (render thread code)
-   * @param[in] current The current size.
-   * @param[in] parentSizeProperty The parent's size
-   */
-  Vector3 operator()( const Vector3& current,
-                      const PropertyInput& parentSizeProperty )
-  {
-    Vector3 size = parentSizeProperty.GetVector3();
-
-    size.width += mOuterBorder.x + mOuterBorder.y;
-    size.height += mOuterBorder.z + mOuterBorder.w;
-
-    return size;
-  }
-
-  const Vector4 mOuterBorder;  ///< The size of the outer-border (Set to 0.0, 0.0f, 0.0f, 0.0f if doesn't exist).
-};
+  return size;
+}
 
-struct ButtonAreaSizeConstraint
-{
   /**
-   * Constraint that sets size to parent's size plus a border.
+   * sets button area size to parent's size plus a border.
    *
    * @param[in] outerBorder The border to extend beyond parent's Size.
+   * @param[in] parentSize  The parent's size
    */
-  ButtonAreaSizeConstraint( Vector4 outerBorder )
-  : mOuterBorder( outerBorder )
-  {
-  }
-
-  /**
-   * (render thread code)
-   * @param[in] current The current size.
-   * @param[in] parentSizeProperty The parent's size
-   */
-  Vector3 operator()( const Vector3& current,
-                      const PropertyInput& parentSizeProperty )
-  {
-    Vector3 size = parentSizeProperty.GetVector3();
-
-    size.width += mOuterBorder.x + mOuterBorder.y;
-    size.width -= (POPUP_OUT_MARGIN_WIDTH + POPUP_OUT_MARGIN_WIDTH);
-    size.height = POPUP_BUTTON_BG_HEIGHT;
-
-    return size;
-  }
+Vector3 ButtonAreaSize( const Vector4& outBoarder, const Vector3& parentSize )
+{
+  Vector3 size( parentSize );
+  size.width += outBoarder.x + outBoarder.y;
+  size.width -= (POPUP_OUT_MARGIN_WIDTH + POPUP_OUT_MARGIN_WIDTH);
+  size.height = POPUP_BUTTON_BG_HEIGHT;
 
-  const Vector4 mOuterBorder;  ///< The size of the outer-border (Set to 0.0, 0.0f, 0.0f, 0.0f if doesn't exist).
-};
+  return size;
+}
 
 } // unnamed namespace
 
@@ -199,13 +160,11 @@ void Popup::OnInitialize()
   mLayer.SetParentOrigin(ParentOrigin::CENTER);
   mLayer.SetAnchorPoint(AnchorPoint::CENTER);
   mLayer.RaiseToTop();
-  mLayer.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
   self.Add(mLayer);
 
   mPopupBg = Actor::New();
   mPopupBg.SetParentOrigin(ParentOrigin::CENTER);
   mPopupBg.SetAnchorPoint(AnchorPoint::CENTER);
-  mPopupBg.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
   mLayer.Add(mPopupBg);
 
   // Any content after this point which is added to Self() will be reparented to
@@ -645,6 +604,23 @@ void Popup::OnControlChildAdd( Actor& child )
   }
 }
 
+void Popup::OnControlSizeSet( const Vector3& targetSize )
+{
+  mLayer.SetSize( targetSize );
+  mPopupBg.SetSize( targetSize );
+
+  const Vector4 outerBorder = mPopupStyle->backgroundOuterBorder;
+  if( mBackgroundImage )
+  {
+    mBackgroundImage.SetSize( BackgroundSize( outerBorder,targetSize ) );
+  }
+  if( mButtonAreaImage )
+  {
+    mButtonAreaImage.SetSize( ButtonAreaSize( outerBorder, targetSize ) );
+  }
+
+}
+
 void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container )
 {
   // Set the popup size
@@ -662,13 +638,7 @@ void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container )
 
   if( mBackgroundImage )
   {
-    Constraint constraint = Constraint::New<Vector3>( Actor::SIZE,
-                                                      ParentSource( Actor::SIZE ),
-                                                      BackgroundSizeConstraint(outerBorder) );
-
-    mBackgroundImage.RemoveConstraints();
-    mBackgroundImage.ApplyConstraint( constraint );
-
+    mBackgroundImage.SetSize(BackgroundSize(outerBorder, Vector3(size)));
     mBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     mBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
     mBackgroundImage.SetPosition( -outerBorder.x, -outerBorder.y, 0.0f );
@@ -683,13 +653,7 @@ void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container )
     }
     else
     {
-      Constraint constraint = Constraint::New<Vector3>( Actor::SIZE,
-                                                      ParentSource( Actor::SIZE ),
-                                                      ButtonAreaSizeConstraint(outerBorder) );
-
-      mButtonAreaImage.RemoveConstraints();
-      mButtonAreaImage.ApplyConstraint( constraint );
-
+      mButtonAreaImage.SetSize( ButtonAreaSize(outerBorder, Vector3(size)) );
       mButtonAreaImage.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
       mButtonAreaImage.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
       mButtonAreaImage.SetY( -outerBorder.z - POPUP_OUT_MARGIN_HEIGHT );
@@ -795,6 +759,7 @@ bool Popup::OnKeyEvent(const KeyEvent& event)
 Vector3 Popup::GetNaturalSize()
 {
   float margin = 2.0f * ( POPUP_OUT_MARGIN_WIDTH + mPopupStyle->margin );
+  const float maxWidth = Stage::GetCurrent().GetSize().width - margin;
 
   Vector3 naturalSize( 0.0f, 0.0f, 0.0f );
 
@@ -803,6 +768,11 @@ Vector3 Popup::GetNaturalSize()
     Vector3 contentSize = RelayoutHelper::GetNaturalSize( mContent );
     // Choose the biggest width
     naturalSize.width = std::max( naturalSize.width, contentSize.width );
+    if( naturalSize.width > maxWidth )
+    {
+      naturalSize.width = maxWidth;
+      contentSize.height = RelayoutHelper::GetHeightForWidth( mContent, maxWidth );
+    }
     naturalSize.height += contentSize.height + mPopupStyle->margin;
   }
 
@@ -246,7 +246,12 @@ private:
   virtual void OnControlChildAdd( Actor& child );
 
   /**
-   * @copydoc Control::OnRelayout()
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size )
+   */
+  virtual void OnControlSizeSet( const Vector3& size );
+
+  /**
+   * @copydoc Control::OnRelayOut()
    */
   virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
 
@@ -40,35 +40,15 @@ const float DEFAULT_PAN_GESTURE_PROCESS_TIME(16.7f); // 16.7 milliseconds, i.e.
 const float DEFAULT_INDICATOR_FIXED_HEIGHT(80.0f);
 
 /**
- * Indicator size constraint
  * Indicator size depends on both indicator's parent size and the scroll content size
  */
-struct IndicatorSizeConstraint
+Vector3 IndicatorSize( const Vector3& parentSize, float contentSize)
 {
-  /**
-   * @param[in] contentSize The size of scrollable content
-   */
-  IndicatorSizeConstraint(float contentSize)
-  : mContentSize(contentSize)
-  {
-  }
-
-  /**
-   * Constraint operator
-   * @param[in] current The current indicator size
-   * @param[in] parentSizeProperty The parent size of scroll indicator.
-   * @return The new scroll indicator size.
-   */
-  Vector3 operator()(const Vector3& current,
-                     const PropertyInput& parentSizeProperty)
-  {
-    const Vector3& parentSize = parentSizeProperty.GetVector3();
-    float height = mContentSize > parentSize.height ? parentSize.height * ( parentSize.height / mContentSize ) : parentSize.height * ( (parentSize.height - mContentSize * 0.5f) / parentSize.height);
-    return Vector3( parentSize.width, std::max(MINIMUM_INDICATOR_HEIGHT, height), parentSize.depth );
-  }
-
-  float mContentSize;  ///< The size of scrollable content
-};
+  float height = contentSize > parentSize.height ?
+                 parentSize.height * ( parentSize.height / contentSize ) :
+                 parentSize.height * ( (parentSize.height - contentSize * 0.5f) / parentSize.height);
+  return Vector3( parentSize.width, std::max(MINIMUM_INDICATOR_HEIGHT, height), parentSize.depth );
+}
 
 /**
  * Indicator position constraint
@@ -228,10 +208,7 @@ void ScrollBar::ApplyConstraints()
     }
     else
     {
-      constraint = Constraint::New<Vector3>( Actor::SIZE,
-                                             ParentSource( Actor::SIZE ),
-                                             IndicatorSizeConstraint( mScrollConnector.GetContentLength() ) );
-      mIndicatorSizeConstraint = mIndicator.ApplyConstraint( constraint );
+      mIndicator.SetSize( IndicatorSize( Self().GetCurrentSize(), mScrollConnector.GetContentLength() ) );
     }
 
     if(mIndicatorPositionConstraint)
@@ -245,16 +222,6 @@ void ScrollBar::ApplyConstraints()
                                            Source( mScrollPositionObject, Toolkit::ScrollConnector::SCROLL_POSITION ),
                                            IndicatorPositionConstraint( mScrollConnector.GetMinLimit(), mScrollConnector.GetMaxLimit() ) );
     mIndicatorPositionConstraint = mIndicator.ApplyConstraint( constraint );
-
-    if( mBackground )
-    {
-      mBackground.RemoveConstraints();
-
-      constraint = Constraint::New<Vector3>(Actor::SIZE,
-                                            ParentSource(Actor::SIZE),
-                                            EqualToConstraint());
-      mBackground.ApplyConstraint(constraint);
-    }
   }
 }
 
@@ -397,6 +364,14 @@ void ScrollBar::OnPan( PanGesture gesture )
   }
 }
 
+void ScrollBar::OnControlSizeSet( const Vector3& size )
+{
+  if(mIndicatorHeightPolicy != Toolkit::ScrollBar::Fixed && mScrollConnector)
+  {
+    mIndicator.SetSize( IndicatorSize( size, mScrollConnector.GetContentLength() ) );
+  }
+}
+
 void ScrollBar::OnScrollDomainChanged(float minPosition, float maxPosition, float contentSize)
 {
   // Reapply constraints when the scroll domain is changed
@@ -186,6 +186,11 @@ private: // from Control
    */
   virtual void OnPan( PanGesture gesture );
 
+  /**
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size )
+   */
+  virtual void OnControlSizeSet( const Vector3& size );
+
 private:
 
   /**
@@ -225,7 +230,6 @@ private:
 
   Constrainable mScrollPositionObject;                               ///< From mScrollConnector
 
-  ImageActor mBackground;                                            ///< Background image of scroll bar.
   ImageActor mIndicator;                                             ///< Image of scroll indicator.
   Animation mAnimation;                                              ///< Scroll indicator Show/Hide Animation.
 
@@ -20,8 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
-#include <dali/public-api/animation/constraint.h>
-#include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/scripting/scripting.h>
@@ -34,39 +32,17 @@ namespace
 const float DEFAULT_CONSTRAINT_DURATION = 0.0f;
 
 /**
- * Constraint that sets a child property relative to parents Width or Height
+ * sets a child property relative to parents size and applies a unit based padding before the relative calculation.
+ * @param[in] scale of parent minus padding between 0 and 1
+ * @param[in] padding in world coordinate units
+ * @param[in] fixed part in world coordinate units
+ * @param[in] size of the parent
+ * @return The relative size with padding.
  */
-struct RelativeToWidthOrHeight
+Vector2 RelativeToSize( const Vector2& scale, const Vector2& padding, const Vector2& fixed, const Vector2& parentSize)
 {
-  /**
-   * Constraint that is relative (%) to parent width/height and applies a
-   * unit based padding before the relative calculation.
-   * @param scale of parent minus padding between 0 and 1
-   * @param padding in world coordinate units
-   * @param fixed part in world coordinate units
-   */
-  RelativeToWidthOrHeight( float scale, float padding, float fixed )
-  : mScaleFactor( scale ),
-    mPadding( padding ),
-    mFixed( fixed )
-  {
-  }
-
-  inline float operator()( const float& parentWidthOrHeight )
-  {
-    return mFixed  + ( parentWidthOrHeight - mPadding  ) * mScaleFactor;
-  }
-
-  float operator()( const float& current,
-                    const PropertyInput& parentWidthOrHeight )
-  {
-    return operator()( parentWidthOrHeight.GetFloat() );
-  }
-
-  float mScaleFactor;
-  float mPadding;
-  float mFixed;
-};
+  return fixed + ( parentSize - padding ) * scale;
+}
 
 #if defined(DEBUG_ENABLED)
 // debugging support, very useful when new features are added or bugs are hunted down
@@ -137,9 +113,8 @@ namespace Toolkit
 const Property::Index TableView::PROPERTY_ROWS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX );
 const Property::Index TableView::PROPERTY_COLUMNS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 1 );
 const Property::Index TableView::PROPERTY_CELL_PADDING( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 2 );
-const Property::Index TableView::PROPERTY_LAYOUT_ANIMATION_DURATION( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 3 );
-const Property::Index TableView::PROPERTY_LAYOUT_ROWS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 4 );
-const Property::Index TableView::PROPERTY_LAYOUT_COLUMNS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 5 );
+const Property::Index TableView::PROPERTY_LAYOUT_ROWS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 3 );
+const Property::Index TableView::PROPERTY_LAYOUT_COLUMNS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 4 );
 
 namespace Internal
 {
@@ -166,9 +141,8 @@ TypeRegistration mType( typeid(Toolkit::TableView), typeid(Toolkit::Control), Cr
 PropertyRegistration property1( mType, "rows", Toolkit::TableView::PROPERTY_ROWS, Property::UNSIGNED_INTEGER, &TableView::SetProperty, &TableView::GetProperty );
 PropertyRegistration property2( mType, "columns", Toolkit::TableView::PROPERTY_COLUMNS, Property::UNSIGNED_INTEGER, &TableView::SetProperty, &TableView::GetProperty );
 PropertyRegistration property3( mType, "cell-padding", Toolkit::TableView::PROPERTY_CELL_PADDING, Property::VECTOR2, &TableView::SetProperty, &TableView::GetProperty );
-PropertyRegistration property4( mType, "layout-animation-duration", Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION, Property::FLOAT, &TableView::SetProperty, &TableView::GetProperty );
-PropertyRegistration property5( mType, "layout-rows", Toolkit::TableView::PROPERTY_LAYOUT_ROWS, Property::MAP, &TableView::SetProperty, &TableView::GetProperty );
-PropertyRegistration property6( mType, "layout-columns", Toolkit::TableView::PROPERTY_LAYOUT_COLUMNS, Property::MAP, &TableView::SetProperty, &TableView::GetProperty );
+PropertyRegistration property4( mType, "layout-rows", Toolkit::TableView::PROPERTY_LAYOUT_ROWS, Property::MAP, &TableView::SetProperty, &TableView::GetProperty );
+PropertyRegistration property5( mType, "layout-columns", Toolkit::TableView::PROPERTY_LAYOUT_COLUMNS, Property::MAP, &TableView::SetProperty, &TableView::GetProperty );
 
 } // namespace
 
@@ -615,16 +589,6 @@ float TableView::GetRelativeWidth( unsigned int columnIndex ) const
   return mRelativeWidths[ columnIndex ];
 }
 
-void TableView::SetLayoutAnimationDuration( float duration )
-{
-  mConstraintDuration = duration;
-}
-
-float TableView::GetLayoutAnimationDuration()
-{
-  return mConstraintDuration;
-}
-
 void TableView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
 {
   float fixedHeightsTotal = 0.0f;
@@ -679,23 +643,8 @@ void TableView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
         Vector2 fixedPosition( ( colPos + 1.0f ) * mPadding.width + cumulatedFixedWidth,
                                  ( rowPos + 1.0f ) * mPadding.height + cumulatedFixedHeight );
 
-        Constraint widthConstraint = Constraint::New<float>( Actor::POSITION_X,
-                                                             ParentSource( Actor::SIZE_WIDTH ),
-                                                             RelativeToWidthOrHeight( relativePosition.x, positionPadding.x, fixedPosition.x ) );
-
-        Constraint heightConstraint = Constraint::New<float>( Actor::POSITION_Y,
-                                                              ParentSource( Actor::SIZE_HEIGHT ),
-                                                              RelativeToWidthOrHeight( relativePosition.y, positionPadding.y, fixedPosition.y ) );
-
-        widthConstraint.SetApplyTime( mConstraintDuration );
-        heightConstraint.SetApplyTime( mConstraintDuration );
-
-        // bake constrained position value if constraint is removed
-        widthConstraint.SetRemoveAction( Constraint::Bake );
-        heightConstraint.SetRemoveAction( Constraint::Bake );
-
-        actor.ApplyConstraint( widthConstraint );
-        actor.ApplyConstraint( heightConstraint );
+        Vector3 actorPosition( RelativeToSize( relativePosition, positionPadding, fixedPosition, size ) );
+        actor.SetPosition( actorPosition );
 
         // 2. set size
         // constrain the actor size to be relative to the size of table
@@ -731,29 +680,11 @@ void TableView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
         fixedSize.width += ( position.columnSpan - 1.0f ) * mPadding.width;
         fixedSize.height += ( position.rowSpan - 1.0f ) * mPadding.height;
 
-        RelativeToWidthOrHeight relativeWidthFunctor( relativeSize.x, sizePadding.x, fixedSize.x );
-        RelativeToWidthOrHeight relativeHeightFunctor( relativeSize.y, sizePadding.y, fixedSize.y );
-
-        widthConstraint = Constraint::New<float>( Actor::SIZE_WIDTH,
-                                                  ParentSource( Actor::SIZE_WIDTH ),
-                                                  relativeWidthFunctor );
-
-        heightConstraint = Constraint::New<float>( Actor::SIZE_HEIGHT,
-                                                   ParentSource( Actor::SIZE_HEIGHT ),
-                                                   relativeHeightFunctor );
-
-        widthConstraint.SetApplyTime( mConstraintDuration );
-        heightConstraint.SetApplyTime( mConstraintDuration );
-
-        // bake constrained size value if constraint is removed
-        widthConstraint.SetRemoveAction( Constraint::Bake );
-        heightConstraint.SetRemoveAction( Constraint::Bake );
-
-        actor.ApplyConstraint( widthConstraint );
-        actor.ApplyConstraint( heightConstraint );
+        Vector2 actorSize( RelativeToSize( relativeSize, sizePadding, fixedSize, size ) );
+        actor.SetSize(actorSize.x, actorSize.y);
 
         // Relayout Children
-        Relayout ( actor, Vector2( relativeWidthFunctor( size.width ), relativeHeightFunctor( size.height ) ), container );
+        Relayout ( actor, actorSize, container );
       }
       // for position we need to keep track of current fixed width and relative width
       // increase for next column
@@ -807,11 +738,6 @@ void TableView::SetProperty( BaseObject* object, Property::Index index, const Pr
         tableViewImpl.SetCellPadding( value.Get<Vector2>() );
         break;
       }
-      case Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION:
-      {
-        tableViewImpl.SetLayoutAnimationDuration( value.Get<float>() );
-        break;
-      }
       case Toolkit::TableView::PROPERTY_LAYOUT_ROWS:
       {
         SetHeightOrWidthProperty( tableViewImpl, &TableView::SetFixedHeight, &TableView::SetRelativeHeight, value );
@@ -852,11 +778,6 @@ Property::Value TableView::GetProperty( BaseObject* object, Property::Index inde
         value = tableViewImpl.GetCellPadding();
         break;
       }
-      case Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION:
-      {
-        value = tableViewImpl.GetLayoutAnimationDuration();
-        break;
-      }
       case Toolkit::TableView::PROPERTY_LAYOUT_ROWS:
       {
         value = tableViewImpl.GetRowHeightsPropertyValue();
@@ -953,8 +874,7 @@ void TableView::OnControlChildRemove( Actor& child )
 TableView::TableView( unsigned int initialRows, unsigned int initialColumns )
 : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
   mCellData( initialRows, initialColumns ),
-  mLayoutingChild( false ),
-  mConstraintDuration( DEFAULT_CONSTRAINT_DURATION )
+  mLayoutingChild( false )
 {
   SetKeyboardNavigationSupport( true );
   ResizeContainers( initialRows, initialColumns );
@@ -174,17 +174,6 @@ public:
   float GetRelativeWidth( unsigned int columnIndex ) const;
 
   /**
-   * @copydoc Toolkit::TableView::SetLayoutAnimationDuration
-   */
-  void SetLayoutAnimationDuration( float duration );
-
-  /**
-   * @copydoc Toolkit::TableView::GetLayoutAnimationDuration
-   */
-  float GetLayoutAnimationDuration();
-
-
-  /**
    * @copydoc Toolkit::TableView::GetRows
    */
   unsigned int GetRows();
@@ -376,7 +365,6 @@ private: // Data
   std::vector<float> mRelativeWidths;
   Size mPadding;
   bool mLayoutingChild;
-  float mConstraintDuration;
 
 };
 
diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
new file mode 100644 (file)
index 0000000..a760e1a
--- /dev/null
@@ -0,0 +1,82 @@
+# Add local source files here
+
+toolkit_src_files = \
+   $(toolkit_src_dir)/builder/builder-actor.cpp \
+   $(toolkit_src_dir)/builder/builder-animations.cpp \
+   $(toolkit_src_dir)/builder/builder-impl.cpp \
+   $(toolkit_src_dir)/builder/builder-set-property.cpp \
+   $(toolkit_src_dir)/builder/builder-signals.cpp \
+   $(toolkit_src_dir)/builder/json-parser-state.cpp \
+   $(toolkit_src_dir)/builder/json-parser-impl.cpp \
+   $(toolkit_src_dir)/builder/tree-node-manipulator.cpp \
+   $(toolkit_src_dir)/builder/replacement.cpp \
+   $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \
+   $(toolkit_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
+   $(toolkit_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
+   $(toolkit_src_dir)/controls/buttons/button-impl.cpp \
+   $(toolkit_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \
+   $(toolkit_src_dir)/controls/buttons/check-box-button-impl.cpp \
+   $(toolkit_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \
+   $(toolkit_src_dir)/controls/buttons/push-button-impl.cpp \
+   $(toolkit_src_dir)/controls/buttons/radio-button-impl.cpp \
+   $(toolkit_src_dir)/controls/cluster/cluster-impl.cpp \
+   $(toolkit_src_dir)/controls/cluster/cluster-style-impl.cpp \
+   $(toolkit_src_dir)/controls/effects-view/effects-view-impl.cpp \
+   $(toolkit_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \
+   $(toolkit_src_dir)/controls/image-view/masked-image-view-impl.cpp \
+   $(toolkit_src_dir)/controls/magnifier/magnifier-impl.cpp \
+   $(toolkit_src_dir)/controls/navigation-frame/navigation-bar.cpp \
+   $(toolkit_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \
+   $(toolkit_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \
+   $(toolkit_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \
+   $(toolkit_src_dir)/controls/navigation-frame/page-impl.cpp \
+   $(toolkit_src_dir)/controls/popup/popup-impl.cpp \
+   $(toolkit_src_dir)/controls/popup/popup-style-impl.cpp \
+   $(toolkit_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \
+   $(toolkit_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \
+   $(toolkit_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \
+   $(toolkit_src_dir)/controls/relayout-controller-impl.cpp \
+   $(toolkit_src_dir)/controls/relayout-controller.cpp \
+   $(toolkit_src_dir)/controls/relayout-helper.cpp \
+   $(toolkit_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \
+   $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \
+   $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \
+   $(toolkit_src_dir)/controls/scrollable/bouncing-effect-actor.cpp \
+   $(toolkit_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scrollable-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-connector-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
+   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
+   $(toolkit_src_dir)/controls/shadow-view/shadow-view-impl.cpp \
+   $(toolkit_src_dir)/controls/slider/slider-impl.cpp \
+   $(toolkit_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
+   $(toolkit_src_dir)/controls/table-view/table-view-impl.cpp \
+   $(toolkit_src_dir)/controls/text-controls/text-label-impl.cpp \
+   $(toolkit_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
+   $(toolkit_src_dir)/controls/view/view-impl.cpp \
+   $(toolkit_src_dir)/focus-manager/focus-manager-impl.cpp \
+   $(toolkit_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
+   $(toolkit_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \
+   $(toolkit_src_dir)/filters/blur-two-pass-filter.cpp \
+   $(toolkit_src_dir)/filters/emboss-filter.cpp \
+   $(toolkit_src_dir)/filters/image-filter.cpp \
+   $(toolkit_src_dir)/filters/spread-filter.cpp \
+   $(toolkit_src_dir)/shader-effects/page-turn-effect-impl.cpp \
+   $(toolkit_src_dir)/shader-effects/water-effect-impl.cpp \
+   $(toolkit_src_dir)/styling/style-manager-impl.cpp \
+   $(toolkit_src_dir)/text/multi-language-support-impl.cpp \
+   $(toolkit_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
+   $(toolkit_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
+   $(toolkit_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \
+   $(toolkit_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp
+
@@ -175,16 +175,6 @@ float TableView::GetRelativeWidth( unsigned int columnIndex ) const
   return GetImpl(*this).GetRelativeWidth( columnIndex );
 }
 
-void TableView::SetLayoutAnimationDuration( float duration )
-{
-  GetImpl(*this).SetLayoutAnimationDuration( duration );
-}
-
-float TableView::GetLayoutAnimationDuration()
-{
-  return GetImpl(*this).GetLayoutAnimationDuration();
-}
-
 unsigned int TableView::GetRows()
 {
   return GetImpl(*this).GetRows();
@@ -50,7 +50,6 @@ public:
   static const Property::Index PROPERTY_ROWS;                       ///< name "rows",                      type UNSIGNED_INTEGER
   static const Property::Index PROPERTY_COLUMNS;                    ///< name "columns",                   type UNSIGNED_INTEGER
   static const Property::Index PROPERTY_CELL_PADDING;               ///< name "cell-padding",              type VECTOR2
-  static const Property::Index PROPERTY_LAYOUT_ANIMATION_DURATION;  ///< name "layout-animation-duration", type FLOAT
 
   /*
    * PROPERTY_LAYOUT_ROWS set the height of the rows
@@ -333,19 +332,6 @@ public:
   float GetRelativeWidth( unsigned int columnIndex ) const;
 
   /**
-   * Sets the layout animation duration for add, remove and relayout
-   * @param duration for the layout animations
-   * @note The default duration is 0.0f.
-   */
-  void SetLayoutAnimationDuration( float duration );
-
-  /**
-   * Gets the layout animation duration for add, remove and relayout
-   * @return duration for the layout animations
-   */
-  float GetLayoutAnimationDuration();
-
-  /**
    * @return the amount of rows in the table
    */
   unsigned int GetRows();
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 28;
+const unsigned int TOOLKIT_MICRO_VERSION = 29;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
new file mode 100755 (executable)
index 0000000..b8f75bc
--- /dev/null
@@ -0,0 +1,316 @@
+# Add local source files here
+
+public_api_src_files = \
+  $(public_api_src_dir)/builder/builder.cpp \
+  $(public_api_src_dir)/builder/json-parser.cpp \
+  $(public_api_src_dir)/builder/tree-node.cpp \
+  $(public_api_src_dir)/controls/control-impl.cpp \
+  $(public_api_src_dir)/controls/control.cpp \
+  $(public_api_src_dir)/controls/alignment/alignment.cpp \
+  $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
+  $(public_api_src_dir)/controls/buttons/button.cpp \
+  $(public_api_src_dir)/controls/buttons/check-box-button.cpp \
+  $(public_api_src_dir)/controls/buttons/push-button.cpp \
+  $(public_api_src_dir)/controls/buttons/radio-button.cpp \
+  $(public_api_src_dir)/controls/default-controls/check-button-factory.cpp \
+  $(public_api_src_dir)/controls/default-controls/push-button-factory.cpp \
+  $(public_api_src_dir)/controls/default-controls/solid-color-actor.cpp \
+  $(public_api_src_dir)/controls/navigation-frame/navigation-control.cpp \
+  $(public_api_src_dir)/controls/navigation-frame/page.cpp \
+  $(public_api_src_dir)/controls/magnifier/magnifier.cpp \
+  $(public_api_src_dir)/controls/page-turn-view/page-factory.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/popup/popup.cpp \
+  $(public_api_src_dir)/controls/scroll-bar/scroll-bar.cpp \
+  $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.cpp \
+  $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.cpp \
+  $(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \
+  $(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \
+  $(public_api_src_dir)/controls/scrollable/item-view/item-view.cpp \
+  $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
+  $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
+  $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-connector.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-component-impl.cpp \
+  $(public_api_src_dir)/controls/scrollable/scroll-component.cpp \
+  $(public_api_src_dir)/controls/scrollable/scrollable.cpp \
+  $(public_api_src_dir)/controls/shadow-view/shadow-view.cpp \
+  $(public_api_src_dir)/controls/slider/slider.cpp \
+  $(public_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \
+  $(public_api_src_dir)/controls/table-view/table-view.cpp \
+  $(public_api_src_dir)/controls/text-controls/text-label.cpp \
+  $(public_api_src_dir)/controls/tool-bar/tool-bar.cpp \
+  $(public_api_src_dir)/controls/bloom-view/bloom-view.cpp \
+  $(public_api_src_dir)/controls/cluster/cluster-style.cpp \
+  $(public_api_src_dir)/controls/cluster/cluster.cpp \
+  $(public_api_src_dir)/controls/effects-view/effects-view.cpp \
+  $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
+  $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \
+  $(public_api_src_dir)/controls/view/view.cpp \
+  $(public_api_src_dir)/focus-manager/focus-manager.cpp \
+  $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \
+  $(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \
+  $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
+  $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
+  $(public_api_src_dir)/shader-effects/alpha-discard-effect.cpp \
+  $(public_api_src_dir)/shader-effects/bendy-effect.cpp \
+  $(public_api_src_dir)/shader-effects/blind-effect.cpp \
+  $(public_api_src_dir)/shader-effects/bouncing-effect.cpp \
+  $(public_api_src_dir)/shader-effects/carousel-effect.cpp \
+  $(public_api_src_dir)/shader-effects/displacement-effect.cpp \
+  $(public_api_src_dir)/shader-effects/dissolve-effect.cpp \
+  $(public_api_src_dir)/shader-effects/dissolve-local-effect.cpp \
+  $(public_api_src_dir)/shader-effects/distance-field-effect.cpp \
+  $(public_api_src_dir)/shader-effects/image-region-effect.cpp \
+  $(public_api_src_dir)/shader-effects/iris-effect.cpp \
+  $(public_api_src_dir)/shader-effects/mask-effect.cpp \
+  $(public_api_src_dir)/shader-effects/mirror-effect.cpp \
+  $(public_api_src_dir)/shader-effects/motion-blur-effect.cpp \
+  $(public_api_src_dir)/shader-effects/motion-stretch-effect.cpp \
+  $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.cpp \
+  $(public_api_src_dir)/shader-effects/overlay-effect.cpp \
+  $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \
+  $(public_api_src_dir)/shader-effects/page-turn-effect.cpp \
+  $(public_api_src_dir)/shader-effects/ripple-effect.cpp \
+  $(public_api_src_dir)/shader-effects/ripple2d-effect.cpp \
+  $(public_api_src_dir)/shader-effects/shear-effect.cpp \
+  $(public_api_src_dir)/shader-effects/soft-button-effect.cpp \
+  $(public_api_src_dir)/shader-effects/spot-effect.cpp \
+  $(public_api_src_dir)/shader-effects/square-dissolve-effect.cpp \
+  $(public_api_src_dir)/shader-effects/swirl-effect.cpp \
+  $(public_api_src_dir)/shader-effects/water-effect.cpp \
+  $(public_api_src_dir)/styling/style-manager.cpp \
+  $(public_api_src_dir)/text/bidirectional-support.cpp \
+  $(public_api_src_dir)/text/character-set-conversion.cpp \
+  $(public_api_src_dir)/text/logical-model.cpp \
+  $(public_api_src_dir)/text/multi-language-support.cpp \
+  $(public_api_src_dir)/text/script.cpp \
+  $(public_api_src_dir)/text/segmentation.cpp \
+  $(public_api_src_dir)/text/text-controller.cpp \
+  $(public_api_src_dir)/text/text-view.cpp \
+  $(public_api_src_dir)/text/text-view-interface.cpp \
+  $(public_api_src_dir)/text/visual-model.cpp \
+  $(public_api_src_dir)/text/layouts/layout-engine.cpp \
+  $(public_api_src_dir)/text/rendering/text-renderer.cpp \
+  $(public_api_src_dir)/text/rendering/basic/text-basic-renderer.cpp \
+  $(public_api_src_dir)/text/rendering/shaders/text-basic-shader.cpp \
+  $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
+  $(public_api_src_dir)/transition-effects/cube-transition-effect.cpp \
+  $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
+  $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
+  $(public_api_src_dir)/dali-toolkit-version.cpp \
+  $(public_api_src_dir)/enums.cpp
+
+# Add public header files here
+
+public_api_header_files = \
+  $(public_api_src_dir)/dali-toolkit-version.h \
+  $(public_api_src_dir)/enums.h
+
+public_api_builder_header_files = \
+  $(public_api_src_dir)/builder/builder.h \
+  $(public_api_src_dir)/builder/json-parser.h \
+  $(public_api_src_dir)/builder/tree-node.h
+
+public_api_controls_header_files = \
+  $(public_api_src_dir)/controls/control-impl.h \
+  $(public_api_src_dir)/controls/control.h
+
+public_api_alignment_header_files = \
+  $(public_api_src_dir)/controls/alignment/alignment.h
+
+public_api_buttons_header_files = \
+  $(public_api_src_dir)/controls/buttons/button.h \
+  $(public_api_src_dir)/controls/buttons/check-box-button.h \
+  $(public_api_src_dir)/controls/buttons/push-button.h \
+  $(public_api_src_dir)/controls/buttons/radio-button.h
+
+public_api_bloom_view_header_files = \
+  $(public_api_src_dir)/controls/bloom-view/bloom-view.h
+
+public_api_bubble_emitter_header_files = \
+  $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.h
+
+public_api_cluster_header_files = \
+  $(public_api_src_dir)/controls/cluster/cluster-style.h \
+  $(public_api_src_dir)/controls/cluster/cluster.h
+
+public_api_default_controls_header_files = \
+  $(public_api_src_dir)/controls/default-controls/check-button-factory.h \
+  $(public_api_src_dir)/controls/default-controls/push-button-factory.h \
+  $(public_api_src_dir)/controls/default-controls/solid-color-actor.h
+
+public_api_effects_view_header_files = \
+  $(public_api_src_dir)/controls/effects-view/effects-view.h
+
+public_api_gaussian_blur_view_header_files = \
+  $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
+
+public_api_image_view_header_files = \
+  $(public_api_src_dir)/controls/image-view/masked-image-view.h
+
+public_api_item_view_header_files = \
+  $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.h \
+  $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.h \
+  $(public_api_src_dir)/controls/scrollable/item-view/item-factory.h \
+  $(public_api_src_dir)/controls/scrollable/item-view/item-layout.h \
+  $(public_api_src_dir)/controls/scrollable/item-view/item-view-declarations.h \
+  $(public_api_src_dir)/controls/scrollable/item-view/item-view.h \
+  $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.h \
+  $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.h \
+  $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.h
+
+public_api_magnifier_header_files = \
+  $(public_api_src_dir)/controls/magnifier/magnifier.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_popup_header_files = \
+  $(public_api_src_dir)/controls/popup/popup.h
+
+public_api_scrollable_header_files = \
+  $(public_api_src_dir)/controls/scrollable/scroll-component-impl.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-component.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-connector.h \
+  $(public_api_src_dir)/controls/scrollable/scrollable.h
+
+public_api_scroll_bar_header_files = \
+  $(public_api_src_dir)/controls/scroll-bar/scroll-bar.h
+
+public_api_scroll_view_header_files = \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h \
+  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.h
+
+public_api_slider_header_files = \
+  $(public_api_src_dir)/controls/slider/slider.h
+
+public_api_shadow_view_header_files = \
+  $(public_api_src_dir)/controls/shadow-view/shadow-view.h
+
+public_api_super_blur_view_header_files = \
+  $(public_api_src_dir)/controls/super-blur-view/super-blur-view.h
+
+public_api_table_view_header_files = \
+  $(public_api_src_dir)/controls/table-view/table-view.h
+
+public_api_text_controls_header_files = \
+  $(public_api_src_dir)/controls/text-controls/text-label.h
+
+public_api_text_header_files = \
+  $(public_api_src_dir)/text/bidirectional-line-info-run.h \
+  $(public_api_src_dir)/text/bidirectional-paragraph-info-run.h \
+  $(public_api_src_dir)/text/bidirectional-support.h \
+  $(public_api_src_dir)/text/character-run.h \
+  $(public_api_src_dir)/text/character-set-conversion.h \
+  $(public_api_src_dir)/text/font-run.h \
+  $(public_api_src_dir)/text/logical-model.h \
+  $(public_api_src_dir)/text/multi-language-support.h \
+  $(public_api_src_dir)/text/script.h \
+  $(public_api_src_dir)/text/script-run.h \
+  $(public_api_src_dir)/text/segmentation.h \
+  $(public_api_src_dir)/text/text-controller.h \
+  $(public_api_src_dir)/text/text-definitions.h \
+  $(public_api_src_dir)/text/text-view.h \
+  $(public_api_src_dir)/text/text-view-interface.h \
+  $(public_api_src_dir)/text/visual-model.h
+
+public_api_text_layouts_header_files = \
+  $(public_api_src_dir)/text/layouts/layout-engine.h
+
+public_api_text_rendering_header_files = \
+  $(public_api_src_dir)/text/rendering/text-renderer.h
+
+public_api_text_rendering_basic_header_files = \
+  $(public_api_src_dir)/text/rendering/basic/text-basic-renderer.h
+
+public_api_text_rendering_shaders_header_files = \
+  $(public_api_src_dir)/text/rendering/shaders/text-basic-shader.h
+
+public_api_text_input_header_files = \
+  $(public_api_src_dir)/controls/text-input/text-input.h
+
+public_api_text_view_header_files = \
+  $(public_api_src_dir)/controls/text-view/text-view.h
+
+public_api_tool_bar_header_files = \
+  $(public_api_src_dir)/controls/tool-bar/tool-bar.h
+
+public_api_navigation_frame_header_files = \
+  $(public_api_src_dir)/controls/navigation-frame/navigation-bar-style.h \
+  $(public_api_src_dir)/controls/navigation-frame/navigation-control.h \
+  $(public_api_src_dir)/controls/navigation-frame/page.h
+
+public_api_view_header_files = \
+  $(public_api_src_dir)/controls/view/view.h
+
+public_api_focus_manager_header_files = \
+  $(public_api_src_dir)/focus-manager/focus-manager.h \
+  $(public_api_src_dir)/focus-manager/keyboard-focus-manager.h \
+  $(public_api_src_dir)/focus-manager/keyinput-focus-manager.h
+
+public_api_shader_effects_header_files = \
+  $(public_api_src_dir)/shader-effects/alpha-discard-effect.h \
+  $(public_api_src_dir)/shader-effects/bendy-effect.h \
+  $(public_api_src_dir)/shader-effects/blind-effect.h \
+  $(public_api_src_dir)/shader-effects/bouncing-effect.h \
+  $(public_api_src_dir)/shader-effects/carousel-effect.h \
+  $(public_api_src_dir)/shader-effects/displacement-effect.h \
+  $(public_api_src_dir)/shader-effects/dissolve-effect.h \
+  $(public_api_src_dir)/shader-effects/dissolve-local-effect.h \
+  $(public_api_src_dir)/shader-effects/distance-field-effect.h \
+  $(public_api_src_dir)/shader-effects/image-region-effect.h \
+  $(public_api_src_dir)/shader-effects/iris-effect.h \
+  $(public_api_src_dir)/shader-effects/mask-effect.h \
+  $(public_api_src_dir)/shader-effects/mirror-effect.h \
+  $(public_api_src_dir)/shader-effects/motion-blur-effect.h \
+  $(public_api_src_dir)/shader-effects/motion-stretch-effect.h \
+  $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.h \
+  $(public_api_src_dir)/shader-effects/overlay-effect.h \
+  $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.h \
+  $(public_api_src_dir)/shader-effects/page-turn-effect.h \
+  $(public_api_src_dir)/shader-effects/ripple-effect.h \
+  $(public_api_src_dir)/shader-effects/ripple2d-effect.h \
+  $(public_api_src_dir)/shader-effects/shear-effect.h \
+  $(public_api_src_dir)/shader-effects/soft-button-effect.h \
+  $(public_api_src_dir)/shader-effects/spot-effect.h \
+  $(public_api_src_dir)/shader-effects/square-dissolve-effect.h \
+  $(public_api_src_dir)/shader-effects/swirl-effect.h \
+  $(public_api_src_dir)/shader-effects/water-effect.h
+
+public_api_bubble_effect_header_files =  \
+  $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.h \
+  $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.h
+
+public_api_styling_header_files = \
+  $(public_api_src_dir)/styling/style-manager.h
+
+public_api_transition_effects_header_files = \
+  $(public_api_src_dir)/transition-effects/cube-transition-effect.h \
+  $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.h \
+  $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.h \
+  $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.h
+
diff --git a/dali-toolkit/sounds/file.list b/dali-toolkit/sounds/file.list
new file mode 100644 (file)
index 0000000..b1df2c4
--- /dev/null
@@ -0,0 +1,4 @@
+# Files to install here
+
+dali_toolkit_sound_files =\
+       $(toolkit_sounds_dir)/*.ogg
similarity index 58%
rename from base/dali-toolkit/styles/file.list
rename to dali-toolkit/styles/file.list
index 83a6e26..8e49fbe 100644 (file)
@@ -1,4 +1,4 @@
 # Files to install here
 
 dali_toolkit_style_files =\
-    $(toolkit_base_styles_dir)/*.json
+    $(toolkit_styles_dir)/*.json
diff --git a/docs/generated-internal/.gitignore b/docs/generated-internal/.gitignore
new file mode 100644 (file)
index 0000000..72e8ffc
--- /dev/null
@@ -0,0 +1 @@
+*
diff --git a/docs/generated-internal/README.md b/docs/generated-internal/README.md
new file mode 100644 (file)
index 0000000..c79ec24
--- /dev/null
@@ -0,0 +1,25 @@
+Deep internal documentation for Dali Toolkit.
+
+Generate the documentation here as follows:
+
+    # Go to dali-toolkit/build/tizen/docs-internal/
+    cd ../../build/tizen/docs-internal/
+    # Start doxygen:
+    ./build.sh
+
+Note, the doxfile assumes you have your Dali repositories checked-out
+side by side with the following structure:
+
+    .
+    ├── dali
+    ├── dali-adaptor
+    └── dali-toolkit
+
+If you have used different names or structure, you will need to adjust
+the value of the `INPUT` variable in the doxyfile:
+
+   build/tizen/docs-internal/dali_internal.doxy
+
+
+
+
diff --git a/optional/dali-toolkit/images/file.list b/optional/dali-toolkit/images/file.list
deleted file mode 100644 (file)
index 44104c8..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Files to install here
-
-dali_toolkit_optional_image_files =\
-    $(toolkit_optional_images_dir)/*.png
diff --git a/optional/dali-toolkit/internal/file.list b/optional/dali-toolkit/internal/file.list
deleted file mode 100644 (file)
index d06c048..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# Add local source files here
-
-toolkit_optional_src_files = \
-   $(toolkit_optional_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/cluster/cluster-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/cluster/cluster-style-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/effects-view/effects-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/image-view/masked-image-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/shadow-view/shadow-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/slider/slider-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/view/view-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-bar.cpp \
-   $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \
-   $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \
-   $(toolkit_optional_src_dir)/controls/navigation-frame/page-impl.cpp \
-   $(toolkit_optional_src_dir)/filters/blur-two-pass-filter.cpp \
-   $(toolkit_optional_src_dir)/filters/emboss-filter.cpp \
-   $(toolkit_optional_src_dir)/filters/image-filter.cpp \
-   $(toolkit_optional_src_dir)/filters/spread-filter.cpp \
-   $(toolkit_optional_src_dir)/shader-effects/water-effect-impl.cpp \
-   $(toolkit_optional_src_dir)/shader-effects/page-turn-effect-impl.cpp \
-   $(toolkit_optional_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
-   $(toolkit_optional_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp \
-   $(toolkit_optional_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
-   $(toolkit_optional_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \
-   $(toolkit_optional_src_dir)/controls/magnifier/magnifier-impl.cpp
diff --git a/optional/dali-toolkit/public-api/file.list b/optional/dali-toolkit/public-api/file.list
deleted file mode 100755 (executable)
index b12694f..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-# Add local source files here
-
-public_api_optional_src_files = \
-  $(public_api_optional_src_dir)/controls/bloom-view/bloom-view.cpp \
-  $(public_api_optional_src_dir)/controls/cluster/cluster.cpp \
-  $(public_api_optional_src_dir)/controls/cluster/cluster-style.cpp \
-  $(public_api_optional_src_dir)/controls/effects-view/effects-view.cpp \
-  $(public_api_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
-  $(public_api_optional_src_dir)/controls/image-view/masked-image-view.cpp \
-  $(public_api_optional_src_dir)/controls/magnifier/magnifier.cpp \
-  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-view.cpp \
-  $(public_api_optional_src_dir)/controls/page-turn-view/page-factory.cpp \
-  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
-  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
-  $(public_api_optional_src_dir)/controls/shadow-view/shadow-view.cpp \
-  $(public_api_optional_src_dir)/controls/slider/slider.cpp \
-  $(public_api_optional_src_dir)/controls/super-blur-view/super-blur-view.cpp \
-  $(public_api_optional_src_dir)/controls/tool-bar/tool-bar.cpp \
-  $(public_api_optional_src_dir)/controls/view/view.cpp \
-  $(public_api_optional_src_dir)/controls/navigation-frame/navigation-control.cpp \
-  $(public_api_optional_src_dir)/controls/navigation-frame/page.cpp \
-  $(public_api_optional_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
-  $(public_api_optional_src_dir)/shader-effects/alpha-discard-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/bendy-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/blind-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/carousel-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/displacement-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/dissolve-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/dissolve-local-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/distance-field-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/iris-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/mask-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/mirror-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/motion-blur-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/motion-stretch-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/nine-patch-mask-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/overlay-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/page-turn-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/ripple-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/ripple2d-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/shear-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/soft-button-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/spot-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/square-dissolve-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/swirl-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/water-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
-  $(public_api_optional_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
-  $(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)/dali-toolkit-version.cpp
-
-# Add public header files here
-
-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-style.h
-
-public_api_optional_effects_view_header_files = \
-  $(public_api_optional_src_dir)/controls/effects-view/effects-view.h
-
-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/masked-image-view.h
-
-public_api_optional_magnifier_header_files = \
-  $(public_api_optional_src_dir)/controls/magnifier/magnifier.h
-
-public_api_optional_page_turn_view_header_files = \
-  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-view.h \
-  $(public_api_optional_src_dir)/controls/page-turn-view/page-factory.h \
-  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
-  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view.h
-
-public_api_optional_slider_header_files = \
-  $(public_api_optional_src_dir)/controls/slider/slider.h
-
-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_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
-
-public_api_optional_view_header_files = \
-  $(public_api_optional_src_dir)/controls/view/view.h
-
-public_api_optional_navigation_frame_header_files = \
-  $(public_api_optional_src_dir)/controls/navigation-frame/navigation-control.h \
-  $(public_api_optional_src_dir)/controls/navigation-frame/page.h \
-  $(public_api_optional_src_dir)/controls/navigation-frame/navigation-bar-style.h
-
-public_api_optional_markup_processor_header_files =
-
-public_api_optional_shader_effects_header_files =               \
-  $(public_api_optional_src_dir)/shader-effects/alpha-discard-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/bendy-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/blind-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/carousel-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/displacement-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/dissolve-local-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/distance-field-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/mirror-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/motion-blur-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/motion-stretch-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/overlay-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/shear-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/soft-button-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/spot-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/square-dissolve-effect.h \
-  $(public_api_optional_src_dir)/shader-effects/water-effect.h
-
-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_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 \
-  $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.h \
-  $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.h
-
index bd15f6f..ad94852 100644 (file)
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.0.28
+Version:    1.0.29
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0