usb popup : change edc file name from usb.edc to usb-popup.edc

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

diff --git a/packaging/system-servant.spec b/packaging/system-servant.spec
index be9a62533081a47e534d1c800db92e57efa425c8..bc4bfe0f70a060f54c88906c87b7a85d17ca87ad 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/usb.edj
+%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/usb-popup.edj
 %endif
 %{TZ_SYS_RO_SHARE}/packages/org.tizen.system-syspopup.xml
 %endif

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2084f9e21b2d5875ad316089dfc6d7c53e3ada9..5e99c6d0b9a9a1c5f368a92af53ca74352bd6af0 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,10 +109,10 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -O2 -g -Wall -fpie")
 ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
 ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
 ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
+ADD_DEFINITIONS("-DSYSTEM_RES=\"${SYSTEM_RES}\"")
 IF(USB_POPUP STREQUAL on)
        IF(PROFILE_MOBILE)
-               ADD_DEFINITIONS("-DSYSTEM_RES=\"${SYSTEM_RES}\"")
-               ADD_DEFINITIONS("-DELM_USB_EDC=\"${SYSTEM_RES}/usb.edj\"")
+               ADD_DEFINITIONS("-DELM_USB_EDC=\"${SYSTEM_RES}/usb-popup.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(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_CUSTOM_TARGET(usb-popup.edj
+                       COMMAND edje_cc -no-save ${CMAKE_SOURCE_DIR}/src/usb/usb-popup.edc ${CMAKE_BINARY_DIR}/usb-popup.edj
+                       DEPENDS ${CMAKE_SOURCE_DIR}/src/usb/usb-popup.edc
+                       COMMENT "making usb popup edj file"
                )
-               ADD_DEPENDENCIES(${PACKAGE} usb.edj)
-               INSTALL(FILES ${CMAKE_BINARY_DIR}/usb.edj DESTINATION ${SYSTEM_RES})
+               ADD_DEPENDENCIES(${PACKAGE} usb-popup.edj)
+               INSTALL(FILES ${CMAKE_BINARY_DIR}/usb-popup.edj DESTINATION ${SYSTEM_RES})
        ENDIF()
 ENDIF(USB_POPUP STREQUAL on)
 

diff --git a/src/usb/usb-popup.edc b/src/usb/usb-popup.edc
new file mode 100755 (executable)
index 0000000..2b60f6e
--- /dev/null
+++ b/src/usb/usb-popup.edc
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+collections {
+       base_scale: 2.6;
+
+       #define POPUP_CHECK_VIEW_LAYOUT_MIN_INC 0 252
+       #define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 15
+       #define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 15
+       #define POPUP_CHECK_VIEW_LAYOUT_CONTENT_MIN_INC 0 162
+       #define POPUP_CHECK_VIEW_LAYOUT_BOTTOM_MIN_INC 0 90
+       #define POPUP_CHECK_VIEW_SWALLOW_END_MIN_INC 50 50
+
+       group { name: "popup_checkview_layout";
+          styles {
+             style { name: "popup_content_style";
+                base: "font=Tizen:style=Regular align=left font_size="POPUP_TEXT_FONT_SIZE1" color=#000000 wrap=mixed ellipsis=1.0 text_class=tizen";
+                tag: "br" "\n";
+                tag: "tab" "\t";
+             }
+          }
+          parts {
+             part { name: "bg";
+                scale: 1;
+                type: SPACER;
+                description { state: "default" 0.0;
+                   min: POPUP_CHECK_VIEW_LAYOUT_MIN_INC;
+                   fixed: 1 0;
+                }
+             }
+             part { name: "pad_l";
+                type: SPACER;
+                scale: 1;
+                description { state: "default" 0.0;
+                   min: POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0;
+                   fixed: 1 0;
+                   rel1.relative: 0.0 0.0;
+                   rel2.relative: 0.0 1.0;
+                   align: 0.0 0.0;
+                }
+             }
+             part { name: "pad_r";
+                type: SPACER;
+                scale: 1;
+                description { state: "default" 0.0;
+                   min: POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 0;
+                   fixed: 1 0;
+                   rel1.relative: 1.0 0.0;
+                   rel2.relative: 1.0 1.0;
+                   align: 1.0 0.0;
+                }
+             }
+             part { name: "elm.swallow.content";
+                type: SWALLOW;
+                scale: 1;
+                description { state: "default" 0.0;
+                   fixed: 0 1;
+                   min: POPUP_CHECK_VIEW_LAYOUT_CONTENT_MIN_INC;
+                   align: 0.5 0.0;
+                   rel2 {
+                      relative: 1.0 0.0;
+                      to: "pad_b";
+                   }
+                }
+             }
+             part { name: "pad_b";
+                type: SPACER;
+                scale: 1;
+                description { state: "default" 0.0;
+                   align: 0.0 1.0;
+                   min: POPUP_CHECK_VIEW_LAYOUT_BOTTOM_MIN_INC;
+                   fixed: 0 1;
+                   rel1.relative: 0.0 1.0;
+                }
+             }
+             part { name: "elm.swallow.end";
+                type: SWALLOW;
+                scale: 1;
+                description { state: "default" 0.0;
+                   align: 0.0 0.5;
+                   min: POPUP_CHECK_VIEW_SWALLOW_END_MIN_INC;
+                   fixed: 1 1;
+                   rel1 {
+                      relative: 1.0 1.0;
+                      to_x: "pad_l";
+                      to_y: "pad_b";
+                   }
+                   rel2 {
+                      relative: 0.0 0.0;
+                      to_x: "pad_r";
+                      to_y: "pad_b";
+                   }
+                }
+             }
+          }
+       }
+}

