X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fsetting-main.c;h=57e933c05fad77a238a24acdf9dc56bd4f9e96ae;hb=05b96a8c8688a86072866f0bb5143c8bb4647436;hp=292fb45ad8dcfc092324235c2e968ad69601fd4b;hpb=dd9b0210747a66e2d22031aef1d425835d7a2e25;p=apps%2Fcore%2Fpreloaded%2Fsettings.git diff --git a/src/setting-main.c b/src/setting-main.c index 292fb45..57e933c 100755 --- a/src/setting-main.c +++ b/src/setting-main.c @@ -562,6 +562,8 @@ void __gl_realized(void *data, Evas_Object *obj, void *event_info) elm_object_item_signal_emit(item, "elm,state,bottom", ""); } else if (list_item->group_style == SETTING_GROUP_STYLE_CENTER) { elm_object_item_signal_emit(item, "elm,state,center", ""); + } else if (list_item->group_style == SETTING_GROUP_STYLE_NONE) { + /* do nothing */ } else { SETTING_TRACE_ERROR("list_item->group_style is wrong"); } @@ -742,12 +744,21 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_ __BACK_POINTER_SET(ad->data_moreConnect); /* if has item , change the last item_date to SETTING_GROUP_STYLE_CENTER*/ - if (item_data) { + if (item_data && index > 1) { item_data->group_style = SETTING_GROUP_STYLE_CENTER; } ad->data_moreConnect->group_style = SETTING_GROUP_STYLE_BOTTOM; + + item_data = ad->data_moreConnect; + index++; } #endif + + if (index == 1) { + item_data->group_style = SETTING_GROUP_STYLE_NONE; + } else if (index == 2) { + item_data->group_style = SETTING_GROUP_STYLE_BOTTOM; + } SETTING_TRACE_END; } @@ -945,12 +956,20 @@ void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object __BACK_POINTER_SET(ad->data_moreSystem); /* if has item , change the last item_date to SETTING_GROUP_STYLE_CENTER*/ - if (item_data) { + if (item_data && index > 1) { item_data->group_style = SETTING_GROUP_STYLE_CENTER; } ad->data_moreSystem->group_style = SETTING_GROUP_STYLE_BOTTOM; + + item_data = ad->data_moreSystem; + index++; } #endif + if (index == 1) { + item_data->group_style = SETTING_GROUP_STYLE_NONE; + } else if (index == 2) { + item_data->group_style = SETTING_GROUP_STYLE_BOTTOM; + } } static void __load_system_level0_list(void *data) @@ -988,7 +1007,7 @@ static void __load_applications_menu_list(void *data, int i, j; Setting_GenGroupItem_Data *item_data = NULL; - + int index = 0; for (i = 0; i < setting_cfg_get_category_length(); i++) { if (safeStrCmp (setting_cfg_get_category_name(i), KeyStr_Applications)) @@ -1033,10 +1052,21 @@ static void __load_applications_menu_list(void *data, } else { item_data->group_style = SETTING_GROUP_STYLE_CENTER; } + + if (index == 0) { + item_data->group_style = SETTING_GROUP_STYLE_TOP; + } + index++; } } } + if (index == 1) { + item_data->group_style = SETTING_GROUP_STYLE_NONE; + } else if (index == 2) { + item_data->group_style = SETTING_GROUP_STYLE_BOTTOM; + } + SETTING_TRACE_END; } @@ -1276,7 +1306,8 @@ static void __load_downloaded_apps_menu_list(void *data, ELM_GENLIST_ITEM_NONE, KeyStr_DownloadedAPPs, NULL); - + get_downloadapp_list(ad); + //SETTING_TRACE("Exit %s with return[%d]",__FUNCTION__, downloaded_apps_num); SETTING_TRACE_END; } @@ -1441,7 +1472,7 @@ static bool __setting_create_main_view(void *data) elm_object_content_set(conform, ad->ly_main); evas_object_show(conform); - //elm_win_conformant_set(ad->win_main, EINA_TRUE); + elm_win_conformant_set(ad->win_main, EINA_TRUE); ad->conformant = conform; @@ -1869,8 +1900,10 @@ void setting_main_destroy_ug_cb(ui_gadget_h ug, void *priv) void setting_main_result_ug_cb(ui_gadget_h ug, service_h service, void *priv) { - if (!priv) - return; + if (!priv) return; + + // set default local automatically + set_defaultLangICU(); } void setting_main_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode, @@ -2099,7 +2132,6 @@ setting_main_click_list_plugin_cb(void *data, Evas_Object *obj, elm_genlist_item_selected_set(item, EINA_FALSE); setting_main_appdata *ad = data; -#ifdef PLUGIN if (ad->plugin_path) { PluginNode* plugin_node = setting_plugin_create(); @@ -2117,7 +2149,6 @@ setting_main_click_list_plugin_cb(void *data, Evas_Object *obj, } #endif } -#endif } /**