From 15293c673ceec0815a37263f224aa73d751e991b Mon Sep 17 00:00:00 2001 From: Jaekyu Park Date: Tue, 12 Apr 2016 21:50:03 +0900 Subject: [PATCH] Tizen 2.4 SDK Rev5 --- src/setting-bluetooth.c | 31 +++++++- src/setting-display.c | 180 ++++++++++++++++++++++++++++++++++++++++----- src/setting-double.c | 28 +++++++ src/setting-info.c | 28 +++++++ src/setting-language.c | 28 +++++++ src/setting-motion.c | 29 ++++++++ src/setting-notification.c | 30 +++++++- src/setting-privacy.c | 28 +++++++ src/setting-safety.c | 28 +++++++ src/setting-sound.c | 67 ++++++++++++++++- src/setting-volume.c | 29 ++++++++ src/setting.c | 151 ++++++++++++++++++++++++++++++++++--- 12 files changed, 626 insertions(+), 31 deletions(-) diff --git a/src/setting-bluetooth.c b/src/setting-bluetooth.c index 303cc92..ba85701 100644 --- a/src/setting-bluetooth.c +++ b/src/setting-bluetooth.c @@ -76,6 +76,17 @@ static int is_disable_visibility_item_view(); static void _update_visibility_view(); +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_QP_BUTTON_BLUETOOTH")); + return strdup(buf); +} +#endif + static void sap_state_vconf_change_cb(keynode_t *key, void *data) { _update_visibility_item_view(is_handsfree_connected()); @@ -780,7 +791,7 @@ Evas_Object *_create_bt_list(void *data) itc2->func.del = _bt_gl_del; Elm_Genlist_Item_Class *itc3 = elm_genlist_item_class_new(); - itc3->item_style = "multiline.2text.1icon"; + itc3->item_style = "2text.1icon.1"; itc3->func.text_get = _gl_bt_title_get; itc3->func.content_get = _gl_bt_check_get; itc3->func.del = _bt_gl_del; @@ -795,6 +806,16 @@ Evas_Object *_create_bt_list(void *data) menu_its = bt_menu_its; +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _bt_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif Elm_Genlist_Item_Class *itc_arr[3] = { itc, itc2, itc3 }; for (idx = 0; idx < BT_LIST_ITEM_COUNT; idx++) { @@ -827,6 +848,14 @@ Evas_Object *_create_bt_list(void *data) elm_genlist_item_class_free(itc2); elm_genlist_item_class_free(itc3); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _bt_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif bt_genlist = genlist; elm_object_part_content_set(layout, "elm.genlist", genlist); diff --git a/src/setting-display.c b/src/setting-display.c index 2cda177..4716ba2 100644 --- a/src/setting-display.c +++ b/src/setting-display.c @@ -107,6 +107,25 @@ static Eina_Bool setting_font_list_pop_cb(void *data, Elm_Object_Item *it); static void _lang_update_font_style_list(void *data, Evas_Object *obj, void *event_info); +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_MBODY_DISPLAY_ABB")); + return strdup(buf); +} + +static char * +_gl_menu_font_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_BODY_FONT_STYLE")); + return strdup(buf); +} +#endif void _init_display() { @@ -257,10 +276,14 @@ void _display_gl_language_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "language cb - genlist is null"); return; } - nf_it = elm_naviframe_item_push(ad->nf, "IDS_ST_BUTTON_LANGUAGE", NULL, NULL, genlist, NULL); +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif evas_object_event_callback_add(genlist, EVAS_CALLBACK_DEL, _clear_lang_cb, ad); #if !defined(FEATURE_SETTING_TELEPHONY) - elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); + elm_naviframe_item_title_enabled_set(nf_it, FALSE, EINA_FALSE); #endif elm_object_item_domain_text_translatable_set(nf_it, SETTING_PACKAGE, EINA_TRUE); @@ -408,6 +431,16 @@ Evas_Object *_create_display_list(void *data) eext_rotary_object_event_activated_set(circle_genlist, EINA_TRUE); #endif +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _display_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif menu_its = display_menu_its; int size = sizeof(display_menu_its) / sizeof(struct _display_menu_item); @@ -459,6 +492,14 @@ Evas_Object *_create_display_list(void *data) elm_genlist_item_class_free(itc2); elm_genlist_item_class_free(itc_ambient_md); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _display_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif g_display_genlist = genlist; return genlist; @@ -555,6 +596,16 @@ static void _screen_timeout_gl_del(void *data, Evas_Object *obj) free(id); } +#ifdef O_TYPE +static char * +_gl_menu_screen_timeout_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_MBODY_SCREEN_TIMEOUT_ABB")); + return strdup(buf); +} +#endif void _show_screen_timeout_list(void *data) { appdata *ad = data; @@ -585,6 +636,16 @@ void _show_screen_timeout_list(void *data) eext_rotary_object_event_activated_set(circle_genlist, EINA_TRUE); #endif +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_screen_timeout_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _screen_timeout_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif int timeout = 0; vconf_get_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, &timeout); screen_time_index = _get_timeout_index(timeout); @@ -613,11 +674,23 @@ void _show_screen_timeout_list(void *data) elm_genlist_item_show(curr_item, ELM_GENLIST_ITEM_SCROLLTO_TOP); } +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _screen_timeout_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif g_screen_time_genlist = genlist; elm_genlist_item_class_free(itc); - nf_it = elm_naviframe_item_push(ad->nf, "IDS_ST_MBODY_SCREEN_TIMEOUT_ABB", NULL, NULL, genlist, NULL); +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif #if !defined(FEATURE_SETTING_TELEPHONY) elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); #endif @@ -977,6 +1050,16 @@ static void _font_size_gl_cb(void *data, Evas_Object *obj, void *event_info) } } +#ifdef O_TYPE +static char * +_gl_menu_font_list_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_BODY_FONT")); + return strdup(buf); +} +#endif void _show_font_list(void *data) { appdata *ad = data; @@ -1006,11 +1089,14 @@ void _show_font_list(void *data) evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); #ifdef _CIRCLE - Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); - padding->item_style = "padding"; - padding->func.del = _font_size_gl_del; + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_font_list_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _font_size_gl_del; - elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); #endif for (idx = 0; idx < 1; idx++) { @@ -1026,11 +1112,25 @@ void _show_font_list(void *data) } } +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _font_size_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif + elm_object_part_content_set(layout, "elm.genlist", genlist); elm_genlist_item_class_free(itc); - nf_it = elm_naviframe_item_push(ad->nf, "IDS_ST_BODY_FONT", NULL, NULL, layout, NULL); +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout,"empty"); +#else + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#endif + #if !defined(FEATURE_SETTING_TELEPHONY) elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); #endif @@ -1293,16 +1393,18 @@ int _show_font_style_list(void *data) DBG("SYSTEM_SETTINGS_KEY_FONT_TYPE = %s", tmp_name); } -#ifdef _CIRCLE - Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); - padding->item_style = "padding"; - padding->func.del = _font_size_gl_del; + default_font_name = _get_default_font(); - elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); -#endif +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_font_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _font_style_gl_del; - default_font_name = _get_default_font(); + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(title_item); +#endif if (default_font_name) { Font_Style_Item_Data *id_default = calloc(sizeof(Font_Style_Item_Data), 1); if (default_font_name && tmp_name && !strcmp(tmp_name, default_font_name)) { @@ -1350,6 +1452,14 @@ int _show_font_style_list(void *data) evas_object_data_set(genlist, "radio_main", ad->font_style_rdg); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _font_style_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif g_font_style_genlist = genlist; elm_object_part_content_set(layout, "elm.genlist", genlist); @@ -1358,7 +1468,11 @@ int _show_font_style_list(void *data) evas_object_smart_callback_add(genlist, "language,changed", _lang_update_font_style_list, ad); - nf_it = elm_naviframe_item_push(ad->nf, "IDS_ST_BODY_FONT_STYLE", NULL, NULL, layout, NULL); +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, "empty"); +#else + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#endif #if !defined(FEATURE_SETTING_TELEPHONY) elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); #endif @@ -1457,6 +1571,16 @@ static void _lang_update_font_style_list(void *data, Evas_Object *obj, void *eve } } +#ifdef O_TYPE +static char * +_gl_menu_font_size_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_BODY_FONT_SIZE_ABB")); + return strdup(buf); +} +#endif void _show_font_size_list(void *data) { appdata *ad = data; @@ -1486,6 +1610,16 @@ void _show_font_size_list(void *data) elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_font_size_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _font_size_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif for (idx = 0; idx < FONT_SIZE_COUNT; idx++) { Item_Data *id = calloc(sizeof(Item_Data), 1); if (id) { @@ -1502,11 +1636,23 @@ void _show_font_size_list(void *data) g_font_size_genlist = genlist; +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _font_size_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif elm_object_part_content_set(layout, "elm.genlist", genlist); elm_genlist_item_class_free(itc); - nf_it = elm_naviframe_item_push(ad->nf, "IDS_ST_BODY_FONT_SIZE_ABB", NULL, NULL, layout, NULL); +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, "empty"); +#else + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#endif #if !defined(FEATURE_SETTING_TELEPHONY) elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); #endif diff --git a/src/setting-double.c b/src/setting-double.c index 54fedaa..c1e1112 100644 --- a/src/setting-double.c +++ b/src/setting-double.c @@ -527,6 +527,16 @@ void clear_double_app_cb(void *data , Evas *e, Evas_Object *obj, void *event_inf unregister_vconf_changing(VCONFKEY_AIL_INFO_STATE, change_app_state_cb); } +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_MBODY_DOUBLE_PRESS_ABB")); + return strdup(buf); +} +#endif Evas_Object *create_double_app_list(void *data) { appdata *ad = data; @@ -560,6 +570,16 @@ Evas_Object *create_double_app_list(void *data) selected_app = _get_selected_app(); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _gl_double_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif Double_Item_Data *id_none = calloc(sizeof(Double_Item_Data), 1); if (id_none) { id_none->pitem = pitem_none; @@ -614,6 +634,14 @@ Evas_Object *create_double_app_list(void *data) elm_object_part_content_set(layout, "elm.genlist", genlist); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _gl_double_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif elm_genlist_item_class_free(itc); return layout; diff --git a/src/setting-info.c b/src/setting-info.c index 370ba2a..7a2e7e0 100644 --- a/src/setting-info.c +++ b/src/setting-info.c @@ -148,6 +148,16 @@ Evas_Object *_gl_info_check_get(void *data, Evas_Object *obj, const char *part) return check; } +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_BUTTON_GEAR_INFO")); + return strdup(buf); +} +#endif Evas_Object *_create_info_list(void *data) { appdata *ad = data; @@ -177,6 +187,16 @@ Evas_Object *_create_info_list(void *data) menu_its = info_menu_its; +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _info_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif for (idx = 0; idx < sizeof(info_menu_its) / sizeof(struct _info_menu_item); idx++) { Info_Item_Data *id = calloc(sizeof(Info_Item_Data), 1); if (id) { @@ -193,6 +213,14 @@ Evas_Object *_create_info_list(void *data) } elm_genlist_item_class_free(itc); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _info_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif g_info_genlist = genlist; elm_object_part_content_set(layout, "elm.genlist", genlist); diff --git a/src/setting-language.c b/src/setting-language.c index b6995c9..2dba8a5 100644 --- a/src/setting-language.c +++ b/src/setting-language.c @@ -310,6 +310,16 @@ static void _lang_gl_del(void *data, Evas_Object *obj) free(id); } +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_BUTTON_LANGUAGE")); + return strdup(buf); +} +#endif Evas_Object *_create_lang_list(void *data) { DBG("_create_lang_list:clear"); @@ -349,6 +359,16 @@ Evas_Object *_create_lang_list(void *data) eext_rotary_object_event_activated_set(circle_genlist, EINA_TRUE); #endif +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _lang_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif menu_its = lang_menu_its; Eina_List *lang_list = _get_language_list(); @@ -405,6 +425,14 @@ Evas_Object *_create_lang_list(void *data) elm_genlist_item_class_free(itc); elm_genlist_item_class_free(itc_1line); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _lang_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif elm_object_part_content_set(layout, "elm.genlist", genlist); return layout; diff --git a/src/setting-motion.c b/src/setting-motion.c index b835d8b..a18157a 100644 --- a/src/setting-motion.c +++ b/src/setting-motion.c @@ -341,6 +341,17 @@ static void _motion_gl_del(void *data, Evas_Object *obj) free(id); } +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_WMGR_HEADER_MOTIONS")); + return strdup(buf); +} +#endif + Evas_Object *_create_motion_list(void *data) { appdata *ad = data; @@ -373,6 +384,16 @@ Evas_Object *_create_motion_list(void *data) elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); menu_its = motion_menu_its; +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _motion_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif char *val = NULL; @@ -399,6 +420,14 @@ Evas_Object *_create_motion_list(void *data) elm_genlist_item_class_free(itc); elm_genlist_item_class_free(itc_wake_up); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _motion_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif motion_data.g_motion_genlist = genlist; elm_object_part_content_set(layout, "elm.genlist", genlist); diff --git a/src/setting-notification.c b/src/setting-notification.c index 884dfa5..5d08c14 100644 --- a/src/setting-notification.c +++ b/src/setting-notification.c @@ -17,6 +17,17 @@ static struct _noti_data g_noti_data; static bool is_called_myself; +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", "Notification"); + return strdup(buf); +} +#endif + void _initialize_noti() { is_called_myself = false; @@ -138,6 +149,16 @@ Evas_Object *_create_noti_list(void *data) menu_its = noti_menu_its; +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _noti_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif #if 0 device_info_h *device_info = NULL; bundle *b = NULL; @@ -162,7 +183,14 @@ Evas_Object *_create_noti_list(void *data) ad); } } - elm_genlist_item_class_free(itc); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _noti_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif g_noti_data.g_noti_genlist = genlist; diff --git a/src/setting-privacy.c b/src/setting-privacy.c index 53dbf38..bcdefcf 100644 --- a/src/setting-privacy.c +++ b/src/setting-privacy.c @@ -339,6 +339,16 @@ static void _privacy_help_cb(void *data, Evas_Object *obj, void *event_info) _create_help_popup(ad); } +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", "Lock screen"); + return strdup(buf); +} +#endif Evas_Object *create_privacy_list(void *data) { appdata *ad = data; @@ -375,6 +385,16 @@ Evas_Object *create_privacy_list(void *data) menu_list = privacy_menu_list; +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _gl_privacy_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif for (idx = 0; idx < sizeof(privacy_menu_list) / sizeof(struct _privacy_menu_item); idx++) { if (idx == 0) { itc = itc_2text; @@ -400,6 +420,14 @@ Evas_Object *create_privacy_list(void *data) elm_genlist_item_class_free(itc_1text); itc = NULL; +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _gl_privacy_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif g_privacy_genlist = genlist; elm_object_part_content_set(layout, "elm.genlist", genlist); diff --git a/src/setting-safety.c b/src/setting-safety.c index b99ed0a..b84dfa9 100644 --- a/src/setting-safety.c +++ b/src/setting-safety.c @@ -258,6 +258,16 @@ static void _gl_safety_del(void *data, Evas_Object *obj) } } +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", "Safety"); + return strdup(buf); +} +#endif Evas_Object *create_safety_list(void *data) { DBG("create_safety_list() is called."); @@ -302,6 +312,16 @@ Evas_Object *create_safety_list(void *data) menu_list = safety_menu_list; +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _gl_safety_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif int count = 0; count = sizeof(safety_menu_list) / sizeof(struct _safety_menu_item); @@ -342,6 +362,14 @@ Evas_Object *create_safety_list(void *data) elm_genlist_item_class_free(itc_1text_1check); elm_genlist_item_class_free(itc_1text); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _gl_safety_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif elm_object_part_content_set(layout, "elm.genlist", genlist); return layout; diff --git a/src/setting-sound.c b/src/setting-sound.c index 365ba6a..8570bbd 100644 --- a/src/setting-sound.c +++ b/src/setting-sound.c @@ -116,6 +116,16 @@ static void pm_state_vconf_changed_cb(keynode_t *key, void *data); static void _vibration_gl_cb(void *data, Evas_Object *obj, void *event_info); static void stop_wav(); +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_OPT_SOUND_ABB2")); + return strdup(buf); +} +#endif void _initialize() { @@ -308,7 +318,11 @@ void _show_volume_list(void *data) DBG("%s", "volume cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); evas_object_event_callback_add(genlist, EVAS_CALLBACK_DEL, _clear_volume_cb, ad); } @@ -501,6 +515,7 @@ Evas_Object *_gl_sound_check_get(void *data, Evas_Object *obj, const char *part) return check; } + Evas_Object *_create_sound_list(void *data) { appdata *ad = data; @@ -541,6 +556,16 @@ Evas_Object *_create_sound_list(void *data) eext_rotary_object_event_activated_set(circle_genlist, EINA_TRUE); #endif +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _sound_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif menu_its = sound_menu_its; @@ -571,6 +596,14 @@ Evas_Object *_create_sound_list(void *data) } } } +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _sound_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif elm_genlist_item_class_free(itc_1text); elm_genlist_item_class_free(itc); elm_genlist_item_class_free(itc_touch_snd); @@ -770,6 +803,16 @@ Eina_Bool _sound_mode_back_cb(void *data, Elm_Object_Item *it) return EINA_TRUE; } +#ifdef O_TYPE +static char * +_gl_menu_sound_mode_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_OPT_SOUND_MODE_ABB")); + return strdup(buf); +} +#endif void _show_sound_mode_list(void *data) { appdata *ad = data; @@ -803,6 +846,16 @@ void _show_sound_mode_list(void *data) eext_rotary_object_event_activated_set(circle_genlist, EINA_TRUE); #endif +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_sound_mode_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _sound_mode_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif Item_Data *id = calloc(sizeof(Item_Data), 1); if (id) { id->index = 0; @@ -833,11 +886,23 @@ void _show_sound_mode_list(void *data) elm_genlist_item_class_free(itc); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _sound_mode_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif g_sound_mode_genlist = genlist; elm_object_part_content_set(layout, "elm.genlist", genlist); - +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#endif + elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); elm_naviframe_item_pop_cb_set(nf_it, _sound_mode_back_cb, ad); } diff --git a/src/setting-volume.c b/src/setting-volume.c index 7882ae6..6eeaac5 100644 --- a/src/setting-volume.c +++ b/src/setting-volume.c @@ -351,6 +351,17 @@ static void _volumn_gl_del(void *data, Evas_Object *obj) free(id); } +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("IDS_ST_OPT_VOLUME")); + return strdup(buf); +} +#endif + Evas_Object *_create_volume_list(void *data) { appdata *ad = data; @@ -379,6 +390,16 @@ Evas_Object *_create_volume_list(void *data) eext_rotary_object_event_activated_set(circle_genlist, EINA_TRUE); #endif +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _volumn_gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif menu_its = volume_menu_its; for (idx = 0; idx < VOLUMN_ITEM_COUNT; idx++) { @@ -396,6 +417,14 @@ Evas_Object *_create_volume_list(void *data) id->item = item; } } +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _volumn_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif elm_genlist_item_class_free(itc); return genlist; diff --git a/src/setting.c b/src/setting.c index 6a0bc3b..7f04938 100644 --- a/src/setting.c +++ b/src/setting.c @@ -185,10 +185,18 @@ void clock_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "clock cb - layout is null"); return; } - nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); + +#ifdef _CIRCLE + const char* navi_title = _("IDS_ST_BUTTON_CLOCK"); + Eina_Bool title_flag = EINA_TRUE; +#else + const char* navi_title = NULL; + Eina_Bool title_flag = FALSE; +#endif + nf_it = elm_naviframe_item_push(ad->nf, navi_title, NULL, NULL, layout, NULL); evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _clear_clock_cb, ad); /*elm_naviframe_item_pop_cb_set(nf_it, _clear_clock_cb, ad); */ - elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); + elm_naviframe_item_title_enabled_set(nf_it, title_flag, EINA_FALSE); elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); is_running_clock = 1; @@ -219,7 +227,11 @@ void notification_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "notification_cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif elm_naviframe_item_pop_cb_set(nf_it, _clear_noti_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -250,10 +262,17 @@ void homescreen_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "homescreen cb - layout is null"); return; } - nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#ifdef _CIRCLE + const char* navi_title = _("IDS_ST_BODY_WALLPAPERS"); + Eina_Bool title_flag = EINA_TRUE; +#else + const char* navi_title = NULL; + Eina_Bool title_flag = FALSE; +#endif + nf_it = elm_naviframe_item_push(ad->nf, navi_title, NULL, NULL, layout, NULL); /*elm_naviframe_item_pop_cb_set(nf_it, _clear_homescreen_cb, ad); */ evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _clear_homescreen_cb, ad); - elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); + elm_naviframe_item_title_enabled_set(nf_it, title_flag, EINA_FALSE); elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); @@ -284,7 +303,11 @@ void sound_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "sound cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif elm_naviframe_item_pop_cb_set(nf_it, _clear_sound_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -316,7 +339,11 @@ void volume_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "volume cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif /*elm_naviframe_item_pop_cb_set(nf_it, _clear_volume_cb, ad); */ elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -348,7 +375,12 @@ void display_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "display cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif + /*elm_naviframe_item_pop_cb_set(nf_it, _clear_display_cb, ad); */ evas_object_event_callback_add(genlist, EVAS_CALLBACK_DEL, _clear_display_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -414,10 +446,17 @@ void battery_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "battery cb - layout is null"); return; } - nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#ifdef _CIRCLE + const char* navi_title = _("IDS_ST_BODY_BATTERY_ABB"); + Eina_Bool title_flag = EINA_TRUE; +#else + const char* navi_title = NULL; + Eina_Bool title_flag = FALSE; +#endif + nf_it = elm_naviframe_item_push(ad->nf, navi_title, NULL, NULL, layout, NULL); /*elm_naviframe_item_pop_cb_set(nf_it, _clear_battery_list_cb, ad); */ evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _clear_battery_cb, ad); - elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); + elm_naviframe_item_title_enabled_set(nf_it, title_flag, EINA_FALSE); ad->MENU_TYPE = SETTING_BATTERY; } @@ -446,7 +485,11 @@ void bluetooth_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "bluetooth cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif /*elm_naviframe_item_pop_cb_set(nf_it, _clear_bluetooth_cb, ad); */ elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -475,7 +518,11 @@ void location_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "bluetooth cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif /*elm_naviframe_item_pop_cb_set(nf_it, _clear_bluetooth_cb, ad); */ elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -504,7 +551,11 @@ void motion_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "motion cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif elm_naviframe_item_pop_cb_set(nf_it, _clear_motion_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -533,8 +584,12 @@ void lockscreen_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "lockscreen cb - genlist is null"); return; } - +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#endif + elm_naviframe_item_pop_cb_set(nf_it, clear_privacy_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -568,7 +623,11 @@ void double_pressing_cb(void *data, Evas_Object *obj, void *event_info) return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#endif evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, clear_double_app_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -614,7 +673,11 @@ void language_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "language cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif elm_naviframe_item_pop_cb_set(nf_it, _clear_lang_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -645,7 +708,11 @@ void safety_cb(void *data, Evas_Object *obj, void *event_info) return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL); +#endif elm_naviframe_item_pop_cb_set(nf_it, clear_safety_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -693,7 +760,11 @@ void gear_info_cb(void *data, Evas_Object *obj, void *event_info) DBG("%s", "info cb - genlist is null"); return; } +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL); +#endif elm_naviframe_item_pop_cb_set(nf_it, _clear_info_cb, ad); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); @@ -968,6 +1039,17 @@ static Evas_Object *_gl_indicator_get(void *data, Evas_Object *obj, const char * return layout; } +#ifdef O_TYPE +static char * +_gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", "Setting"); + return strdup(buf); +} +#endif + static Evas_Object *_create_mainlist_winset(Evas_Object *parent, appdata *ad) { Evas_Object *genlist = NULL; @@ -1001,6 +1083,18 @@ static Evas_Object *_create_mainlist_winset(Evas_Object *parent, appdata *ad) elm_genlist_realization_mode_set(genlist, EINA_TRUE); elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _gl_del; + + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); +#endif + +#ifndef _CIRCLE Item_Data *id_indi = calloc(sizeof(Item_Data), 1); if (id_indi) { id_indi->index = idx; @@ -1013,6 +1107,7 @@ static Evas_Object *_create_mainlist_winset(Evas_Object *parent, appdata *ad) NULL, NULL); elm_genlist_item_select_mode_set(id_indi->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); } +#endif #if 0 vconf_get_bool(VCONFKEY_SETAPPL_EMERGENCY_STATUS_BOOL, &is_emergency); @@ -1045,6 +1140,15 @@ static Evas_Object *_create_mainlist_winset(Evas_Object *parent, appdata *ad) ad); } } +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif + elm_genlist_item_class_free(itc); elm_genlist_item_class_free(itc_tmp); @@ -1116,7 +1220,11 @@ static void _create_view_layout(appdata *ad) ea_object_event_callback_add(ad->nf, EA_CALLBACK_BACK, _naviframe_back_cb, ad); ea_object_event_callback_add(ad->nf, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL); +#ifdef _CIRCLE + nf_it = elm_naviframe_item_push(ad->nf, NULL, btn, NULL, genlist, "empty"); +#else nf_it = elm_naviframe_item_push(ad->nf, NULL, btn, NULL, genlist, NULL); +#endif elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE); elm_naviframe_item_pop_cb_set(nf_it, _pop_cb, ad); /* ad->win_main */ @@ -1524,6 +1632,16 @@ static void _location_gl_del(void *data, Evas_Object *obj) +#ifdef O_TYPE +static char * +_gl_menu_location_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + char buf[1024]; + + snprintf(buf, 1023, "%s", _("Location")); + return strdup(buf); +} +#endif Evas_Object *_create_location_list(void *data) { @@ -1553,11 +1671,14 @@ Evas_Object *_create_location_list(void *data) elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); #ifdef _CIRCLE - Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); - padding->item_style = "padding"; - padding->func.del = _location_gl_del; + Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new(); + title_item ->func.text_get = _gl_menu_location_title_text_get; + title_item->item_style = "title"; + title_item->func.del = _location_gl_del; - elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_append(genlist, title_item, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + + elm_genlist_item_class_free(title_item); #endif menu_its = location_menu_its; @@ -1584,6 +1705,14 @@ Evas_Object *_create_location_list(void *data) } elm_genlist_item_class_free(itc); +#ifdef _CIRCLE + Elm_Genlist_Item_Class *padding = elm_genlist_item_class_new(); + padding->item_style = "padding"; + padding->func.del = _location_gl_del; + + elm_genlist_item_append(genlist, padding, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_class_free(padding); +#endif location_genlist = genlist; elm_object_part_content_set(layout, "elm.genlist", genlist); -- 2.7.4