diff --git a/src/usb/usb.edc b/src/usb/usb.edc
deleted file mode 100755 (executable)
index 2b60f6e..0000000
--- a/src/usb/usb.edc
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-collections {
-       base_scale: 2.6;
-
-       #define POPUP_CHECK_VIEW_LAYOUT_MIN_INC 0 252
-       #define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 15
-       #define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 15
-       #define POPUP_CHECK_VIEW_LAYOUT_CONTENT_MIN_INC 0 162
-       #define POPUP_CHECK_VIEW_LAYOUT_BOTTOM_MIN_INC 0 90
-       #define POPUP_CHECK_VIEW_SWALLOW_END_MIN_INC 50 50
-
-       group { name: "popup_checkview_layout";
-          styles {
-             style { name: "popup_content_style";
-                base: "font=Tizen:style=Regular align=left font_size="POPUP_TEXT_FONT_SIZE1" color=#000000 wrap=mixed ellipsis=1.0 text_class=tizen";
-                tag: "br" "\n";
-                tag: "tab" "\t";
-             }
-          }
-          parts {
-             part { name: "bg";
-                scale: 1;
-                type: SPACER;
-                description { state: "default" 0.0;
-                   min: POPUP_CHECK_VIEW_LAYOUT_MIN_INC;
-                   fixed: 1 0;
-                }
-             }
-             part { name: "pad_l";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                   min: POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0;
-                   fixed: 1 0;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 0.0 1.0;
-                   align: 0.0 0.0;
-                }
-             }
-             part { name: "pad_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                   min: POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 0;
-                   fixed: 1 0;
-                   rel1.relative: 1.0 0.0;
-                   rel2.relative: 1.0 1.0;
-                   align: 1.0 0.0;
-                }
-             }
-             part { name: "elm.swallow.content";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                   fixed: 0 1;
-                   min: POPUP_CHECK_VIEW_LAYOUT_CONTENT_MIN_INC;
-                   align: 0.5 0.0;
-                   rel2 {
-                      relative: 1.0 0.0;
-                      to: "pad_b";
-                   }
-                }
-             }
-             part { name: "pad_b";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                   align: 0.0 1.0;
-                   min: POPUP_CHECK_VIEW_LAYOUT_BOTTOM_MIN_INC;
-                   fixed: 0 1;
-                   rel1.relative: 0.0 1.0;
-                }
-             }
-             part { name: "elm.swallow.end";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                   align: 0.0 0.5;
-                   min: POPUP_CHECK_VIEW_SWALLOW_END_MIN_INC;
-                   fixed: 1 1;
-                   rel1 {
-                      relative: 1.0 1.0;
-                      to_x: "pad_l";
-                      to_y: "pad_b";
-                   }
-                   rel2 {
-                      relative: 0.0 0.0;
-                      to_x: "pad_r";
-                      to_y: "pad_b";
-                   }
-                }
-             }
-          }
-       }
-}