From: Agnelo Vaz Date: Thu, 8 Oct 2015 16:18:20 +0000 (+0100) Subject: Move common images folder to the style folder X-Git-Tag: dali_1.1.7~22^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=1e23ec5e83aa854625a432d8ec1c1d7fc50e1bf2 Move common images folder to the style folder * Keep images all under the style folder to encourage correct placement of images and not just all in common Change-Id: Id16410b6c88de4c8b1b642113906a85cd74a7a23 Signed-off-by: Agnelo Vaz --- diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index d44e4b4..50bd34e 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -16,7 +16,7 @@ # Build the Dali Toolkit library -toolkit_images_dir = ../../../dali-toolkit/images-common +toolkit_images_dir = ../../../dali-toolkit/styles/images-common toolkit_sounds_dir = ../../../dali-toolkit/sounds toolkit_src_dir = ../../../dali-toolkit/internal public_api_src_dir = ../../../dali-toolkit/public-api @@ -25,9 +25,9 @@ devel_api_src_dir = ../../../dali-toolkit/devel-api toolkit_styles_dir = $(STYLE_DIR) toolkit_style_images_dir = $(STYLE_DIR)/images -include ../../../dali-toolkit/images-common/file.list include ../../../dali-toolkit/sounds/file.list include ../../../dali-toolkit/styles/file.list +include ../../../dali-toolkit/styles/images-common/file.list include ../../../dali-toolkit/internal/file.list include ../../../dali-toolkit/public-api/file.list include ../../../dali-toolkit/devel-api/file.list diff --git a/dali-toolkit/images-common/00_popup_bg.9.png b/dali-toolkit/styles/images-common/00_popup_bg.9.png similarity index 100% rename from dali-toolkit/images-common/00_popup_bg.9.png rename to dali-toolkit/styles/images-common/00_popup_bg.9.png diff --git a/dali-toolkit/images-common/00_popup_bg.png b/dali-toolkit/styles/images-common/00_popup_bg.png similarity index 100% rename from dali-toolkit/images-common/00_popup_bg.png rename to dali-toolkit/styles/images-common/00_popup_bg.png diff --git a/dali-toolkit/images-common/00_popup_bottom_bg.png b/dali-toolkit/styles/images-common/00_popup_bottom_bg.png similarity index 100% rename from dali-toolkit/images-common/00_popup_bottom_bg.png rename to dali-toolkit/styles/images-common/00_popup_bottom_bg.png diff --git a/dali-toolkit/images-common/00_popup_bubble_bg.png b/dali-toolkit/styles/images-common/00_popup_bubble_bg.png similarity index 100% rename from dali-toolkit/images-common/00_popup_bubble_bg.png rename to dali-toolkit/styles/images-common/00_popup_bubble_bg.png diff --git a/dali-toolkit/images-common/00_popup_bubble_tail_bottom.png b/dali-toolkit/styles/images-common/00_popup_bubble_tail_bottom.png similarity index 100% rename from dali-toolkit/images-common/00_popup_bubble_tail_bottom.png rename to dali-toolkit/styles/images-common/00_popup_bubble_tail_bottom.png diff --git a/dali-toolkit/images-common/00_popup_button_bg.png b/dali-toolkit/styles/images-common/00_popup_button_bg.png similarity index 100% rename from dali-toolkit/images-common/00_popup_button_bg.png rename to dali-toolkit/styles/images-common/00_popup_button_bg.png diff --git a/dali-toolkit/images-common/00_popup_button_pressed.png b/dali-toolkit/styles/images-common/00_popup_button_pressed.png similarity index 100% rename from dali-toolkit/images-common/00_popup_button_pressed.png rename to dali-toolkit/styles/images-common/00_popup_button_pressed.png diff --git a/dali-toolkit/images-common/B16-8_TTS_focus.png b/dali-toolkit/styles/images-common/B16-8_TTS_focus.png similarity index 100% rename from dali-toolkit/images-common/B16-8_TTS_focus.png rename to dali-toolkit/styles/images-common/B16-8_TTS_focus.png diff --git a/dali-toolkit/images-common/button-disabled.9.png b/dali-toolkit/styles/images-common/button-disabled.9.png similarity index 100% rename from dali-toolkit/images-common/button-disabled.9.png rename to dali-toolkit/styles/images-common/button-disabled.9.png diff --git a/dali-toolkit/images-common/button-down-disabled.9.png b/dali-toolkit/styles/images-common/button-down-disabled.9.png similarity index 100% rename from dali-toolkit/images-common/button-down-disabled.9.png rename to dali-toolkit/styles/images-common/button-down-disabled.9.png diff --git a/dali-toolkit/images-common/button-down.9.png b/dali-toolkit/styles/images-common/button-down.9.png similarity index 100% rename from dali-toolkit/images-common/button-down.9.png rename to dali-toolkit/styles/images-common/button-down.9.png diff --git a/dali-toolkit/images-common/button-up.9.png b/dali-toolkit/styles/images-common/button-up.9.png similarity index 100% rename from dali-toolkit/images-common/button-up.9.png rename to dali-toolkit/styles/images-common/button-up.9.png diff --git a/dali-toolkit/images-common/checkbox-selected-diabled.png b/dali-toolkit/styles/images-common/checkbox-selected-diabled.png similarity index 100% rename from dali-toolkit/images-common/checkbox-selected-diabled.png rename to dali-toolkit/styles/images-common/checkbox-selected-diabled.png diff --git a/dali-toolkit/images-common/checkbox-selected.png b/dali-toolkit/styles/images-common/checkbox-selected.png similarity index 100% rename from dali-toolkit/images-common/checkbox-selected.png rename to dali-toolkit/styles/images-common/checkbox-selected.png diff --git a/dali-toolkit/images-common/checkbox-unselected-disabled.png b/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png similarity index 100% rename from dali-toolkit/images-common/checkbox-unselected-disabled.png rename to dali-toolkit/styles/images-common/checkbox-unselected-disabled.png diff --git a/dali-toolkit/images-common/checkbox-unselected.png b/dali-toolkit/styles/images-common/checkbox-unselected.png similarity index 100% rename from dali-toolkit/images-common/checkbox-unselected.png rename to dali-toolkit/styles/images-common/checkbox-unselected.png diff --git a/dali-toolkit/images-common/copy_paste_icon_clipboard.png b/dali-toolkit/styles/images-common/copy_paste_icon_clipboard.png similarity index 100% rename from dali-toolkit/images-common/copy_paste_icon_clipboard.png rename to dali-toolkit/styles/images-common/copy_paste_icon_clipboard.png diff --git a/dali-toolkit/images-common/copy_paste_icon_copy.png b/dali-toolkit/styles/images-common/copy_paste_icon_copy.png similarity index 100% rename from dali-toolkit/images-common/copy_paste_icon_copy.png rename to dali-toolkit/styles/images-common/copy_paste_icon_copy.png diff --git a/dali-toolkit/images-common/copy_paste_icon_cut.png b/dali-toolkit/styles/images-common/copy_paste_icon_cut.png similarity index 100% rename from dali-toolkit/images-common/copy_paste_icon_cut.png rename to dali-toolkit/styles/images-common/copy_paste_icon_cut.png diff --git a/dali-toolkit/images-common/copy_paste_icon_paste.png b/dali-toolkit/styles/images-common/copy_paste_icon_paste.png similarity index 100% rename from dali-toolkit/images-common/copy_paste_icon_paste.png rename to dali-toolkit/styles/images-common/copy_paste_icon_paste.png diff --git a/dali-toolkit/images-common/copy_paste_icon_select.png b/dali-toolkit/styles/images-common/copy_paste_icon_select.png similarity index 100% rename from dali-toolkit/images-common/copy_paste_icon_select.png rename to dali-toolkit/styles/images-common/copy_paste_icon_select.png diff --git a/dali-toolkit/images-common/copy_paste_icon_select_all.png b/dali-toolkit/styles/images-common/copy_paste_icon_select_all.png similarity index 100% rename from dali-toolkit/images-common/copy_paste_icon_select_all.png rename to dali-toolkit/styles/images-common/copy_paste_icon_select_all.png diff --git a/dali-toolkit/images-common/cursor_handler_ball_center.png b/dali-toolkit/styles/images-common/cursor_handler_ball_center.png similarity index 100% rename from dali-toolkit/images-common/cursor_handler_ball_center.png rename to dali-toolkit/styles/images-common/cursor_handler_ball_center.png diff --git a/dali-toolkit/images-common/file.list b/dali-toolkit/styles/images-common/file.list similarity index 100% rename from dali-toolkit/images-common/file.list rename to dali-toolkit/styles/images-common/file.list diff --git a/dali-toolkit/images-common/insertpoint-icon-pressed.png b/dali-toolkit/styles/images-common/insertpoint-icon-pressed.png similarity index 100% rename from dali-toolkit/images-common/insertpoint-icon-pressed.png rename to dali-toolkit/styles/images-common/insertpoint-icon-pressed.png diff --git a/dali-toolkit/images-common/insertpoint-icon.png b/dali-toolkit/styles/images-common/insertpoint-icon.png similarity index 100% rename from dali-toolkit/images-common/insertpoint-icon.png rename to dali-toolkit/styles/images-common/insertpoint-icon.png diff --git a/dali-toolkit/images-common/keyboard_focus.png b/dali-toolkit/styles/images-common/keyboard_focus.png similarity index 100% rename from dali-toolkit/images-common/keyboard_focus.png rename to dali-toolkit/styles/images-common/keyboard_focus.png diff --git a/dali-toolkit/images-common/magnifier.png b/dali-toolkit/styles/images-common/magnifier.png similarity index 100% rename from dali-toolkit/images-common/magnifier.png rename to dali-toolkit/styles/images-common/magnifier.png diff --git a/dali-toolkit/images-common/popup_bg.png b/dali-toolkit/styles/images-common/popup_bg.png similarity index 100% rename from dali-toolkit/images-common/popup_bg.png rename to dali-toolkit/styles/images-common/popup_bg.png diff --git a/dali-toolkit/images-common/popup_bubble_bg.#.png b/dali-toolkit/styles/images-common/popup_bubble_bg.#.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_bg.#.png rename to dali-toolkit/styles/images-common/popup_bubble_bg.#.png diff --git a/dali-toolkit/images-common/popup_bubble_bg_ef.#.png b/dali-toolkit/styles/images-common/popup_bubble_bg_ef.#.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_bg_ef.#.png rename to dali-toolkit/styles/images-common/popup_bubble_bg_ef.#.png diff --git a/dali-toolkit/images-common/popup_bubble_bg_line.#.png b/dali-toolkit/styles/images-common/popup_bubble_bg_line.#.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_bg_line.#.png rename to dali-toolkit/styles/images-common/popup_bubble_bg_line.#.png diff --git a/dali-toolkit/images-common/popup_bubble_tail_bottom.png b/dali-toolkit/styles/images-common/popup_bubble_tail_bottom.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_tail_bottom.png rename to dali-toolkit/styles/images-common/popup_bubble_tail_bottom.png diff --git a/dali-toolkit/images-common/popup_bubble_tail_bottom_ef.png b/dali-toolkit/styles/images-common/popup_bubble_tail_bottom_ef.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_tail_bottom_ef.png rename to dali-toolkit/styles/images-common/popup_bubble_tail_bottom_ef.png diff --git a/dali-toolkit/images-common/popup_bubble_tail_bottom_line.png b/dali-toolkit/styles/images-common/popup_bubble_tail_bottom_line.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_tail_bottom_line.png rename to dali-toolkit/styles/images-common/popup_bubble_tail_bottom_line.png diff --git a/dali-toolkit/images-common/popup_bubble_tail_top.png b/dali-toolkit/styles/images-common/popup_bubble_tail_top.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_tail_top.png rename to dali-toolkit/styles/images-common/popup_bubble_tail_top.png diff --git a/dali-toolkit/images-common/popup_bubble_tail_top_ef.png b/dali-toolkit/styles/images-common/popup_bubble_tail_top_ef.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_tail_top_ef.png rename to dali-toolkit/styles/images-common/popup_bubble_tail_top_ef.png diff --git a/dali-toolkit/images-common/popup_bubble_tail_top_line.png b/dali-toolkit/styles/images-common/popup_bubble_tail_top_line.png similarity index 100% rename from dali-toolkit/images-common/popup_bubble_tail_top_line.png rename to dali-toolkit/styles/images-common/popup_bubble_tail_top_line.png diff --git a/dali-toolkit/images-common/popup_scroll.png b/dali-toolkit/styles/images-common/popup_scroll.png similarity index 100% rename from dali-toolkit/images-common/popup_scroll.png rename to dali-toolkit/styles/images-common/popup_scroll.png diff --git a/dali-toolkit/images-common/popup_tail_down.png b/dali-toolkit/styles/images-common/popup_tail_down.png similarity index 100% rename from dali-toolkit/images-common/popup_tail_down.png rename to dali-toolkit/styles/images-common/popup_tail_down.png diff --git a/dali-toolkit/images-common/popup_tail_left.png b/dali-toolkit/styles/images-common/popup_tail_left.png similarity index 100% rename from dali-toolkit/images-common/popup_tail_left.png rename to dali-toolkit/styles/images-common/popup_tail_left.png diff --git a/dali-toolkit/images-common/popup_tail_right.png b/dali-toolkit/styles/images-common/popup_tail_right.png similarity index 100% rename from dali-toolkit/images-common/popup_tail_right.png rename to dali-toolkit/styles/images-common/popup_tail_right.png diff --git a/dali-toolkit/images-common/popup_tail_up.png b/dali-toolkit/styles/images-common/popup_tail_up.png similarity index 100% rename from dali-toolkit/images-common/popup_tail_up.png rename to dali-toolkit/styles/images-common/popup_tail_up.png diff --git a/dali-toolkit/images-common/radio-button-selected-disabled.png b/dali-toolkit/styles/images-common/radio-button-selected-disabled.png similarity index 100% rename from dali-toolkit/images-common/radio-button-selected-disabled.png rename to dali-toolkit/styles/images-common/radio-button-selected-disabled.png diff --git a/dali-toolkit/images-common/radio-button-selected.png b/dali-toolkit/styles/images-common/radio-button-selected.png similarity index 100% rename from dali-toolkit/images-common/radio-button-selected.png rename to dali-toolkit/styles/images-common/radio-button-selected.png diff --git a/dali-toolkit/images-common/radio-button-unselected-disabled.png b/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png similarity index 100% rename from dali-toolkit/images-common/radio-button-unselected-disabled.png rename to dali-toolkit/styles/images-common/radio-button-unselected-disabled.png diff --git a/dali-toolkit/images-common/radio-button-unselected.png b/dali-toolkit/styles/images-common/radio-button-unselected.png similarity index 100% rename from dali-toolkit/images-common/radio-button-unselected.png rename to dali-toolkit/styles/images-common/radio-button-unselected.png diff --git a/dali-toolkit/images-common/selection-popup-bg.9.png b/dali-toolkit/styles/images-common/selection-popup-bg.9.png similarity index 100% rename from dali-toolkit/images-common/selection-popup-bg.9.png rename to dali-toolkit/styles/images-common/selection-popup-bg.9.png diff --git a/dali-toolkit/images-common/selection_handle_ball_left.png b/dali-toolkit/styles/images-common/selection_handle_ball_left.png similarity index 100% rename from dali-toolkit/images-common/selection_handle_ball_left.png rename to dali-toolkit/styles/images-common/selection_handle_ball_left.png diff --git a/dali-toolkit/images-common/selection_handle_ball_right.png b/dali-toolkit/styles/images-common/selection_handle_ball_right.png similarity index 100% rename from dali-toolkit/images-common/selection_handle_ball_right.png rename to dali-toolkit/styles/images-common/selection_handle_ball_right.png diff --git a/dali-toolkit/images-common/selection_marker_left.png b/dali-toolkit/styles/images-common/selection_marker_left.png similarity index 100% rename from dali-toolkit/images-common/selection_marker_left.png rename to dali-toolkit/styles/images-common/selection_marker_left.png diff --git a/dali-toolkit/images-common/selection_marker_right.png b/dali-toolkit/styles/images-common/selection_marker_right.png similarity index 100% rename from dali-toolkit/images-common/selection_marker_right.png rename to dali-toolkit/styles/images-common/selection_marker_right.png diff --git a/dali-toolkit/images-common/slider-popup-arrow.png b/dali-toolkit/styles/images-common/slider-popup-arrow.png similarity index 100% rename from dali-toolkit/images-common/slider-popup-arrow.png rename to dali-toolkit/styles/images-common/slider-popup-arrow.png diff --git a/dali-toolkit/images-common/slider-popup.9.png b/dali-toolkit/styles/images-common/slider-popup.9.png similarity index 100% rename from dali-toolkit/images-common/slider-popup.9.png rename to dali-toolkit/styles/images-common/slider-popup.9.png diff --git a/dali-toolkit/images-common/slider-popup.png b/dali-toolkit/styles/images-common/slider-popup.png similarity index 100% rename from dali-toolkit/images-common/slider-popup.png rename to dali-toolkit/styles/images-common/slider-popup.png diff --git a/dali-toolkit/images-common/slider-skin-handle.png b/dali-toolkit/styles/images-common/slider-skin-handle.png similarity index 100% rename from dali-toolkit/images-common/slider-skin-handle.png rename to dali-toolkit/styles/images-common/slider-skin-handle.png diff --git a/dali-toolkit/images-common/slider-skin-progress.9.png b/dali-toolkit/styles/images-common/slider-skin-progress.9.png similarity index 100% rename from dali-toolkit/images-common/slider-skin-progress.9.png rename to dali-toolkit/styles/images-common/slider-skin-progress.9.png diff --git a/dali-toolkit/images-common/slider-skin-progress.png b/dali-toolkit/styles/images-common/slider-skin-progress.png similarity index 100% rename from dali-toolkit/images-common/slider-skin-progress.png rename to dali-toolkit/styles/images-common/slider-skin-progress.png diff --git a/dali-toolkit/images-common/slider-skin.9.png b/dali-toolkit/styles/images-common/slider-skin.9.png similarity index 100% rename from dali-toolkit/images-common/slider-skin.9.png rename to dali-toolkit/styles/images-common/slider-skin.9.png diff --git a/dali-toolkit/images-common/slider-skin.png b/dali-toolkit/styles/images-common/slider-skin.png similarity index 100% rename from dali-toolkit/images-common/slider-skin.png rename to dali-toolkit/styles/images-common/slider-skin.png diff --git a/dali-toolkit/images-common/text-input-selection-handle-left-press.png b/dali-toolkit/styles/images-common/text-input-selection-handle-left-press.png similarity index 100% rename from dali-toolkit/images-common/text-input-selection-handle-left-press.png rename to dali-toolkit/styles/images-common/text-input-selection-handle-left-press.png diff --git a/dali-toolkit/images-common/text-input-selection-handle-left.png b/dali-toolkit/styles/images-common/text-input-selection-handle-left.png similarity index 100% rename from dali-toolkit/images-common/text-input-selection-handle-left.png rename to dali-toolkit/styles/images-common/text-input-selection-handle-left.png diff --git a/dali-toolkit/images-common/text-input-selection-handle-right-press.png b/dali-toolkit/styles/images-common/text-input-selection-handle-right-press.png similarity index 100% rename from dali-toolkit/images-common/text-input-selection-handle-right-press.png rename to dali-toolkit/styles/images-common/text-input-selection-handle-right-press.png diff --git a/dali-toolkit/images-common/text-input-selection-handle-right.png b/dali-toolkit/styles/images-common/text-input-selection-handle-right.png similarity index 100% rename from dali-toolkit/images-common/text-input-selection-handle-right.png rename to dali-toolkit/styles/images-common/text-input-selection-handle-right.png diff --git a/docs/content/programming-guide/styling.h b/docs/content/programming-guide/styling.h index f1949ca..d6c197f 100644 --- a/docs/content/programming-guide/styling.h +++ b/docs/content/programming-guide/styling.h @@ -57,6 +57,6 @@ Each style selector can have resource folders associated with it. Images for that style should be in their own folder named images. -Common images not specific for a particular style will be in the dali-toolkit common images folder. +Common images not specific for a particular style will be in the images-common folder located in the style folder. * */