TizenRefApp-7359 [Call UI] Remove dummy define for image source path

Change-Id: I132cae402d2499b0eb5c09823c6b7c99031a2283

diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index c4ea75a..cef798d 100755 (executable)
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -74,7 +74,7 @@ ADD_CUSTOM_COMMAND(
                ${EDJE_DIR}/call.edc ${CMAKE_BINARY_DIR}/call.edj
                DEPENDS ${EDJE_DIR}/call.edc
                        ${INC_DIR}/callui-view-layout.h
-                       ${EDC_SRC_DIR}/callui-color-classes.edc
+                       ${EDC_SRC_DIR}/callui-common-color-classes.edc
                        ${EDC_SRC_DIR}/callui-common-utils.edc
                        ${EDC_SRC_DIR}/callui-common-macro-part.edc
                        ${EDC_SRC_DIR}/callui-common-macro-button.edc

diff --git a/edje_src/edc/callui-action-bar.edc b/edje_src/edc/callui-action-bar.edc
index 99df19d..111c234 100644 (file)
--- a/edje_src/edc/callui-action-bar.edc
+++ b/edje_src/edc/callui-action-bar.edc
@@ -15,7 +15,7 @@
  *
  */
 
-#define ACTION_BAR_ICON_PATH IMG_SRC_DIR/"action_bar"
+#define ACTION_BAR_IMG_SRC_DIR "action_bar"
 
 styles {
        style { name: "action_btn_norm";
@@ -250,7 +250,7 @@ styles {
        group { name: "elm/button/base/"grp_name; \
                images { \
                        image: img1 COMP; \
-                       image: ACTION_BAR_ICON_PATH"/call_onoff_bar.#.png" COMP; \
+                       image: ACTION_BAR_IMG_SRC_DIR"/call_onoff_bar.#.png" COMP; \
                } \
                script { \
                        public mouse_down = 0; \
@@ -337,7 +337,7 @@ styles {
                                type: IMAGE; \
                                scale: 1; \
                                description { state: "default" 0.0; \
-                                       image.normal: ACTION_BAR_ICON_PATH"/call_onoff_bar.#.png"; \
+                                       image.normal: ACTION_BAR_IMG_SRC_DIR"/call_onoff_bar.#.png"; \
                                        rel1.relative: (STYLE_ONOFF_BAR_L_PAD/BTN_LAYOUT_SINGLE_BTN_WIDTH) (STYLE_ONOFF_BAR_T_PAD/BTN_LAYOUT_SINGLE_BTN_HEIGHT); \
                                        rel2.relative: (STYLE_ONOFF_BAR_R/BTN_LAYOUT_SINGLE_BTN_WIDTH) (STYLE_ONOFF_BAR_B/BTN_LAYOUT_SINGLE_BTN_HEIGHT); \
                                        color_class: "action_bar_onoff_bar_norm";\
@@ -564,11 +564,11 @@ group{ name: "elm/layout/callui/action_bar";
        }
 }
 
-ACTION_BTN("callui_action_btn_add", ACTION_BAR_ICON_PATH"/call_btn_addcall.png")
-ACTION_BTN("callui_action_btn_keypad", ACTION_BAR_ICON_PATH"/call_btn_keypad.png")
-ACTION_BTN("callui_action_btn_contacts", ACTION_BAR_ICON_PATH"/call_btn_contacts.png")
+ACTION_BTN("callui_action_btn_add", ACTION_BAR_IMG_SRC_DIR"/call_btn_addcall.png")
+ACTION_BTN("callui_action_btn_keypad", ACTION_BAR_IMG_SRC_DIR"/call_btn_keypad.png")
+ACTION_BTN("callui_action_btn_contacts", ACTION_BAR_IMG_SRC_DIR"/call_btn_contacts.png")
 
-ACTION_BTN_TOGGLE("callui_action_btn_speaker", ACTION_BAR_ICON_PATH"/call_btn_volume.png")
-ACTION_BTN_TOGGLE("callui_action_btn_mute", ACTION_BAR_ICON_PATH"/call_btn_mute.png")
-ACTION_BTN_TOGGLE("callui_action_btn_headset", ACTION_BAR_ICON_PATH"/call_btn_bluetooth.png")
+ACTION_BTN_TOGGLE("callui_action_btn_speaker", ACTION_BAR_IMG_SRC_DIR"/call_btn_volume.png")
+ACTION_BTN_TOGGLE("callui_action_btn_mute", ACTION_BAR_IMG_SRC_DIR"/call_btn_mute.png")
+ACTION_BTN_TOGGLE("callui_action_btn_headset", ACTION_BAR_IMG_SRC_DIR"/call_btn_bluetooth.png")
 

diff --git a/edje_src/edc/callui-color-classes.edc b/edje_src/edc/callui-common-color-classes.edc
similarity index 100%
rename from edje_src/edc/callui-color-classes.edc
rename to edje_src/edc/callui-common-color-classes.edc

diff --git a/edje_src/edc/callui-common-utils.edc b/edje_src/edc/callui-common-utils.edc
index 68919cd..15d840e 100644 (file)
--- a/edje_src/edc/callui-common-utils.edc
+++ b/edje_src/edc/callui-common-utils.edc
@@ -15,7 +15,4 @@
  *
  */
 
-// TODO need to be removed separately
-#define        IMG_SRC_DIR ""
-
 #define TRANSITION_GLIDE(duration) CUBIC_BEZIER (duration) 0.25 0.46 0.45 1.0

diff --git a/edje_src/edc/callui-keypad.edc b/edje_src/edc/callui-keypad.edc
index 474ab27..10ffcae 100644 (file)
--- a/edje_src/edc/callui-keypad.edc
+++ b/edje_src/edc/callui-keypad.edc
@@ -15,11 +15,11 @@
  *
  */
 
-#define CU_KEYPAD_NUM_IMG_SRC_DIR                      IMG_SRC_DIR/"keypad"
+#define KEYPAD_NUM_IMG_SRC_DIR                         "keypad"
 
-#define CU_KEYPAD_ANIMATION_DURATION           0.8
-#define CU_KEYPAD_ANIMATION_DELAY                      0.6 0.0
-#define CU_KEYPAD_DOWN_ARW_START_ANIM_MAX_H    3
+#define KEYPAD_ANIM_DURATION                           0.8
+#define KEYPAD_ANIM_DELAY                                      0.6 0.0
+#define KEYPAD_DOWN_ARW_START_ANIM_MAX_H       3
 
 #define PART_KEYPAD_CUSTOM_ONE_ICON(txt, column, row, num_icon) \
                        CU_PART_RECT( txt, \
@@ -291,27 +291,27 @@ group{ name: "elm/layout/callui/keypad";
 
 group{ name: "elm/layout/callui/keypad_btns";
        images {
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_01.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_02.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_03.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_04.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_05.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_06.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_07.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_08.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_09.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_01.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_02.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_03.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_04.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_05.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_06.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_07.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_08.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_asterisk.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_00.png" COMP;
-               image: CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_sharp.png" COMP;
-               image: IMG_SRC_DIR/"call_open_arrow_01.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_01.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_02.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_03.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_04.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_05.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_06.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_07.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_08.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_09.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_01.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_02.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_03.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_04.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_05.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_06.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_07.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_08.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_asterisk.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_00.png" COMP;
+               image: KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_sharp.png" COMP;
+               image: "call_open_arrow_01.png" COMP;
        }
        parts {
                CU_PART_SPACER( "bg",
@@ -349,8 +349,8 @@ group{ name: "elm/layout/callui/keypad_btns";
                                rel1 {relative: 0.0 0.0; to: "keypad_arrow_rect";}
                                rel2 {relative: 1.0 1.0; to: "keypad_arrow_rect";}
                                align: 0.5 0.0;
-                               image.normal: IMG_SRC_DIR/"call_open_arrow_01.png";
-                               max: -1 CU_KEYPAD_DOWN_ARW_START_ANIM_MAX_H;
+                               image.normal: "call_open_arrow_01.png";
+                               max: -1 KEYPAD_DOWN_ARW_START_ANIM_MAX_H;
                                fixed: 0 1;
                                aspect_preference: HORIZONTAL;
                                visible: 1;
@@ -358,7 +358,7 @@ group{ name: "elm/layout/callui/keypad_btns";
                        description { state: "move" 0.0;
                                rel1 { relative: 0.0 0.0; to: "keypad_arrow_rect";}
                                rel2 { relative: 1.0 1.0; to: "keypad_arrow_rect";}
-                               image.normal: IMG_SRC_DIR/"call_open_arrow_01.png";
+                               image.normal: "call_open_arrow_01.png";
                                aspect_preference: SOURCE;
                                align: 0.5 1.0;
                        }
@@ -373,18 +373,18 @@ group{ name: "elm/layout/callui/keypad_btns";
                                visible: 1;
                        }
                )
-               PART_KEYPAD_CUSTOM_ONE_ICON("1", 0, 0, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_01.png")
-               PART_KEYPAD_CUSTOM_TWO_ICON("2", 1, 0, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_02.png", CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_01.png")
-               PART_KEYPAD_CUSTOM_TWO_ICON("3", 2, 0, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_03.png", CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_02.png")
-               PART_KEYPAD_CUSTOM_TWO_ICON("4", 0, 1, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_04.png", CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_03.png")
-               PART_KEYPAD_CUSTOM_TWO_ICON("5", 1, 1, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_05.png", CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_04.png")
-               PART_KEYPAD_CUSTOM_TWO_ICON("6", 2, 1, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_06.png", CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_05.png")
-               PART_KEYPAD_CUSTOM_TWO_ICON("7", 0, 2, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_07.png", CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_06.png")
-               PART_KEYPAD_CUSTOM_TWO_ICON("8", 1, 2, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_08.png", CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_07.png")
-               PART_KEYPAD_CUSTOM_TWO_ICON("9", 2, 2, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_09.png", CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_08.png")
-               PART_KEYPAD_CUSTOM_ONE_ICON("star", 0, 3, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_asterisk.png")
-               PART_KEYPAD_CUSTOM_ONE_ICON("0", 1, 3, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_00.png")
-               PART_KEYPAD_CUSTOM_ONE_ICON("sharp", 2, 3, CU_KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_sharp.png")
+               PART_KEYPAD_CUSTOM_ONE_ICON("1", 0, 0, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_01.png")
+               PART_KEYPAD_CUSTOM_TWO_ICON("2", 1, 0, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_02.png", KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_01.png")
+               PART_KEYPAD_CUSTOM_TWO_ICON("3", 2, 0, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_03.png", KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_02.png")
+               PART_KEYPAD_CUSTOM_TWO_ICON("4", 0, 1, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_04.png", KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_03.png")
+               PART_KEYPAD_CUSTOM_TWO_ICON("5", 1, 1, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_05.png", KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_04.png")
+               PART_KEYPAD_CUSTOM_TWO_ICON("6", 2, 1, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_06.png", KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_05.png")
+               PART_KEYPAD_CUSTOM_TWO_ICON("7", 0, 2, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_07.png", KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_06.png")
+               PART_KEYPAD_CUSTOM_TWO_ICON("8", 1, 2, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_08.png", KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_07.png")
+               PART_KEYPAD_CUSTOM_TWO_ICON("9", 2, 2, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_09.png", KEYPAD_NUM_IMG_SRC_DIR/"keypad_english_08.png")
+               PART_KEYPAD_CUSTOM_ONE_ICON("star", 0, 3, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_asterisk.png")
+               PART_KEYPAD_CUSTOM_ONE_ICON("0", 1, 3, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_00.png")
+               PART_KEYPAD_CUSTOM_ONE_ICON("sharp", 2, 3, KEYPAD_NUM_IMG_SRC_DIR/"keypad_number_sharp.png")
        }
        programs {
                script {
@@ -407,7 +407,7 @@ group{ name: "elm/layout/callui/keypad_btns";
                        after: "resize_down_arrow";
                }
                program { name: "start_down_arrow_anim_w_delay";
-                       in: CU_KEYPAD_ANIMATION_DELAY;
+                       in: KEYPAD_ANIM_DELAY;
                        after: "start_down_arrow_anim";
                }
                program { name: "resize_down_arrow";
@@ -415,7 +415,7 @@ group{ name: "elm/layout/callui/keypad_btns";
                        source: "down_arrow";
                        action: STATE_SET "move" 0.0;
                        target: "keypad_down_arw";
-                       transition: DECELERATE CU_KEYPAD_ANIMATION_DURATION;
+                       transition: DECELERATE KEYPAD_ANIM_DURATION;
                        after: "repeat";
                }
                program { name: "repeat";

diff --git a/edje_src/edc/callui-view-caller-info.edc b/edje_src/edc/callui-view-caller-info.edc
index 4c42c9d..706000e 100644 (file)
--- a/edje_src/edc/callui-view-caller-info.edc
+++ b/edje_src/edc/callui-view-caller-info.edc
@@ -66,7 +66,7 @@ styles {
 
 group{ name: "elm/layout/callui/manage_calls";
        images {
-               image: IMG_SRC_DIR/"call_multi_ic_arrow.png" COMP;
+               image: "call_multi_ic_arrow.png" COMP;
        }
        parts {
                CU_PART_SPACER( "bg",
@@ -77,7 +77,7 @@ group{ name: "elm/layout/callui/manage_calls";
                        description { state: "default" 0.0;
                                rel1 { relative: 0.0 0.0;       to: "bg"; }
                                rel2 { relative: 1.0 1.0;       to: "bg"; }
-                               image.normal: IMG_SRC_DIR/"call_multi_ic_arrow.png";
+                               image.normal: "call_multi_ic_arrow.png";
                                color_class: "manage_calls_arrow";
                        }
                )
@@ -87,7 +87,7 @@ group{ name: "elm/layout/callui/manage_calls";
 group{
        name: "elm/layout/callui/caller_info";
        images {
-               image: IMG_SRC_DIR/"core_button_add.png" COMP;
+               image: "core_button_add.png" COMP;
        }
        parts {
                CU_PART_SPACER( "bg",
@@ -362,7 +362,7 @@ group{
                                max: EC_ADD_CONT_BTN_SIZE;
                                rel1 { relative: 0.0 1.0;       to_x: "ec_add_cont.padding.left";       to_y: "ec_add_cont.padding.top"; }
                                rel2 { relative: 0.0 1.0;       to_x: "ec_add_cont.padding.left"; }
-                               image.normal: IMG_SRC_DIR/"core_button_add.png";
+                               image.normal: "core_button_add.png";
                                color: COLOR_WHITE;
                        }
                        description { state: "show" 0.0;

diff --git a/edje_src/edc/callui-view-elements.edc b/edje_src/edc/callui-view-elements.edc
index 7a13ec1..2499126 100644 (file)
--- a/edje_src/edc/callui-view-elements.edc
+++ b/edje_src/edc/callui-view-elements.edc
@@ -15,7 +15,7 @@
  *
  */
 
-#define        CALLID_IMG_SRC_DIR      IMG_SRC_DIR/"caller_id"
+#define        CALLID_IMG_SRC_DIR      "caller_id"
 
 #define CALLID_IMG_DIR_96      CALLID_IMG_SRC_DIR/"96x96"
 #define CALLID_IMG_DIR_138     CALLID_IMG_SRC_DIR/"138x138"
@@ -261,4 +261,4 @@ group { name: "elm/layout/callui/caller_id";
        }
 }
 
-CIRCLE_BTN_WITH_ICON("callui_circle_bottom_end_call", ENDCALL_BTN_SIZE, "bottom_bar_end_call", "bottom_bar_end_call", IMG_SRC_DIR/"call_btn_ic_reject.png", "btn_icon_def_color")
+CIRCLE_BTN_WITH_ICON("callui_circle_bottom_end_call", ENDCALL_BTN_SIZE, "bottom_bar_end_call", "bottom_bar_end_call", "call_btn_ic_reject.png", "btn_icon_def_color")

diff --git a/edje_src/edc/callui-view-end-call.edc b/edje_src/edc/callui-view-end-call.edc
index 266c973..17cb34a 100644 (file)
--- a/edje_src/edc/callui-view-end-call.edc
+++ b/edje_src/edc/callui-view-end-call.edc
@@ -195,19 +195,19 @@ styles {
 
 group { name: "elm/layout/callui/end_call_view";
        images {
-               image: IMG_SRC_DIR/"core_bg.png" COMP;
-               image: IMG_SRC_DIR/"core_bg_dim.png" COMP;
+               image: "core_bg.png" COMP;
+               image: "core_bg_dim.png" COMP;
        }
        parts {
                CU_PART_IMAGE( "dim_bg",
                        description { state: "default" 0.0;
-                               image.normal: IMG_SRC_DIR/"core_bg_dim.png";
+                               image.normal: "core_bg_dim.png";
                        }
                )
                CU_PART_IMAGE( "bg",
                        clip_to: "content.clipper";
                        description { state: "default" 0.0;
-                               image.normal: IMG_SRC_DIR/"core_bg.png";
+                               image.normal: "core_bg.png";
                        }
                )
                CU_PART_SPACER( "content.clipper.maximized",
@@ -484,5 +484,5 @@ group { name: "elm/layout/callui/end_call_view";
        }
 }
 
-END_CALL_REPLY_BTN("callui_endcall_callback", IMG_SRC_DIR/"call_end_call.png")
-END_CALL_REPLY_BTN("callui_endcall_message", IMG_SRC_DIR/"call_end_message.png")
+END_CALL_REPLY_BTN("callui_endcall_callback", "call_end_call.png")
+END_CALL_REPLY_BTN("callui_endcall_message", "call_end_message.png")

diff --git a/edje_src/edc/callui-view-incoming-call-noti.edc b/edje_src/edc/callui-view-incoming-call-noti.edc
index 96e237b..d4ee602 100644 (file)
--- a/edje_src/edc/callui-view-incoming-call-noti.edc
+++ b/edje_src/edc/callui-view-incoming-call-noti.edc
@@ -662,7 +662,7 @@ group { name: "elm/layout/callui/reject_msg_item";
 
 group { name: "elm/layout/callui/reject_msg_item_compose";
        images {
-               image: IMG_SRC_DIR/"core_button_add.png" COMP;
+               image: "core_button_add.png" COMP;
        }
        parts {
                CU_PART_BASE_WH(AN_MAX_W, ACTIVE_NOTI_RM_ITEM_HEIGHT)
@@ -705,7 +705,7 @@ group { name: "elm/layout/callui/reject_msg_item_compose";
                                rel2 { relative: 0.0 1.0; to_x: "add_icon.pad.right"; }
                                min: AN_RM_ITEM_ADD_ICON_SIZE;
                                max: AN_RM_ITEM_ADD_ICON_SIZE;
-                               image.normal: IMG_SRC_DIR/"core_button_add.png";
+                               image.normal: "core_button_add.png";
                                fixed: 1 1;
                        }
                )
@@ -756,13 +756,13 @@ group { name: "elm/layout/callui/reject_msg_item_compose";
 
 group { name: "elm/layout/callui/reject_msg_scroller_bg";
        images {
-               image: IMG_SRC_DIR/"core_bg.png" COMP;
+               image: "core_bg.png" COMP;
        }
        parts {
                CU_PART_IMAGE( "bg",
                        clip_to: "bg.clipper";
                        description { state: "default" 0.0;
-                               image.normal: IMG_SRC_DIR/"core_bg.png";
+                               image.normal: "core_bg.png";
                                rel1 { relative: 0.0 0.0; to: "bg.clipper"; }
                                fill {
                                        type: TILE;
@@ -797,15 +797,15 @@ group { name: "elm/layout/callui/reject_msg_scroller_bg";
 group {
        name: "elm/layout/callui/active_noti_main";
        images {
-               image: IMG_SRC_DIR/"core_bg.png" COMP;
-               image: IMG_SRC_DIR/"call_inline_btn_open.png" COMP;
-               image: IMG_SRC_DIR/"call_active_ic_call.png" COMP;
+               image: "core_bg.png" COMP;
+               image: "call_inline_btn_open.png" COMP;
+               image: "call_active_ic_call.png" COMP;
        }
        parts {
                CU_PART_IMAGE( "bg",
                        clip_to: "bg.clipper";
                        description { state: "default" 0.0;
-                               image.normal: IMG_SRC_DIR/"core_bg.png";
+                               image.normal: "core_bg.png";
                                rel1 { relative: 0.0 0.0; to: "contact_info"; }
                                fill {
                                        type: TILE;
@@ -969,7 +969,7 @@ group {
                                rel2 { relative: 1.0 1.0; to: "handler"; }
                                min: AN_HANDLER_ICON_SIZE;
                                max: AN_HANDLER_ICON_SIZE;
-                               image.normal: IMG_SRC_DIR/"call_inline_btn_open.png";
+                               image.normal: "call_inline_btn_open.png";
                                fixed: 1 1;
                        }
                        description { state: "show" 0.0;
@@ -985,7 +985,7 @@ group {
                                rel2 { relative: 1.0 1.0; to: "handler"; }
                                min: AN_HANDLER_ICON_SIZE;
                                max: AN_HANDLER_ICON_SIZE;
-                               image.normal: IMG_SRC_DIR/"call_inline_btn_open.png";
+                               image.normal: "call_inline_btn_open.png";
                                fixed: 1 1;
                                color: 255 255 255 50;
                        }
@@ -1048,7 +1048,7 @@ group {
                                rel1 { relative: 1.0 1.0; to_x: "caller_id.pad.left"; to_y: "caller_id.pad.bottom"; }
                                rel2 { relative: 1.0 1.0; to_x: "caller_id.pad.left"; to_y: "caller_id.pad.bottom"; }
                                min: AN_CALL_ICON_SIZE;
-                               image.normal: IMG_SRC_DIR/"call_active_ic_call.png";
+                               image.normal: "call_active_ic_call.png";
                                fixed: 1 1;
                        }
                )
@@ -1226,8 +1226,8 @@ group {
        }
 }
 
-RESOURCE_IMAGE("call_end_ic_call", IMG_SRC_DIR/"call_end_ic_call.png")
-RESOURCE_IMAGE("call_end_ic_end", IMG_SRC_DIR/"call_end_ic_end.png")
+RESOURCE_IMAGE("call_end_ic_call", "call_end_ic_call.png")
+RESOURCE_IMAGE("call_end_ic_end", "call_end_ic_end.png")
 
 /* Active notification buttons */
 ACTIVE_NOTI_BTN("callui_active_noti_accept", "active_noti_accept_call", "active_noti_accept_call")

diff --git a/edje_src/edc/callui-view-incoming-call.edc b/edje_src/edc/callui-view-incoming-call.edc
index 252ee02..ec8a1f8 100644 (file)
--- a/edje_src/edc/callui-view-incoming-call.edc
+++ b/edje_src/edc/callui-view-incoming-call.edc
@@ -127,7 +127,7 @@ styles {
                description { state: "default" 0.0; \
                        rel1 { relative: lpos tpos; } \
                        rel2 { relative: rpos bpos; } \
-                       image.normal: IMG_SRC_DIR/"call_btn_circle.png"; \
+                       image.normal: "call_btn_circle.png"; \
                        align: 0.0 0.5; \
                        color_class: color_code; \
                        aspect_preference: SOURCE; \
@@ -174,10 +174,10 @@ styles {
 
 group { name: "elm/layout/callui/lock_accept";
        images {
-               image: IMG_SRC_DIR/"call_button_bg_line_accept_reject.png" COMP;
-               image: IMG_SRC_DIR/"call_button_bg_accept_reject.png" COMP;
-               image: IMG_SRC_DIR/"call_btn_ic_accept.png" COMP;
-               image: IMG_SRC_DIR/"call_btn_circle.png" COMP;
+               image: "call_button_bg_line_accept_reject.png" COMP;
+               image: "call_button_bg_accept_reject.png" COMP;
+               image: "call_btn_ic_accept.png" COMP;
+               image: "call_btn_circle.png" COMP;
        }
        parts {
                part {name: "background";
@@ -191,10 +191,10 @@ group { name: "elm/layout/callui/lock_accept";
                }
                CREATE_OUTER_CIRCLE_RECT("rect_outer_circle", MTLOCK_ACCEPT_OUTER_CIRCLE_L, MTLOCK_ACCEPT_OUTER_CIRCLE_T, MTLOCK_ACCEPT_OUTER_CIRCLE_R, MTLOCK_ACCEPT_OUTER_CIRCLE_B)
                CREATE_OUTER_CIRCLE_CLIP("rect_outer_circle_clipper", MTLOCK_ACCEPT_OUTER_CIRCLE_L, MTLOCK_ACCEPT_OUTER_CIRCLE_CLIP_RECT_T, MTLOCK_ACCEPT_OUTER_CIRCLE_R, MTLOCK_ACCEPT_OUTER_CIRCLE_CLIP_RECT_B)
-               CREATE_OUTER_CIRCLE("accept_outer_circle", "rect_outer_circle", IMG_SRC_DIR/"call_button_bg_line_accept_reject.png", "rect_outer_circle_clipper", "ic_accept_outer_circle")
-               CREATE_INNER_CIRCLE_SIMPLE_IMAGE("accept_inner_circle_bg", MTLOCK_ACCEPT_INNER_CIRCLE_L, MTLOCK_ACCEPT_INNER_CIRCLE_T, MTLOCK_ACCEPT_INNER_CIRCLE_R, MTLOCK_ACCEPT_INNER_CIRCLE_B, "rect_outer_circle_clipper", IMG_SRC_DIR/"call_button_bg_accept_reject.png", "ic_accept_inner_circle_bg");
+               CREATE_OUTER_CIRCLE("accept_outer_circle", "rect_outer_circle", "call_button_bg_line_accept_reject.png", "rect_outer_circle_clipper", "ic_accept_outer_circle")
+               CREATE_INNER_CIRCLE_SIMPLE_IMAGE("accept_inner_circle_bg", MTLOCK_ACCEPT_INNER_CIRCLE_L, MTLOCK_ACCEPT_INNER_CIRCLE_T, MTLOCK_ACCEPT_INNER_CIRCLE_R, MTLOCK_ACCEPT_INNER_CIRCLE_B, "rect_outer_circle_clipper", "call_button_bg_accept_reject.png", "ic_accept_inner_circle_bg");
 
-               CREATE_INNER_CIRCLE("accept_inner_circle", MTLOCK_ACCEPT_INNER_CIRCLE_L, MTLOCK_ACCEPT_INNER_CIRCLE_T, MTLOCK_ACCEPT_INNER_CIRCLE_R, MTLOCK_ACCEPT_INNER_CIRCLE_B, IMG_SRC_DIR/"call_btn_ic_accept.png", "ic_accept_inner_circle")
+               CREATE_INNER_CIRCLE("accept_inner_circle", MTLOCK_ACCEPT_INNER_CIRCLE_L, MTLOCK_ACCEPT_INNER_CIRCLE_T, MTLOCK_ACCEPT_INNER_CIRCLE_R, MTLOCK_ACCEPT_INNER_CIRCLE_B, "call_btn_ic_accept.png", "ic_accept_inner_circle")
        }
        programs {
                CREATE_PROGRAM_IN_TRANSITION("accept_outer_circle,show", "outer_circle,show", "outer-circle", "show", 0.0, "accept_outer_circle")
@@ -205,10 +205,10 @@ group { name: "elm/layout/callui/lock_accept";
 group {
        name: "elm/layout/callui/lock_reject";
        images {
-               image: IMG_SRC_DIR/"call_button_bg_line_accept_reject.png" COMP;
-               image: IMG_SRC_DIR/"call_button_bg_accept_reject.png" COMP;
-               image: IMG_SRC_DIR/"call_btn_ic_reject.png" COMP;
-               image: IMG_SRC_DIR/"call_btn_circle.png" COMP;
+               image: "call_button_bg_line_accept_reject.png" COMP;
+               image: "call_button_bg_accept_reject.png" COMP;
+               image: "call_btn_ic_reject.png" COMP;
+               image: "call_btn_circle.png" COMP;
        }
        parts {
                part { name: "background";
@@ -222,10 +222,10 @@ group {
                }
                CREATE_OUTER_CIRCLE_RECT("rect_outer_circle", MTLOCK_REJECT_OUTER_CIRCLE_L, MTLOCK_REJECT_OUTER_CIRCLE_T, MTLOCK_REJECT_OUTER_CIRCLE_R, MTLOCK_REJECT_OUTER_CIRCLE_B)
                CREATE_OUTER_CIRCLE_CLIP("rect_outer_circle_clipper", MTLOCK_REJECT_OUTER_CIRCLE_L, MTLOCK_REJECT_OUTER_CIRCLE_CLIP_RECT_T, MTLOCK_REJECT_OUTER_CIRCLE_R, MTLOCK_REJECT_OUTER_CIRCLE_CLIP_RECT_B)
-               CREATE_OUTER_CIRCLE("reject_outer_circle", "rect_outer_circle", IMG_SRC_DIR/"call_button_bg_line_accept_reject.png", "rect_outer_circle_clipper", "ic_reject_outer_circle")
-               CREATE_INNER_CIRCLE_SIMPLE_IMAGE("reject_inner_circle_bg", MTLOCK_REJECT_INNER_CIRCLE_L, MTLOCK_REJECT_INNER_CIRCLE_T, MTLOCK_REJECT_INNER_CIRCLE_R, MTLOCK_REJECT_INNER_CIRCLE_B, "rect_outer_circle_clipper", IMG_SRC_DIR/"call_button_bg_accept_reject.png", "ic_reject_inner_circle_bg");
+               CREATE_OUTER_CIRCLE("reject_outer_circle", "rect_outer_circle", "call_button_bg_line_accept_reject.png", "rect_outer_circle_clipper", "ic_reject_outer_circle")
+               CREATE_INNER_CIRCLE_SIMPLE_IMAGE("reject_inner_circle_bg", MTLOCK_REJECT_INNER_CIRCLE_L, MTLOCK_REJECT_INNER_CIRCLE_T, MTLOCK_REJECT_INNER_CIRCLE_R, MTLOCK_REJECT_INNER_CIRCLE_B, "rect_outer_circle_clipper", "call_button_bg_accept_reject.png", "ic_reject_inner_circle_bg");
 
-               CREATE_INNER_CIRCLE("reject_inner_circle", MTLOCK_REJECT_INNER_CIRCLE_L, MTLOCK_REJECT_INNER_CIRCLE_T, MTLOCK_REJECT_INNER_CIRCLE_R, MTLOCK_REJECT_INNER_CIRCLE_B, IMG_SRC_DIR/"call_btn_ic_reject.png", "ic_reject_inner_circle")
+               CREATE_INNER_CIRCLE("reject_inner_circle", MTLOCK_REJECT_INNER_CIRCLE_L, MTLOCK_REJECT_INNER_CIRCLE_T, MTLOCK_REJECT_INNER_CIRCLE_R, MTLOCK_REJECT_INNER_CIRCLE_B, "call_btn_ic_reject.png", "ic_reject_inner_circle")
        }
        programs {
                CREATE_PROGRAM_IN_TRANSITION("reject_outer_circle,show", "outer_circle,show", "outer-circle", "show", 0.0, "reject_outer_circle")
@@ -235,8 +235,8 @@ group {
 
 group { name: "elm/layout/callui/lock_reject_with_msg";
        images {
-               image: IMG_SRC_DIR/"call_inline_btn_open.png" COMP;
-               image: IMG_SRC_DIR/"call_inline_btn_close.png" COMP;
+               image: "call_inline_btn_open.png" COMP;
+               image: "call_inline_btn_close.png" COMP;
        }
        parts {
                part {
@@ -258,7 +258,7 @@ group { name: "elm/layout/callui/lock_reject_with_msg";
                        description { state: "default" 0.0;
                                rel1 { relative: MTLOCK_REJECT_MSG_ARW_L MTLOCK_REJECT_MSG_ARW_T; }
                                rel2 { relative: MTLOCK_REJECT_MSG_ARW_R MTLOCK_REJECT_MSG_ARW_B; }
-                               image.normal: IMG_SRC_DIR/"call_inline_btn_open.png";
+                               image.normal: "call_inline_btn_open.png";
                                color_class: "ic_reject_msg_arrow";
                                visible: 0;
                        }
@@ -357,7 +357,7 @@ group { name: "elm/layout/callui/lock_reject_with_msg";
                        description { state: "default" 0.0;
                                rel1 { relative: MTLOCK_REJECT_MSG_ARW_L MTLOCK_REJECT_MSG_ARW_CLOSE_T; }
                                rel2 { relative: MTLOCK_REJECT_MSG_ARW_R MTLOCK_REJECT_MSG_ARW_CLOSE_B; }
-                               image.normal: IMG_SRC_DIR/"call_inline_btn_close.png";
+                               image.normal: "call_inline_btn_close.png";
                                color_class: "ic_reject_msg_arrow";
                        }
                }
@@ -454,5 +454,5 @@ group { name: "elm/layout/callui/lock_reject_with_msg";
        }
 }
 
-BG_IMAGE_LY("incoming_call_bg", IMG_SRC_DIR/"core_bg.png")
-BG_IMAGE_LY("incoming_call_bg_dim", IMG_SRC_DIR/"core_bg_dim.png")
+BG_IMAGE_LY("incoming_call_bg", "core_bg.png")
+BG_IMAGE_LY("incoming_call_bg_dim", "core_bg_dim.png")

diff --git a/edje_src/edc/callui-view-main-layout.edc b/edje_src/edc/callui-view-main-layout.edc
index 1b256bf..ba2ad8d 100644 (file)
--- a/edje_src/edc/callui-view-main-layout.edc
+++ b/edje_src/edc/callui-view-main-layout.edc
@@ -116,12 +116,12 @@ styles {
 
 group { name: "elm/layout/callui/view_main";
        images {
-               image: IMG_SRC_DIR/"core_bg.png" COMP;
+               image: "core_bg.png" COMP;
        }
        parts {
                CU_PART_IMAGE( "bg",
                        description { state: "default" 0.0;
-                               image.normal: IMG_SRC_DIR/"core_bg.png";
+                               image.normal: "core_bg.png";
                        }
                )
                CU_PART_PADDING_LEFT(MAIN_VIEW_LAYOUT_PAD_LEFT)

diff --git a/edje_src/edc/callui-view-multi-call-list.edc b/edje_src/edc/callui-view-multi-call-list.edc
index fe8f53a..6bf1933 100644 (file)
--- a/edje_src/edc/callui-view-multi-call-list.edc
+++ b/edje_src/edc/callui-view-multi-call-list.edc
@@ -32,7 +32,7 @@ group { name: "elm/layout/callui/multicall_list_view";
                        type: IMAGE;
                        scale: 1;
                        description { state: "default" 0.0;
-                               image.normal: IMG_SRC_DIR/"core_bg.png";
+                               image.normal: "core_bg.png";
                        }
                }
                CU_PART_PADDING_TOP_NAME("call_time_bg", MULTICALL_LIST_CONTENT_PADDING)
@@ -80,5 +80,5 @@ group { name: "elm/layout/callui/multicall_list_view";
        }
 }
 
-CIRCLE_BTN_WITH_ICON("callui_multi_list_end_call", MULTI_LIST_LIST_ICON_BG_SIZE, "multi_list_btn_end_call", "multi_list_btn_end_call", IMG_SRC_DIR/"call_btn_ic_end.png", "btn_icon_def_color")
-CIRCLE_BTN_WITH_ICON("callui_multi_list_split_call", MULTI_LIST_LIST_ICON_BG_SIZE, "multi_list_btn_split_call", "multi_list_btn_split_call", IMG_SRC_DIR/"call_btn_ic_split.png", "btn_icon_def_color")
+CIRCLE_BTN_WITH_ICON("callui_multi_list_end_call", MULTI_LIST_LIST_ICON_BG_SIZE, "multi_list_btn_end_call", "multi_list_btn_end_call", "call_btn_ic_end.png", "btn_icon_def_color")
+CIRCLE_BTN_WITH_ICON("callui_multi_list_split_call", MULTI_LIST_LIST_ICON_BG_SIZE, "multi_list_btn_split_call", "multi_list_btn_split_call", "call_btn_ic_split.png", "btn_icon_def_color")

diff --git a/edje_src/edc/callui-view-multi-call-split.edc b/edje_src/edc/callui-view-multi-call-split.edc
index 1f19494..02d29fb 100644 (file)
--- a/edje_src/edc/callui-view-multi-call-split.edc
+++ b/edje_src/edc/callui-view-multi-call-split.edc
@@ -127,7 +127,7 @@ styles {
                type: IMAGE; \
                scale: 1; \
                description { state: "default" 0.0; \
-                       image.normal: IMG_SRC_DIR/"call_multi_hold_bg.png"; \
+                       image.normal: "call_multi_hold_bg.png"; \
                        color: 0 0 0 200; \
                } \
        } \
@@ -143,8 +143,8 @@ styles {
 group { \
        name: "elm/layout/callui/"_name; \
        images { \
-               image: IMG_SRC_DIR/"call_multi_ic_arrow.png" COMP; \
-               image: IMG_SRC_DIR/"call_multi_hold_bg.png" COMP; \
+               image: "call_multi_ic_arrow.png" COMP; \
+               image: "call_multi_hold_bg.png" COMP; \
        } \
        parts { \
                _bg_part \
@@ -288,7 +288,7 @@ group { \
                                min: MANAGE_ARROW_SIZE; \
                                max: MANAGE_ARROW_SIZE; \
                                fixed: 1 1; \
-                               image.normal: IMG_SRC_DIR/"call_multi_ic_arrow.png"; \
+                               image.normal: "call_multi_ic_arrow.png"; \
                                align: 0.0 1.0; \
                        } \
                        description { state: "show" 0.0; \
@@ -406,5 +406,5 @@ group { name: "elm/layout/callui/split_callers_info";
        }
 }
 
-SPLIT_CALL_MANAGE_BTN("callui_multi_split_merge_btn", IMG_SRC_DIR/"call_multi_hold_btn_merge_bg.png", IMG_SRC_DIR/"call_multi_ic_merge.png", "multi_hold_merge_btn_norm", "multi_hold_merge_btn_press");
-SPLIT_CALL_MANAGE_BTN("callui_multi_split_swap_btn", IMG_SRC_DIR/"call_multi_hold_btn_swap_bg.png", IMG_SRC_DIR/"call_multi_ic_swap.png", "multi_hold_swap_btn_norm", "multi_hold_swap_btn_press");
+SPLIT_CALL_MANAGE_BTN("callui_multi_split_merge_btn", "call_multi_hold_btn_merge_bg.png", "call_multi_ic_merge.png", "multi_hold_merge_btn_norm", "multi_hold_merge_btn_press");
+SPLIT_CALL_MANAGE_BTN("callui_multi_split_swap_btn", "call_multi_hold_btn_swap_bg.png", "call_multi_ic_swap.png", "multi_hold_swap_btn_norm", "multi_hold_swap_btn_press");

diff --git a/edje_src/edc/callui-view-quick-pannel.edc b/edje_src/edc/callui-view-quick-pannel.edc
index 4863722..5ec7029 100644 (file)
--- a/edje_src/edc/callui-view-quick-pannel.edc
+++ b/edje_src/edc/callui-view-quick-pannel.edc
@@ -36,7 +36,7 @@
 
 #define QP_TOGGLE_BTN_MIN_SIZE 90 90
 
-#define QUICK_PANEL_ICON_PATH IMG_SRC_DIR/"quick_panel"
+#define QP_IMG_SRC_DIR "quick_panel"
 
 styles {
        style { name: "qp_mc_caller_name";
@@ -53,7 +53,7 @@ styles {
                        item: "focus_highlight" "on"; \
                } \
                images { \
-                       image: QUICK_PANEL_ICON_PATH"/call_noti_btn_bg.png" COMP; \
+                       image: QP_IMG_SRC_DIR"/call_noti_btn_bg.png" COMP; \
                        image: img COMP; \
                } \
                script { \
@@ -67,7 +67,7 @@ styles {
                                        min: QP_TOGGLE_BTN_MIN_SIZE; \
                                        color_class: bg_cc; \
                                        image { \
-                                               normal: QUICK_PANEL_ICON_PATH"/call_noti_btn_bg.png"; \
+                                               normal: QP_IMG_SRC_DIR"/call_noti_btn_bg.png"; \
                                                middle: DEFAULT; \
                                        } \
                                } \
@@ -505,17 +505,17 @@ group { name: "elm/layout/callui/quickpanel";
 }
 
 /* Quick panel Mini Control accept and reject buttons */
-QP_MC_TOGGLE_BTN("callui_qp_btn_end", "qp_mc_reject_norm", "qp_mc_reject_press", QUICK_PANEL_ICON_PATH"/call_noti_btn_end.png")
-QP_MC_TOGGLE_BTN("callui_qp_btn_call", "qp_mc_accept_norm", "qp_mc_accept_press", QUICK_PANEL_ICON_PATH"/call_noti_btn_send.png")
+QP_MC_TOGGLE_BTN("callui_qp_btn_end", "qp_mc_reject_norm", "qp_mc_reject_press", QP_IMG_SRC_DIR"/call_noti_btn_end.png")
+QP_MC_TOGGLE_BTN("callui_qp_btn_call", "qp_mc_accept_norm", "qp_mc_accept_press", QP_IMG_SRC_DIR"/call_noti_btn_send.png")
 
 /* Quick panel Mini Control mute button */
-QP_MC_TOGGLE_BTN("callui_qp_btn_mute", "qp_mc_toogle_norm", "qp_mc_toogle_norm", QUICK_PANEL_ICON_PATH"/call_noti_btn_mute.png")
-QP_MC_TOGGLE_BTN("callui_qp_btn_mute_on", "qp_mc_toogle_off", "qp_mc_toogle_off", QUICK_PANEL_ICON_PATH"/call_noti_btn_mute.png")
+QP_MC_TOGGLE_BTN("callui_qp_btn_mute", "qp_mc_toogle_norm", "qp_mc_toogle_norm", QP_IMG_SRC_DIR"/call_noti_btn_mute.png")
+QP_MC_TOGGLE_BTN("callui_qp_btn_mute_on", "qp_mc_toogle_off", "qp_mc_toogle_off", QP_IMG_SRC_DIR"/call_noti_btn_mute.png")
 
 /* Quick panel Mini Control speaker button */
-QP_MC_TOGGLE_BTN("callui_qp_btn_speaker", "qp_mc_toogle_norm", "qp_mc_toogle_norm", QUICK_PANEL_ICON_PATH"/call_noti_btn_speaker.png")
-QP_MC_TOGGLE_BTN("callui_qp_btn_speaker_on", "qp_mc_toogle_off", "qp_mc_toogle_off", QUICK_PANEL_ICON_PATH"/call_noti_btn_speaker.png")
+QP_MC_TOGGLE_BTN("callui_qp_btn_speaker", "qp_mc_toogle_norm", "qp_mc_toogle_norm", QP_IMG_SRC_DIR"/call_noti_btn_speaker.png")
+QP_MC_TOGGLE_BTN("callui_qp_btn_speaker_on", "qp_mc_toogle_off", "qp_mc_toogle_off", QP_IMG_SRC_DIR"/call_noti_btn_speaker.png")
 
 /* Quick panel Mini Control resume button */
-QP_MC_TOGGLE_BTN("callui_qp_btn_resume", "qp_mc_toogle_norm", "qp_mc_toogle_norm", QUICK_PANEL_ICON_PATH"/call_noti_btn_resume.png")
-QP_MC_TOGGLE_BTN("callui_qp_btn_resume_on", "qp_mc_toogle_off", "qp_mc_toogle_off", QUICK_PANEL_ICON_PATH"/call_noti_btn_resume.png")
+QP_MC_TOGGLE_BTN("callui_qp_btn_resume", "qp_mc_toogle_norm", "qp_mc_toogle_norm", QP_IMG_SRC_DIR"/call_noti_btn_resume.png")
+QP_MC_TOGGLE_BTN("callui_qp_btn_resume_on", "qp_mc_toogle_off", "qp_mc_toogle_off", QP_IMG_SRC_DIR"/call_noti_btn_resume.png")

diff --git a/edje_src/edc/callui-view-touch-lock-screen.edc b/edje_src/edc/callui-view-touch-lock-screen.edc
index f3d19b7..b0c3a7c 100644 (file)
--- a/edje_src/edc/callui-view-touch-lock-screen.edc
+++ b/edje_src/edc/callui-view-touch-lock-screen.edc
@@ -25,8 +25,8 @@ styles {
 
 group { name: "elm/layout/callui/touch_lock_screen";
        images {
-               image: IMG_SRC_DIR/"call_lock_icon.png" COMP;
-               image: IMG_SRC_DIR/"call_bg_dim.png" COMP;
+               image: "call_lock_icon.png" COMP;
+               image: "call_bg_dim.png" COMP;
        }
        parts {
                part { name: "bg";
@@ -34,7 +34,7 @@ group { name: "elm/layout/callui/touch_lock_screen";
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               image.normal: IMG_SRC_DIR/"call_bg_dim.png";
+                               image.normal: "call_bg_dim.png";
                                aspect_preference: BOTH;
                                align: 0.0 0.0;
                        }
@@ -46,7 +46,7 @@ group { name: "elm/layout/callui/touch_lock_screen";
                        description { state: "default" 0.0;
                                rel1 {relative: LOCK_SCREEN_ICON_L LOCK_SCREEN_ICON_T; to: "bg"; }
                                rel2 {relative: LOCK_SCREEN_ICON_R LOCK_SCREEN_ICON_B; to: "bg"; }
-                               image.normal: IMG_SRC_DIR/"call_lock_icon.png";
+                               image.normal: "call_lock_icon.png";
                                aspect_preference: SOURCE;
                        }
                }

diff --git a/res/edje/call.edc b/res/edje/call.edc
index f6ed488..c3d68f6 100644 (file)
--- a/res/edje/call.edc
+++ b/res/edje/call.edc
@@ -17,7 +17,7 @@
 
 #include "../../inc/callui-view-layout.h"
 
-#include "../../edje_src/edc/callui-color-classes.edc"
+#include "../../edje_src/edc/callui-common-color-classes.edc"
 #include "../../edje_src/edc/callui-common-utils.edc"
 #include "../../edje_src/edc/callui-common-macro-part.edc"
 #include "../../edje_src/edc/callui-common-macro-image.edc"