yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=d2f3bcf27f1d28469b48741b62f7044e0aea36f0
commit d2f3bcf27f1d28469b48741b62f7044e0aea36f0 Author: Yakov Goldberg <[email protected]> Date: Mon May 11 15:23:03 2015 +0300 Move images folder into bin folder --- CMakeLists.txt | 1 - src/bin/gui/CMakeLists.txt | 4 +++- src/bin/gui/egui_layout.json | 8 ++++---- {data => src/bin/gui}/images/CMakeLists.txt | 0 {data => src/bin/gui}/images/canvas_bg.jpg | Bin {data => src/bin/gui}/images/enventor_icon.png | Bin {data => src/bin/gui}/images/erigo_icon.png | Bin {data => src/bin/gui}/images/factory_actionslider.png | Bin {data => src/bin/gui}/images/factory_bg.png | Bin {data => src/bin/gui}/images/factory_box.png | Bin {data => src/bin/gui}/images/factory_bubble.png | Bin {data => src/bin/gui}/images/factory_button.png | Bin {data => src/bin/gui}/images/factory_calendar.png | Bin {data => src/bin/gui}/images/factory_check.png | Bin {data => src/bin/gui}/images/factory_clock.png | Bin {data => src/bin/gui}/images/factory_colorselector.png | Bin {data => src/bin/gui}/images/factory_ctxpopup.png | Bin {data => src/bin/gui}/images/factory_dayselector.png | Bin {data => src/bin/gui}/images/factory_diskselector.png | Bin {data => src/bin/gui}/images/factory_entry.png | Bin {data => src/bin/gui}/images/factory_flip.png | Bin {data => src/bin/gui}/images/factory_frame.png | Bin {data => src/bin/gui}/images/factory_gengrid.png | Bin {data => src/bin/gui}/images/factory_genlist.png | Bin {data => src/bin/gui}/images/factory_icon.png | Bin {data => src/bin/gui}/images/factory_image.png | Bin {data => src/bin/gui}/images/factory_label.png | Bin {data => src/bin/gui}/images/factory_layout.png | Bin {data => src/bin/gui}/images/factory_menu.png | Bin {data => src/bin/gui}/images/factory_naviframe.png | Bin {data => src/bin/gui}/images/factory_radio.png | Bin {data => src/bin/gui}/images/factory_table.png | Bin {data => src/bin/gui}/images/factory_toolbar.png | Bin {data => src/bin/gui}/images/factory_win.png | Bin {data => src/bin/gui}/images/icon_autoscroll.png | Bin {data => src/bin/gui}/images/icon_close.png | Bin {data => src/bin/gui}/images/icon_down_arrow.png | Bin {data => src/bin/gui}/images/icon_prop_menu.png | Bin {data => src/bin/gui}/images/icon_prop_menu2.png | Bin {data => src/bin/gui}/images/icon_up_arrow.png | Bin {data => src/bin/gui}/images/resize_red.png | Bin {data => src/bin/gui}/images/table_cell_border.png | Bin 42 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94621c6..8659817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,5 @@ add_custom_target(uninstall add_subdirectory(src/lib) add_subdirectory(src/bin) add_subdirectory(src/tests) -add_subdirectory(data/images) add_subdirectory(data/config) add_subdirectory(data/layouts) diff --git a/src/bin/gui/CMakeLists.txt b/src/bin/gui/CMakeLists.txt index 3a6e6d8..e600edc 100644 --- a/src/bin/gui/CMakeLists.txt +++ b/src/bin/gui/CMakeLists.txt @@ -23,7 +23,7 @@ if (${EGUI_IS_RELEASE}) set(PACKAGE_THEME_DIR_DEFINITION EGUI_LAYOUT_THEME_PATH="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}/themes") elseif (NOT ${EGUI_IS_RELEASE}) set(PACKAGE_DATA_DIR_DEFINITION PACKAGE_DATA_DIR="${CMAKE_BINARY_DIR}/data") - set(PACKAGE_IMAGES_DIR_DEFINITION EGUI_LAYOUT_IMAGES_PATH="${CMAKE_BINARY_DIR}/data/images") + set(PACKAGE_IMAGES_DIR_DEFINITION EGUI_LAYOUT_IMAGES_PATH="${CMAKE_CURRENT_BINARY_DIR}/images") set(PACKAGE_EDJE_DIR_DEFINITION EGUI_LAYOUT_EDJE_PATH="${CMAKE_BINARY_DIR}/data/layouts") set(PACKAGE_THEME_DIR_DEFINITION EGUI_LAYOUT_THEME_PATH="${CMAKE_BINARY_DIR}/data/themes") endif(${EGUI_IS_RELEASE}) @@ -97,3 +97,5 @@ target_link_libraries (${TARGET} ) install(TARGETS ${TARGET} DESTINATION bin) + +add_subdirectory(images) diff --git a/src/bin/gui/egui_layout.json b/src/bin/gui/egui_layout.json index 7755f14..797349d 100644 --- a/src/bin/gui/egui_layout.json +++ b/src/bin/gui/egui_layout.json @@ -9,10 +9,10 @@ { "Images": { - "res_canvas_bg":"data/images/canvas_bg.jpg", - "erigo_icon":"data/images/erigo_icon.png", - "move_up_icon":"data/images/icon_up_arrow.png", - "move_down_icon":"data/images/icon_down_arrow.png" + "res_canvas_bg":"images/canvas_bg.jpg", + "erigo_icon":"images/erigo_icon.png", + "move_up_icon":"images/icon_up_arrow.png", + "move_down_icon":"images/icon_down_arrow.png" }, "Eo_Callbacks": { diff --git a/data/images/CMakeLists.txt b/src/bin/gui/images/CMakeLists.txt similarity index 100% rename from data/images/CMakeLists.txt rename to src/bin/gui/images/CMakeLists.txt diff --git a/data/images/canvas_bg.jpg b/src/bin/gui/images/canvas_bg.jpg similarity index 100% rename from data/images/canvas_bg.jpg rename to src/bin/gui/images/canvas_bg.jpg diff --git a/data/images/enventor_icon.png b/src/bin/gui/images/enventor_icon.png similarity index 100% rename from data/images/enventor_icon.png rename to src/bin/gui/images/enventor_icon.png diff --git a/data/images/erigo_icon.png b/src/bin/gui/images/erigo_icon.png similarity index 100% rename from data/images/erigo_icon.png rename to src/bin/gui/images/erigo_icon.png diff --git a/data/images/factory_actionslider.png b/src/bin/gui/images/factory_actionslider.png similarity index 100% rename from data/images/factory_actionslider.png rename to src/bin/gui/images/factory_actionslider.png diff --git a/data/images/factory_bg.png b/src/bin/gui/images/factory_bg.png similarity index 100% rename from data/images/factory_bg.png rename to src/bin/gui/images/factory_bg.png diff --git a/data/images/factory_box.png b/src/bin/gui/images/factory_box.png similarity index 100% rename from data/images/factory_box.png rename to src/bin/gui/images/factory_box.png diff --git a/data/images/factory_bubble.png b/src/bin/gui/images/factory_bubble.png similarity index 100% rename from data/images/factory_bubble.png rename to src/bin/gui/images/factory_bubble.png diff --git a/data/images/factory_button.png b/src/bin/gui/images/factory_button.png similarity index 100% rename from data/images/factory_button.png rename to src/bin/gui/images/factory_button.png diff --git a/data/images/factory_calendar.png b/src/bin/gui/images/factory_calendar.png similarity index 100% rename from data/images/factory_calendar.png rename to src/bin/gui/images/factory_calendar.png diff --git a/data/images/factory_check.png b/src/bin/gui/images/factory_check.png similarity index 100% rename from data/images/factory_check.png rename to src/bin/gui/images/factory_check.png diff --git a/data/images/factory_clock.png b/src/bin/gui/images/factory_clock.png similarity index 100% rename from data/images/factory_clock.png rename to src/bin/gui/images/factory_clock.png diff --git a/data/images/factory_colorselector.png b/src/bin/gui/images/factory_colorselector.png similarity index 100% rename from data/images/factory_colorselector.png rename to src/bin/gui/images/factory_colorselector.png diff --git a/data/images/factory_ctxpopup.png b/src/bin/gui/images/factory_ctxpopup.png similarity index 100% rename from data/images/factory_ctxpopup.png rename to src/bin/gui/images/factory_ctxpopup.png diff --git a/data/images/factory_dayselector.png b/src/bin/gui/images/factory_dayselector.png similarity index 100% rename from data/images/factory_dayselector.png rename to src/bin/gui/images/factory_dayselector.png diff --git a/data/images/factory_diskselector.png b/src/bin/gui/images/factory_diskselector.png similarity index 100% rename from data/images/factory_diskselector.png rename to src/bin/gui/images/factory_diskselector.png diff --git a/data/images/factory_entry.png b/src/bin/gui/images/factory_entry.png similarity index 100% rename from data/images/factory_entry.png rename to src/bin/gui/images/factory_entry.png diff --git a/data/images/factory_flip.png b/src/bin/gui/images/factory_flip.png similarity index 100% rename from data/images/factory_flip.png rename to src/bin/gui/images/factory_flip.png diff --git a/data/images/factory_frame.png b/src/bin/gui/images/factory_frame.png similarity index 100% rename from data/images/factory_frame.png rename to src/bin/gui/images/factory_frame.png diff --git a/data/images/factory_gengrid.png b/src/bin/gui/images/factory_gengrid.png similarity index 100% rename from data/images/factory_gengrid.png rename to src/bin/gui/images/factory_gengrid.png diff --git a/data/images/factory_genlist.png b/src/bin/gui/images/factory_genlist.png similarity index 100% rename from data/images/factory_genlist.png rename to src/bin/gui/images/factory_genlist.png diff --git a/data/images/factory_icon.png b/src/bin/gui/images/factory_icon.png similarity index 100% rename from data/images/factory_icon.png rename to src/bin/gui/images/factory_icon.png diff --git a/data/images/factory_image.png b/src/bin/gui/images/factory_image.png similarity index 100% rename from data/images/factory_image.png rename to src/bin/gui/images/factory_image.png diff --git a/data/images/factory_label.png b/src/bin/gui/images/factory_label.png similarity index 100% rename from data/images/factory_label.png rename to src/bin/gui/images/factory_label.png diff --git a/data/images/factory_layout.png b/src/bin/gui/images/factory_layout.png similarity index 100% rename from data/images/factory_layout.png rename to src/bin/gui/images/factory_layout.png diff --git a/data/images/factory_menu.png b/src/bin/gui/images/factory_menu.png similarity index 100% rename from data/images/factory_menu.png rename to src/bin/gui/images/factory_menu.png diff --git a/data/images/factory_naviframe.png b/src/bin/gui/images/factory_naviframe.png similarity index 100% rename from data/images/factory_naviframe.png rename to src/bin/gui/images/factory_naviframe.png diff --git a/data/images/factory_radio.png b/src/bin/gui/images/factory_radio.png similarity index 100% rename from data/images/factory_radio.png rename to src/bin/gui/images/factory_radio.png diff --git a/data/images/factory_table.png b/src/bin/gui/images/factory_table.png similarity index 100% rename from data/images/factory_table.png rename to src/bin/gui/images/factory_table.png diff --git a/data/images/factory_toolbar.png b/src/bin/gui/images/factory_toolbar.png similarity index 100% rename from data/images/factory_toolbar.png rename to src/bin/gui/images/factory_toolbar.png diff --git a/data/images/factory_win.png b/src/bin/gui/images/factory_win.png similarity index 100% rename from data/images/factory_win.png rename to src/bin/gui/images/factory_win.png diff --git a/data/images/icon_autoscroll.png b/src/bin/gui/images/icon_autoscroll.png similarity index 100% rename from data/images/icon_autoscroll.png rename to src/bin/gui/images/icon_autoscroll.png diff --git a/data/images/icon_close.png b/src/bin/gui/images/icon_close.png similarity index 100% rename from data/images/icon_close.png rename to src/bin/gui/images/icon_close.png diff --git a/data/images/icon_down_arrow.png b/src/bin/gui/images/icon_down_arrow.png similarity index 100% rename from data/images/icon_down_arrow.png rename to src/bin/gui/images/icon_down_arrow.png diff --git a/data/images/icon_prop_menu.png b/src/bin/gui/images/icon_prop_menu.png similarity index 100% rename from data/images/icon_prop_menu.png rename to src/bin/gui/images/icon_prop_menu.png diff --git a/data/images/icon_prop_menu2.png b/src/bin/gui/images/icon_prop_menu2.png similarity index 100% rename from data/images/icon_prop_menu2.png rename to src/bin/gui/images/icon_prop_menu2.png diff --git a/data/images/icon_up_arrow.png b/src/bin/gui/images/icon_up_arrow.png similarity index 100% rename from data/images/icon_up_arrow.png rename to src/bin/gui/images/icon_up_arrow.png diff --git a/data/images/resize_red.png b/src/bin/gui/images/resize_red.png similarity index 100% rename from data/images/resize_red.png rename to src/bin/gui/images/resize_red.png diff --git a/data/images/table_cell_border.png b/src/bin/gui/images/table_cell_border.png similarity index 100% rename from data/images/table_cell_border.png rename to src/bin/gui/images/table_cell_border.png --
