From 98f24efb4244fb6fa4cdd77010c760421efbe94c Mon Sep 17 00:00:00 2001 From: Igor Olshevskyi Date: Mon, 8 Feb 2016 16:32:03 +0200 Subject: [PATCH] TizenRefApp-5676 [Call] Remove SDK build warnings for.edc files Change-Id: I63f065d5730984e0b04dbd4d2d98d4620123c00e --- CMakeLists.txt | 4 +- .../callui-view-quick-pannel-landscape.edc | 136 +++---- .../edc/call_edc/callui-view-quick-pannel.edc | 108 ++--- res/edje_src/edc/call_edc/callui_view_end_call.edc | 439 +++++++++------------ .../edc/call_edc/callui_view_incoming_active.edc | 243 ++++++------ src/callui-view-callend.c | 4 +- 6 files changed, 411 insertions(+), 523 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6cde71..c2386ec 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} "-pie" ${pkgs_LDFLAGS}) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_BINARY_DIR}/call.edj - COMMAND edje_cc -no-save -id ${EDC_IMG_DIR} + COMMAND edje_cc -id ${EDC_IMG_DIR} ${EDJE_CC_DEFINITIONS} ${EDJE_DIR}/call.edc ${CMAKE_BINARY_DIR}/call.edj DEPENDS ${EDJE_DIR}/call.edc @@ -86,7 +86,7 @@ ADD_CUSTOM_TARGET(call.edje ALL DEPENDS ${CMAKE_BINARY_DIR}/call.edj) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_BINARY_DIR}/call_theme.edj - COMMAND edje_cc -no-save -id ${EDC_IMG_DIR} + COMMAND edje_cc -id ${EDC_IMG_DIR} ${EDJE_CC_DEFINITIONS} ${EDJE_DIR}/call_theme.edc ${CMAKE_BINARY_DIR}/call_theme.edj DEPENDS ${EDJE_DIR}/call_theme.edc diff --git a/res/edje_src/edc/call_edc/callui-view-quick-pannel-landscape.edc b/res/edje_src/edc/call_edc/callui-view-quick-pannel-landscape.edc index 8387b0f..6422be6 100644 --- a/res/edje_src/edc/call_edc/callui-view-quick-pannel-landscape.edc +++ b/res/edje_src/edc/call_edc/callui-view-quick-pannel-landscape.edc @@ -15,46 +15,46 @@ * */ -#define SCREEN_W 1280 -#define SCREEN_H 172 +#define LAND_QP_W MAIN_SCREEN_H +#define LAND_QP_H 172 -#define RECT_QP_W(x) ((x)/SCREEN_W) -#define RECT_QP_H(y) ((y)/SCREEN_H) +#define LAND_RECT_QP_W(x) ((x)/LAND_QP_W) +#define LAND_RECT_QP_H(y) ((y)/LAND_QP_H) -#define BUTTON_OFFSET 40 -#define TEXT_OFFSET 30 -#define BUTTON_OFFSET_LAST_W 32 -#define BUTTON_OFFSET_LAST_H 42 -#define BUTTON_SIZE 90 -#define IMAGE_SIZE 96 -#define TEXT_SIZE 98 -#define TEXT_NAME_SIZE 55 +#define LAND_BTN_OFFSET 40 +#define LAND_TEXT_OFFSET 30 +#define LAND_BTN_OFFSET_LAST_W 32 +#define LAND_BTN_OFFSET_LAST_H 42 +#define LAND_BTN_SIZE 90 +#define LAND_IMAGE_SIZE 96 +#define LAND_TEXT_SIZE 98 +#define LAND_TEXT_NAME_SIZE 55 -#define RECT_QT_BUTTON_X0(x)(RECT_QP_W(SCREEN_W-((x*BUTTON_SIZE)+BUTTON_OFFSET_LAST_W+((x-1)*BUTTON_OFFSET)))) -#define RECT_QT_BUTTON_X1(x)(RECT_QP_W(SCREEN_W-((x*BUTTON_SIZE)+BUTTON_OFFSET_LAST_W+(x*BUTTON_OFFSET)))) +#define LAND_RECT_QT_BTN_X0(x) (LAND_RECT_QP_W(LAND_QP_W-((x*LAND_BTN_SIZE)+LAND_BTN_OFFSET_LAST_W+((x-1)*LAND_BTN_OFFSET)))) +#define LAND_RECT_QT_BTN_X1(x) (LAND_RECT_QP_W(LAND_QP_W-((x*LAND_BTN_SIZE)+LAND_BTN_OFFSET_LAST_W+(x*LAND_BTN_OFFSET)))) -#define CALL_QUICKPANEL_TEXT_RECT_INCO_X0 RECT_QP_W(((2*BUTTON_OFFSET_LAST_W)+IMAGE_SIZE)) -#define CALL_QUICKPANEL_TEXT_RECT_INCO_Y0 RECT_QP_H(TEXT_OFFSET) -#define CALL_QUICKPANEL_TEXT_RECT_INCO_X1 RECT_QT_BUTTON_X0(2) -#define CALL_QUICKPANEL_TEXT_RECT_INCO_Y1 RECT_QP_H((SCREEN_H-BUTTON_OFFSET_LAST_H)) +#define LAND_CALL_QP_TEXT_RECT_INCO_X0 LAND_RECT_QP_W(((2*LAND_BTN_OFFSET_LAST_W)+LAND_IMAGE_SIZE)) +#define LAND_CALL_QP_TEXT_RECT_INCO_Y0 LAND_RECT_QP_H(LAND_TEXT_OFFSET) +#define LAND_CALL_QP_TEXT_RECT_INCO_X1 LAND_RECT_QT_BTN_X0(2) +#define LAND_CALL_QP_TEXT_RECT_INCO_Y1 LAND_RECT_QP_H((LAND_QP_H-LAND_BTN_OFFSET_LAST_H)) -#define CALL_QUICKPANEL_TEXT_RECT_DURING_X0 RECT_QP_W(BUTTON_OFFSET_LAST_W) -#define CALL_QUICKPANEL_TEXT_RECT_DURING_X1 RECT_QT_BUTTON_X0(3) +#define LAND_CALL_QP_TEXT_RECT_DURING_X0 LAND_RECT_QP_W(LAND_BTN_OFFSET_LAST_W) +#define LAND_CALL_QP_TEXT_RECT_DURING_X1 LAND_RECT_QT_BTN_X0(3) -#define CALL_QUICKPANEL_CONTACT_IMAGE_X0 RECT_QP_W(BUTTON_OFFSET_LAST_W) -#define CALL_QUICKPANEL_CONTACT_IMAGE_Y0 RECT_QP_H(TEXT_OFFSET) -#define CALL_QUICKPANEL_CONTACT_IMAGE_X1 RECT_QP_W(BUTTON_OFFSET_LAST_W+IMAGE_SIZE) -#define CALL_QUICKPANEL_CONTACT_IMAGE_Y1 RECT_QP_H((SCREEN_H-BUTTON_OFFSET_LAST_H)) +#define LAND_CALL_QP_CONTACT_IMAGE_X0 LAND_RECT_QP_W(LAND_BTN_OFFSET_LAST_W) +#define LAND_CALL_QP_CONTACT_IMAGE_Y0 LAND_RECT_QP_H(LAND_TEXT_OFFSET) +#define LAND_CALL_QP_CONTACT_IMAGE_X1 LAND_RECT_QP_W(LAND_BTN_OFFSET_LAST_W+LAND_IMAGE_SIZE) +#define LAND_CALL_QP_CONTACT_IMAGE_Y1 LAND_RECT_QP_H((LAND_QP_H-LAND_BTN_OFFSET_LAST_H)) -#define CALL_QUICKPANEL_CONTACT_NAME_X0 (0.0) -#define CALL_QUICKPANEL_CONTACT_NAME_Y0 (0.0) -#define CALL_QUICKPANEL_CONTACT_NAME_X1 (1.0) -#define CALL_QUICKPANEL_CONTACT_NAME_Y1 (TEXT_NAME_SIZE/TEXT_SIZE) +#define LAND_CALL_QP_CONTACT_NAME_X0 (0.0) +#define LAND_CALL_QP_CONTACT_NAME_Y0 (0.0) +#define LAND_CALL_QP_CONTACT_NAME_X1 (1.0) +#define LAND_CALL_QP_CONTACT_NAME_Y1 (LAND_TEXT_NAME_SIZE/LAND_TEXT_SIZE) -#define CALL_QUICKPANEL_TIMER_X0 (0.0) -#define CALL_QUICKPANEL_TIMER_Y0 (TEXT_NAME_SIZE/TEXT_SIZE) -#define CALL_QUICKPANEL_TIMER_X1 (1.0) -#define CALL_QUICKPANEL_TIMER_Y1 (1.0) +#define LAND_CALL_QP_TIMER_X0 (0.0) +#define LAND_CALL_QP_TIMER_Y0 (LAND_TEXT_NAME_SIZE/LAND_TEXT_SIZE) +#define LAND_CALL_QP_TIMER_X1 (1.0) +#define LAND_CALL_QP_TIMER_Y1 (1.0) styles { style { @@ -67,38 +67,6 @@ styles { } } -#define SWALLOW_BUTTON(part_name, x0, x1, inco, duri, out, resume) \ - part { name: part_name; \ - type: SWALLOW; \ - scale: 1; \ - description { \ - state: "default" 0.0; \ - fixed: 1 1; \ - rel1 { relative: RECT_QT_BUTTON_X0(x0) RECT_QP_H(BUTTON_OFFSET); to: "background";} \ - rel2 { relative: RECT_QT_BUTTON_X1(x1) RECT_QP_H((SCREEN_H - BUTTON_OFFSET_LAST_H)); to: "background";} \ - } \ - description { \ - state: "incoming" 0.0; \ - inherit: "default" 0.0; \ - visible: inco; \ - } \ - description { \ - state: "during" 0.0; \ - inherit: "default" 0.0; \ - visible: duri; \ - } \ - description { \ - state: "outgoing" 0.0; \ - inherit: "default" 0.0; \ - visible: out; \ - } \ - description { \ - state: "resume" 0.0; \ - inherit: "default" 0.0; \ - visible: resume; \ - } \ - } \ - group { name: "quickpanel_ls"; @@ -118,8 +86,8 @@ group { description { state: "default" 0.0; fixed: 1 1; - rel1 { relative: CALL_QUICKPANEL_TEXT_RECT_INCO_X0 CALL_QUICKPANEL_TEXT_RECT_INCO_Y0; to: "background";} - rel2 { relative: CALL_QUICKPANEL_TEXT_RECT_INCO_X1 CALL_QUICKPANEL_TEXT_RECT_INCO_Y1; to: "background";} + rel1 { relative: LAND_CALL_QP_TEXT_RECT_INCO_X0 LAND_CALL_QP_TEXT_RECT_INCO_Y0; to: "background";} + rel2 { relative: LAND_CALL_QP_TEXT_RECT_INCO_X1 LAND_CALL_QP_TEXT_RECT_INCO_Y1; to: "background";} } description { state: "incoming" 0.0; @@ -128,14 +96,14 @@ group { description { state: "during" 0.0; inherit: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_TEXT_RECT_DURING_X0 CALL_QUICKPANEL_TEXT_RECT_INCO_Y0; to: "background";} - rel2 { relative: CALL_QUICKPANEL_TEXT_RECT_DURING_X1 CALL_QUICKPANEL_TEXT_RECT_INCO_Y1; to: "background";} + rel1 { relative: LAND_CALL_QP_TEXT_RECT_DURING_X0 LAND_CALL_QP_TEXT_RECT_INCO_Y0; to: "background";} + rel2 { relative: LAND_CALL_QP_TEXT_RECT_DURING_X1 LAND_CALL_QP_TEXT_RECT_INCO_Y1; to: "background";} } description { state: "resume" 0.0; inherit: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_TEXT_RECT_DURING_X0 CALL_QUICKPANEL_TEXT_RECT_INCO_Y0; to: "background";} - rel2 { relative: CALL_QUICKPANEL_TEXT_RECT_DURING_X1 CALL_QUICKPANEL_TEXT_RECT_INCO_Y1; to: "background";} + rel1 { relative: LAND_CALL_QP_TEXT_RECT_DURING_X0 LAND_CALL_QP_TEXT_RECT_INCO_Y0; to: "background";} + rel2 { relative: LAND_CALL_QP_TEXT_RECT_DURING_X1 LAND_CALL_QP_TEXT_RECT_INCO_Y1; to: "background";} } description { state: "outgoing" 0.0; @@ -149,8 +117,8 @@ group { description { state: "default" 0.0; fixed: 1 1; - rel1 { relative: RECT_QT_BUTTON_X0(2) RECT_QP_H(BUTTON_OFFSET); to: "background";} - rel2 { relative: RECT_QT_BUTTON_X1(1) RECT_QP_H((SCREEN_H - BUTTON_OFFSET_LAST_H)); to: "background";} + rel1 { relative: LAND_RECT_QT_BTN_X0(2) LAND_RECT_QP_H(LAND_BTN_OFFSET); to: "background";} + rel2 { relative: LAND_RECT_QT_BTN_X1(1) LAND_RECT_QP_H((LAND_QP_H - LAND_BTN_OFFSET_LAST_H)); to: "background";} } description { state: "incoming" 0.0; @@ -170,8 +138,8 @@ group { description { state: "resume" 0.0; inherit: "default" 0.0; - rel1 { relative: RECT_QT_BUTTON_X0(3) RECT_QP_H(BUTTON_OFFSET); to: "background";} - rel2 { relative: RECT_QT_BUTTON_X1(2) RECT_QP_H((SCREEN_H - BUTTON_OFFSET_LAST_H)); to: "background";} + rel1 { relative: LAND_RECT_QT_BTN_X0(3) LAND_RECT_QP_H(LAND_BTN_OFFSET); to: "background";} + rel2 { relative: LAND_RECT_QT_BTN_X1(2) LAND_RECT_QP_H((LAND_QP_H - LAND_BTN_OFFSET_LAST_H)); to: "background";} visible: 1; } } @@ -182,8 +150,8 @@ group { description { state: "default" 0.0; fixed: 1 1; - rel1 { relative: CALL_QUICKPANEL_CONTACT_NAME_X0 CALL_QUICKPANEL_CONTACT_NAME_Y0; to: "txt_area";} - rel2 { relative: CALL_QUICKPANEL_CONTACT_NAME_X1 CALL_QUICKPANEL_CONTACT_NAME_Y1; to: "txt_area";} + rel1 { relative: LAND_CALL_QP_CONTACT_NAME_X0 LAND_CALL_QP_CONTACT_NAME_Y0; to: "txt_area";} + rel2 { relative: LAND_CALL_QP_CONTACT_NAME_X1 LAND_CALL_QP_CONTACT_NAME_Y1; to: "txt_area";} align: 0.0 0.5; text { ellipsis: 0.0; @@ -202,8 +170,8 @@ group { description { state: "default" 0.0; fixed: 1 1; - rel1 { relative: CALL_QUICKPANEL_TIMER_X0 CALL_QUICKPANEL_TIMER_Y0; to: "txt_area";} - rel2 { relative: CALL_QUICKPANEL_TIMER_X1 CALL_QUICKPANEL_TIMER_Y1; to: "txt_area";} + rel1 { relative: LAND_CALL_QP_TIMER_X0 LAND_CALL_QP_TIMER_Y0; to: "txt_area";} + rel2 { relative: LAND_CALL_QP_TIMER_X1 LAND_CALL_QP_TIMER_Y1; to: "txt_area";} fixed: 1 1; text { align: 0.0 0.5; @@ -221,8 +189,8 @@ group { description { fixed: 1 1; state: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X0 CALL_QUICKPANEL_CONTACT_IMAGE_Y0;} - rel2 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X1 CALL_QUICKPANEL_CONTACT_IMAGE_Y1;} + rel1 { relative: LAND_CALL_QP_CONTACT_IMAGE_X0 LAND_CALL_QP_CONTACT_IMAGE_Y0;} + rel2 { relative: LAND_CALL_QP_CONTACT_IMAGE_X1 LAND_CALL_QP_CONTACT_IMAGE_Y1;} } description { state: "incoming" 0.0; @@ -262,8 +230,8 @@ group { description { visible: 0; fixed: 1 1; - rel1 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X0 CALL_QUICKPANEL_CONTACT_IMAGE_Y0;} - rel2 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X1 CALL_QUICKPANEL_CONTACT_IMAGE_Y1;} + rel1 { relative: LAND_CALL_QP_CONTACT_IMAGE_X0 LAND_CALL_QP_CONTACT_IMAGE_Y0;} + rel2 { relative: LAND_CALL_QP_CONTACT_IMAGE_X1 LAND_CALL_QP_CONTACT_IMAGE_Y1;} image { normal: IMG_SRC_DIR/"call_photo_id_mask.png"; } @@ -307,8 +275,8 @@ group { description { visible: 0; fixed: 1 1; - rel1 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X0 CALL_QUICKPANEL_CONTACT_IMAGE_Y0;} - rel2 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X1 CALL_QUICKPANEL_CONTACT_IMAGE_Y1;} + rel1 { relative: LAND_CALL_QP_CONTACT_IMAGE_X0 LAND_CALL_QP_CONTACT_IMAGE_Y0;} + rel2 { relative: LAND_CALL_QP_CONTACT_IMAGE_X1 LAND_CALL_QP_CONTACT_IMAGE_Y1;} image { normal: IMG_SRC_DIR/"call_photo_id.png"; } diff --git a/res/edje_src/edc/call_edc/callui-view-quick-pannel.edc b/res/edje_src/edc/call_edc/callui-view-quick-pannel.edc index 85dd171..99d14bc 100644 --- a/res/edje_src/edc/call_edc/callui-view-quick-pannel.edc +++ b/res/edje_src/edc/call_edc/callui-view-quick-pannel.edc @@ -15,46 +15,46 @@ * */ -#define SCREEN_W 720 -#define SCREEN_H 172 +#define QP_W MAIN_SCREEN_W +#define QP_H 172 -#define RECT_QP_W(x) ((x)/SCREEN_W) -#define RECT_QP_H(y) ((y)/SCREEN_H) +#define RECT_QP_W(x) ((x)/QP_W) +#define RECT_QP_H(y) ((y)/QP_H) -#define BUTTON_OFFSET 40 -#define TEXT_OFFSET 30 -#define BUTTON_OFFSET_LAST_W 32 -#define BUTTON_OFFSET_LAST_H 42 -#define BUTTON_SIZE 90 -#define IMAGE_SIZE 96 -#define TEXT_SIZE 98 -#define TEXT_NAME_SIZE 55 +#define BTN_OFFSET 40 +#define TEXT_OFFSET 30 +#define BTN_OFFSET_LAST_W 32 +#define BTN_OFFSET_LAST_H 42 +#define BTN_SIZE 90 +#define IMAGE_SIZE 96 +#define TEXT_SIZE 98 +#define TEXT_NAME_SIZE 55 -#define RECT_QT_BUTTON_X0(x)(RECT_QP_W(SCREEN_W-((x*BUTTON_SIZE)+BUTTON_OFFSET_LAST_W+((x-1)*BUTTON_OFFSET)))) -#define RECT_QT_BUTTON_X1(x)(RECT_QP_W(SCREEN_W-((x*BUTTON_SIZE)+BUTTON_OFFSET_LAST_W+(x*BUTTON_OFFSET)))) +#define RECT_QT_BTN_X0(x) (RECT_QP_W(QP_W-((x*BTN_SIZE)+BTN_OFFSET_LAST_W+((x-1)*BTN_OFFSET)))) +#define RECT_QT_BTN_X1(x) (RECT_QP_W(QP_W-((x*BTN_SIZE)+BTN_OFFSET_LAST_W+(x*BTN_OFFSET)))) -#define CALL_QUICKPANEL_TEXT_RECT_INCO_X0 RECT_QP_W(((2*BUTTON_OFFSET_LAST_W)+IMAGE_SIZE)) -#define CALL_QUICKPANEL_TEXT_RECT_INCO_Y0 RECT_QP_H(TEXT_OFFSET) -#define CALL_QUICKPANEL_TEXT_RECT_INCO_X1 RECT_QT_BUTTON_X0(2) -#define CALL_QUICKPANEL_TEXT_RECT_INCO_Y1 RECT_QP_H((SCREEN_H-BUTTON_OFFSET_LAST_H)) +#define CALL_QP_TEXT_RECT_INCO_X0 RECT_QP_W(((2*BTN_OFFSET_LAST_W)+IMAGE_SIZE)) +#define CALL_QP_TEXT_RECT_INCO_Y0 RECT_QP_H(TEXT_OFFSET) +#define CALL_QP_TEXT_RECT_INCO_X1 RECT_QT_BTN_X0(2) +#define CALL_QP_TEXT_RECT_INCO_Y1 RECT_QP_H((QP_H-BTN_OFFSET_LAST_H)) -#define CALL_QUICKPANEL_TEXT_RECT_DURING_X0 RECT_QP_W(BUTTON_OFFSET_LAST_W) -#define CALL_QUICKPANEL_TEXT_RECT_DURING_X1 RECT_QT_BUTTON_X0(3) +#define CALL_QP_TEXT_RECT_DURING_X0 RECT_QP_W(BTN_OFFSET_LAST_W) +#define CALL_QP_TEXT_RECT_DURING_X1 RECT_QT_BTN_X0(3) -#define CALL_QUICKPANEL_CONTACT_IMAGE_X0 RECT_QP_W(BUTTON_OFFSET_LAST_W) -#define CALL_QUICKPANEL_CONTACT_IMAGE_Y0 RECT_QP_H(TEXT_OFFSET) -#define CALL_QUICKPANEL_CONTACT_IMAGE_X1 RECT_QP_W(BUTTON_OFFSET_LAST_W+IMAGE_SIZE) -#define CALL_QUICKPANEL_CONTACT_IMAGE_Y1 RECT_QP_H((SCREEN_H-BUTTON_OFFSET_LAST_H)) +#define CALL_QP_CONTACT_IMAGE_X0 RECT_QP_W(BTN_OFFSET_LAST_W) +#define CALL_QP_CONTACT_IMAGE_Y0 RECT_QP_H(TEXT_OFFSET) +#define CALL_QP_CONTACT_IMAGE_X1 RECT_QP_W(BTN_OFFSET_LAST_W+IMAGE_SIZE) +#define CALL_QP_CONTACT_IMAGE_Y1 RECT_QP_H((QP_H-BTN_OFFSET_LAST_H)) -#define CALL_QUICKPANEL_CONTACT_NAME_X0 (0.0) -#define CALL_QUICKPANEL_CONTACT_NAME_Y0 (0.0) -#define CALL_QUICKPANEL_CONTACT_NAME_X1 (1.0) -#define CALL_QUICKPANEL_CONTACT_NAME_Y1 (TEXT_NAME_SIZE/TEXT_SIZE) +#define CALL_QP_CONTACT_NAME_X0 0.0 +#define CALL_QP_CONTACT_NAME_Y0 0.0 +#define CALL_QP_CONTACT_NAME_X1 1.0 +#define CALL_QP_CONTACT_NAME_Y1 (TEXT_NAME_SIZE/TEXT_SIZE) -#define CALL_QUICKPANEL_TIMER_X0 (0.0) -#define CALL_QUICKPANEL_TIMER_Y0 (TEXT_NAME_SIZE/TEXT_SIZE) -#define CALL_QUICKPANEL_TIMER_X1 (1.0) -#define CALL_QUICKPANEL_TIMER_Y1 (1.0) +#define CALL_QP_TIMER_X0 0.0 +#define CALL_QP_TIMER_Y0 (TEXT_NAME_SIZE/TEXT_SIZE) +#define CALL_QP_TIMER_X1 1.0 +#define CALL_QP_TIMER_Y1 1.0 styles { style { @@ -73,8 +73,8 @@ styles { scale: 1; \ description { \ state: "default" 0.0; \ - rel1 { relative: RECT_QT_BUTTON_X0(x0) RECT_QP_H(BUTTON_OFFSET); to: "background";} \ - rel2 { relative: RECT_QT_BUTTON_X1(x1) RECT_QP_H((SCREEN_H - BUTTON_OFFSET_LAST_H)); to: "background";} \ + rel1 { relative: RECT_QT_BTN_X0(x0) RECT_QP_H(BTN_OFFSET); to: "background";} \ + rel2 { relative: RECT_QT_BTN_X1(x1) RECT_QP_H((QP_H - BTN_OFFSET_LAST_H)); to: "background";} \ } \ description { \ state: "incoming" 0.0; \ @@ -115,8 +115,8 @@ group { scale: 1; description { state: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_TEXT_RECT_INCO_X0 CALL_QUICKPANEL_TEXT_RECT_INCO_Y0; to: "background";} - rel2 { relative: CALL_QUICKPANEL_TEXT_RECT_INCO_X1 CALL_QUICKPANEL_TEXT_RECT_INCO_Y1; to: "background";} + rel1 { relative: CALL_QP_TEXT_RECT_INCO_X0 CALL_QP_TEXT_RECT_INCO_Y0; to: "background";} + rel2 { relative: CALL_QP_TEXT_RECT_INCO_X1 CALL_QP_TEXT_RECT_INCO_Y1; to: "background";} } description { state: "incoming" 0.0; @@ -125,14 +125,14 @@ group { description { state: "during" 0.0; inherit: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_TEXT_RECT_DURING_X0 CALL_QUICKPANEL_TEXT_RECT_INCO_Y0; to: "background";} - rel2 { relative: CALL_QUICKPANEL_TEXT_RECT_DURING_X1 CALL_QUICKPANEL_TEXT_RECT_INCO_Y1; to: "background";} + rel1 { relative: CALL_QP_TEXT_RECT_DURING_X0 CALL_QP_TEXT_RECT_INCO_Y0; to: "background";} + rel2 { relative: CALL_QP_TEXT_RECT_DURING_X1 CALL_QP_TEXT_RECT_INCO_Y1; to: "background";} } description { state: "resume" 0.0; inherit: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_TEXT_RECT_DURING_X0 CALL_QUICKPANEL_TEXT_RECT_INCO_Y0; to: "background";} - rel2 { relative: CALL_QUICKPANEL_TEXT_RECT_DURING_X1 CALL_QUICKPANEL_TEXT_RECT_INCO_Y1; to: "background";} + rel1 { relative: CALL_QP_TEXT_RECT_DURING_X0 CALL_QP_TEXT_RECT_INCO_Y0; to: "background";} + rel2 { relative: CALL_QP_TEXT_RECT_DURING_X1 CALL_QP_TEXT_RECT_INCO_Y1; to: "background";} } description { state: "outgoing" 0.0; @@ -145,8 +145,8 @@ group { scale: 1; description { state: "default" 0.0; - rel1 { relative: RECT_QT_BUTTON_X0(2) RECT_QP_H(BUTTON_OFFSET); to: "background";} - rel2 { relative: RECT_QT_BUTTON_X1(1) RECT_QP_H((SCREEN_H - BUTTON_OFFSET_LAST_H)); to: "background";} + rel1 { relative: RECT_QT_BTN_X0(2) RECT_QP_H(BTN_OFFSET); to: "background";} + rel2 { relative: RECT_QT_BTN_X1(1) RECT_QP_H((QP_H - BTN_OFFSET_LAST_H)); to: "background";} } description { state: "incoming" 0.0; @@ -166,8 +166,8 @@ group { description { state: "resume" 0.0; inherit: "default" 0.0; - rel1 { relative: RECT_QT_BUTTON_X0(3) RECT_QP_H(BUTTON_OFFSET); to: "background";} - rel2 { relative: RECT_QT_BUTTON_X1(2) RECT_QP_H((SCREEN_H - BUTTON_OFFSET_LAST_H)); to: "background";} + rel1 { relative: RECT_QT_BTN_X0(3) RECT_QP_H(BTN_OFFSET); to: "background";} + rel2 { relative: RECT_QT_BTN_X1(2) RECT_QP_H((QP_H - BTN_OFFSET_LAST_H)); to: "background";} visible: 1; } } @@ -177,8 +177,8 @@ group { scale: 1; description { state: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_CONTACT_NAME_X0 CALL_QUICKPANEL_CONTACT_NAME_Y0; to: "txt_area";} - rel2 { relative: CALL_QUICKPANEL_CONTACT_NAME_X1 CALL_QUICKPANEL_CONTACT_NAME_Y1; to: "txt_area";} + rel1 { relative: CALL_QP_CONTACT_NAME_X0 CALL_QP_CONTACT_NAME_Y0; to: "txt_area";} + rel2 { relative: CALL_QP_CONTACT_NAME_X1 CALL_QP_CONTACT_NAME_Y1; to: "txt_area";} align: 0.0 0.5; text { ellipsis: 0.0; @@ -196,8 +196,8 @@ group { scale: 1; description { state: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_TIMER_X0 CALL_QUICKPANEL_TIMER_Y0; to: "txt_area";} - rel2 { relative: CALL_QUICKPANEL_TIMER_X1 CALL_QUICKPANEL_TIMER_Y1; to: "txt_area";} + rel1 { relative: CALL_QP_TIMER_X0 CALL_QP_TIMER_Y0; to: "txt_area";} + rel2 { relative: CALL_QP_TIMER_X1 CALL_QP_TIMER_Y1; to: "txt_area";} fixed: 1 1; text { align: 0.0 0.5; @@ -215,8 +215,8 @@ group { description { fixed: 1 1; state: "default" 0.0; - rel1 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X0 CALL_QUICKPANEL_CONTACT_IMAGE_Y0;} - rel2 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X1 CALL_QUICKPANEL_CONTACT_IMAGE_Y1;} + rel1 { relative: CALL_QP_CONTACT_IMAGE_X0 CALL_QP_CONTACT_IMAGE_Y0;} + rel2 { relative: CALL_QP_CONTACT_IMAGE_X1 CALL_QP_CONTACT_IMAGE_Y1;} } description { state: "incoming" 0.0; @@ -256,8 +256,8 @@ group { description { visible: 0; fixed: 1 1; - rel1 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X0 CALL_QUICKPANEL_CONTACT_IMAGE_Y0;} - rel2 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X1 CALL_QUICKPANEL_CONTACT_IMAGE_Y1;} + rel1 { relative: CALL_QP_CONTACT_IMAGE_X0 CALL_QP_CONTACT_IMAGE_Y0;} + rel2 { relative: CALL_QP_CONTACT_IMAGE_X1 CALL_QP_CONTACT_IMAGE_Y1;} image { normal: IMG_SRC_DIR/"call_photo_id_mask.png"; } @@ -301,8 +301,8 @@ group { description { visible: 0; fixed: 1 1; - rel1 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X0 CALL_QUICKPANEL_CONTACT_IMAGE_Y0;} - rel2 { relative: CALL_QUICKPANEL_CONTACT_IMAGE_X1 CALL_QUICKPANEL_CONTACT_IMAGE_Y1;} + rel1 { relative: CALL_QP_CONTACT_IMAGE_X0 CALL_QP_CONTACT_IMAGE_Y0;} + rel2 { relative: CALL_QP_CONTACT_IMAGE_X1 CALL_QP_CONTACT_IMAGE_Y1;} image { normal: IMG_SRC_DIR/"call_photo_id.png"; } diff --git a/res/edje_src/edc/call_edc/callui_view_end_call.edc b/res/edje_src/edc/call_edc/callui_view_end_call.edc index fbc58cc..19b48af 100644 --- a/res/edje_src/edc/call_edc/callui_view_end_call.edc +++ b/res/edje_src/edc/call_edc/callui_view_end_call.edc @@ -17,7 +17,7 @@ styles { style { - name: "call_timer_style1"; + name: "call_timer_style"; base: "font=Tizen:style=Regular align=left font_size=40 color=#FFFFFF ellipsis=1.0"; } style { @@ -29,10 +29,6 @@ styles { base: "font=Tizen:style=Regular align=left font_size=34 color=#FFFFFF ellipsis=1.0"; } style { - name: "call_timer_style2"; - base: "font=Tizen:style=Regular align=right font_size=40 color=#FFFFFF ellipsis=1.0"; - } - style { name: "button_style"; base: "font=Tizen:style=Regular align=center font_size=34 color=#808080 ellipsis=1.0"; } @@ -42,154 +38,165 @@ styles { } } -#define SPACE_NOTIFICATION 40 -#define SPACE_NOTI_MAIN_TITLE 30 -#define MAIN_TITLE 54 -#define SPACE_MAIN_TITLE_MAIN_IMAGE 40 -#define MAIN_IMAGE 98 -#define SPACE_MAIN_IMAGE 44 -#define BOTTOM_BUTTON_HEIGHT 162 -#define MAIN_BG_HEIGHT (SPACE_NOTIFICATION+SPACE_NOTI_MAIN_TITLE+MAIN_TITLE+SPACE_MAIN_TITLE_MAIN_IMAGE+MAIN_IMAGE+SPACE_MAIN_IMAGE+BOTTOM_BUTTON_HEIGHT) -#define MAIN_WIDTH 720 -#define MAIN_WIDTH_TWO (720/2) -#define MAIN_HEIGHT 1280 -#define WIDTH_MAIN_TITLE 32 -#define SPACER_MAIN_TITLE_CALL_NAME 15 -#define SPACER_MAIN_INFO (SPACE_NOTI_MAIN_TITLE+MAIN_TITLE+SPACER_MAIN_TITLE_CALL_NAME) -#define SIZE_TEXT_INFO 78 -#define SPACE_TEXT_INFO_BUTTON 6 -#define WIDTH_CREATE_BUTTON 359 -#define HEIGHT_CREATE_BUTTON 46 -#define ADD_ICON_BUTTON_ICON_SIZE 80 -#define ADD_BUTTON_ICON_SIZE 120 -#define ADD_BUTTON_OFFSET 20 - -#define ADD_ICON_BUTTON_L_PAD 32 -#define ADD_ICON_BUTTON_R_PAD 17 - -#define BOTTOM_BUTTON_ICON_SIZE 64 -#define BOTTOM_BUTTON_TEXT_SIZE 132 -#define BOTTOM_BUTTON_ICON_T_PAD 32 -#define BOTTOM_BUTTON_ICON_L_PAD ((MAIN_WIDTH_TWO/2)-(BOTTOM_BUTTON_ICON_SIZE/2)) -#define BOTTOM_BUTTON_R_PAD (BOTTOM_BUTTON_R_PAD+BOTTOM_BUTTON_ICON_SIZE) -#define BOTTOM_BUTTON_TEXT_R_PAD 114 -#define BOTTOM_BUTTON_TEXT_L_PAD (BOTTOM_BUTTON_TEXT_R_PAD+BOTTOM_BUTTON_TEXT_SIZE) -#define BOTTOM_BUTTON_TEXT_B_PAD 32 - -#define MAIN_TITLE_X0 ((WIDTH_MAIN_TITLE)/MAIN_WIDTH) -#define MAIN_TITLE_Y0 ((SPACE_NOTIFICATION+SPACE_NOTI_MAIN_TITLE)/MAIN_BG_HEIGHT) -#define MAIN_TITLE_Y1 ((SPACE_NOTIFICATION+MAIN_TITLE+SPACE_NOTI_MAIN_TITLE)/MAIN_BG_HEIGHT) - -#define CONTACT_IMAGE_X0 (WIDTH_MAIN_TITLE/MAIN_WIDTH) -#define CONTACT_IMAGE_Y0 ((SPACE_NOTIFICATION+MAIN_TITLE+SPACE_NOTI_MAIN_TITLE+SPACE_MAIN_TITLE_MAIN_IMAGE)/MAIN_BG_HEIGHT) -#define CONTACT_IMAGE_X1 ((WIDTH_MAIN_TITLE+MAIN_IMAGE)/MAIN_WIDTH) -#define CONTACT_IMAGE_Y1 ((SPACE_NOTIFICATION+MAIN_TITLE+SPACE_NOTI_MAIN_TITLE+SPACE_MAIN_TITLE_MAIN_IMAGE+MAIN_IMAGE)/MAIN_BG_HEIGHT) - -#define RECT_BUTTON_X0 (0.0) -#define RECT_BUTTON_Y0 ((MAIN_BG_HEIGHT-BOTTOM_BUTTON_HEIGHT)/MAIN_BG_HEIGHT) - -#define CONTACT_NAME_X0 (CONTACT_IMAGE_X1+(WIDTH_MAIN_TITLE/MAIN_WIDTH)) -#define CONTACT_NAME_Y0 ((SPACE_NOTIFICATION+MAIN_TITLE+SPACE_NOTI_MAIN_TITLE+SPACER_MAIN_TITLE_CALL_NAME)/MAIN_BG_HEIGHT) -#define CONTACT_NAME_X1 ((MAIN_WIDTH-ADD_ICON_BUTTON_R_PAD-ADD_ICON_BUTTON_ICON_SIZE-ADD_ICON_BUTTON_L_PAD)/MAIN_WIDTH) -#define CONTACT_NAME_Y1 ((SPACE_NOTIFICATION+MAIN_TITLE+SPACE_NOTI_MAIN_TITLE+SPACER_MAIN_TITLE_CALL_NAME+76)/MAIN_BG_HEIGHT) - -#define CONTACT_NUMBER_X0 (CONTACT_IMAGE_X1+(WIDTH_MAIN_TITLE/MAIN_WIDTH)) -#define CONTACT_NUMBER_Y0 ((SPACE_NOTIFICATION+MAIN_TITLE+SPACE_NOTI_MAIN_TITLE+SPACER_MAIN_TITLE_CALL_NAME+76+6)/MAIN_BG_HEIGHT) -#define CONTACT_NUMBER_X1 ((MAIN_WIDTH-ADD_ICON_BUTTON_R_PAD-ADD_ICON_BUTTON_ICON_SIZE-ADD_ICON_BUTTON_L_PAD)/MAIN_WIDTH) -#define CONTACT_NUMBER_Y1 ((SPACE_NOTIFICATION+MAIN_TITLE+SPACE_NOTI_MAIN_TITLE+SPACER_MAIN_TITLE_CALL_NAME+76+6+46)/MAIN_BG_HEIGHT) - -#define CREATE_CONTACT_X0 ((MAIN_WIDTH-ADD_ICON_BUTTON_R_PAD-ADD_ICON_BUTTON_ICON_SIZE)/MAIN_WIDTH) -#define CREATE_CONTACT_Y0 ((MAIN_BG_HEIGHT-BOTTOM_BUTTON_HEIGHT-64-24-ADD_ICON_BUTTON_ICON_SIZE)/MAIN_BG_HEIGHT) -#define CREATE_CONTACT_X1 ((MAIN_WIDTH-ADD_ICON_BUTTON_R_PAD)/MAIN_WIDTH) -#define CREATE_CONTACT_Y1 ((MAIN_BG_HEIGHT-BOTTOM_BUTTON_HEIGHT-64-24)/MAIN_BG_HEIGHT) - -#define BUTTON_ICON_X0 (BOTTOM_BUTTON_ICON_L_PAD/MAIN_WIDTH_TWO) -#define BUTTON_ICON_Y0 (BOTTOM_BUTTON_ICON_T_PAD/BOTTOM_BUTTON_HEIGHT) -#define BUTTON_ICON_X1 ((BOTTOM_BUTTON_ICON_L_PAD+BOTTOM_BUTTON_ICON_SIZE)/MAIN_WIDTH_TWO) -#define BUTTON_ICON_Y1 (BOTTOM_BUTTON_ICON_T_PAD+BOTTOM_BUTTON_ICON_SIZE)/BOTTOM_BUTTON_HEIGHT - -#define BUTTON_TEXT_X0 (BOTTOM_BUTTON_TEXT_R_PAD/MAIN_WIDTH_TWO) -#define BUTTON_TEXT_Y0 ((BOTTOM_BUTTON_ICON_T_PAD+BOTTOM_BUTTON_ICON_SIZE)/BOTTOM_BUTTON_HEIGHT) -#define BUTTON_TEXT_X1 (BOTTOM_BUTTON_TEXT_L_PAD/MAIN_WIDTH_TWO) -#define BUTTON_TEXT_Y1 ((BOTTOM_BUTTON_HEIGHT-BOTTOM_BUTTON_TEXT_B_PAD)/BOTTOM_BUTTON_HEIGHT) +#define MAIN_WIDTH MAIN_SCREEN_W +#define MAIN_HEIGHT MAIN_SCREEN_H +#define MAIN_WIDTH_TWO (MAIN_WIDTH/2) -group { - name: "call_back"; - parts { - part { name: "rect_call_back"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: 255 255 255 255; - } - description { - state: "pressed" 0.0; - color: 0 0 0 76; - } - } +#define EC_MAIN_TITLE_T_PAD 30 +#define EC_MAIN_TITLE_H 54 +#define EC_CONTACT_IMAGE_T_PAD 30 +#define EC_CONTACT_IMAGE_SIZE 168 +#define EC_BOTTOM_BTN_T_PAD 44 +#define EC_BOTTOM_BTN_H 190 +#define EC_MAIN_BG_H (INDICATOR_HEIGHT+EC_MAIN_TITLE_T_PAD+EC_MAIN_TITLE_H+EC_CONTACT_IMAGE_T_PAD+EC_CONTACT_IMAGE_SIZE+EC_BOTTOM_BTN_T_PAD+EC_BOTTOM_BTN_H) - part { name: "call_back_text"; - type: TEXTBLOCK; - scale: 1; - description { - state: "default" 0.0; - fixed: 1 1; - rel1 { relative: BUTTON_TEXT_X0 BUTTON_TEXT_Y0; to: "rect_call_back";} - rel2 { relative: BUTTON_TEXT_X1 BUTTON_TEXT_Y1; to: "rect_call_back";} - text { - fit: 1 1; - style:"button_style"; - } - } - description { - state: "pressed" 0.0; - inherit: "default" 0.0; - text.style:"button_style_pressed"; - } - } +#define EC_MAIN_TITLE_R_PAD 32 - part { name: "call_back_icon"; - type: IMAGE; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1 { relative: BUTTON_ICON_X0 BUTTON_ICON_Y0; to: "rect_call_back";} - rel2 { relative: BUTTON_ICON_X1 BUTTON_ICON_Y1; to: "rect_call_back";} - image { - normal: IMG_SRC_DIR/"call_button_icon_03.png"; - } - color_class: "AO009"; - } - description { - state: "pressed" 0.0; - inherit: "default" 0.0; - color_class: "AO001"; - } - } - } - programs { - program { - name: "pressed"; - signal: "mouse,down,*"; - source: "*"; - action: STATE_SET "pressed" 0.0; - target: "rect_call_back"; - target: "call_back_icon"; - target: "call_back_text"; - } - program { - name: "unpressed"; - signal: "mouse,up,*"; - source: "*"; - action: STATE_SET "default" 0.0; - target: "rect_call_back"; - target: "call_back_icon"; - target: "call_back_text"; - } - } -} +#define EC_CONTACT_NAME_T_PAD 50 +#define EC_CONTACT_NAME_H 76 + +#define EC_CONTACT_NUMBER_T_PAD 6 +#define EC_CONTACT_NUMBER_H 46 + +#define EC_ADD_BTN_ICON_SIZE 80 +#define EC_ADD_BTN_ICON_B_PAD 88 +#define EC_ADD_BTN_SIZE 120 +#define EC_ADD_BUTTON_R_PAD 20 + +#define EC_ADD_ICON_BTN_L_PAD 32 +#define EC_ADD_ICON_BTN_R_PAD 17 + +#define EC_BOTTOM_BTN_ICON_SIZE 64 +#define EC_BOTTOM_BTN_TEXT_W 132 +#define EC_BOTTOM_BTN_ICON_T_PAD 36 +#define EC_BOTTOM_BTN_ICON_L_PAD ((MAIN_WIDTH_TWO-EC_BOTTOM_BTN_ICON_SIZE)/2) +#define EC_BOTTOM_BTN_R_PAD (EC_BOTTOM_BTN_R_PAD+EC_BOTTOM_BTN_ICON_SIZE) + +#define EC_BOTTOM_BTN_TEXT_B_PAD 38 +#define EC_BOTTOM_BTN_TEXT_R_PAD ((MAIN_WIDTH_TWO-EC_BOTTOM_BTN_TEXT_W)/2) +#define EC_BOTTOM_BTN_TEXT_L_PAD (EC_BOTTOM_BTN_TEXT_R_PAD+EC_BOTTOM_BTN_TEXT_W) + +#define EC_MAIN_TITLE_X0 ((EC_MAIN_TITLE_R_PAD)/MAIN_WIDTH) +#define EC_MAIN_TITLE_Y0 ((INDICATOR_HEIGHT+EC_MAIN_TITLE_T_PAD)/EC_MAIN_BG_H) +#define EC_MAIN_TITLE_Y1 ((INDICATOR_HEIGHT+EC_MAIN_TITLE_H+EC_MAIN_TITLE_T_PAD)/EC_MAIN_BG_H) + +#define EC_CONTACT_IMAGE_X0 (EC_MAIN_TITLE_R_PAD/MAIN_WIDTH) +#define EC_CONTACT_IMAGE_Y0 ((INDICATOR_HEIGHT+EC_MAIN_TITLE_H+EC_MAIN_TITLE_T_PAD+EC_CONTACT_IMAGE_T_PAD)/EC_MAIN_BG_H) +#define EC_CONTACT_IMAGE_X1 ((EC_MAIN_TITLE_R_PAD+EC_CONTACT_IMAGE_SIZE)/MAIN_WIDTH) +#define EC_CONTACT_IMAGE_Y1 ((INDICATOR_HEIGHT+EC_MAIN_TITLE_H+EC_MAIN_TITLE_T_PAD+EC_CONTACT_IMAGE_T_PAD+EC_CONTACT_IMAGE_SIZE)/EC_MAIN_BG_H) + +#define EC_RECT_BUTTON_X0 0.0 +#define EC_RECT_BUTTON_Y0 ((EC_MAIN_BG_H-EC_BOTTOM_BTN_H)/EC_MAIN_BG_H) + +#define EC_CONTACT_NAME_X0 (EC_CONTACT_IMAGE_X1+(EC_MAIN_TITLE_R_PAD/MAIN_WIDTH)) +#define EC_CONTACT_NAME_Y0 ((INDICATOR_HEIGHT+EC_MAIN_TITLE_H+EC_MAIN_TITLE_T_PAD+EC_CONTACT_NAME_T_PAD)/EC_MAIN_BG_H) +#define EC_CONTACT_NAME_X1 ((MAIN_WIDTH-EC_ADD_ICON_BTN_R_PAD-EC_ADD_BTN_ICON_SIZE-EC_ADD_ICON_BTN_L_PAD)/MAIN_WIDTH) +#define EC_CONTACT_NAME_Y1 ((INDICATOR_HEIGHT+EC_MAIN_TITLE_H+EC_MAIN_TITLE_T_PAD+EC_CONTACT_NAME_T_PAD+EC_CONTACT_NAME_H)/EC_MAIN_BG_H) + +#define EC_CONTACT_NUMBER_X0 (EC_CONTACT_IMAGE_X1+(EC_MAIN_TITLE_R_PAD/MAIN_WIDTH)) +#define EC_CONTACT_NUMBER_Y0 ((INDICATOR_HEIGHT+EC_MAIN_TITLE_H+EC_MAIN_TITLE_T_PAD+EC_CONTACT_NAME_T_PAD+EC_CONTACT_NAME_H+EC_CONTACT_NUMBER_T_PAD)/EC_MAIN_BG_H) +#define EC_CONTACT_NUMBER_X1 ((MAIN_WIDTH-EC_ADD_ICON_BTN_R_PAD-EC_ADD_BTN_ICON_SIZE-EC_ADD_ICON_BTN_L_PAD)/MAIN_WIDTH) +#define EC_CONTACT_NUMBER_Y1 ((INDICATOR_HEIGHT+EC_MAIN_TITLE_H+EC_MAIN_TITLE_T_PAD+EC_CONTACT_NAME_T_PAD+EC_CONTACT_NAME_H+EC_CONTACT_NUMBER_T_PAD+EC_CONTACT_NUMBER_H)/EC_MAIN_BG_H) + +#define EC_CREATE_CONTACT_X0 ((MAIN_WIDTH-EC_ADD_ICON_BTN_R_PAD-EC_ADD_BTN_ICON_SIZE)/MAIN_WIDTH) +#define EC_CREATE_CONTACT_Y0 ((EC_MAIN_BG_H-EC_BOTTOM_BTN_H-EC_ADD_BTN_ICON_B_PAD-EC_ADD_BTN_ICON_SIZE)/EC_MAIN_BG_H) +#define EC_CREATE_CONTACT_X1 ((MAIN_WIDTH-EC_ADD_ICON_BTN_R_PAD)/MAIN_WIDTH) +#define EC_CREATE_CONTACT_Y1 ((EC_MAIN_BG_H-EC_BOTTOM_BTN_H-EC_ADD_BTN_ICON_B_PAD)/EC_MAIN_BG_H) + +#define EC_BUTTON_ICON_X0 (EC_BOTTOM_BTN_ICON_L_PAD/MAIN_WIDTH_TWO) +#define EC_BUTTON_ICON_Y0 (EC_BOTTOM_BTN_ICON_T_PAD/EC_BOTTOM_BTN_H) +#define EC_BUTTON_ICON_X1 ((EC_BOTTOM_BTN_ICON_L_PAD+EC_BOTTOM_BTN_ICON_SIZE)/MAIN_WIDTH_TWO) +#define EC_BUTTON_ICON_Y1 (EC_BOTTOM_BTN_ICON_T_PAD+EC_BOTTOM_BTN_ICON_SIZE)/EC_BOTTOM_BTN_H + +#define EC_BUTTON_TEXT_X0 (EC_BOTTOM_BTN_TEXT_R_PAD/MAIN_WIDTH_TWO) +#define EC_BUTTON_TEXT_Y0 ((EC_BOTTOM_BTN_ICON_T_PAD+EC_BOTTOM_BTN_ICON_SIZE)/EC_BOTTOM_BTN_H) +#define EC_BUTTON_TEXT_X1 (EC_BOTTOM_BTN_TEXT_L_PAD/MAIN_WIDTH_TWO) +#define EC_BUTTON_TEXT_Y1 ((EC_BOTTOM_BTN_ICON_T_PAD+EC_BOTTOM_BTN_ICON_SIZE+EC_BOTTOM_BTN_TEXT_B_PAD)/EC_BOTTOM_BTN_H) + +#define EC_ADD_BTN_ICON_X0 (EC_ADD_BUTTON_R_PAD/EC_ADD_BTN_SIZE) +#define EC_ADD_BTN_ICON_Y0 (EC_ADD_BUTTON_R_PAD/EC_ADD_BTN_SIZE) +#define EC_ADD_BTN_ICON_X1 ((EC_ADD_BTN_ICON_SIZE + EC_ADD_BUTTON_R_PAD)/EC_ADD_BTN_SIZE) +#define EC_ADD_BTN_ICON_Y1 ((EC_ADD_BTN_ICON_SIZE + EC_ADD_BUTTON_R_PAD)/EC_ADD_BTN_SIZE) + +#define EC_MAIN_BG_Y1 (EC_MAIN_BG_H/MAIN_HEIGHT) + +#define END_BOTTOM_BUTTON(style_name, img_path) \ +group { \ + name: style_name; \ + parts { \ + part { name: "bg"; \ + type: RECT; \ + scale: 1; \ + description { \ + state: "default" 0.0; \ + color: 255 255 255 255; \ + } \ + description { \ + state: "pressed" 0.0; \ + color: 0 0 0 76; \ + } \ + } \ + part { name: "end_btn_text"; \ + type: TEXTBLOCK; \ + scale: 1; \ + description { \ + state: "default" 0.0; \ + rel1 { relative: EC_BUTTON_TEXT_X0 EC_BUTTON_TEXT_Y0; to: "bg";} \ + rel2 { relative: EC_BUTTON_TEXT_X1 EC_BUTTON_TEXT_Y1; to: "bg";} \ + text { \ + fit: 1 1; \ + style:"button_style"; \ + } \ + } \ + description { \ + state: "pressed" 0.0; \ + inherit: "default" 0.0; \ + text.style:"button_style_pressed"; \ + } \ + } \ + part { name: "end_btn_icon"; \ + type: IMAGE; \ + scale: 1; \ + description { \ + state: "default" 0.0; \ + rel1 { relative: EC_BUTTON_ICON_X0 EC_BUTTON_ICON_Y0; to: "bg";} \ + rel2 { relative: EC_BUTTON_ICON_X1 EC_BUTTON_ICON_Y1; to: "bg";} \ + image { \ + normal: img_path; \ + } \ + color_class: "AO009"; \ + } \ + description { \ + state: "pressed" 0.0; \ + inherit: "default" 0.0; \ + color_class: "AO001"; \ + } \ + } \ + } \ + programs { \ + program { \ + name: "pressed"; \ + signal: "mouse,down,*"; \ + source: "*"; \ + action: STATE_SET "pressed" 0.0; \ + target: "bg"; \ + target: "end_btn_icon"; \ + target: "end_btn_text"; \ + } \ + program { \ + name: "unpressed"; \ + signal: "mouse,up,*"; \ + source: "*"; \ + action: STATE_SET "default" 0.0; \ + target: "bg"; \ + target: "end_btn_icon"; \ + target: "end_btn_text"; \ + } \ + } \ +} \ + +END_BOTTOM_BUTTON("call_back", IMG_SRC_DIR/"call_button_icon_03.png") +END_BOTTOM_BUTTON("message_button", IMG_SRC_DIR/"call_button_icon_04.png") group { name: "create_contact_button"; @@ -212,10 +219,9 @@ group { type: IMAGE; scale: 1; description { - fixed: 1 1; state: "default" 0.0; - rel1 { relative: (ADD_BUTTON_OFFSET/ADD_BUTTON_ICON_SIZE) (ADD_BUTTON_OFFSET/ADD_BUTTON_ICON_SIZE); to: "bg";} - rel2 { relative: ((ADD_ICON_BUTTON_ICON_SIZE + ADD_BUTTON_OFFSET)/ADD_BUTTON_ICON_SIZE) ((ADD_ICON_BUTTON_ICON_SIZE + ADD_BUTTON_OFFSET)/ADD_BUTTON_ICON_SIZE); to: "bg";} + rel1 { relative: EC_ADD_BTN_ICON_X0 EC_ADD_BTN_ICON_Y0; to: "bg";} + rel2 { relative: EC_ADD_BTN_ICON_X1 EC_ADD_BTN_ICON_Y1; to: "bg";} image { normal: IMG_SRC_DIR/"call_button_add.png"; } @@ -242,84 +248,6 @@ group { } group { - name: "message_button"; - parts { - part { name: "rect_message"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: 255 255 255 255; - } - description { - state: "pressed" 0.0; - color: 0 0 0 76; - } - } - - part { name: "message_text"; - type: TEXTBLOCK; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1 { relative: BUTTON_TEXT_X0 BUTTON_TEXT_Y0; to: "rect_message";} - rel2 { relative: BUTTON_TEXT_X1 BUTTON_TEXT_Y1; to: "rect_message";} - text { - fit: 1 1; - style:"button_style"; - } - } - description { - state: "pressed" 0.0; - inherit: "default" 0.0; - text.style:"button_style_pressed"; - } - } - - part { name: "message_icon"; - type: IMAGE; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1 { relative: BUTTON_ICON_X0 BUTTON_ICON_Y0; to: "rect_message";} - rel2 { relative: BUTTON_ICON_X1 BUTTON_ICON_Y1; to: "rect_message";} - image { - normal: IMG_SRC_DIR/"call_button_icon_04.png"; - } - color_class: "AO009"; - } - description { - state: "pressed" 0.0; - inherit: "default" 0.0; - color_class: "AO001"; - } - } - } - programs { - program { - name: "pressed"; - signal: "mouse,down,*"; - source: "*"; - action: STATE_SET "pressed" 0.0; - target: "rect_message"; - target: "message_icon"; - target: "message_text"; - } - program { - name: "unpressed"; - signal: "mouse,up,*"; - source: "*"; - action: STATE_SET "default" 0.0; - target: "rect_message"; - target: "message_icon"; - target: "message_text"; - } - } -} - -group { name: "main_end_call"; parts { part { name: "background"; @@ -333,11 +261,10 @@ group { part { name: "contact_ly"; type: RECT; description { - fixed: 1 1; state: "default" 0.0; color_class: "AO001"; - rel1 { relative: 0 0; to: "background"; } - rel2 { relative: 1 (MAIN_BG_HEIGHT/MAIN_HEIGHT); to: "background"; } + rel1 { relative: 0.0 0.0; to: "background"; } + rel2 { relative: 1.0 EC_MAIN_BG_Y1; to: "background"; } } description { state: "show" 0.0; @@ -355,10 +282,9 @@ group { type: SWALLOW; scale: 1; description { - fixed: 1 1; state: "default" 0.0; - rel1 { relative: CONTACT_IMAGE_X0 CONTACT_IMAGE_Y0; to: "contact_ly";} - rel2 { relative: CONTACT_IMAGE_X1 CONTACT_IMAGE_Y1; to: "contact_ly";} + rel1 { relative: EC_CONTACT_IMAGE_X0 EC_CONTACT_IMAGE_Y0; to: "contact_ly";} + rel2 { relative: EC_CONTACT_IMAGE_X1 EC_CONTACT_IMAGE_Y1; to: "contact_ly";} } description { state: "show" 0.0; @@ -377,9 +303,8 @@ group { scale: 1; description { visible: 0; - fixed: 1 1; - rel1 { relative: CONTACT_IMAGE_X0 CONTACT_IMAGE_Y0; to: "contact_ly";} - rel2 { relative: CONTACT_IMAGE_X1 CONTACT_IMAGE_Y1; to: "contact_ly";} + rel1 { relative: EC_CONTACT_IMAGE_X0 EC_CONTACT_IMAGE_Y0; to: "contact_ly";} + rel2 { relative: EC_CONTACT_IMAGE_X1 EC_CONTACT_IMAGE_Y1; to: "contact_ly";} image { normal: IMG_SRC_DIR/"call_photo_id_mask.png"; } @@ -402,9 +327,8 @@ group { scale: 1; description { visible: 0; - fixed: 1 1; - rel1 { relative: CONTACT_IMAGE_X0 CONTACT_IMAGE_Y0; to: "contact_ly";} - rel2 { relative: CONTACT_IMAGE_X1 CONTACT_IMAGE_Y1; to: "contact_ly";} + rel1 { relative: EC_CONTACT_IMAGE_X0 EC_CONTACT_IMAGE_Y0; to: "contact_ly";} + rel2 { relative: EC_CONTACT_IMAGE_X1 EC_CONTACT_IMAGE_Y1; to: "contact_ly";} image { normal: IMG_SRC_DIR/"call_photo_id.png"; } @@ -428,9 +352,8 @@ group { scale: 1; description { state: "default" 0.0; - fixed: 1 1; - rel1 { relative: CONTACT_NAME_X0 CONTACT_NAME_Y0; to: "contact_ly";} - rel2 { relative: CONTACT_NAME_X1 CONTACT_NAME_Y1; to: "contact_ly";} + rel1 { relative: EC_CONTACT_NAME_X0 EC_CONTACT_NAME_Y0; to: "contact_ly";} + rel2 { relative: EC_CONTACT_NAME_X1 EC_CONTACT_NAME_Y1; to: "contact_ly";} text { ellipsis: 0.0; style:"call_name"; @@ -453,9 +376,8 @@ group { scale: 1; description { state: "default" 0.0; - fixed: 1 1; - rel1 { relative: CONTACT_NUMBER_X0 CONTACT_NUMBER_Y0; to: "contact_ly";} - rel2 { relative: CONTACT_NUMBER_X1 CONTACT_NUMBER_Y1; to: "contact_ly";} + rel1 { relative: EC_CONTACT_NUMBER_X0 EC_CONTACT_NUMBER_Y0; to: "contact_ly";} + rel2 { relative: EC_CONTACT_NUMBER_X1 EC_CONTACT_NUMBER_Y1; to: "contact_ly";} text { ellipsis: 1.0; style:"call_number"; @@ -478,10 +400,8 @@ group { scale: 1; description { state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - rel1 { relative: CREATE_CONTACT_X0 CREATE_CONTACT_Y0; to: "contact_ly";} - rel2 { relative: CREATE_CONTACT_X1 CREATE_CONTACT_Y1; to: "contact_ly";} + rel1 { relative: EC_CREATE_CONTACT_X0 EC_CREATE_CONTACT_Y0; to: "contact_ly";} + rel2 { relative: EC_CREATE_CONTACT_X1 EC_CREATE_CONTACT_Y1; to: "contact_ly";} } description { state: "show" 0.0; @@ -500,8 +420,7 @@ group { scale: 1; description { state: "default" 0.0; - fixed: 1 1; - rel1 { relative: 0.0 RECT_BUTTON_Y0; to: "contact_ly";} + rel1 { relative: 0.0 EC_RECT_BUTTON_Y0; to: "contact_ly";} rel2 { relative: 0.5 1.0; to: "contact_ly";} } } @@ -511,8 +430,7 @@ group { scale: 1; description { state: "default" 0.0; - fixed: 1 1; - rel1 { relative: 0.5 RECT_BUTTON_Y0; to: "contact_ly";} + rel1 { relative: 0.5 EC_RECT_BUTTON_Y0; to: "contact_ly";} rel2 { relative: 1.0 1.0; to: "contact_ly";} } } @@ -521,10 +439,9 @@ group { scale: 1; description { state: "default" 0.0; - fixed: 1 1; - rel1 { relative: MAIN_TITLE_X0 MAIN_TITLE_Y0; to: "contact_ly";} - rel2 { relative: 1.0 MAIN_TITLE_Y1; to: "contact_ly";} - text.style:"call_timer_style1"; + rel1 { relative: EC_MAIN_TITLE_X0 EC_MAIN_TITLE_Y0; to: "contact_ly";} + rel2 { relative: 1.0 EC_MAIN_TITLE_Y1; to: "contact_ly";} + text.style:"call_timer_style"; } } } diff --git a/res/edje_src/edc/call_edc/callui_view_incoming_active.edc b/res/edje_src/edc/call_edc/callui_view_incoming_active.edc index 16e038a..cf19557 100644 --- a/res/edje_src/edc/call_edc/callui_view_incoming_active.edc +++ b/res/edje_src/edc/call_edc/callui_view_incoming_active.edc @@ -26,92 +26,95 @@ styles { } } -#define SPACE_NOTIFICATION 40 -#define REC_MAIN_INFO 144 -#define SPACE_ICON 23 -#define ICON_H 98 -#define SPACE_ICON_W 32 -#define REC_BUTTON_H 120 -#define BUTTON_H 78 -#define SWAP_BUTTON_Y 46 -#define MAIN_HEIGHT (SPACE_NOTIFICATION+REC_MAIN_INFO+REC_BUTTON_H+SWAP_BUTTON_Y) -#define MAIN_HEIGHT_RECT_REJECT (REC_MAIN_INFO+REC_BUTTON_H+SPACE_NOTIFICATION+SPACE_NOTIFICATION) -#define MAIN_HEIGHT_REJECT 1280 -#define MAIN_WIDTH 720 -#define SPACE_BUTTON 186 -#define SPACE_BETWEEN_BUTTONS 16 -#define SPACE_BUTTON_Y 21 -#define BUTTON_SIZE_X_LITTLE 208 -#define BUTTON_SIZE_X_BIG 320 -#define BUTTON_SIZE_Y 78 -#define NAME_SIZE 56 -#define NUMBER_SIZE 43 -#define BUTTON_RJ_MSG 20 -#define BUTTON_RJ_MSG_OFFSET 22 -#define ACTIVE_NOTIFICATION_SIZE_Y 320 - -#define CONTACT_IMAGE_X0 (SPACE_ICON_W/MAIN_WIDTH) -#define CONTACT_IMAGE_Y0 ((SPACE_NOTIFICATION+SPACE_ICON)/MAIN_HEIGHT) -#define CONTACT_IMAGE_X1 ((SPACE_ICON_W+ICON_H)/MAIN_WIDTH) -#define CONTACT_IMAGE_Y1 ((SPACE_NOTIFICATION+SPACE_ICON+ICON_H)/MAIN_HEIGHT) - -#define CONTACT_INFO_X0 (0.0) -#define CONTACT_INFO_Y0 (0.0) -#define CONTACT_INFO_X1 (1.0) -#define CONTACT_INFO_Y1 ((MAIN_HEIGHT)/MAIN_HEIGHT) -#define CONTACT_INFO_Y_REJECT ((MAIN_HEIGHT_RECT_REJECT)/MAIN_HEIGHT_REJECT) - -#define CONTACT_REJECT_MSG_X0 (0.0) -#define CONTACT_REJECT_MSG_Y0 ((MAIN_HEIGHT_RECT_REJECT)/MAIN_HEIGHT_REJECT) -#define CONTACT_REJECT_MSG_X1 (1.0) -#define CONTACT_REJECT_MSG_Y1 (1.0) - -#define CONTACT_REJECT_MSG_BUTTON_X0 ((SPACE_ICON_W)/MAIN_WIDTH) -#define CONTACT_REJECT_MSG_BUTTON_Y0 ((BUTTON_RJ_MSG)/(MAIN_HEIGHT_REJECT-MAIN_HEIGHT_RECT_REJECT)) -#define CONTACT_REJECT_MSG_BUTTON_X1 ((MAIN_WIDTH-SPACE_ICON_W)/MAIN_WIDTH) -#define CONTACT_REJECT_MSG_BUTTON_Y1 ((BUTTON_RJ_MSG+BUTTON_H)/(MAIN_HEIGHT_REJECT-MAIN_HEIGHT_RECT_REJECT)) - -#define CONTACT_REJECT_MSG_GENLIST_Y1 ((BUTTON_RJ_MSG+BUTTON_H+BUTTON_RJ_MSG_OFFSET)/(MAIN_HEIGHT_REJECT-MAIN_HEIGHT_RECT_REJECT)) - -#define CONTACT_CALL_BTN_X0 ((SPACE_ICON_W)/MAIN_WIDTH) -#define CONTACT_BTN_Y0 (SPACE_BUTTON/ACTIVE_NOTIFICATION_SIZE_Y) -#define CONTACT_CALL_BTN_X1 ((SPACE_ICON_W+BUTTON_SIZE_X_LITTLE)/MAIN_WIDTH) -#define CONTACT_BTN_Y1 ((SPACE_BUTTON+BUTTON_SIZE_Y)/ACTIVE_NOTIFICATION_SIZE_Y) - -#define CONTACT_CALL_BTN_BIG_X0 (SPACE_ICON_W/MAIN_WIDTH) -#define CONTACT_CALL_BTN_BIG_Y0 CONTACT_BTN_Y0 -#define CONTACT_CALL_BTN_BIG_X1 ((SPACE_ICON_W+BUTTON_SIZE_X_BIG)/MAIN_WIDTH) -#define CONTACT_CALL_BTN_BIG_Y1 CONTACT_BTN_Y1 - -#define CONTACT_RJ_MSG_BTN_X0 ((SPACE_ICON_W+SPACE_BETWEEN_BUTTONS+BUTTON_SIZE_X_LITTLE)/MAIN_WIDTH) -#define CONTACT_RJ_MSG_BTN_Y0 CONTACT_BTN_Y0 -#define CONTACT_RJ_MSG_BTN_X1 ((SPACE_ICON_W+SPACE_BETWEEN_BUTTONS+BUTTON_SIZE_X_LITTLE+BUTTON_SIZE_X_LITTLE)/MAIN_WIDTH) -#define CONTACT_RJ_MSG_BTN_Y1 CONTACT_BTN_Y1 - -#define CONTACT_END_BTN_X0 ((MAIN_WIDTH-SPACE_ICON_W-BUTTON_SIZE_X_LITTLE)/MAIN_WIDTH) -#define CONTACT_END_BTN_Y0 CONTACT_BTN_Y0 -#define CONTACT_END_BTN_X1 ((MAIN_WIDTH-SPACE_ICON_W)/MAIN_WIDTH) -#define CONTACT_END_BTN_Y1 CONTACT_BTN_Y1 - -#define CONTACT_END_BTN_BIG_X0 ((MAIN_WIDTH-SPACE_ICON_W-BUTTON_SIZE_X_BIG)/MAIN_WIDTH) -#define CONTACT_END_BTN_BIG_Y0 CONTACT_BTN_Y0 -#define CONTACT_END_BTN_BIG_X1 ((MAIN_WIDTH-SPACE_ICON_W)/MAIN_WIDTH) -#define CONTACT_END_BTN_BIG_Y1 CONTACT_BTN_Y1 - -#define SWAP_X0 (((MAIN_WIDTH/2)-SPACE_ICON)/MAIN_WIDTH) -#define SWAP_Y0 ((MAIN_HEIGHT-SWAP_BUTTON_Y)/MAIN_HEIGHT) -#define SWAP_X1 (((MAIN_WIDTH/2)+SPACE_ICON)/MAIN_WIDTH) -#define SWAP_Y1 1.0 - -#define CONTACT_NAME_X0 ((SPACE_ICON_W+ICON_H+SPACE_BETWEEN_BUTTONS)/MAIN_WIDTH) -#define CONTACT_NAME_Y0 ((SPACE_NOTIFICATION+SPACE_ICON)/MAIN_HEIGHT) -#define CONTACT_NAME_X1 (1.0) -#define CONTACT_NAME_Y1 ((SPACE_NOTIFICATION+SPACE_ICON+NAME_SIZE)/MAIN_HEIGHT) - -#define CONTACT_NUMBER_X0 ((SPACE_ICON_W+ICON_H+SPACE_BETWEEN_BUTTONS)/MAIN_WIDTH) -#define CONTACT_NUMBER_Y0 ((SPACE_NOTIFICATION+SPACE_ICON+NAME_SIZE)/MAIN_HEIGHT) -#define CONTACT_NUMBER_X1 (1.0) -#define CONTACT_NUMBER_Y1 ((SPACE_NOTIFICATION+SPACE_ICON+NAME_SIZE+NUMBER_SIZE)/MAIN_HEIGHT) +#define IAC_REC_MAIN_INFO 144 +#define IAC_SPACE_ICON 23 +#define IAC_ICON_H 98 +#define IAC_SPACE_ICON_W 32 +#define IAC_REC_BTN_H 120 +#define IAC_BTN_H 78 +#define IAC_IAC_SWAP_BTN_Y 46 + +#define IAC_MAIN_HEIGHT (INDICATOR_HEIGHT+IAC_REC_MAIN_INFO+IAC_REC_BTN_H+IAC_IAC_SWAP_BTN_Y) +#define IAC_MAIN_WIDTH MAIN_SCREEN_W +#define IAC_MAIN_HEIGHT_REJECT MAIN_SCREEN_H + +#define IAC_MAIN_HEIGHT_RECT_REJECT (IAC_REC_MAIN_INFO+IAC_REC_BTN_H+INDICATOR_HEIGHT+INDICATOR_HEIGHT) +#define IAC_MAIN_HEIGHT_REJECT MAIN_SCREEN_H + +#define IAH_SPACE_BTN 186 +#define IAC_SPACE_BETWEEN_BTNS 16 +#define IAH_SPACE_BTN_Y 21 + +#define IAC_BTN_SIZE_X_LITTLE 208 +#define IAC_BTN_SIZE_X_BIG 320 +#define IAC_BTN_SIZE_Y 78 + +#define IAC_IAC_CONTACT_NAME_H 56 +#define IAC_IAC_CONTACT_NUMBER_H 43 +#define IAC_BTN_RJ_MSG 20 +#define IAC_BTN_RJ_MSG_OFFSET 22 +#define IAC_ACTIVE_NOTI_SIZE_Y 320 + +#define IAC_CONTACT_IMG_X0 (IAC_SPACE_ICON_W/IAC_MAIN_WIDTH) +#define IAC_CONTACT_IMG_Y0 ((INDICATOR_HEIGHT+IAC_SPACE_ICON)/IAC_MAIN_HEIGHT) +#define IAC_CONTACT_IMG_X1 ((IAC_SPACE_ICON_W+IAC_ICON_H)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_IMG_Y1 ((INDICATOR_HEIGHT+IAC_SPACE_ICON+IAC_ICON_H)/IAC_MAIN_HEIGHT) + +#define IAC_CONTACT_INFO_Y1 (1.0) + +#define IAC_CONTACT_INFO_Y_REJECT ((IAC_MAIN_HEIGHT_RECT_REJECT)/IAC_MAIN_HEIGHT_REJECT) + +#define IAC_CONTACT_REJ_MSG_X0 (0.0) +#define IAC_CONTACT_REJ_MSG_Y0 ((IAC_MAIN_HEIGHT_RECT_REJECT)/IAC_MAIN_HEIGHT_REJECT) +#define IAC_CONTACT_REJ_MSG_X1 (1.0) +#define IAC_CONTACT_REJ_MSG_Y1 (1.0) + +#define IAC_CONTACT_REJ_MSG_BTN_X0 ((IAC_SPACE_ICON_W)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_REJ_MSG_BTN_Y0 ((IAC_BTN_RJ_MSG)/(IAC_MAIN_HEIGHT_REJECT-IAC_MAIN_HEIGHT_RECT_REJECT)) +#define IAC_CONTACT_REJ_MSG_BTN_X1 ((IAC_MAIN_WIDTH-IAC_SPACE_ICON_W)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_REJ_MSG_BTN_Y1 ((IAC_BTN_RJ_MSG+IAC_BTN_H)/(IAC_MAIN_HEIGHT_REJECT-IAC_MAIN_HEIGHT_RECT_REJECT)) + +#define IAC_CONTACT_REJ_MSG_GENLIST_Y1 ((IAC_BTN_RJ_MSG+IAC_BTN_H+IAC_BTN_RJ_MSG_OFFSET)/(IAC_MAIN_HEIGHT_REJECT-IAC_MAIN_HEIGHT_RECT_REJECT)) + +#define IAC_CONTACT_CALL_BTN_X0 ((IAC_SPACE_ICON_W)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_BTN_Y0 (IAH_SPACE_BTN/IAC_ACTIVE_NOTI_SIZE_Y) +#define IAC_CONTACT_CALL_BTN_X1 ((IAC_SPACE_ICON_W+IAC_BTN_SIZE_X_LITTLE)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_BTN_Y1 ((IAH_SPACE_BTN+IAC_BTN_SIZE_Y)/IAC_ACTIVE_NOTI_SIZE_Y) + +#define IAC_CONTACT_CALL_BTN_BIG_X0 (IAC_SPACE_ICON_W/IAC_MAIN_WIDTH) +#define IAC_CONTACT_CALL_BTN_BIG_Y0 IAC_CONTACT_BTN_Y0 +#define IAC_CONTACT_CALL_BTN_BIG_X1 ((IAC_SPACE_ICON_W+IAC_BTN_SIZE_X_BIG)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_CALL_BTN_BIG_Y1 IAC_CONTACT_BTN_Y1 + +#define IAC_CONTACT_RJ_MSG_BTN_X0 ((IAC_SPACE_ICON_W+IAC_SPACE_BETWEEN_BTNS+IAC_BTN_SIZE_X_LITTLE)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_RJ_MSG_BTN_Y0 IAC_CONTACT_BTN_Y0 +#define IAC_CONTACT_RJ_MSG_BTN_X1 ((IAC_SPACE_ICON_W+IAC_SPACE_BETWEEN_BTNS+IAC_BTN_SIZE_X_LITTLE+IAC_BTN_SIZE_X_LITTLE)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_RJ_MSG_BTN_Y1 IAC_CONTACT_BTN_Y1 + +#define IAC_CONTACT_END_BTN_X0 ((IAC_MAIN_WIDTH-IAC_SPACE_ICON_W-IAC_BTN_SIZE_X_LITTLE)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_END_BTN_Y0 IAC_CONTACT_BTN_Y0 +#define IAC_CONTACT_END_BTN_X1 ((IAC_MAIN_WIDTH-IAC_SPACE_ICON_W)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_END_BTN_Y1 IAC_CONTACT_BTN_Y1 + +#define IAC_CONTACT_END_BTN_BIG_X0 ((IAC_MAIN_WIDTH-IAC_SPACE_ICON_W-IAC_BTN_SIZE_X_BIG)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_END_BTN_BIG_Y0 IAC_CONTACT_BTN_Y0 +#define IAC_CONTACT_END_BTN_BIG_X1 ((IAC_MAIN_WIDTH-IAC_SPACE_ICON_W)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_END_BTN_BIG_Y1 IAC_CONTACT_BTN_Y1 + +#define IAC_SWAP_X0 (((IAC_MAIN_WIDTH/2)-IAC_SPACE_ICON)/IAC_MAIN_WIDTH) +#define IAC_SWAP_Y0 ((IAC_MAIN_HEIGHT-IAC_IAC_SWAP_BTN_Y)/IAC_MAIN_HEIGHT) +#define IAC_SWAP_X1 (((IAC_MAIN_WIDTH/2)+IAC_SPACE_ICON)/IAC_MAIN_WIDTH) +#define IAC_SWAP_Y1 (1.0) + +#define IAC_CONTACT_NAME_X0 ((IAC_SPACE_ICON_W+IAC_ICON_H+IAC_SPACE_BETWEEN_BTNS)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_NAME_Y0 ((INDICATOR_HEIGHT+IAC_SPACE_ICON)/IAC_MAIN_HEIGHT) +#define IAC_CONTACT_NAME_X1 (1.0) +#define IAC_CONTACT_NAME_Y1 ((INDICATOR_HEIGHT+IAC_SPACE_ICON+IAC_IAC_CONTACT_NAME_H)/IAC_MAIN_HEIGHT) + +#define IAC_CONTACT_NUMBER_X0 ((IAC_SPACE_ICON_W+IAC_ICON_H+IAC_SPACE_BETWEEN_BTNS)/IAC_MAIN_WIDTH) +#define IAC_CONTACT_NUMBER_Y0 ((INDICATOR_HEIGHT+IAC_SPACE_ICON+IAC_IAC_CONTACT_NAME_H)/IAC_MAIN_HEIGHT) +#define IAC_CONTACT_NUMBER_X1 (1.0) +#define IAC_CONTACT_NUMBER_Y1 ((INDICATOR_HEIGHT+IAC_SPACE_ICON+IAC_IAC_CONTACT_NAME_H+IAC_IAC_CONTACT_NUMBER_H)/IAC_MAIN_HEIGHT) group { name: "main_button_ly"; @@ -190,7 +193,7 @@ group { state: "default" 0.0; color: 255 255 255 255; rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 CONTACT_REJECT_MSG_GENLIST_Y1;} + rel2 { relative: 1.0 IAC_CONTACT_REJ_MSG_GENLIST_Y1;} } } @@ -200,8 +203,8 @@ group { description { fixed: 1 1; state: "default" 0.0; - rel1 { relative: CONTACT_REJECT_MSG_BUTTON_X0 CONTACT_REJECT_MSG_BUTTON_Y0;} - rel2 { relative: CONTACT_REJECT_MSG_BUTTON_X1 CONTACT_REJECT_MSG_BUTTON_Y1;} + rel1 { relative: IAC_CONTACT_REJ_MSG_BTN_X0 IAC_CONTACT_REJ_MSG_BTN_Y0;} + rel2 { relative: IAC_CONTACT_REJ_MSG_BTN_X1 IAC_CONTACT_REJ_MSG_BTN_Y1;} } } @@ -212,7 +215,7 @@ group { fixed: 1 1; align: 0.0 0.0; state: "default" 0.0; - rel1 { relative: 0.0 CONTACT_REJECT_MSG_GENLIST_Y1;} + rel1 { relative: 0.0 IAC_CONTACT_REJ_MSG_GENLIST_Y1;} rel2 { relative: 1.0 1.0;} } } @@ -230,7 +233,7 @@ group { state: "default" 0.0; color: 0 0 0 77; rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 CONTACT_INFO_Y1;} + rel2 { relative: 1.0 IAC_CONTACT_INFO_Y1;} } } @@ -242,19 +245,19 @@ group { state: "default" 0.0; color: 61 185 204 255; rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 CONTACT_INFO_Y1;} + rel2 { relative: 1.0 IAC_CONTACT_INFO_Y1;} } description { state: "small" 0.0; inherit: "default" 0.0; rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 CONTACT_INFO_Y1;} + rel2 { relative: 1.0 IAC_CONTACT_INFO_Y1;} } description { state: "big" 0.0; inherit: "default" 0.0; rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 CONTACT_INFO_Y_REJECT;} + rel2 { relative: 1.0 IAC_CONTACT_INFO_Y_REJECT;} } } @@ -279,8 +282,8 @@ group { aspect_preference: HORIZONTAL; state: "default" 0.0; color: 255 255 0 255; - rel1 { relative: CONTACT_IMAGE_X0 CONTACT_IMAGE_Y0; to: "bg";} - rel2 { relative: CONTACT_IMAGE_X1 CONTACT_IMAGE_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_IMG_X0 IAC_CONTACT_IMG_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_IMG_X1 IAC_CONTACT_IMG_Y1; to: "bg";} } description { state: "show" 0.0; @@ -301,8 +304,8 @@ group { fixed: 1 1; state: "default" 0.0; visible: 0; - rel1 { relative: CONTACT_REJECT_MSG_X0 CONTACT_REJECT_MSG_Y0;} - rel2 { relative: CONTACT_REJECT_MSG_X1 CONTACT_REJECT_MSG_Y1;} + rel1 { relative: IAC_CONTACT_REJ_MSG_X0 IAC_CONTACT_REJ_MSG_Y0;} + rel2 { relative: IAC_CONTACT_REJ_MSG_X1 IAC_CONTACT_REJ_MSG_Y1;} } description { state: "hide" 0.0; @@ -322,8 +325,8 @@ group { description { visible: 1; fixed: 1 1; - rel1 { relative: SWAP_X0 SWAP_Y0; to: "bg";} - rel2 { relative: SWAP_X1 SWAP_Y1; to: "bg";} + rel1 { relative: IAC_SWAP_X0 IAC_SWAP_Y0; to: "bg";} + rel2 { relative: IAC_SWAP_X1 IAC_SWAP_Y1; to: "bg";} aspect_preference: SOURCE; } description { @@ -346,8 +349,8 @@ group { fixed: 1 1; aspect: 1 1; aspect_preference: HORIZONTAL; - rel1 { relative: CONTACT_IMAGE_X0 CONTACT_IMAGE_Y0; to: "bg";} - rel2 { relative: CONTACT_IMAGE_X1 CONTACT_IMAGE_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_IMG_X0 IAC_CONTACT_IMG_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_IMG_X1 IAC_CONTACT_IMG_Y1; to: "bg";} image { normal: IMG_SRC_DIR/"call_photo_id_mask.png"; } @@ -399,8 +402,8 @@ group { description { state: "default" 0.0; fixed: 1 1; - rel1 { relative: CONTACT_NAME_X0 CONTACT_NAME_Y0; to: "bg";} - rel2 { relative: CONTACT_NAME_X1 CONTACT_NAME_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_NAME_X0 IAC_CONTACT_NAME_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_NAME_X1 IAC_CONTACT_NAME_Y1; to: "bg";} align: 0.0 0.5; text { ellipsis: 0.0; @@ -426,8 +429,8 @@ group { description { state: "default" 0.0; fixed: 1 1; - rel1 { relative: CONTACT_NUMBER_X0 CONTACT_NUMBER_Y0; to: "bg";} - rel2 { relative: CONTACT_NUMBER_X1 CONTACT_NUMBER_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_NUMBER_X0 IAC_CONTACT_NUMBER_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_NUMBER_X1 IAC_CONTACT_NUMBER_Y1; to: "bg";} align: 0.0 0.5; text { ellipsis: 1.0; @@ -452,21 +455,21 @@ group { description { state: "default" 0.0; fixed: 1 1; - rel1 { relative: CONTACT_CALL_BTN_X0 CONTACT_BTN_Y0; to: "bg";} - rel2 { relative: CONTACT_CALL_BTN_X1 CONTACT_BTN_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_CALL_BTN_X0 IAC_CONTACT_BTN_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_CALL_BTN_X1 IAC_CONTACT_BTN_Y1; to: "bg";} color: 255 0 0 255; } description { state: "big" 0.0; inherit: "default" 0.0; - rel1 { relative: CONTACT_CALL_BTN_BIG_X0 CONTACT_CALL_BTN_BIG_Y0; to: "bg";} - rel2 { relative: CONTACT_CALL_BTN_BIG_X1 CONTACT_CALL_BTN_BIG_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_CALL_BTN_BIG_X0 IAC_CONTACT_CALL_BTN_BIG_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_CALL_BTN_BIG_X1 IAC_CONTACT_CALL_BTN_BIG_Y1; to: "bg";} } description { state: "small" 0.0; inherit: "default" 0.0; - rel1 { relative: CONTACT_CALL_BTN_X0 CONTACT_BTN_Y0; to: "bg";} - rel2 { relative: CONTACT_CALL_BTN_X1 CONTACT_BTN_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_CALL_BTN_X0 IAC_CONTACT_BTN_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_CALL_BTN_X1 IAC_CONTACT_BTN_Y1; to: "bg";} } } @@ -477,8 +480,8 @@ group { state: "default" 0.0; fixed: 1 1; visible: 0; - rel1 { relative: CONTACT_RJ_MSG_BTN_X0 CONTACT_RJ_MSG_BTN_Y0; to: "bg";} - rel2 { relative: CONTACT_RJ_MSG_BTN_X1 CONTACT_RJ_MSG_BTN_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_RJ_MSG_BTN_X0 IAC_CONTACT_RJ_MSG_BTN_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_RJ_MSG_BTN_X1 IAC_CONTACT_RJ_MSG_BTN_Y1; to: "bg";} color: 255 0 0 255; } description { @@ -499,21 +502,21 @@ group { description { state: "default" 0.0; fixed: 1 1; - rel1 { relative: CONTACT_END_BTN_X0 CONTACT_BTN_Y0; to: "bg";} - rel2 { relative: CONTACT_END_BTN_X1 CONTACT_BTN_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_END_BTN_X0 IAC_CONTACT_BTN_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_END_BTN_X1 IAC_CONTACT_BTN_Y1; to: "bg";} color: 255 0 0 255; } description { state: "big" 0.0; inherit: "default" 0.0; - rel1 { relative: CONTACT_END_BTN_X0 CONTACT_BTN_Y0; to: "bg";} - rel2 { relative: CONTACT_END_BTN_X1 CONTACT_BTN_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_END_BTN_X0 IAC_CONTACT_BTN_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_END_BTN_X1 IAC_CONTACT_BTN_Y1; to: "bg";} } description { state: "small" 0.0; inherit: "default" 0.0; - rel1 { relative: CONTACT_END_BTN_X0 CONTACT_BTN_Y0; to: "bg";} - rel2 { relative: CONTACT_END_BTN_X1 CONTACT_BTN_Y1; to: "bg";} + rel1 { relative: IAC_CONTACT_END_BTN_X0 IAC_CONTACT_BTN_Y0; to: "bg";} + rel2 { relative: IAC_CONTACT_END_BTN_X1 IAC_CONTACT_BTN_Y1; to: "bg";} } } } diff --git a/src/callui-view-callend.c b/src/callui-view-callend.c index 380cf0c..905755c 100644 --- a/src/callui-view-callend.c +++ b/src/callui-view-callend.c @@ -239,7 +239,7 @@ static void __callui_view_callend_create_screen(callui_app_data_t *ad, Evas_Obje if (button_call_back) { elm_layout_file_set(button_call_back, EDJ_NAME, "call_back"); evas_object_event_callback_add(button_call_back, EVAS_CALLBACK_MOUSE_UP, __callui_endcall_voicecall_btn_cb, (void *)priv->call_number); - elm_object_part_text_set(button_call_back, "call_back_text", _("IDS_CALL_BUTTON_CALL")); + elm_object_part_text_set(button_call_back, "end_btn_text", _("IDS_CALL_BUTTON_CALL")); } elm_object_part_content_set(priv->contents, "button_call_back", button_call_back); @@ -247,7 +247,7 @@ static void __callui_view_callend_create_screen(callui_app_data_t *ad, Evas_Obje if (button_message) { elm_layout_file_set(button_message, EDJ_NAME, "message_button"); evas_object_event_callback_add(button_message, EVAS_CALLBACK_MOUSE_UP, __vcui_endcall_msg_btn_cb, (void *)priv->call_number); - elm_object_part_text_set(button_message, "message_text", _("IDS_COM_BODY_MESSAGE")); + elm_object_part_text_set(button_message, "end_btn_text", _("IDS_COM_BODY_MESSAGE")); } elm_object_part_content_set(priv->contents, "button_message_back", button_message); elm_object_part_text_set(priv->contents, "main_title_status", _("IDS_CALL_BODY_CALL_ENDE_M_STATUS_ABB")); -- 2.7.4