#include <glib.h>
#include <Elementary.h>
-#include <efl-assist/efl_assist.h>
#include <vconf.h>
#include <notification.h>
#include <feedback.h>
-#include <wifi-direct.h>
#include <efl_extension.h>
#include "wfd-app.h"
WFD_APP_LOG(WFD_APP_LOG_HIGH, "popup resp : %d\n", resp);
- if (ad->rotate_event_handler) {
- ecore_event_handler_del(ad->rotate_event_handler);
- ad->rotate_event_handler = NULL;
- }
-
switch (resp) {
case /* MT */ WFD_POP_RESP_APRV_CONNECT_PBC_YES:
{
evas_object_hide(ad->win);
/* tickernoti popup */
- snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
+ snprintf(msg, WFD_POP_STR_MAX_LEN, D_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
connection->peer_name);
notification_status_message_post(msg);
}
WFD_APP_LOG(WFD_APP_LOG_LOW,
"wifi_direct_accept_connection() failed. result=[%d]\n", result);
/* tickernoti popup */
- notification_status_message_post(_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"));
+ notification_status_message_post(D_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"));
}
}
break;
WFD_APP_LOG(WFD_APP_LOG_ERROR, "Error, Incorrect PIN!!\n");
keypad_popup_timeout--;
/* tickernoti popup */
- notification_status_message_post(_("IDS_COM_BODY_PINS_DO_NOT_MATCH"));
+ notification_status_message_post(D_("IDS_COM_BODY_PINS_DO_NOT_MATCH"));
/* redraw the popup */
wfd_prepare_popup(WFD_POP_PROG_CONNECT_WITH_KEYPAD, (void *) NULL);
result = wifi_direct_set_wps_pin(connection->wps_pin);
if (result != WIFI_DIRECT_ERROR_NONE) {
/* tickernoti popup */
- snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
+ snprintf(msg, WFD_POP_STR_MAX_LEN, D_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
connection->peer_name);
notification_status_message_post(msg);
return;
evas_object_hide(ad->win);
/* tickernoti popup */
- snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
+ snprintf(msg, WFD_POP_STR_MAX_LEN, D_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
connection->peer_name);
notification_status_message_post(msg);
}
return;
}
-void __set_parent_rotate_angle(wfd_appdata_t *ad)
-{
- __WFD_APP_FUNC_ENTER__;
-
- int rots1[1] = {0};
-
- if (ad == NULL || ad->win == NULL) {
- WFD_APP_LOG(WFD_APP_LOG_ERROR, "Parameter NULL");
- return;
- }
-
- elm_win_wm_rotation_available_rotations_set(ad->win, rots1, 1);
-
- __WFD_APP_FUNC_EXIT__;
- return;
-}
-
/**
* This function let the app create a popup which includes no button
* @return popup
popup = elm_popup_add(win);
elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
- eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, NULL);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, NULL);
evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad);
// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_domain_translatable_text_set(popup, PACKAGE, pop->text);
elm_popup_timeout_set(popup, pop->timeout);
- __set_parent_rotate_angle(ad);
+
evas_object_show(popup);
evas_object_show(win);
popup = elm_popup_add(win);
elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
- eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data1);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data1);
evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad);
// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_part_content_set(popup, "button1", btn);
evas_object_smart_callback_add(btn, "clicked", __popup_resp_cb, (void *) pop->resp_data1);
- __set_parent_rotate_angle(ad);
evas_object_show(popup);
evas_object_show(win);
popup = elm_popup_add(win);
elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
- eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data2);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data2);
evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad);
// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_domain_translatable_part_text_set(popup, "title,text",
- PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
+ PACKAGE, D_("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
elm_object_domain_translatable_text_set(popup, PACKAGE, pop->text);
btn1 = elm_button_add(popup);
evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb,
(void *) pop->resp_data1);
- __set_parent_rotate_angle(ad);
evas_object_show(popup);
evas_object_show(win);
ad->popup = NULL;
}
- if (ad->rotate_event_handler) {
- ecore_event_handler_del(ad->rotate_event_handler);
- ad->rotate_event_handler = NULL;
- }
-
if (ad->win) {
evas_object_hide(ad->win);
}
popup = elm_popup_add(win);
elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
- eext_object_event_callback_add(popup, EA_CALLBACK_BACK, _wfd_ug_automatic_turn_off_popup_cb, userdata);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _wfd_ug_automatic_turn_off_popup_cb, userdata);
evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad);
// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_part_content_set(popup, "button1", btn);
evas_object_smart_callback_add(btn, "clicked", _wfd_ug_automatic_turn_off_popup_cb, userdata);
- __set_parent_rotate_angle(ad);
evas_object_show(popup);
evas_object_show(win);
char msg1[WFD_POP_STR_MAX_LEN] = {0};
char msg2[WFD_POP_STR_MAX_LEN] = {0};
+ char label_str[WFD_POP_STR_MAX_LEN] = {0, };
Evas_Object *label = (Evas_Object*) data;
wfd_appdata_t *ad = wfd_get_appdata();
if (keypad_popup_timeout > 0) {
_replace_1PS_2PD((char *)msg1, sizeof(msg1),
- _("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
+ D_("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
connection->peer_name, keypad_popup_timeout);
- strcat(msg1, " ");
- snprintf(msg2, sizeof(msg2), _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
+ snprintf(msg2, sizeof(msg2), D_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
connection->peer_name);
- strcat(msg1, msg2);
- elm_object_domain_translatable_text_set(label, PACKAGE, msg1);
+ snprintf(label_str, sizeof(label_str), "%s %s", msg1, msg2);
+ elm_object_domain_translatable_text_set(label, PACKAGE, label_str);
}
// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, 0.0);
elm_object_domain_translatable_part_text_set(popup, "title,text",
- PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
+ PACKAGE, D_("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
layout = elm_layout_add(popup);
if (layout == NULL) {
/* add time */
time = elm_label_add(layout);
elm_label_line_wrap_set(time, ELM_WRAP_MIXED);
- elm_object_text_set(time, _("<font_size=40><align=center>00:00</align></font_size>"));
+ elm_object_text_set(time,
D_("<font_size=40><align=center>00:00</align></font_size>"));
evas_object_size_hint_weight_set(time, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(time, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(time);
elm_object_part_content_set(popup, "button1", btn2);
evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb,
(void *) pop->resp_data2);
- eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data2);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data2);
}
if (pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES || pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_PBC_YES ) {
elm_object_part_content_set(popup, "button2", btn1);
evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb,
(void *) pop->resp_data1);
- eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data1);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data1);
}
elm_object_content_set(popup, layout);
- __set_parent_rotate_angle(ad);
evas_object_show(popup);
evas_object_show(win);
return NULL;
}
WFD_APP_LOG(WFD_APP_LOG_LOW, "wfd_rename desc\n");
+ char buf[WFD_POP_STR_MAX_LEN] = {0, };
char msg1[WFD_POP_STR_MAX_LEN] = {0, };
char msg2[WFD_POP_STR_MAX_LEN] = {0, };
wfd_appdata_t *ad = wfd_get_appdata();
wfd_connection_info_s *connection = ad->connection;
WFD_RETV_IF(connection == NULL, NULL, "Incorrect parameter(NULL)\n");
- if (!g_strcmp0(part, "elm.text.multiline")) {
+ if (!strcmp("elm.text.multiline", part)) {
if (keypad_popup_timeout > 0) {
ad->timeout = keypad_popup_timeout;
}
- _replace_1PS_2PD((char *)msg1, sizeof(msg1),
- _("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
+ _replace_1PS_2PD((char *)msg1, WFD_POP_STR_MAX_LEN,
+ D_("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
connection->peer_name, ad->timeout);
- strcat(msg1, " ");
- snprintf(msg2, sizeof(msg2),
- _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
+ snprintf(msg2, WFD_POP_STR_MAX_LEN,
+ D_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
connection->peer_name);
- strcat(msg1, msg2);
- WFD_APP_LOG(WFD_APP_LOG_LOW, "string %s", msg1);
+
+ WFD_APP_LOG(WFD_APP_LOG_LOW, "string %s %s", msg1, msg2);
+ snprintf(buf, WFD_POP_STR_MAX_LEN,
+ "<font_size=30>%s %s</font_size>",
+ msg1, msg2);
__WFD_APP_FUNC_EXIT__;
- return g_strdup(msg1);
+ return g_strdup(buf);
}
__WFD_APP_FUNC_EXIT__;
return NULL;
ELM_INPUT_PANEL_LAYOUT_DATETIME);
elm_object_signal_emit(entry, "elm,action,hide,search_icon", "");
elm_object_domain_translatable_part_text_set(entry, "elm.guide",
- PACKAGE, _("IDS_WIFI_POP_PIN"));
+ PACKAGE, D_("IDS_WIFI_POP_PIN"));
elm_entry_input_panel_return_key_autoenabled_set(entry,EINA_TRUE);
elm_entry_input_panel_return_key_type_set(entry,
ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
}
WFD_APP_LOG(WFD_APP_LOG_LOW, "Part %s", part);
- if (!g_strcmp0(part, "elm.text.main.right")) {
+ if (!strcmp("elm.text", part)) {
__WFD_APP_FUNC_EXIT__;
return g_strdup(" Show password");
}
WFD_APP_LOG(WFD_APP_LOG_LOW, "Part %s", part);
- if (!g_strcmp0(part, "elm.icon.left")) {
+ if (!strcmp("elm.swallow.icon", part)) {
check = elm_check_add(obj);
evas_object_propagate_events_set(check, EINA_FALSE);
evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL);
pinpopup = elm_popup_add(ad->layout);
elm_popup_align_set(pinpopup, ELM_NOTIFY_ALIGN_FILL, 1.0);
- eext_object_event_callback_add(pinpopup, EA_CALLBACK_BACK, eext_popup_back_cb,
+ eext_object_event_callback_add(pinpopup, EEXT_CALLBACK_BACK, eext_popup_back_cb,
NULL);
evas_object_size_hint_weight_set(pinpopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_domain_translatable_part_text_set(pinpopup, "title,text",
- PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
+ PACKAGE, D_("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
genlist = elm_genlist_add(pinpopup);
elm_genlist_homogeneous_set(genlist, EINA_TRUE);
/* Entry genlist item */
ad->pin_desc_itc = elm_genlist_item_class_new();
if(ad->pin_desc_itc != NULL) {
- ad->pin_desc_itc->item_style = "multiline_main";
+ ad->pin_desc_itc->item_style = WFD_GENLIST_MULTILINE_TEXT_STYLE;
ad->pin_desc_itc->func.text_get = __wfd_main_desc_label_get;
ad->pin_desc_itc->func.content_get = NULL;
ad->pin_desc_itc->func.state_get = NULL;
ad->paswd_itc = elm_genlist_item_class_new();
if(ad->paswd_itc != NULL) {
- ad->paswd_itc->item_style = "1line";
+ ad->paswd_itc->item_style = WFD_GENLIST_1LINE_TEXT_ICON_STYLE;
ad->paswd_itc->func.text_get = __wfd_password_label;
ad->paswd_itc->func.content_get = __wfd_password_check;
ad->paswd_itc->func.state_get = NULL;
evas_object_show(genlist);
elm_object_content_set(pinpopup, genlist);
- __set_parent_rotate_angle(ad);
evas_object_show(pinpopup);
evas_object_show(win);
elm_object_focus_set(ad->pin_entry, EINA_TRUE);
case /* MT */ WFD_POP_APRV_CONNECTION_WPS_PUSHBUTTON_REQ:
_replace_1PS_2PD((char *)pop->text, sizeof(pop->text),
- _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
+ D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
peer_name, WFD_POP_TIMER_120);
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_SK2_OK"));
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_WIFI_SK_CANCEL"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_WIFI_SK2_OK"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_WIFI_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_PBC_YES;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
case /* MT */ WFD_POP_APRV_CONNECTION_WPS_DISPLAY_REQ:
snprintf(pop->text, sizeof(pop->text),
- _("IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"),
+ D_("IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"),
peer_name);
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_BUTTON_ALLOW"));
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_WIFI_BUTTON_ALLOW"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_DISPLAY_OK;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
case /* MT */ WFD_POP_APRV_CONNECTION_WPS_KEYPAD_REQ:
_replace_1PS_2PD((char *)pop->text, sizeof(pop->text),
- _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
+ D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
peer_name, WFD_POP_TIMER_120);
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_BR_SK_OK"));
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_BR_SK_OK"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
break;
case /* MT */ WFD_POP_PROG_CONNECT:
- snprintf(pop->text, sizeof(pop->text), "%s", _("IDS_WIFI_BODY_CONNECTING_ING"));
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->text, sizeof(pop->text), "%s", D_("IDS_WIFI_BODY_CONNECTING_ING"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_NO;
case /* MO */ WFD_POP_PROG_CONNECT_WITH_KEYPAD:
_replace_1PS_2PD((char *)text, sizeof(text),
- _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
+ D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
peer_name, WFD_POP_TIMER_120);
snprintf(text1, WFD_POP_STR_MAX_LEN, "%s %s",
- text, _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"));
+ text, D_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"));
snprintf(pop->text, sizeof(pop->text), text1, connection->peer_name);
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_SK_CONNECT"));
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_WIFI_SK_CONNECT"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_PROG_CONNECT_KEYPAD_OK;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
case /* MO/MT */ WFD_POP_PROG_CONNECT_WITH_PIN:
_replace_1PS_2PD((char *)text, sizeof(text),
- _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
+ D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
peer_name, WFD_POP_TIMER_120);
snprintf(text1, WFD_POP_STR_MAX_LEN, "%s %s %s",
text,
"<br>",
- _("IDS_WIFI_POP_PIN_CODE_PS"));
+ D_("IDS_WIFI_POP_PIN_CODE_PS"));
snprintf(pop->text, sizeof(pop->text), text1, connection->wps_pin);
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
break;
case WFD_POP_PROG_CONNECT_CANCEL:
- snprintf(pop->text, sizeof(pop->text), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->text, sizeof(pop->text), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
ad->popup = wfd_draw_pop_type_a(ad->win, pop);
break;
projects / apps / native / ug-wifi-direct.git / blobdiff