%define _unpackaged_files_terminate_build 0
Name: wifi-efl-ug
Summary: Wi-Fi UI Gadget for TIZEN
-Version: 1.0.157
+Version: 1.0.158
Release: 1
Group: App/Network
License: Flora-1.1
ctxpopup = elm_ctxpopup_add(eap_data->win);
eap_data->sub_popup = ctxpopup;
elm_object_style_set(ctxpopup, "dropdown/list");
- eext_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK,
+ eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK,
cert_ctxpopup_dismissed_cb, NULL);
evas_object_smart_callback_add(ctxpopup,"dismissed",
cert_ctxpopup_dismissed_cb, eap_data);
{
eap_connect_data_t *eap_data = (eap_connect_data_t *)data;
- if (!g_strcmp0(part, "elm.text.main")) {
+ if (!g_strcmp0(part, "elm.text.sub")) {
return g_strdup(sc(eap_data->str_pkg_name,
I18N_TYPE_User_Certificate));
}
Evas_Object *ly = NULL;
char buf[100];
- if (!strcmp(part, "elm.icon.entry")) {
+ if (!strcmp(part, "elm.swallow.icon.0")) {
ly = elm_layout_add(obj);
elm_layout_file_set(ly, CUSTOM_EDITFIELD_PATH,
"eap_dropdown_button");
ctxpopup = elm_ctxpopup_add(eap_data->win);
eap_data->sub_popup = ctxpopup;
elm_object_style_set(ctxpopup, "dropdown/list");
- eext_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK,
+ eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK,
eext_ctxpopup_back_cb, NULL);
evas_object_smart_callback_add(ctxpopup,"dismissed",
ctxpopup_dismissed_cb, eap_data);
{
eap_connect_data_t *eap_data = (eap_connect_data_t *)data;
- if (!g_strcmp0(part, "elm.text.main")) {
+ if (!g_strcmp0(part, "elm.text.sub")) {
return g_strdup(sc(eap_data->str_pkg_name, I18N_TYPE_EAP_method));
}
Evas_Object *ly = NULL;
char buf[100];
- if (!strcmp(part, "elm.icon.entry")) {
+ if (!strcmp(part, "elm.swallow.icon.0")) {
ly = elm_layout_add(obj);
elm_layout_file_set(ly, CUSTOM_EDITFIELD_PATH,
"eap_dropdown_button");
ctxpopup = elm_ctxpopup_add(eap_data->win);
eap_data->sub_popup = ctxpopup;
elm_object_style_set(ctxpopup, "dropdown/list");
- eext_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK, eext_ctxpopup_back_cb, NULL);
+ eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK, eext_ctxpopup_back_cb, NULL);
evas_object_smart_callback_add(ctxpopup,"dismissed", ctxpopup_dismissed_cb, eap_data);
elm_ctxpopup_direction_priority_set(ctxpopup,
ELM_CTXPOPUP_DIRECTION_DOWN,
{
eap_connect_data_t *eap_data = (eap_connect_data_t *)data;
- if (!g_strcmp0(part, "elm.text.main")) {
+ if (!g_strcmp0(part, "elm.text.sub")) {
return g_strdup(sc(eap_data->str_pkg_name,
I18N_TYPE_Phase_2_authentication));
}
Evas_Object *ly = NULL;
char buf[100];
- if (!strcmp(part, "elm.icon.entry")) {
+ if (!strcmp(part, "elm.swallow.icon.0")) {
ly = elm_layout_add(obj);
elm_layout_file_set(ly, CUSTOM_EDITFIELD_PATH,
"eap_dropdown_button");
return NULL;
}
- if (!g_strcmp0(part, "elm.text.main")) {
+ if (!g_strcmp0(part, "elm.text.sub")) {
return g_strdup(dgettext(PACKAGE, entry_info->title_txt));
}
return NULL;
}
- if (g_strcmp0(part, "elm.icon.entry") == 0) {
+ if (g_strcmp0(part, "elm.swallow.icon.0") == 0) {
Evas_Object *entry = NULL;
char *guide_txt = NULL;
char *accepted = NULL;
{
char *str_pkg_name = (char *)data;
- if (!g_strcmp0(part, "elm.text.main.left")) {
+ if (!strcmp("elm.text", part)) {
char buf[1024];
snprintf(buf, 1023, "%s", sc(str_pkg_name, I18N_TYPE_Show_password));
return strdup(buf);
{
Evas_Object *check = NULL;
- if(!g_strcmp0(part, "elm.icon.right")) {
+ if (!strcmp("elm.swallow.end", part)) {
check = elm_check_add(obj);
evas_object_propagate_events_set(check, EINA_FALSE);
static void __common_eap_connect_popup_init_item_class(void *data)
{
- g_eap_type_itc.item_style = "entry.main";
+ g_eap_type_itc.item_style = WIFI_GENLIST_2LINE_BOTTOM_SWALLOW_STYLE;
g_eap_type_itc.func.text_get = _gl_eap_type_text_get;
g_eap_type_itc.func.content_get = _gl_eap_type_content_get;
g_eap_type_itc.func.state_get = NULL;
g_eap_type_itc.func.del = NULL;
- g_eap_auth_itc.item_style = "entry.main";
+ g_eap_auth_itc.item_style = WIFI_GENLIST_2LINE_BOTTOM_SWALLOW_STYLE;
g_eap_auth_itc.func.text_get = _gl_eap_auth_text_get;
g_eap_auth_itc.func.content_get = _gl_eap_auth_content_get;
g_eap_auth_itc.func.state_get = NULL;
g_eap_auth_itc.func.del = NULL;
- g_eap_user_cert_itc.item_style = "entry.main";
+ g_eap_user_cert_itc.item_style = WIFI_GENLIST_2LINE_BOTTOM_SWALLOW_STYLE;
g_eap_user_cert_itc.func.text_get = _gl_eap_user_cert_text_get;
g_eap_user_cert_itc.func.content_get = _gl_eap_user_cert_content_get;
g_eap_user_cert_itc.func.state_get = NULL;
g_eap_user_cert_itc.func.del = NULL;
- g_eap_entry_itc.item_style = "entry.main";
+ g_eap_entry_itc.item_style = WIFI_GENLIST_2LINE_BOTTOM_SWALLOW_STYLE;
g_eap_entry_itc.func.text_get = _gl_eap_entry_item_text_get;
g_eap_entry_itc.func.content_get = _gl_eap_entry_item_content_get;
g_eap_entry_itc.func.state_get = NULL;
eap_data->eap_done_ok = FALSE;
eap_data->genlist = view_list = elm_genlist_add(parent);
+ //elm_genlist_realization_mode_set(view_list, EINA_TRUE);
elm_genlist_mode_set(view_list, ELM_LIST_COMPRESS);
elm_scroller_content_min_limit(view_list, EINA_FALSE, EINA_TRUE);
/* Create the entry items */
_create_and_update_list_items_based_on_rules(eap_type, eap_data);
- evas_object_show(view_list);
evas_object_smart_callback_add(view_list, "language,changed",
gl_lang_changed, NULL);
Evas_Object *popup = NULL;
Evas_Object *list = NULL;
- Evas_Object *box = NULL;
if (layout_main == NULL || device_info == NULL || pkg_name == NULL) {
return NULL;
evas_object_show(popup);
elm_object_focus_set(popup, EINA_TRUE);
- box = elm_box_add(popup);
- evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
/* Create an EAP connect view list */
- list = _create_list(box, eap_data);
- elm_object_content_set(box, list);
-
- elm_box_pack_end(box, list);
- evas_object_size_hint_min_set(box, -1, ELM_SCALE_SIZE(300));
- elm_object_content_set(popup, box);
+ list = _create_list(popup, eap_data);
+ elm_object_content_set(popup, list);
evas_object_smart_callback_add(eap_data->conf,
"virtualkeypad,state,on", _eap_popup_keypad_on_cb,
_view_detail_description_data_t* det =
(_view_detail_description_data_t*) data;
- if (0 == strncmp("elm.text.main", part, strlen(part))) {
+ if (0 == strncmp("elm.text.sub", part, strlen(part))) {
return g_strdup(dgettext(PACKAGE, det->title));
}
_view_detail_description_data_t* det =
(_view_detail_description_data_t*) data;
- if (g_strcmp0(part, "elm.icon.entry") == 0) {
+ if (g_strcmp0(part, "elm.swallow.end") == 0) {
Evas_Object *entry = NULL;
entry = elm_entry_add(obj);
return NULL;
}
- if (!g_strcmp0(part, "elm.text.main")) {
+ if (!g_strcmp0(part, "elm.text.sub")) {
return g_strdup(dgettext(PACKAGE, entry_info->title_txt));
}
return NULL;
}
- if (g_strcmp0(part, "elm.icon.entry") == 0) {
+ if (g_strcmp0(part, "elm.swallow.end") == 0) {
Evas_Object *entry = NULL;
char *guide_txt = NULL;
char *accepted = NULL;
retvm_if(NULL == data || NULL == part, NULL);
full_ip_info_t *ip_data = (full_ip_info_t *) data;
- if (!strncmp(part, "elm.text.main.left", strlen(part))) {
+ if (!strcmp("elm.text", part)) {
ip_info_list_t *ip_info_list_data = ip_data->ip_info_list;
#ifdef ACCESSIBLITY_FEATURE
char buf[100];
retvm_if(NULL == data || NULL == obj || NULL == part, NULL);
full_ip_info_t *ip_data = (full_ip_info_t *) data;
ip_info_list_t *ip_info_list_data = ip_data->ip_info_list;
- Evas_Object *ic = NULL;
Evas_Object *toggle_btn = NULL;
- ic = elm_layout_add(obj);
-
- if (!g_strcmp0(part, "elm.icon.2")) {
- elm_layout_theme_set(ic, "layout", "list/C/type.3", "default");
-
- toggle_btn = elm_check_add(ic);
+ if (!strcmp("elm.swallow.end", part)) {
+ toggle_btn = elm_check_add(obj);
elm_object_style_set(toggle_btn, "on&off");
elm_object_focus_allow_set(toggle_btn, EINA_FALSE);
if (WIFI_IP_CONFIG_TYPE_STATIC == ip_info_list_data->ip_type) {
evas_object_propagate_events_set(toggle_btn, EINA_FALSE);
evas_object_size_hint_align_set(toggle_btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(toggle_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_layout_content_set(ic, "elm.swallow.content", toggle_btn);
evas_object_smart_callback_add(toggle_btn, "changed",
__ip_info_toggle_item_sel_cb, ip_data);
}
- return ic;
+ return toggle_btn;
}
#if 0
ip_info_list_data->input_panel_cb = input_panel_cb;
ip_info_list_data->input_panel_cb_data = input_panel_cb_data;
- ip_toggle_itc.item_style = "1line";
+ ip_toggle_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE;
ip_toggle_itc.func.text_get = _ip_info_iptoggle_text_get;
ip_toggle_itc.func.content_get = _ip_info_iptoggle_content_get;
ip_toggle_itc.func.state_get = NULL;
ip_toggle_itc.func.del = NULL;
- description_itc.item_style = "entry.main";
+ description_itc.item_style = WIFI_GENLIST_2LINE_BOTTOM_SWALLOW_STYLE;
description_itc.func.text_get = _ip_info_detail_description_text_get;
description_itc.func.content_get = _ip_info_detail_description_content_get;
description_itc.func.state_get = NULL;
description_itc.func.del = _ip_info_detail_description_del;
- ip_entry_itc.item_style = "entry.main";
+ ip_entry_itc.item_style = WIFI_GENLIST_2LINE_BOTTOM_SWALLOW_STYLE;
ip_entry_itc.func.text_get = _ip_info_entry_item_text_get;
ip_entry_itc.func.content_get = _ip_info_entry_item_content_get;
ip_entry_itc.func.state_get = NULL;
static Elm_Entry_Filter_Limit_Size limit_filter_data;
pswd_popup_t *pswd_popup_data = (pswd_popup_t *)data;
- if (!g_strcmp0(part, "elm.icon.entry")) {
+ if (!g_strcmp0(part, "elm.swallow.content")) {
editfield = elm_layout_add(obj);
elm_layout_theme_set(editfield, "layout", "editfield", "singleline");
evas_object_size_hint_align_set(editfield, EVAS_HINT_FILL, 0.0);
} else {
elm_entry_password_set((Evas_Object *)data, EINA_TRUE);
}
+ elm_entry_cursor_end_set((Evas_Object *)data);
}
static char *_gl_pswd_check_box_item_text_get(void *data, Evas_Object *obj,
const char *part)
evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
/* Entry genlist item */
- g_pswd_entry_itc.item_style = "entry";
+ g_pswd_entry_itc.item_style = WIFI_GENLIST_SWALLOW_CONTENT_STYLE;
g_pswd_entry_itc.func.text_get = NULL;
g_pswd_entry_itc.func.content_get = _gl_pswd_entry_item_content_get;
g_check_box_itc.func.state_get = NULL;
_common_wps_options_popup_cb, pswd_popup_data);
}
+ //elm_genlist_realization_mode_set(genlist, EINA_TRUE);
evas_object_show(genlist);
elm_object_content_set(passpopup, genlist);
#define WIFI_GENLIST_MULTILINE_TEXT_STYLE "multiline"
#define WIFI_GENLIST_GROUP_INDEX_STYLE "group_index"
+/* Genlist new style for Tizen 3.0 */
+#define WIFI_GENLIST_2LINE_BOTTOM_SWALLOW_STYLE "type2"
+#define WIFI_GENLIST_SWALLOW_CONTENT_STYLE "full"
+
/* Icon Size*/
-#define DEFAULT_BG_SIZE 96
+#define DEFAULT_BG_SIZE 60
#define DEFAULT_BUTTON_CIRCLE_SIZE 40
typedef enum {
#include "winset_popup.h"
#include "wlan_manager.h"
#include "viewer_manager.h"
-#include <efl_assist.h>
#include <efl_util.h>
#define PACKAGE "ug-wifi-efl-UG"
detailview_list = elm_genlist_add(layout);
assertm_if(NULL == detailview_list, "NULL!!");
+ //elm_genlist_realization_mode_set(detailview_list, EINA_TRUE);
elm_object_style_set(detailview_list, "dialogue");
_detail_data->view_detail_list = detailview_list;
genlist = elm_genlist_add(passpopup);
evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ //elm_genlist_realization_mode_set(genlist, EINA_TRUE);
elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE);
g_entry_itc.item_style = "entry";
manager_object->ctxpopup = elm_ctxpopup_add(parent);
elm_ctxpopup_auto_hide_disabled_set(manager_object->ctxpopup, EINA_TRUE);
elm_object_style_set(manager_object->ctxpopup, "more/default");
- eext_object_event_callback_add(manager_object->ctxpopup, EA_CALLBACK_BACK,
+ eext_object_event_callback_add(manager_object->ctxpopup, EEXT_CALLBACK_BACK,
_ctxpopup_del_cb, NULL);
- eext_object_event_callback_add(manager_object->ctxpopup, EA_CALLBACK_MORE,
+ eext_object_event_callback_add(manager_object->ctxpopup, EEXT_CALLBACK_MORE,
_ctxpopup_del_cb, NULL);
evas_object_smart_callback_add(manager_object->ctxpopup, "dismissed",
_ctxpopup_dismissed_cb, _win_main);
Evas_Object *c = NULL;
- Evas_Object *icon = NULL;
#ifdef ACCESSIBLITY_FEATURE
Evas_Object *ao = NULL;
#endif
if (!strcmp("elm.swallow.end", part)) {
- icon = elm_layout_add(obj);
- elm_layout_theme_set(icon, "layout", "list/C/type.3", "default");
switch (manager_object -> header_mode) {
case HEADER_MODE_OFF:
/* Wi-Fi off indication button */
- c = elm_check_add(icon);
+ c = elm_check_add(obj);
elm_object_style_set(c, "on&off");
evas_object_propagate_events_set(c, EINA_FALSE);
elm_check_state_set(c, EINA_FALSE);
case HEADER_MODE_ACTIVATING:
case HEADER_MODE_DEACTIVATING:
/* Progress animation */
- c = elm_progressbar_add(icon);
+ c = elm_progressbar_add(obj);
elm_object_style_set(c, "process_medium");
evas_object_size_hint_align_set(c, EVAS_HINT_FILL, 0.5);
evas_object_size_hint_weight_set(c, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
default:
/* Wi-Fi on indication button */
- c = elm_check_add(icon);
+ c = elm_check_add(obj);
elm_object_style_set(c, "on&off");
evas_object_propagate_events_set(c, EINA_FALSE);
elm_check_state_set(c, EINA_TRUE);
}
evas_object_size_hint_align_set(c, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(c, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_layout_content_set(icon, "elm.swallow.content", c);
}
- return icon;
+ return c;
}
static void __viewer_manager_wifi_onoff_item_create(Evas_Object* genlist)
elm_object_domain_translatable_part_text_set(layout, "text.title",
PACKAGE, sc(PACKAGE, I18N_TYPE_Wi_Fi));
- eext_object_event_callback_add(manager_object->nav, EA_CALLBACK_BACK,
+ eext_object_event_callback_add(manager_object->nav, EEXT_CALLBACK_BACK,
__ea_setup_wizard_back_cb, NULL);
__viewer_manager_wifi_onoff_item_create(manager_object->list);
elm_object_part_content_set(layout, "elm.swallow.content", manager_object->list);
- eext_object_event_callback_add(manager_object->nav, EA_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
+ eext_object_event_callback_add(manager_object->nav, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
back_btn = elm_button_add(manager_object->nav);
elm_object_style_set(back_btn, "naviframe/back_btn/default");
elm_object_part_content_set(layout,
"elm.swallow.content", manager_object->nav);
elm_naviframe_prev_btn_auto_pushed_set(manager_object->nav, EINA_FALSE);
- eext_object_event_callback_add(manager_object->nav, EA_CALLBACK_MORE,
+ eext_object_event_callback_add(manager_object->nav, EEXT_CALLBACK_MORE,
eext_naviframe_more_cb, NULL);
/* Add layout for custom styles */
}
old_mode = manager_object->header_mode;
- if (old_mode == new_mode)
+ if (old_mode == new_mode) {
+ if (new_mode == HEADER_MODE_OFF && manager_object->scan_button) {
+ evas_object_del(manager_object->scan_button);
+ manager_object->scan_button = NULL;
+ }
return;
+ }
DEBUG_LOG(UG_NAME_NORMAL, "Header mode %d --> %d", old_mode, new_mode);
// To use multiline textblock/entry/editfield in genlist, set height_for_width mode
// then the item's height is calculated while the item's width fits to genlist width.
elm_genlist_mode_set(viewer_list, ELM_LIST_COMPRESS);
- elm_genlist_homogeneous_set(viewer_list, EINA_TRUE);
+ //elm_genlist_realization_mode_set(viewer_list, EINA_TRUE);
evas_object_size_hint_weight_set(viewer_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(viewer_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
list = elm_genlist_add(parent);
assertm_if(NULL == list, "list allocation fail!!");
elm_genlist_mode_set(list, ELM_LIST_COMPRESS);
- elm_genlist_homogeneous_set(list, EINA_TRUE);
+ //elm_genlist_realization_mode_set(list, EINA_TRUE);
evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);