usb popup : change system-syspopup.edc to usb.edc

Change-Id: I3539371984f71811b9e99eb521bb7f90575c6f83
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>

diff --git a/packaging/system-servant.spec b/packaging/system-servant.spec
index 4e65a38..be9a625 100755 (executable)
--- a/packaging/system-servant.spec
+++ b/packaging/system-servant.spec
@@ -341,7 +341,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.system-syspopup/bin/system-syspopup
 %if "%{?profile}" == "mobile"
-%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/system-syspopup.edj
+%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/usb.edj
 %endif
 %{TZ_SYS_RO_SHARE}/packages/org.tizen.system-syspopup.xml
 %endif

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97695bb..f2084f9 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -112,7 +112,7 @@ ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
 IF(USB_POPUP STREQUAL on)
        IF(PROFILE_MOBILE)
                ADD_DEFINITIONS("-DSYSTEM_RES=\"${SYSTEM_RES}\"")
-               ADD_DEFINITIONS("-DELM_SYSTEM_EDC=\"${SYSTEM_RES}/${PACKAGE}.edj\"")
+               ADD_DEFINITIONS("-DELM_USB_EDC=\"${SYSTEM_RES}/usb.edj\"")
        ENDIF()
 ENDIF(USB_POPUP STREQUAL on)
 
@@ -126,13 +126,13 @@ INSTALL(TARGETS ${PACKAGE} DESTINATION ${BINDIR})
 
 IF(USB_POPUP STREQUAL on)
        IF(PROFILE_MOBILE)
-               ADD_CUSTOM_TARGET(${PACKAGE}.edj
-                       COMMAND edje_cc -no-save ${CMAKE_SOURCE_DIR}/src/usb/${PACKAGE}.edc ${CMAKE_BINARY_DIR}/${PACKAGE}.edj
-                       DEPENDS ${CMAKE_SOURCE_DIR}/src/usb/${PACKAGE}.edc
-                       COMMENT "making edj file"
+               ADD_CUSTOM_TARGET(usb.edj
+                       COMMAND edje_cc -no-save ${CMAKE_SOURCE_DIR}/src/usb/usb.edc ${CMAKE_BINARY_DIR}/usb.edj
+                       DEPENDS ${CMAKE_SOURCE_DIR}/src/usb/usb.edc
+                       COMMENT "making usb edj file"
                )
-               ADD_DEPENDENCIES(${PACKAGE} ${PACKAGE}.edj)
-               INSTALL(FILES ${CMAKE_BINARY_DIR}/${PACKAGE}.edj DESTINATION ${SYSTEM_RES})
+               ADD_DEPENDENCIES(${PACKAGE} usb.edj)
+               INSTALL(FILES ${CMAKE_BINARY_DIR}/usb.edj DESTINATION ${SYSTEM_RES})
        ENDIF()
 ENDIF(USB_POPUP STREQUAL on)
 

diff --git a/src/usb/usb-device.c b/src/usb/usb-device.c
index 3f88c9c..22b2cc4 100755 (executable)
--- a/src/usb/usb-device.c
+++ b/src/usb/usb-device.c
@@ -215,7 +215,7 @@ static int usbhost_show(bundle *b, const struct popup_ops *ops)
 
        /* layout */
        layout = elm_layout_add(popup);
-       elm_layout_file_set(layout, ELM_SYSTEM_EDC, "popup_checkview_layout");
+       elm_layout_file_set(layout, ELM_USB_EDC, "popup_checkview_layout");
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_part_text_set(layout, "elm.text", "Description text");
 

diff --git a/src/usb/system-syspopup.edc b/src/usb/usb.edc
similarity index 100%
rename from src/usb/system-syspopup.edc
rename to src/usb/usb.edc