Change edje directory for consistency

Change-Id: Ib20ced3318398784482da807acd586ecfc44c177
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85d0b95..50331fe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ ADD_CUSTOM_TARGET(
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/edc/candidate-single/candidate.edc
 )
 ADD_DEPENDENCIES(${PROJECT_NAME} candidate-single.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/candidate-single.edj DESTINATION ${ISE_LAYOUTDIR}/sdk/edc)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/candidate-single.edj DESTINATION ${ISE_RESDIR}/edje)
 # For edc File end
 # For edc File
 ADD_CUSTOM_TARGET(
@@ -111,7 +111,7 @@ ADD_CUSTOM_TARGET(
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/edc/candidate-multiline/candidate.edc
 )
 ADD_DEPENDENCIES(${PROJECT_NAME} candidate-multiline.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/candidate-multiline.edj DESTINATION ${ISE_LAYOUTDIR}/sdk/edc)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/candidate-multiline.edj DESTINATION ${ISE_RESDIR}/edje)
 # For edc File end
 # For edc File
 ADD_CUSTOM_TARGET(
@@ -123,7 +123,7 @@ ADD_CUSTOM_TARGET(
         ${CMAKE_BINARY_DIR}/customised_gengrid.edj
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/edc/gengrid/customised_gengrid.edc)
 ADD_DEPENDENCIES(${PROJECT_NAME} customised_gengrid.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/customised_gengrid.edj DESTINATION ${ISE_LAYOUTDIR}/sdk/edc)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/customised_gengrid.edj DESTINATION ${ISE_RESDIR}/edje)
 
 ADD_CUSTOM_TARGET(
     layout_keypad.edj
@@ -132,7 +132,7 @@ ADD_CUSTOM_TARGET(
         ${CMAKE_BINARY_DIR}/layout_keypad.edj
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/edc/gengrid/layout_keypad.edc)
 ADD_DEPENDENCIES(${PROJECT_NAME} layout_keypad.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/layout_keypad.edj DESTINATION ${ISE_LAYOUTDIR}/sdk/edc)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/layout_keypad.edj DESTINATION ${ISE_RESDIR}/edje)
 
 if(${TARGET} STREQUAL "wearable")
 ADD_CUSTOM_TARGET(w-input-stt.edj COMMAND edje_cc

diff --git a/src/candidate/efl/candidate-efl.cpp b/src/candidate/efl/candidate-efl.cpp
index 0004a36..9347501 100644 (file)
--- a/src/candidate/efl/candidate-efl.cpp
+++ b/src/candidate/efl/candidate-efl.cpp
@@ -23,7 +23,7 @@
 
 using namespace std;
 
-#define CANDIDATE_EDJ_FILE_PATH LAYOUTDIR"/sdk/edc/candidate-single.edj"
+#define CANDIDATE_EDJ_FILE_PATH RESDIR"/edje/candidate-single.edj"
 #include "configure.h"
 static void
 _mouse_down(void *data, Evas *e,

diff --git a/src/candidate/efl/candidate-multiline-efl.cpp b/src/candidate/efl/candidate-multiline-efl.cpp
index e3b78f1..1852970 100644 (file)
--- a/src/candidate/efl/candidate-multiline-efl.cpp
+++ b/src/candidate/efl/candidate-multiline-efl.cpp
@@ -26,7 +26,7 @@
 
 using namespace std;
 
-#define CANDIDATE_EDJ_FILE_PATH       LAYOUTDIR"/sdk/edc/candidate-multiline.edj"
+#define CANDIDATE_EDJ_FILE_PATH       RESDIR"/edje/candidate-multiline.edj"
 #define MORE_BUTTON_WIDTH             89
 #define MORE_BUTTON_HEIGHT            64
 #define CANDIDATE_WINDOW_HEIGHT       84
@@ -554,4 +554,4 @@ int
 EflMultiLineCandidate::get_height()
 {
     return CANDIDATE_WINDOW_HEIGHT*m_screenRatio;
-}
\ No newline at end of file
+}

diff --git a/src/ise-emoticon-mode.cpp b/src/ise-emoticon-mode.cpp
index bbd795f..d1aba4b 100644 (file)
--- a/src/ise-emoticon-mode.cpp
+++ b/src/ise-emoticon-mode.cpp
@@ -50,8 +50,8 @@
 #endif
 
 #define EMOTICON_DIR LAYOUTDIR"/emoticons/"
-#define EMOTICON_EDJ_FILE_PATH LAYOUTDIR"/sdk/edc/layout_keypad.edj"
-#define CUSTOM_GENGRID_EDJ_FILE_PATH LAYOUTDIR"/sdk/edc/customised_gengrid.edj"
+#define EMOTICON_EDJ_FILE_PATH RESDIR"/edje/layout_keypad.edj"
+#define CUSTOM_GENGRID_EDJ_FILE_PATH RESDIR"/edje/customised_gengrid.edj"
 
 #define EMOTICON_EDJ_GROUP_PORT_CANDIDATE_ON "emoticon.main.portrait.candidate.on"
 #define EMOTICON_EDJ_GROUP_LAND_CANDIDATE_ON "emoticon.main.landscape.candidate.on"