From 9198556c0fe4ce3f01d0aa5ead0757f36cc2e844 Mon Sep 17 00:00:00 2001 From: Pekka Kahkonen Date: Fri, 10 May 2013 10:51:38 +0300 Subject: fix there is no send/cancel/save button/icon when composing email --- composer/src/email-composer.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/composer/src/email-composer.c b/composer/src/email-composer.c index 442ec07..214eee4 100755 --- a/composer/src/email-composer.c +++ b/composer/src/email-composer.c @@ -803,26 +803,32 @@ void create_composer_frame(EmailComposerUGD *ugd) ugd->navi_item = elm_naviframe_item_push(ugd->navi_bar, title_str, NULL, NULL, outer_layout, NULL); elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", ""); - // Right : cancel button - cancel_btn = elm_button_add(ugd->navi_bar); - elm_object_style_set(cancel_btn, "naviframe/back_btn/default"); - elm_object_item_part_content_set(ugd->navi_item, "title_prev_btn", cancel_btn); - evas_object_smart_callback_add(cancel_btn, "clicked", _composer_back_button_cb, ugd); - ugd->cancel_btn = cancel_btn; - debug_log("cancel_btn of composer: %p", ugd->cancel_btn); - - // Middle : more button + // Right : more button more_btn = elm_button_add(ugd->navi_bar); elm_object_style_set(more_btn, "naviframe/more/default"); elm_object_focus_allow_set(more_btn, EINA_FALSE); - elm_object_item_part_content_set(ugd->navi_item, "title_more_btn", more_btn); + elm_object_item_part_content_set(ugd->navi_item, "title_right_btn", more_btn); evas_object_smart_callback_add(more_btn, "clicked", _composer_more_toolbar_button_cb, ugd); + // Middle : cancel button + cancel_btn = elm_button_add(ugd->navi_bar); + elm_object_style_set(cancel_btn, "naviframe/back_btn/default"); + elm_object_item_part_content_set(ugd->navi_item, "title_left_btn", cancel_btn); + evas_object_smart_callback_add(cancel_btn, "clicked", _composer_back_button_cb, ugd); + ugd->cancel_btn = cancel_btn; + // Left : send button send_btn = elm_button_add(ugd->navi_bar); - elm_object_style_set(send_btn, "naviframe/toolbar/default"); + elm_object_style_set(send_btn, "naviframe/title_icon"); elm_object_text_set(send_btn, dgettext("sys_string", "IDS_COM_SK_SEND_ABB")); - elm_object_item_part_content_set(ugd->navi_item, "title_toolbar_button1", send_btn); + + Evas_Object *icon = elm_icon_add(send_btn); + elm_image_file_set(icon, IMGDIR"/M02_popup_icon_send email.png", NULL); + evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_HORIZONTAL, 1 , 1); + elm_image_resizable_set(icon, EINA_TRUE, EINA_TRUE); + elm_object_content_set(send_btn, icon); + + elm_object_item_part_content_set(ugd->navi_item, "title_more_btn", send_btn); evas_object_smart_callback_add(send_btn, "clicked", _composer_cbar_send_clicked, ugd); ugd->send_btn = send_btn; -- cgit v1.2.3