From f53c5280b1c2f131fa482b40307f8105cef4f802 Mon Sep 17 00:00:00 2001 From: Jisung Ahn Date: Fri, 28 Dec 2012 16:42:33 +0900 Subject: [PATCH] remove thumbnail show Change-Id: I32896f4c1d3114743c4b41beb1a8097fc232d206 --- main/src/slider/ivug-slider-item.cpp | 12 ++---------- main/src/view/ivug-crop-view.cpp | 6 ------ main/src/view/ivug-main-view-menu.cpp | 2 -- main/src/view/ivug-setas-view-callerid.cpp | 7 ------- main/src/view/ivug-setas-view-wallpaper.cpp | 7 ------- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/main/src/slider/ivug-slider-item.cpp b/main/src/slider/ivug-slider-item.cpp index f11e296..d78cdf9 100755 --- a/main/src/slider/ivug-slider-item.cpp +++ b/main/src/slider/ivug-slider-item.cpp @@ -31,7 +31,6 @@ #define IVUG_SLIDER_EDJ EDJ_PATH"/ivug-slider.edj" -#define USE_IMAGE_THUMBNAIL #define USE_VIDEO_THUMBNAIL @@ -210,11 +209,6 @@ static bool _set_mitem(Slide_Item* si, Media_Item *item) si->mitem = item; -#ifdef USE_IMAGE_THUMBNAIL -// Set thumbnail - _show_thumbnail(si, mdata->thumbnail_path); -#endif - si->type = _get_sitem_type(mdata->slide_type); if ( si->type == SITEM_TYPE_IMAGE ) @@ -399,10 +393,6 @@ _photocam_loaded_cb(void *data, Evas_Object *obj, void *event_info) evas_object_show(obj); //photocam show. -#ifdef USE_IMAGE_THUMBNAIL - _hide_thumbnail(si); -#endif - _call_user_callback(si); MSG_SITEM_HIGH("Photocam Pre-loaded. File=%s", ivug_get_filename(mdata->filepath)); @@ -726,6 +716,8 @@ ivug_slider_item_load(Slide_Item *si) MSG_SITEM_ERROR("Failed photocam to set file file=%s", path); si->state = SLIDE_STATE_ERROR; + _show_thumbnail(si, DEFAULT_THUMBNAIL_PATH); + _call_user_callback(si); return false; } diff --git a/main/src/view/ivug-crop-view.cpp b/main/src/view/ivug-crop-view.cpp index e3a234c..7c79260 100755 --- a/main/src/view/ivug-crop-view.cpp +++ b/main/src/view/ivug-crop-view.cpp @@ -224,12 +224,6 @@ void _on_preloaded(void *data, Evas_Object *obj, void *event_info) ecore_timer_del(pCropView->box_timer); pCropView->box_timer = ecore_timer_add(0.3, _on_box_timer_expired, data); - Evas_Object *object = elm_object_part_content_unset(pCropView->layout, "thumbnail"); - if(object != NULL) - { - evas_object_del(object); - } - pCropView->notify_area = const_cast(edje_object_part_object_get(_EDJ(pCropView->layout), "crop.contents.swallow.notify")); diff --git a/main/src/view/ivug-main-view-menu.cpp b/main/src/view/ivug-main-view-menu.cpp index c445de4..ec9f17a 100755 --- a/main/src/view/ivug-main-view-menu.cpp +++ b/main/src/view/ivug-main-view-menu.cpp @@ -646,8 +646,6 @@ _on_delete_selected(void *data, Evas_Object *obj, void *event_info) MSG_MAIN_HIGH("Removing current slide."); -// First, remove thumbnail and delete item - ivug_main_view_set_hide_timer(pMainView); _ivug_selectioninfo_create(pMainView, IDS_DELETED); diff --git a/main/src/view/ivug-setas-view-callerid.cpp b/main/src/view/ivug-setas-view-callerid.cpp index 89a9c87..b5912f5 100755 --- a/main/src/view/ivug-setas-view-callerid.cpp +++ b/main/src/view/ivug-setas-view-callerid.cpp @@ -223,13 +223,6 @@ _on_photocam_loaded(void *data, Evas_Object *obj, void *event_info) return; } -// Remove thumbnail - Evas_Object *object = elm_object_part_content_unset(pSetAsData->layout, "setasview.thumbnail"); - if(object != NULL) - { - evas_object_del(object); - } - MSG_SETAS_HIGH("Photocam loaded."); pSetAsData->box_timer = ecore_timer_add(CROP_BOX_INTERVAL_TIME, _put_scissorbox_timer_cb, (void *)pSetAsData->layout); diff --git a/main/src/view/ivug-setas-view-wallpaper.cpp b/main/src/view/ivug-setas-view-wallpaper.cpp index d793485..541a9ba 100755 --- a/main/src/view/ivug-setas-view-wallpaper.cpp +++ b/main/src/view/ivug-setas-view-wallpaper.cpp @@ -107,13 +107,6 @@ _on_photocam_loaded(void *data, Evas_Object *obj, void *event_info) return; } -// Remove thumbnail - Evas_Object *object = elm_object_part_content_unset(pSetAsData->layout, "setasview.thumbnail"); - if(object != NULL) - { - evas_object_del(object); - } - MSG_SETAS_HIGH("Photocam loaded."); elm_object_disabled_set(pSetAsData->btn_ok, EINA_FALSE); -- 2.7.4