--- a/src/util/ui-utils-contacts.c +++ b/src/util/ui-utils-contacts.c @@ -232,7 +232,7 @@ evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0.0); evas_object_smart_callback_add(btn, "clicked", _number_select_cancel, pack); - elm_object_text_set(btn, D_("Cancel")); + elm_button_label_set(btn, D_("Cancel")); evas_object_show(btn); elm_box_pack_end(box, btn); --- a/src/util/ui-utils.c +++ b/src/util/ui-utils.c @@ -285,21 +285,21 @@ Evas_Object *inwin = elm_win_inwin_add(ui_utils_view_window_get(view)); Evas_Object *bx = elm_box_add(ui_utils_view_window_get(view)); - elm_box_homogeneous_set(bx, 1); + elm_box_homogenous_set(bx, 1); Evas_Object *e = elm_label_add(ui_utils_view_window_get(view)); - elm_object_text_set(e, label); + elm_label_label_set(e, label); evas_object_show(e); elm_box_pack_end(bx, e); Evas_Object *bx2 = elm_box_add(ui_utils_view_window_get(view)); elm_box_horizontal_set(bx2, 1); - elm_box_homogeneous_set(bx2, 1); + elm_box_homogenous_set(bx2, 1); for (buttons = g_list_first(buttons); buttons; buttons = g_list_next(buttons)) { e = elm_button_add(ui_utils_view_window_get(view)); - elm_object_text_set(e, + elm_button_label_set(e, ((struct InwinButton *) buttons->data)-> label); evas_object_smart_callback_add(e, "clicked", @@ -371,7 +371,7 @@ tmp = g_strdup_printf("%s", label); lbl = elm_label_add(win); - elm_object_text_set(lbl, tmp); + elm_label_label_set(lbl, tmp); elm_label_line_wrap_set(lbl, EINA_TRUE); evas_object_size_hint_align_set(lbl, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -382,7 +382,7 @@ if (check_label && strlen(check_label) && check_value) { check = elm_check_add(win); - elm_object_text_set(check, check_label); + elm_check_label_set(check, check_label); elm_check_state_set(check, *check_value); elm_check_state_pointer_set(check, check_value); elm_box_pack_end(box, check); @@ -391,13 +391,13 @@ box2 = elm_box_add(win); elm_box_horizontal_set(box2, EINA_TRUE); - elm_box_homogeneous_set(box2, EINA_TRUE); + elm_box_homogenous_set(box2, EINA_TRUE); evas_object_size_hint_align_set(box2, EVAS_HINT_FILL, 0); /* ok - yes - no - cancel */ if (buttonflags & DIALOG_OK) { btn = elm_button_add(win); - elm_object_text_set(btn, D_("Ok")); + elm_button_label_set(btn, D_("Ok")); evas_object_data_set(btn, "type", GINT_TO_POINTER(DIALOG_OK)); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0); @@ -408,7 +408,7 @@ } if (buttonflags & DIALOG_YES) { btn = elm_button_add(win); - elm_object_text_set(btn, D_("Yes")); + elm_button_label_set(btn, D_("Yes")); evas_object_data_set(btn, "type", GINT_TO_POINTER(DIALOG_YES)); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0); @@ -419,7 +419,7 @@ } if (buttonflags & DIALOG_NO) { btn = elm_button_add(win); - elm_object_text_set(btn, D_("No")); + elm_button_label_set(btn, D_("No")); evas_object_data_set(btn, "type", GINT_TO_POINTER(DIALOG_NO)); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0); @@ -430,7 +430,7 @@ } if (buttonflags & DIALOG_CANCEL) { btn = elm_button_add(win); - elm_object_text_set(btn, D_("Cancel")); + elm_button_label_set(btn, D_("Cancel")); evas_object_data_set(btn, "type", GINT_TO_POINTER(DIALOG_CANCEL)); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0); @@ -513,7 +513,7 @@ pack->inwin = elm_win_inwin_add(win); box = elm_box_add(win); -// elm_box_homogeneous_set(box, EINA_TRUE); +// elm_box_homogenous_set(box, EINA_TRUE); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -540,7 +540,7 @@ elm_box_pack_end(box, pack->list); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Cancel")); + elm_button_label_set(btn, D_("Cancel")); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0); evas_object_smart_callback_add(btn, "clicked", @@ -581,12 +581,12 @@ evas_object_show(bx); lb = elm_label_add(parent); - elm_object_text_set(lb, label); + elm_label_label_set(lb, label); elm_box_pack_end(bx, lb); evas_object_show(lb); bt = elm_button_add(parent); - elm_object_text_set(bt, "Close"); + elm_button_label_set(bt, "Close"); evas_object_smart_callback_add(bt, "clicked", _notify_button_close_cb, notify); elm_box_pack_end(bx, bt); evas_object_show(bt); @@ -636,13 +636,13 @@ //evas_object_event_callback_add(inwin, EVAS_CALLBACK_DEL, error_message_del, NULL); Evas_Object *box = elm_box_add(win); - elm_box_homogeneous_set(box, EINA_FALSE); + elm_box_homogenous_set(box, EINA_FALSE); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); Evas_Object *heading = elm_label_add(win); //elm_label_line_wrap_set(heading, EINA_TRUE); - elm_object_text_set(heading, error_msg); + elm_label_label_set(heading, error_msg); evas_object_size_hint_weight_set(heading, 1.0, 1.0); evas_object_size_hint_align_set(heading, 0.5, 0.5); evas_object_show(heading); @@ -651,7 +651,7 @@ if (detail_msg) { Evas_Object *lb = elm_label_add(win); elm_label_line_wrap_set(lb, EINA_TRUE); - elm_object_text_set(lb, detail_msg); + elm_label_label_set(lb, detail_msg); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(lb); @@ -666,7 +666,7 @@ } Evas_Object *bt = elm_button_add(win); - elm_object_text_set(bt, D_("Ok")); + elm_button_label_set(bt, D_("Ok")); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 1.0); evas_object_smart_callback_add(bt, "clicked", error_message_ok_cb, inwin); --- a/src/util/window.c +++ b/src/util/window.c @@ -301,21 +301,21 @@ Evas_Object *inwin = elm_win_inwin_add(window_evas_object_get(win)); Evas_Object *bx = elm_box_add(window_evas_object_get(win)); - elm_box_homogeneous_set(bx, 1); + elm_box_homogenous_set(bx, 1); Evas_Object *e = elm_label_add(window_evas_object_get(win)); - elm_object_text_set(e, label); + elm_label_label_set(e, label); evas_object_show(e); elm_box_pack_end(bx, e); Evas_Object *bx2 = elm_box_add(window_evas_object_get(win)); elm_box_horizontal_set(bx2, 1); - elm_box_homogeneous_set(bx2, 1); + elm_box_homogenous_set(bx2, 1); for (buttons = g_list_first(buttons); buttons; buttons = g_list_next(buttons)) { e = elm_button_add(window_evas_object_get(win)); - elm_object_text_set(e, + elm_button_label_set(e, ((struct InwinButton *) buttons->data)-> label); evas_object_smart_callback_add(e, "clicked", --- a/src/view/call-active-view.c +++ b/src/view/call-active-view.c @@ -157,7 +157,7 @@ g_debug("adding the speaker toggle..."); data->speaker_toggle = elm_toggle_add(window_evas_object_get(win)); - elm_object_text_set(data->speaker_toggle, D_("Speaker")); + elm_toggle_label_set(data->speaker_toggle, D_("Speaker")); //elm_toggle_icon_set(data->speaker_toggle, ico); elm_toggle_state_set(data->speaker_toggle, EINA_FALSE); elm_object_scale_set(data->speaker_toggle, 1.2); @@ -168,7 +168,7 @@ g_debug("adding the mute toggle..."); data->mute_toggle = elm_toggle_add(window_evas_object_get(win)); - elm_object_text_set(data->mute_toggle, D_("Mute")); + elm_toggle_label_set(data->mute_toggle, D_("Mute")); elm_toggle_state_set(data->mute_toggle, EINA_FALSE); elm_object_scale_set(data->mute_toggle, 1.2); evas_object_smart_callback_add(data->mute_toggle, "changed", @@ -178,7 +178,7 @@ g_debug("adding the volume slider..."); data->volume_slider = elm_slider_add(window_evas_object_get(win)); - elm_object_text_set(data->volume_slider, D_("Volume")); + elm_slider_label_set(data->volume_slider, D_("Volume")); elm_slider_min_max_set(data->volume_slider, 0.0, 100.0); elm_slider_value_set(data->volume_slider, (double)phoneui_utils_sound_volume_get( @@ -191,7 +191,7 @@ g_debug("adding the mic slider..."); data->mic_slider = elm_slider_add(window_evas_object_get(win)); - elm_object_text_set(data->mic_slider, D_("Mic")); + elm_slider_label_set(data->mic_slider, D_("Mic")); elm_slider_min_max_set(data->mic_slider, 0.0, 100.0); elm_slider_value_set(data->mic_slider, (double)phoneui_utils_sound_volume_get( @@ -202,14 +202,14 @@ evas_object_show(data->mic_slider); data->bt_call_state = elm_button_add(window_evas_object_get(win)); - elm_object_text_set(data->bt_call_state, D_("Release")); + elm_button_label_set(data->bt_call_state, D_("Release")); evas_object_smart_callback_add(data->bt_call_state, "clicked", (Evas_Smart_Cb) call_button_state_clicked, data); window_swallow(win, "button_release", data->bt_call_state); evas_object_show(data->bt_call_state); data->bt_keypad = elm_button_add(window_evas_object_get(win)); - elm_object_text_set(data->bt_keypad, D_("Keypad")); + elm_button_label_set(data->bt_keypad, D_("Keypad")); evas_object_smart_callback_add(data->bt_keypad, "clicked", (Evas_Smart_Cb) call_button_dtmf_clicked, data); window_swallow(win, "button_dtmf", data->bt_keypad); @@ -258,12 +258,12 @@ if (data->parent.dtmf_active) { data->parent.dtmf_active = FALSE; call_dtmf_disable((struct CallViewData *) data); - elm_object_text_set(data->bt_keypad, D_("Keypad")); + elm_button_label_set(data->bt_keypad, D_("Keypad")); } else { data->parent.dtmf_active = TRUE; call_dtmf_enable((struct CallViewData *) data); - elm_object_text_set(data->bt_keypad, D_("Hide Keypad")); + elm_button_label_set(data->bt_keypad, D_("Hide Keypad")); } } --- a/src/view/call-common.c +++ b/src/view/call-common.c @@ -175,7 +175,7 @@ call_common_window_to_pending(struct CallActiveViewData *win) { if (win->state == CALL_STATE_ACTIVE) { - elm_object_text_set(win->bt_call_state, D_("Pickup")); + elm_button_label_set(win->bt_call_state, D_("Pickup")); } else if (win->state == CALL_STATE_PENDING) { /*Do nothing as we want it to be pending */ @@ -197,7 +197,7 @@ win->parent.id); } else if (win->state == CALL_STATE_PENDING) { - elm_object_text_set(win->bt_call_state, D_("Release")); + elm_button_label_set(win->bt_call_state, D_("Release")); } else { g_debug("Bad state (%d) for an active call!", win->state); --- a/src/view/call-incoming-view.c +++ b/src/view/call-incoming-view.c @@ -69,7 +69,7 @@ evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); data->bt_accept = elm_button_add(window_evas_object_get(win)); - elm_object_text_set(data->bt_accept, D_("Accept")); + elm_button_label_set(data->bt_accept, D_("Accept")); elm_button_icon_set(data->bt_accept, ic); evas_object_smart_callback_add(data->bt_accept, "clicked", call_button_accept_clicked, data); @@ -81,7 +81,7 @@ elm_icon_file_set(ic, ICON_CALL_REJECT, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); data->bt_reject = elm_button_add(window_evas_object_get(win)); - elm_object_text_set(data->bt_reject, D_("Reject")); + elm_button_label_set(data->bt_reject, D_("Reject")); elm_button_icon_set(data->bt_reject, ic); evas_object_smart_callback_add(data->bt_reject, "clicked", (Evas_Smart_Cb) call_button_release_clicked, data); --- a/src/view/contact-list-common.c +++ b/src/view/contact-list-common.c @@ -160,7 +160,7 @@ } if (it) { return elm_genlist_item_insert_before(list_data->list, - &itc, g_hash_table_ref(entry), NULL, it, + &itc, g_hash_table_ref(entry), it, ELM_GENLIST_ITEM_NONE, NULL, NULL); } } @@ -274,7 +274,7 @@ win = ui_utils_view_window_get(list_data->view); list_data->index = NULL; list_data->list = elm_genlist_add(win); - elm_genlist_horizontal_set(list_data->list, ELM_LIST_LIMIT); + elm_genlist_horizontal_mode_set(list_data->list, ELM_LIST_LIMIT); elm_genlist_longpress_timeout_set(list_data->list, 0.5); elm_genlist_multi_select_set(list_data->list, EINA_TRUE); evas_object_size_hint_align_set(list_data->list, 0.0, 0.0); @@ -291,7 +291,7 @@ } list_data->progress = elm_progressbar_add(win); elm_object_style_set(list_data->progress, "wheel"); - elm_object_text_set(list_data->progress, D_("Loading...")); + elm_progressbar_label_set(list_data->progress, D_("Loading...")); evas_object_size_hint_align_set(list_data->progress, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(list_data->progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); --- a/src/view/contact-list-view.c +++ b/src/view/contact-list-view.c @@ -43,7 +43,7 @@ struct View view; struct ContactListData list_data; Evas_Object *ctx; - Elm_Object_Item *action_edit, *action_del, *action_unsel; + Elm_Ctxpopup_Item *action_edit, *action_del, *action_unsel; Evas_Object *bt1, *bt2, *bt_options, *bt_message, *bt_edit, *bt_delete; Evas_Object *inwin; }; @@ -88,21 +88,21 @@ _list_list_longpressed, win); view.bt1 = elm_button_add(win); - elm_object_text_set(view.bt1, D_("Call")); + elm_button_label_set(view.bt1, D_("Call")); evas_object_smart_callback_add(view.bt1, "clicked", _list_call_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_new", view.bt1); evas_object_show(view.bt1); view.bt2 = elm_button_add(win); - elm_object_text_set(view.bt2, D_("SMS")); + elm_button_label_set(view.bt2, D_("SMS")); evas_object_smart_callback_add(view.bt2, "clicked", _list_message_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_call", view.bt2); evas_object_show(view.bt2); view.bt_options = elm_button_add(win); - elm_object_text_set(view.bt_options, D_("New")); + elm_button_label_set(view.bt_options, D_("New")); evas_object_smart_callback_add(view.bt_options, "clicked", _list_new_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_options", view.bt_options); --- a/src/view/contact-view.c +++ b/src/view/contact-view.c @@ -170,7 +170,7 @@ view->fields = elm_genlist_add(win); elm_scroller_policy_set(view->fields, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); - elm_genlist_horizontal_set(view->fields, ELM_LIST_LIMIT); + elm_genlist_horizontal_mode_set(view->fields, ELM_LIST_LIMIT); evas_object_size_hint_align_set(view->fields, 0.0, 0.0); elm_layout_content_set(view->pager_layout, "fields", view->fields); @@ -188,35 +188,35 @@ evas_object_show(view->fields); view->btn_save = elm_button_add(win); - elm_object_text_set(view->btn_save, D_("Save")); + elm_button_label_set(view->btn_save, D_("Save")); evas_object_smart_callback_add(view->btn_save, "clicked", _contact_save_clicked, view); elm_layout_content_set(view->pager_layout, "button_save", view->btn_save); evas_object_show(view->btn_save); view->btn_cancel = elm_button_add(win); - elm_object_text_set(view->btn_cancel, D_("Cancel")); + elm_button_label_set(view->btn_cancel, D_("Cancel")); evas_object_smart_callback_add(view->btn_cancel, "clicked", _contact_cancel_clicked, view); elm_layout_content_set(view->pager_layout, "button_cancel", view->btn_cancel); evas_object_show(view->btn_cancel); view->btn_call = elm_button_add(win); - elm_object_text_set(view->btn_call, D_("Call")); + elm_button_label_set(view->btn_call, D_("Call")); evas_object_smart_callback_add(view->btn_call, "clicked", _contact_call_clicked, view); elm_layout_content_set(view->pager_layout, "button_call", view->btn_call); evas_object_show(view->btn_call); view->btn_sms = elm_button_add(win); - elm_object_text_set(view->btn_sms, D_("SMS")); + elm_button_label_set(view->btn_sms, D_("SMS")); evas_object_smart_callback_add(view->btn_sms, "clicked", _contact_sms_clicked, view); elm_layout_content_set(view->pager_layout, "button_sms", view->btn_sms); evas_object_show(view->btn_sms); view->btn_delete = elm_button_add(win); - elm_object_text_set(view->btn_delete, D_("Delete")); + elm_button_label_set(view->btn_delete, D_("Delete")); evas_object_smart_callback_add(view->btn_delete, "clicked", _contact_delete_clicked, view); evas_object_show(view->btn_delete); @@ -224,7 +224,7 @@ view->btn_delete); view->btn_addfield = elm_button_add(win); - elm_object_text_set(view->btn_addfield, D_("Add Field")); + elm_button_label_set(view->btn_addfield, D_("Add Field")); evas_object_smart_callback_add(view->btn_addfield, "clicked", _contact_add_field_clicked, view); evas_object_show(view->btn_addfield); @@ -557,7 +557,7 @@ _update_changes_of_field(fd->view, fd->name, fd->value, ""); _update_changes_of_field(fd->view, field, "", fd->value); fd->name = strdup(field); - elm_object_text_set(fd->field_button, field); + elm_button_label_set(fd->field_button, field); _set_modify(fd->view, 1); phoneui_utils_contacts_field_type_get(fd->name, _change_field_type_cb, fd); } @@ -803,21 +803,21 @@ btn_save = elm_button_add(fd->view->pager); - elm_object_text_set(btn_save, D_("Save")); + elm_button_label_set(btn_save, D_("Save")); evas_object_smart_callback_add(btn_save, "clicked", save_cb, fd); elm_layout_content_set(layout, "button_save", btn_save); evas_object_show(btn_save); btn_back = elm_button_add(fd->view->pager); - elm_object_text_set(btn_back, D_("Back")); + elm_button_label_set(btn_back, D_("Back")); evas_object_smart_callback_add(btn_back, "clicked", _field_edit_button_back_clicked_cb, fd); elm_layout_content_set(layout, "button_back", btn_back); evas_object_show(btn_back); btn_remove = elm_button_add(fd->view->pager); - elm_object_text_set(btn_remove, D_("Remove")); + elm_button_label_set(btn_remove, D_("Remove")); evas_object_smart_callback_add(btn_remove, "clicked", _field_edit_button_remove_clicked_cb, fd); elm_layout_content_set(layout, "button_remove", btn_remove); @@ -857,7 +857,7 @@ else { edje_object_signal_emit((Evas_Object *) elm_genlist_item_object_get(fd->item), "start_edit", "elm"); elm_entry_editable_set(fd->value_entry, EINA_TRUE); - elm_object_focus_set(fd->value_entry, EINA_FALSE); + elm_object_focus(fd->value_entry); } fd->edit_on = 1; _set_modify(fd->view, 1); @@ -871,7 +871,7 @@ struct ContactFieldData *fd = (struct ContactFieldData *) _data; if (strcmp(part, "elm.swallow.field_button") == 0) { Evas_Object *btn = elm_button_add(obj); - elm_object_text_set(btn, fd->name); + elm_button_label_set(btn, fd->name); evas_object_smart_callback_add(btn, "clicked", _field_clicked, fd); fd->field_button = btn; --- a/src/view/dialer-view.c +++ b/src/view/dialer-view.c @@ -96,13 +96,13 @@ "phoneui/dialer/dialer"); view.text_number = elm_label_add(win); - elm_object_text_set(view.text_number, ""); + elm_label_label_set(view.text_number, ""); evas_object_size_hint_align_set(view.text_number, 0.0, 0.5); ui_utils_view_swallow(VIEW_PTR(view), "text_number", view.text_number); evas_object_show(view.text_number); view.text_number_info = elm_label_add(win); - elm_object_text_set(view.text_number_info, + elm_label_label_set(view.text_number_info, D_("Click to open contact list.")); ui_utils_view_swallow(VIEW_PTR(view), "text_number_info", view.text_number_info); evas_object_show(view.text_number_info); @@ -130,28 +130,28 @@ evas_object_show(view.keypad); view.bt_exit = elm_button_add(win); - elm_object_text_set(view.bt_exit, D_("Close")); + elm_button_label_set(view.bt_exit, D_("Close")); evas_object_smart_callback_add(view.bt_exit, "clicked", _dialer_exit_clicked_cb, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_exit", view.bt_exit); evas_object_show(view.bt_exit); view.bt_suggest = elm_button_add(win); - elm_object_text_set(view.bt_suggest, D_("Suggest")); + elm_button_label_set(view.bt_suggest, D_("Suggest")); evas_object_smart_callback_add(view.bt_suggest, "clicked", _dialer_suggest_clicked_cb, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_suggest", view.bt_suggest); evas_object_show(view.bt_suggest); view.bt_options = elm_button_add(win); - elm_object_text_set(view.bt_options, D_("More")); + elm_button_label_set(view.bt_options, D_("More")); evas_object_smart_callback_add(view.bt_options, "clicked", _dialer_options_clicked_cb, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_options", view.bt_options); evas_object_show(view.bt_options); view.bt_call = elm_button_add(win); - elm_object_text_set(view.bt_call, D_("Call")); + elm_button_label_set(view.bt_call, D_("Call")); evas_object_smart_callback_add(view.bt_call, "clicked", _dialer_call_clicked_cb, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_call", view.bt_call); @@ -173,14 +173,14 @@ view.bx2 = elm_box_add(win); elm_box_horizontal_set(view.bx2, 0); - elm_box_homogeneous_set(view.bx2, 1); + elm_box_homogenous_set(view.bx2, 1); evas_object_show(view.bx2); int iSuggest; for (iSuggest = MAX_SUGGEST - 1; iSuggest >= 0; --iSuggest) { view.bt_suggest_contact[iSuggest] = elm_button_add(win); - elm_object_text_set(view.bt_suggest_contact[iSuggest], D_("Contact")); + elm_button_label_set(view.bt_suggest_contact[iSuggest], D_("Contact")); evas_object_size_hint_min_set(view.bt_suggest_contact[iSuggest], 130, 80); evas_object_smart_callback_add(view.bt_suggest_contact[iSuggest], "clicked", _dialer_suggest_contact_clicked_cb, GINT_TO_POINTER(iSuggest)); @@ -197,11 +197,11 @@ view.bx = elm_box_add(win); elm_box_horizontal_set(view.bx, 0); - elm_box_homogeneous_set(view.bx, 1); + elm_box_homogenous_set(view.bx, 1); evas_object_show(view.bx); view.bt_save = elm_button_add(win); - elm_object_text_set(view.bt_save, D_("Save")); + elm_button_label_set(view.bt_save, D_("Save")); evas_object_size_hint_min_set(view.bt_save, 130, 80); evas_object_smart_callback_add(view.bt_save, "clicked", _dialer_contact_add_clicked_cb, NULL); @@ -209,7 +209,7 @@ elm_box_pack_end(view.bx, view.bt_save); view.bt_message = elm_button_add(win); - elm_object_text_set(view.bt_message, D_("Send SMS")); + elm_button_label_set(view.bt_message, D_("Send SMS")); evas_object_size_hint_min_set(view.bt_message, 130, 80); evas_object_smart_callback_add(view.bt_message, "clicked", _dialer_message_clicked_cb, NULL); @@ -307,7 +307,7 @@ int iSuggest; for (iSuggest = 0; iSuggest < MAX_SUGGEST; ++iSuggest) { - elm_object_text_set(view.bt_suggest_contact[iSuggest], D_("")); + elm_button_label_set(view.bt_suggest_contact[iSuggest], D_("")); evas_object_hide(view.bt_suggest_contact[iSuggest]); } @@ -352,7 +352,7 @@ } if (sName) { - elm_object_text_set(view.bt_suggest_contact[cSuggest], sName); + elm_button_label_set(view.bt_suggest_contact[cSuggest], sName); evas_object_show(view.bt_suggest_contact[cSuggest]); ++cSuggest; } @@ -528,7 +528,7 @@ } } - elm_object_text_set(view.text_number, number); + elm_label_label_set(view.text_number, number); if (length == 0) { edje_object_signal_emit(ui_utils_view_layout_get(VIEW_PTR(view)), "number_empty", "elm"); --- a/src/view/dialog-view.c +++ b/src/view/dialog-view.c @@ -70,7 +70,7 @@ window_text_set(win, "content", D_("Unknown message.")); data->bt_close = elm_button_add(win->win); - elm_object_text_set(data->bt_close, D_("Close")); + elm_button_label_set(data->bt_close, D_("Close")); evas_object_smart_callback_add(data->bt_close, "clicked", dialog_view_close_clicked, data); window_swallow(win, "button_close", data->bt_close); --- a/src/view/message-list-view.c +++ b/src/view/message-list-view.c @@ -106,7 +106,7 @@ elm_theme_extension_add(NULL, phoneui_theme); obj = elm_button_add(win); - elm_object_text_set(obj, D_("New")); + elm_button_label_set(obj, D_("New")); evas_object_smart_callback_add(obj, "clicked", _new_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_new", obj); evas_object_show(obj); @@ -115,7 +115,7 @@ view.hv = elm_hover_add(win); obj = elm_button_add(win); - elm_object_text_set(obj, D_("Options")); + elm_button_label_set(obj, D_("Options")); evas_object_smart_callback_add(obj, "clicked", _hover_bt_1, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_options", obj); evas_object_show(obj); @@ -125,11 +125,11 @@ box = elm_box_add(win); elm_box_horizontal_set(box, 0); - elm_box_homogeneous_set(box, 1); + elm_box_homogenous_set(box, 1); evas_object_show(box); obj = elm_button_add(win); - elm_object_text_set(obj, D_("Answer")); + elm_button_label_set(obj, D_("Answer")); evas_object_size_hint_min_set(obj, 130, 80); evas_object_smart_callback_add(obj, "clicked", _answer_clicked, NULL); evas_object_show(obj); @@ -137,7 +137,7 @@ view.answer_bt = obj; obj = elm_button_add(win); - elm_object_text_set(obj, D_("Call")); + elm_button_label_set(obj, D_("Call")); evas_object_size_hint_min_set(obj, 130, 80); evas_object_smart_callback_add(obj, "clicked", _call_clicked, NULL); evas_object_show(obj); @@ -145,7 +145,7 @@ view.call_bt = obj; obj = elm_button_add(win); - elm_object_text_set(obj, D_("Forward")); + elm_button_label_set(obj, D_("Forward")); evas_object_size_hint_min_set(obj, 130, 80); evas_object_smart_callback_add(obj, "clicked", _forward_clicked, NULL); evas_object_show(obj); @@ -153,7 +153,7 @@ view.forward_bt = obj; obj = elm_button_add(win); - elm_object_text_set(obj, D_("Delete")); + elm_button_label_set(obj, D_("Delete")); evas_object_size_hint_min_set(obj, 130, 80); evas_object_smart_callback_add(obj, "clicked", _delete_clicked, NULL); evas_object_show(obj); @@ -162,7 +162,7 @@ elm_hover_content_set(view.hv, "top", box); obj = elm_button_add(win); - elm_object_text_set(obj, D_("Show")); + elm_button_label_set(obj, D_("Show")); evas_object_smart_callback_add(obj, "clicked", _show_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_show", obj); evas_object_show(obj); @@ -184,7 +184,7 @@ view.top_pb = elm_progressbar_add(win); elm_object_style_set(view.top_pb, "wheel"); - elm_object_text_set(view.top_pb, D_("Loading...")); + elm_progressbar_label_set(view.top_pb, D_("Loading...")); elm_progressbar_pulse(view.top_pb, EINA_TRUE); evas_object_size_hint_align_set(view.top_pb, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(view.top_pb, EVAS_HINT_EXPAND, @@ -195,7 +195,7 @@ view.bottom_pb = elm_progressbar_add(win); elm_object_style_set(view.bottom_pb, "wheel"); - elm_object_text_set(view.bottom_pb, D_("Loading...")); + elm_progressbar_label_set(view.bottom_pb, D_("Loading...")); elm_progressbar_pulse(view.bottom_pb, EINA_TRUE); evas_object_size_hint_align_set(view.bottom_pb, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(view.bottom_pb, EVAS_HINT_EXPAND, @@ -515,23 +515,23 @@ } if (new && out) { - elm_object_text_set(view.right_bt, D_("Edit")); + elm_button_label_set(view.right_bt, D_("Edit")); evas_object_smart_callback_del(view.right_bt, "clicked", _edit_clicked); evas_object_smart_callback_del(view.right_bt, "clicked", _show_clicked); evas_object_smart_callback_add(view.right_bt, "clicked", _edit_clicked, NULL); - elm_object_text_set(view.forward_bt, D_("Edit")); + elm_button_label_set(view.forward_bt, D_("Edit")); evas_object_size_hint_min_set(view.forward_bt, 130, 80); evas_object_smart_callback_del(view.forward_bt, "clicked", _edit_clicked); evas_object_smart_callback_del(view.forward_bt, "clicked", _forward_clicked); evas_object_smart_callback_add(view.forward_bt, "clicked", _edit_clicked, NULL); } else { - elm_object_text_set(view.right_bt, D_("Show")); + elm_button_label_set(view.right_bt, D_("Show")); evas_object_smart_callback_del(view.right_bt, "clicked", _edit_clicked); evas_object_smart_callback_del(view.right_bt, "clicked", _show_clicked); evas_object_smart_callback_add(view.right_bt, "clicked", _show_clicked, NULL); - elm_object_text_set(view.forward_bt, D_("Forward")); + elm_button_label_set(view.forward_bt, D_("Forward")); evas_object_size_hint_min_set(view.forward_bt, 130, 80); evas_object_smart_callback_del(view.forward_bt, "clicked", _edit_clicked); evas_object_smart_callback_del(view.forward_bt, "clicked", _forward_clicked); @@ -742,7 +742,7 @@ insert_mode = LIST_INSERT_APPEND; it = elm_genlist_item_insert_before(view.list, &itc, - rowdata, NULL, it, + rowdata, it, ELM_GENLIST_ITEM_NONE, NULL, NULL); } @@ -869,18 +869,18 @@ Evas_Object *txt = elm_anchorblock_add(win); elm_anchorblock_hover_style_set(txt, "popout"); elm_anchorblock_hover_parent_set(txt, win); - elm_object_text_set(txt, g_variant_get_string(tmp, NULL)); + elm_anchorblock_text_set(txt, g_variant_get_string(tmp, NULL)); evas_object_show(txt); Evas_Object *bubble = elm_bubble_add(win); elm_bubble_content_set(bubble, txt); tmp = g_hash_table_lookup(message, "Date"); if (tmp) { - elm_object_text_set(bubble, + elm_bubble_label_set(bubble, g_variant_get_string(tmp, NULL)); } tmp = g_hash_table_lookup(message, "Phone"); if (tmp) { - elm_object_text_part_set(bubble, "info", + elm_bubble_info_set(bubble, g_variant_get_string(tmp, NULL)); } return bubble; --- a/src/view/message-new-view.c +++ b/src/view/message-new-view.c @@ -266,8 +266,7 @@ edje_object_part_text_set(elm_layout_edje_get(view->layout_content), "content_title", D_("Enter your message")); - view->content_entry = elm_entry_add(win); - elm_entry_scrollable_set(view->content_entry, EINA_TRUE); + view->content_entry = elm_scrolled_entry_add(win); evas_object_smart_callback_add(view->content_entry, "changed", _content_changed, view); if (view->content != NULL) { @@ -276,10 +275,10 @@ } evas_object_show(view->content_entry); elm_layout_content_set(view->layout_content, "content_entry", view->content_entry); - elm_object_focus_set(view->content_entry, EINA_TRUE); + elm_object_focus(view->content_entry); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Insert")); + elm_button_label_set(btn, D_("Insert")); evas_object_smart_callback_add(btn, "clicked", _content_button_insert_clicked, view); elm_layout_content_set(view->layout_content, @@ -287,7 +286,7 @@ evas_object_show(btn); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Close")); + elm_button_label_set(btn, D_("Close")); evas_object_smart_callback_add(btn, "clicked", _content_button_close_clicked, view); elm_layout_content_set(view->layout_content, @@ -295,7 +294,7 @@ evas_object_show(btn); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Continue")); + elm_button_label_set(btn, D_("Continue")); evas_object_smart_callback_add(btn, "clicked", _content_button_continue_clicked, view); elm_layout_content_set(view->layout_content, @@ -322,7 +321,7 @@ "recipients_title", D_("Define Recipients")); view->list_recipients = elm_genlist_add(win); - elm_genlist_horizontal_set(view->list_recipients, ELM_LIST_LIMIT); + elm_genlist_horizontal_mode_set(view->list_recipients, ELM_LIST_LIMIT); evas_object_size_hint_align_set(view->list_recipients, 0.0, 0.0); evas_object_size_hint_weight_set(view->list_recipients, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -339,7 +338,7 @@ g_ptr_array_foreach(view->recipients, _process_recipient, view); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Back")); + elm_button_label_set(btn, D_("Back")); evas_object_smart_callback_add(btn, "clicked", _recipients_button_back_clicked, view); elm_layout_content_set(view->layout_recipients, @@ -347,7 +346,7 @@ evas_object_show(btn); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Contact")); + elm_button_label_set(btn, D_("Contact")); evas_object_smart_callback_add(btn, "clicked", _recipients_button_add_contact_clicked, view); @@ -356,7 +355,7 @@ evas_object_show(btn); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Number")); + elm_button_label_set(btn, D_("Number")); evas_object_smart_callback_add(btn, "clicked", _recipients_button_add_number_clicked, view); @@ -365,7 +364,7 @@ evas_object_show(btn); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Send")); + elm_button_label_set(btn, D_("Send")); evas_object_smart_callback_add(btn, "clicked", _recipients_button_send_clicked, view); elm_layout_content_set(view->layout_recipients, @@ -395,14 +394,14 @@ contact_list_add(&view->contact_list_data); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Back")); + elm_button_label_set(btn, D_("Back")); evas_object_smart_callback_add(btn, "clicked", _contacts_button_back_clicked, view); elm_layout_content_set(view->layout_contacts, "contacts_button_back", btn); evas_object_show(btn); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Add")); + elm_button_label_set(btn, D_("Add")); evas_object_smart_callback_add(btn, "clicked", _contacts_button_add_clicked, view); elm_layout_content_set(view->layout_contacts, "contacts_button_add", btn); @@ -431,14 +430,14 @@ "number_title", D_("Add Number")); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Back")); + elm_button_label_set(btn, D_("Back")); evas_object_smart_callback_add(btn, "clicked", _number_button_back_clicked, view); elm_layout_content_set(view->layout_number, "number_button_back", btn); evas_object_show(btn); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Add")); + elm_button_label_set(btn, D_("Add")); evas_object_smart_callback_add(btn, "clicked", _number_button_add_clicked, view); elm_layout_content_set(view->layout_number, "number_button_add", btn); @@ -488,14 +487,14 @@ contact_list_add(&view->contact_list_data); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Back")); + elm_button_label_set(btn, D_("Back")); evas_object_smart_callback_add(btn, "clicked", _insert_contacts_button_back_clicked, view); elm_layout_content_set(view->layout_contacts, "contacts_button_back", btn); evas_object_show(btn); btn = elm_button_add(win); - elm_object_text_set(btn, D_("Add")); + elm_button_label_set(btn, D_("Add")); evas_object_smart_callback_add(btn, "clicked", _insert_contacts_button_add_clicked, view); elm_layout_content_set(view->layout_contacts, "contacts_button_add", btn); @@ -547,7 +546,7 @@ int len; view = (struct MessageNewViewData *)data; - content = elm_entry_markup_to_utf8(elm_entry_entry_get(view->content_entry)); + content = elm_entry_markup_to_utf8(elm_scrolled_entry_entry_get(view->content_entry)); len = phone_utils_gsm_sms_strlen(content); // Make space for text, number and ending null character @@ -561,7 +560,7 @@ view->content = content; if (view->content != NULL) { - elm_entry_entry_set(view->content_entry, + elm_scrolled_entry_entry_set(view->content_entry, elm_entry_utf8_to_markup(view->content)); } } @@ -593,7 +592,7 @@ (void) event_info; struct MessageNewViewData *view = (struct MessageNewViewData *)data; elm_pager_content_promote(view->pager, view->layout_content); - elm_object_focus_set(view->content_entry, EINA_TRUE); + elm_object_focus(view->content_entry); } static void @@ -803,7 +802,7 @@ /*FIXME: consider changing to an iterative way by using get_size (emulating what's * being done in phone_utils) as calculating for all the string on every keystroke is a bit sluggish. */ - content = elm_entry_markup_to_utf8(elm_entry_entry_get(obj)); + content = elm_entry_markup_to_utf8(elm_scrolled_entry_entry_get(obj)); /* if the entry is still empty elm_entry_markup_to_utf8 will return * NULL - which makes g_strstrip segfault :| @@ -953,7 +952,7 @@ _deinit_message_new_view(view); } else if (elm_pager_content_top_get(view->pager) == view->layout_content) { - elm_object_focus_set(view->content_entry, EINA_TRUE); + elm_object_focus(view->content_entry); } } --- a/src/view/message-show-view.c +++ b/src/view/message-show-view.c @@ -189,7 +189,7 @@ evas_object_size_hint_weight_set(view->content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); if (content) { - elm_object_text_set(view->content, content); + elm_anchorblock_text_set(view->content, content); } elm_scroller_content_set(view->sc_content, view->content); evas_object_show(view->content); @@ -198,7 +198,7 @@ obj = elm_button_add(win); - elm_object_text_set(obj, D_("Close")); + elm_button_label_set(obj, D_("Close")); evas_object_smart_callback_add(obj, "clicked", _close_clicked, view); ui_utils_view_swallow(VIEW_PTR(*view), "button_close", obj); @@ -208,7 +208,7 @@ view->hv = elm_hover_add(win); obj = elm_button_add(win); - elm_object_text_set(obj, D_("Options")); + elm_button_label_set(obj, D_("Options")); evas_object_smart_callback_add(obj, "clicked", _hover_bt_1, view->hv); ui_utils_view_swallow(VIEW_PTR(*view), "button_options", obj); @@ -219,11 +219,11 @@ box = elm_box_add(win); elm_box_horizontal_set(box, 0); - elm_box_homogeneous_set(box, 1); + elm_box_homogenous_set(box, 1); evas_object_show(box); obj = elm_button_add(win); - elm_object_text_set(obj, D_("Delete")); + elm_button_label_set(obj, D_("Delete")); evas_object_size_hint_min_set(obj, 140, 80); evas_object_smart_callback_add(obj, "clicked", _delete_clicked, view); @@ -232,7 +232,7 @@ if (in_msg) { obj = elm_button_add(win); - elm_object_text_set(obj, D_("Call")); + elm_button_label_set(obj, D_("Call")); evas_object_size_hint_min_set(obj, 140, 80); evas_object_smart_callback_add(obj, "clicked", _call_clicked, view); @@ -241,7 +241,7 @@ } obj = elm_button_add(win); - elm_object_text_set(obj, D_("Add Contact")); + elm_button_label_set(obj, D_("Add Contact")); evas_object_size_hint_min_set(obj, 140, 80); evas_object_smart_callback_add(obj, "clicked", _new_contact_clicked, @@ -251,7 +251,7 @@ view->add_contact_bt = obj; obj = elm_button_add(win); - elm_object_text_set(obj, D_("Forward")); + elm_button_label_set(obj, D_("Forward")); evas_object_size_hint_min_set(obj, 140, 80); evas_object_smart_callback_add(obj, "clicked", _forward_clicked, view); evas_object_show(obj); @@ -261,7 +261,7 @@ obj = elm_button_add(win); - elm_object_text_set(obj, D_("Answer")); + elm_button_label_set(obj, D_("Answer")); evas_object_smart_callback_add(obj, "clicked", _answer_clicked, view); ui_utils_view_swallow(VIEW_PTR(*view), "button_answer", obj); @@ -409,7 +409,7 @@ options = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, common_utils_variant_unref); - content = elm_entry_markup_to_utf8(elm_object_text_get(view->content)); + content = elm_entry_markup_to_utf8(elm_anchorblock_text_get(view->content)); if (content) { g_hash_table_insert(options, "Content", g_variant_ref_sink(g_variant_new_string(content))); --- a/src/view/phone-log-view.c +++ b/src/view/phone-log-view.c @@ -114,7 +114,7 @@ view.toolbar = elm_toolbar_add(win); ui_utils_view_swallow(VIEW_PTR(view), "toolbar", view.toolbar); - elm_toolbar_homogeneous_set(view.toolbar, 1); + elm_toolbar_homogenous_set(view.toolbar, 1); elm_toolbar_mode_shrink_set(view.toolbar, ELM_TOOLBAR_SHRINK_NONE); elm_toolbar_align_set(view.toolbar, 0.0); elm_toolbar_icon_size_set(view.toolbar, 16); @@ -190,7 +190,7 @@ _add_genlist(Evas_Object *win) { Evas_Object *list = elm_genlist_add(win); - elm_genlist_horizontal_set(list, ELM_LIST_LIMIT); + elm_genlist_horizontal_mode_set(list, ELM_LIST_LIMIT); evas_object_size_hint_align_set(list, 0.0, 0.0); evas_object_show(list); @@ -405,7 +405,7 @@ (void) data; if (!strcmp(part,"elm.swallow.end")) { Evas_Object *btn = elm_button_add(obj); - elm_object_text_set(btn, "Action"); + elm_button_label_set(btn, "Action"); return (btn); } return (NULL); --- a/src/view/quick-settings-view.c +++ b/src/view/quick-settings-view.c @@ -108,7 +108,7 @@ view.toolbar = elm_toolbar_add(win); ui_utils_view_swallow(VIEW_PTR(view), "toolbar", view.toolbar); - elm_toolbar_homogeneous_set(view.toolbar, EINA_TRUE); + elm_toolbar_homogenous_set(view.toolbar, EINA_TRUE); elm_toolbar_mode_shrink_set(view.toolbar, ELM_TOOLBAR_SHRINK_NONE); elm_toolbar_align_set(view.toolbar, 0.0); elm_toolbar_icon_size_set(view.toolbar, 16); @@ -190,21 +190,21 @@ evas_object_smart_callback_add(view.profiles_combo, "selected", _profile_selected_cb, NULL); view.button_lock = elm_button_add(win); - elm_object_text_set(view.button_lock, D_("Lock")); + elm_button_label_set(view.button_lock, D_("Lock")); elm_layout_content_set(view.layout1, "power-frame-lock-button", view.button_lock); evas_object_smart_callback_add(view.button_lock, "clicked", _button_lock_clicked_cb, NULL); evas_object_show(view.button_lock); view.button_suspend = elm_button_add(win); - elm_object_text_set(view.button_suspend, D_("Suspend")); + elm_button_label_set(view.button_suspend, D_("Suspend")); elm_layout_content_set(view.layout1, "power-frame-suspend-button", view.button_suspend); evas_object_smart_callback_add(view.button_suspend, "clicked", _button_suspend_clicked_cb, NULL); evas_object_show(view.button_suspend); view.button_shutdown = elm_button_add(win); - elm_object_text_set(view.button_shutdown, D_("Shutdown")); + elm_button_label_set(view.button_shutdown, D_("Shutdown")); elm_layout_content_set(view.layout1, "power-frame-shutdown-button", view.button_shutdown); evas_object_smart_callback_add(view.button_shutdown, "clicked", _button_shutdown_clicked_cb, NULL); @@ -357,7 +357,7 @@ D_("Failed to retrieve the current profile."), error); } else - elm_object_text_set(view.profiles_combo, profile); + elm_hoversel_label_set(view.profiles_combo, profile); /* Whether we got the profile or not, enable it now. */ elm_object_disabled_set(view.profiles_combo, EINA_FALSE); @@ -368,7 +368,7 @@ { /*FIXME: I should probably free this profile, but how?, CHECK DBUS*/ (void) userdata; - elm_object_text_set(view.profiles_combo, profile); + elm_hoversel_label_set(view.profiles_combo, profile); } static void --- a/src/view/sim-auth-input-view.c +++ b/src/view/sim-auth-input-view.c @@ -98,14 +98,14 @@ "phoneui/notification/sim_auth_input"); view.bt1 = elm_button_add(win); - elm_object_text_set(view.bt1, D_("Delete")); + elm_button_label_set(view.bt1, D_("Delete")); evas_object_smart_callback_add(view.bt1, "clicked", _sim_auth_delete_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_delete", view.bt1); evas_object_show(view.bt1); view.bt2 = elm_button_add(win); - elm_object_text_set(view.bt2, D_("OK")); + elm_button_label_set(view.bt2, D_("OK")); evas_object_smart_callback_add(view.bt2, "clicked", _sim_auth_ok_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_ok", view.bt2); --- a/src/view/sim-manager-view.c +++ b/src/view/sim-manager-view.c @@ -195,7 +195,7 @@ contact_list_add(&pack->contact_list_data); pack->cbutton = elm_button_add(win); - elm_object_text_set(pack->cbutton, D_("Cancel")); + elm_button_label_set(pack->cbutton, D_("Cancel")); evas_object_smart_callback_add(pack->cbutton, "clicked", _contact_select_cancel, pack); ui_utils_view_swallow(VIEW_PTR(pack), "contacts_button_back", @@ -203,7 +203,7 @@ evas_object_show(pack->cbutton); pack->sbutton = elm_button_add(win); - elm_object_text_set(pack->sbutton, D_("Select")); + elm_button_label_set(pack->sbutton, D_("Select")); evas_object_smart_callback_add(pack->sbutton, "clicked", _contact_select_add, pack); ui_utils_view_swallow(VIEW_PTR(*pack), "contacts_button_add", @@ -432,7 +432,7 @@ elm_win_resize_object_add(win, name_lb); evas_object_size_hint_weight_set(name_lb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(name_lb, EVAS_HINT_FILL, 0.0); - elm_object_text_set(name_lb, D_("Name:")); + elm_button_label_set(name_lb, D_("Name:")); evas_object_show(name_lb); elm_box_pack_end(box, name_lb); @@ -458,7 +458,7 @@ elm_win_resize_object_add(win, number_lb); evas_object_size_hint_weight_set(number_lb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(number_lb, EVAS_HINT_FILL, 0.0); - elm_object_text_set(number_lb, D_("Number:")); + elm_button_label_set(number_lb, D_("Number:")); evas_object_show(number_lb); elm_box_pack_end(box, number_lb); @@ -491,7 +491,7 @@ evas_object_size_hint_align_set(sbtn, EVAS_HINT_FILL, 0.0); evas_object_smart_callback_add(sbtn, "clicked", _number_add_save, pack); - elm_object_text_set(sbtn, D_("Save")); + elm_button_label_set(sbtn, D_("Save")); evas_object_show(sbtn); elm_box_pack_start(box0, sbtn); @@ -501,7 +501,7 @@ evas_object_size_hint_align_set(cbtn, EVAS_HINT_FILL, 0.0); evas_object_smart_callback_add(cbtn, "clicked", _number_add_cancel, pack); - elm_object_text_set(cbtn, D_("Cancel")); + elm_button_label_set(cbtn, D_("Cancel")); evas_object_show(cbtn); elm_box_pack_end(box0, cbtn); @@ -718,7 +718,7 @@ win = ui_utils_view_window_get(VIEW_PTR(view)); list_data->index = NULL; list_data->list = elm_genlist_add(win); - elm_genlist_horizontal_set(list_data->list, ELM_LIST_LIMIT); + elm_genlist_horizontal_mode_set(list_data->list, ELM_LIST_LIMIT); evas_object_size_hint_align_set(list_data->list, 0.0, 0.0); elm_object_scale_set(list_data->list, 1.0); itc.item_style = "sim-contact"; @@ -817,7 +817,7 @@ sim_manager_list_add(&view.list_data); view.bt_import_all = elm_button_add(win); - elm_object_text_set(view.bt_import_all, D_("Import all")); + elm_button_label_set(view.bt_import_all, D_("Import all")); evas_object_smart_callback_add(view.bt_import_all, "clicked", _list_import_all_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_import_all", @@ -825,7 +825,7 @@ evas_object_show(view.bt_import_all); view.bt_copy_to_sim = elm_button_add(win); - elm_object_text_set(view.bt_copy_to_sim, D_("Copy to SIM")); + elm_button_label_set(view.bt_copy_to_sim, D_("Copy to SIM")); evas_object_smart_callback_add(view.bt_copy_to_sim, "clicked", _list_copy_to_sim_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_new", @@ -833,7 +833,7 @@ evas_object_show(view.bt_copy_to_sim); view.bt_options = elm_button_add(win); - elm_object_text_set(view.bt_options, D_("Options")); + elm_button_label_set(view.bt_options, D_("Options")); evas_object_smart_callback_add(view.bt_options, "clicked", _list_options_clicked, NULL); ui_utils_view_swallow(VIEW_PTR(view), "button_options", @@ -847,11 +847,11 @@ view.bx = elm_box_add(win); elm_box_horizontal_set(view.bx, 0); - elm_box_homogeneous_set(view.bx, 1); + elm_box_homogenous_set(view.bx, 1); evas_object_show(view.bx); view.bt_message = elm_button_add(win); - elm_object_text_set(view.bt_message, D_("Import")); + elm_button_label_set(view.bt_message, D_("Import")); evas_object_size_hint_min_set(view.bt_message, 130, 80); evas_object_smart_callback_add(view.bt_message, "clicked", _list_import_clicked, NULL); @@ -859,7 +859,7 @@ elm_box_pack_end(view.bx, view.bt_message); view.bt_edit = elm_button_add(win); - elm_object_text_set(view.bt_edit, D_("Edit")); + elm_button_label_set(view.bt_edit, D_("Edit")); evas_object_size_hint_min_set(view.bt_edit, 130, 80); evas_object_smart_callback_add(view.bt_edit, "clicked", _list_edit_clicked, NULL); @@ -867,7 +867,7 @@ elm_box_pack_end(view.bx, view.bt_edit); view.bt_delete = elm_button_add(win); - elm_object_text_set(view.bt_delete, D_("Delete")); + elm_button_label_set(view.bt_delete, D_("Delete")); evas_object_size_hint_min_set(view.bt_delete, 130, 80); evas_object_smart_callback_add(view.bt_delete, "clicked", _list_delete_clicked, NULL); @@ -879,7 +879,7 @@ /* loading indicator */ view.pb = elm_progressbar_add(win); elm_object_style_set(view.pb, "wheel"); - elm_object_text_set(view.pb, D_("Loading...")); + elm_progressbar_label_set(view.pb, D_("Loading...")); evas_object_size_hint_align_set(view.pb, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(view.pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); --- a/src/view/ussd-view.c +++ b/src/view/ussd-view.c @@ -89,7 +89,7 @@ window_text_set(win, "message", data->message); data->bt_close = elm_button_add(window_evas_object_get(win)); - elm_object_text_set(data->bt_close, D_("Close")); + elm_button_label_set(data->bt_close, D_("Close")); evas_object_smart_callback_add(data->bt_close, "clicked", frame_ussd_close_clicked, data); window_swallow(win, "button_close", data->bt_close);