X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fwidget%2Fmf-gengrid.c;h=24d6d40a40fc75fa4fcc31e58e2eb45904ae43bc;hb=0fb829505292ade55df961779afdbf7e2adbbcd8;hp=3e53e80eb168c9750fcc8445b9b1c90df9c37588;hpb=788c17380d55d44767097eb4e07e903bbf9e37c0;p=apps%2Fcore%2Fpreloaded%2Fmyfiles.git diff --git a/src/widget/mf-gengrid.c b/src/widget/mf-gengrid.c index 3e53e80..24d6d40 100644 --- a/src/widget/mf-gengrid.c +++ b/src/widget/mf-gengrid.c @@ -31,7 +31,7 @@ static inline void __mf_gengrid_get_thumbnail(mfItemData_s *params) { int error_code = 0; if (params->thumb_path == NULL) { - if (ecore_file_is_dir(params->m_ItemName->str)) { + if (mf_file_attr_is_dir(params->m_ItemName->str)) { if (params->ap->mf_Status.view_type == mf_view_root) { params->thumb_path = strdup(MF_ICON_THUMBNAIL_FOLDER); } else if (mf_fm_svc_wrapper_is_root_path(params->ap->mf_Status.path->str) == MYFILE_OTG) { @@ -76,7 +76,7 @@ static inline void __mf_gengrid_get_thumbnail(mfItemData_s *params) /*set default icon*/ fsFileType type = FILE_TYPE_NONE; type = mf_file_attr_get_file_type_by_mime(params->m_ItemName->str); - if (ecore_file_is_dir(params->m_ItemName->str)) { + if (mf_file_attr_is_dir(params->m_ItemName->str)) { if (mf_fm_svc_wrapper_is_root_path(params->ap->mf_Status.path->str) == MYFILE_OTG) { params->thumb_path = strdup(MF_ICON_EXTERNAL_DEVICE); } else { @@ -109,7 +109,7 @@ static void __mf_gengrid_icon_clicked(void *data, Evas_Object *obj, void *event_ Elm_Object_Item *item = (Elm_Object_Item *) event_info; int ret = 0; - if (ap->mf_Status.more == MORE_EDIT) + if (ap->mf_Status.more == MORE_EDIT || ap->mf_Status.more == MORE_SHARE_EDIT) return; if (item != NULL) { elm_gengrid_item_selected_set(item, EINA_FALSE); @@ -332,7 +332,7 @@ void mf_gengrid_item_select(void *data, Evas_Object *pGengrid, int *file_count, while (it) { itemData = elm_object_item_data_get(it); if (itemData->m_checked) { - if (ecore_file_is_dir(itemData->m_ItemName->str)) { + if (mf_file_attr_is_dir(itemData->m_ItemName->str)) { //bool systemfolder = FALSE; ap->mf_Status.flagFolderSelect = TRUE; (*dir_count)++; @@ -401,39 +401,13 @@ static Evas_Object *__mf_gengrid_item_icon_get(void *data, Evas_Object *obj, con mf_retvm_if(ap == NULL, NULL, "ap is NULL"); if (!strcmp(part, "elm.swallow.icon")) { - Evas_Object *bg = elm_bg_add(obj); __mf_gengrid_get_thumbnail(params); - elm_bg_load_size_set(bg, MF_ICON_SIZE, MF_ICON_SIZE); - if (bg) { - elm_bg_file_set(bg, params->thumb_path, NULL); - evas_object_size_hint_max_set(bg, MF_ICON_SIZE, MF_ICON_SIZE); - evas_object_size_hint_aspect_set(bg, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(bg); - - } - fsFileType type = FILE_TYPE_NONE; - type = mf_file_attr_get_file_type_by_mime(params->m_ItemName->str); - if (type == FILE_TYPE_VIDEO) { - Evas_Object *layout = NULL;; - layout = elm_layout_add(obj); - elm_object_focus_set(layout, EINA_FALSE); - elm_layout_file_set(layout, EDJ_NAME, GRP_THUMBNAIL_ONLY); - elm_object_part_content_set(layout, "thumbnail", bg); - - const char *play_icon_path = MF_ICON_THUMBNAIL_VIDEO_PLAY; - Evas_Object *play_icon = NULL; - play_icon = elm_image_add(obj); - elm_object_focus_set(play_icon, EINA_FALSE); - elm_image_file_set(play_icon, play_icon_path, NULL); - evas_object_show(play_icon); - elm_object_part_content_set(layout, "video_play", play_icon); - return layout; - - } - return bg; + Evas_Object *icon = elm_image_add(obj); + elm_image_file_set(icon, params->thumb_path, NULL); + elm_image_aspect_fixed_set(icon, EINA_FALSE); + evas_object_show(icon); + return icon; } else if (!strcmp(part, "elm.swallow.block") && params->ap->mf_Status.more == MORE_EDIT) { Evas_Object *layout = elm_layout_add(obj); elm_layout_theme_set(layout, "gengrid", "item", "block/default"); @@ -528,12 +502,31 @@ static void __mf_gengrid_item_del(void *data, Evas_Object * obj) -Evas_Object *mf_gengrid_create_grid (Evas_Object *parent) +void mf_gengrid_gen_style_set() +{ + gic.item_style = "default_gridtext"; + gic.func.text_get = __mf_gengrid_item_label_get; + gic.func.content_get = __mf_gengrid_item_icon_get; + gic.func.state_get = NULL; + gic.func.del = __mf_gengrid_item_del; +} + +Evas_Object *mf_gengrid_create(Evas_Object *parent) { MF_TRACE_BEGIN; mf_retvm_if(parent == NULL, NULL, "parent is NULL"); + Evas_Object *grid = NULL; + grid = mf_gengrid_create_grid(parent); + mf_gengrid_gen_style_set(); + return grid; +} +Evas_Object *mf_gengrid_create_grid (Evas_Object *parent) +{ + MF_TRACE_BEGIN; + mf_retvm_if(parent == NULL, NULL, "parent is NULL"); + Evas_Object *grid = NULL; grid = elm_gengrid_add(parent); evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -543,13 +536,6 @@ Evas_Object *mf_gengrid_create_grid (Evas_Object *parent) elm_gengrid_horizontal_set(grid, EINA_FALSE); elm_scroller_bounce_set(grid, EINA_FALSE, EINA_TRUE); elm_gengrid_multi_select_set(grid, EINA_TRUE); - - gic.item_style = "default_gridtext"; - gic.func.text_get = __mf_gengrid_item_label_get; - gic.func.content_get = __mf_gengrid_item_icon_get; - gic.func.state_get = NULL; - gic.func.del = __mf_gengrid_item_del; - evas_object_show(grid); return grid; } @@ -607,15 +593,11 @@ Evas_Object *mf_gengrid_create_list(void *data, Evas_Object *parent) dir_list = ap->mf_FileOperation.folder_list; } - gengrid = mf_gengrid_create_grid(parent); + gengrid = mf_gengrid_create(parent); evas_object_smart_callback_add(gengrid, "longpressed", __mf_gengrid_thumbs_longpressed, ap); - if (MF_SCALE_FACTORY == 1) { - elm_gengrid_item_size_set(gengrid, MF_HD_GENGRID_ITEM_WIDTH, MF_HD_GENGRID_ITEM_HEIGTH); - } else { - elm_gengrid_item_size_set(gengrid, MF_WVGA_GENGRID_ITEM_WIDTH, MF_WVGA_GENGRID_ITEM_HEIGTH); - } + elm_gengrid_item_size_set(gengrid, MF_HD_GENGRID_ITEM_WIDTH, MF_HD_GENGRID_ITEM_HEIGTH); if (gengrid == NULL) { return NULL;