From: Jisung Ahn Date: Fri, 28 Dec 2012 04:29:44 +0000 (+0900) Subject: merge master X-Git-Tag: 2.1b_release~3^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c275633a1cfcbf61f0b23b0d6aa9faec0c99d43;p=apps%2Fhome%2Fug-image-viewer-efl.git merge master Change-Id: Iedf21e9c047c416f562bf647b67e4004f7e634fa --- diff --git a/common/src/ivug-db.c b/common/src/ivug-db.c index cfca679..d9b6ba4 100755 --- a/common/src/ivug-db.c +++ b/common/src/ivug-db.c @@ -326,7 +326,7 @@ media_handle ivug_db_get_file_handle(const char* filepath) return NULL; char buf[1024] = {0,}; - snprintf(buf, sizeof(buf), "MEDIA_PATH=\'%s\'", filepath); + snprintf(buf, sizeof(buf), "MEDIA_PATH=\"%s\"", filepath); media_handle m_handle = NULL; @@ -382,7 +382,7 @@ media_handle ivug_db_get_folder_handle(const char* folderpath) filter_handle media_filter = NULL; char buf[1024] = {0,}; - snprintf(buf, sizeof(buf), "FOLDER_PATH=\'%s\'", folderpath); + snprintf(buf, sizeof(buf), "FOLDER_PATH=\"%s\"", folderpath); media_handle m_handle = NULL; @@ -680,7 +680,7 @@ tag_handle ivug_db_get_tag_handle(const char* tagname) filter_handle media_filter = NULL; char buf[1024] = {0,}; - snprintf(buf, sizeof(buf), "TAG_NAME=\'%s\'", tagname); + snprintf(buf, sizeof(buf), "TAG_NAME=\"%s\"", tagname); tag_handle t_handle = NULL; diff --git a/main/layout/ivug-crop-view.edc b/main/layout/ivug-crop-view.edc index c93ff08..9e5f663 100755 --- a/main/layout/ivug-crop-view.edc +++ b/main/layout/ivug-crop-view.edc @@ -22,7 +22,7 @@ #define PROGRESSBAR_WIDTH 100 #define PROGRESSBAR_HEIGHT 100 -#define NOTIFY_HEIGHT 40 +#define NOTIFY_HEIGHT 47 collections { group { diff --git a/main/layout/ivug-setas.edc b/main/layout/ivug-setas.edc index a60a67b..f5ac4b6 100755 --- a/main/layout/ivug-setas.edc +++ b/main/layout/ivug-setas.edc @@ -18,6 +18,8 @@ #define PADDING_VISIBILITY 0 +#define NOTIFY_HEIGHT 47 + collections { #define PROGRESSBAR_WIDTH 100 @@ -39,6 +41,47 @@ collections { } } + part { name: "setasview.contents"; + type: RECT; + scale: 1; + repeat_events: 0; + description { state: "default" 0.0; + color: 0 0 0 100; + align: 0.0 0.0; + rel1.relative: 0.0 0.0; + rel1.to_x: "bg"; + rel1.to_y: "bg"; + rel1.offset: 0 0; + rel2.relative: 1.0 0.0; + rel2.to_x: "bg"; + rel2.to_y: "toolbar_bg"; + rel2.offset: 0 -NOTIFY_HEIGHT; //for notify + visible: 1; + } + } + + part { name: "setasview.contents.swallow"; + type: SWALLOW; + scale: 1; + repeat_events: 0; + description { state: "default" 0.0; + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; } + visible: 1; + } + } + + part { name: "setasview.contents.swallow.notify"; + type: RECT; + scale: 1; + repeat_events: 0; + description { state: "default" 0.0; + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; offset: 0 NOTIFY_HEIGHT;} + visible: 1; + } + } + part{ name: "setasview.photocam"; type: SWALLOW; @@ -49,8 +92,8 @@ collections { description { state: "default" 0.0; visible: 1; - rel1 { relative: 0 0; to:bg; } - rel2 { relative: 1 1; to:bg; } + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; } } } @@ -64,8 +107,8 @@ collections { state: "default" 0.0; align: 0.5 0.5; visible: 1; - rel1 { relative: 0 0; to:bg; } - rel2 { relative: 1 1; to:bg; } + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; } } } @@ -110,26 +153,8 @@ collections { description { state: "default" 0.0; visible: 0; - rel1 { relative: 0 0; to:bg; } - rel2 { relative: 1 1; to:bg; } - } - } - - part { name: "setasview.contents"; - type: SWALLOW; - scale: 1; - repeat_events: 0; - description { state: "default" 0.0; - color: 255 0 0 100; - align: 0.0 0.0; - rel1.relative: 0.0 0.0; - rel1.to_x: "bg"; - rel1.to_y: "bg"; - rel1.offset: 0 0; - rel2.relative: 1.0 0.0; - rel2.to_x: "bg"; - rel2.to_y: "toolbar_bg"; - visible: 1; + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; } } } @@ -161,145 +186,3 @@ collections { } } - - -collections { -#define BTN_SET_CALLER_IMAGE_WIDTH 86 -#define BTN_SET_CALLER_IMAGE_HEIGHT 86 -#if 1 - group { - name: "setas_view_btn"; - - images { - image: "00_winset_control_toolbar_bg.png" COMP; - } - - parts{ - part { - name: "base"; - type: RECT; - scale:1; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - } - } - part { name: "controlbar_bg"; - scale: 1; - description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 999999 CONTROLBAR_SMALL_HEIGHT_INC; - fixed: 0 1; - align: 0.0 1.0; - visible: 1; - rel1 { to: "base"; } - rel2 { to: "base"; } - //image.normal: "00_winset_control_toolbar_bg.png"; - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "controlbar_clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "controlbar_bg"; - rel2.to: "controlbar_bg"; - visible: 1; - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "elm.prev_btn_bg"; - type: RECT; - scale: 1; - clip_to: "controlbar_clip"; - description { state: "default" 0.0; - min: 0 0; - fixed: 1 0; - align: 1.0 0.0; - rel1 { relative: 1.0 0.0; to: "controlbar_bg"; } - rel2.to: "controlbar_bg"; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0; - } - } - part { name: "elm.swallow.prev_btn"; - type: SWALLOW; - scale: 1; - clip_to: "controlbar_clip"; - description { state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "elm.prev_btn_bg"; - rel2.to: "elm.prev_btn_bg"; - } - } - part { name: "controlbar"; - type: SWALLOW; - scale: 1; - clip_to: "controlbar_clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "controlbar_bg"; - rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; } - visible: 1; - } - } - - part { - name: "selectioninfo"; - type: SWALLOW; - description { state: "default" 0.0; - fixed: 0 1; - align: 0.5 1.0; - rel1 { - relative: 0.0 0.0; to:"controlbar_bg"; - } - rel2 { - relative: 1.0 0.0; to:"controlbar_bg"; - } - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - } - - programs { - - program { - name: "hide_menu"; - signal: "elm,state,hide"; - source: "event"; - action: STATE_SET "hide" 0.0; - target: "controlbar_clip"; - target: "controlbar_bg"; - target: "selectioninfo"; - } - - program { - name: "show_menu"; - signal: "elm,state,show"; - source: "event"; - action: STATE_SET "default" 0.0; - target: "controlbar_clip"; - target: "controlbar_bg"; - target: "selectioninfo"; - } - } - } -} - diff --git a/main/res/images/01_Control icon/00_winset_btn_prev.png b/main/res/images/01_Control icon/00_winset_btn_prev.png deleted file mode 100644 index d45184d..0000000 Binary files a/main/res/images/01_Control icon/00_winset_btn_prev.png and /dev/null differ diff --git a/main/res/images/01_Control icon/01_controlbar_icon_trim.png b/main/res/images/01_Control icon/01_controlbar_icon_trim.png deleted file mode 100644 index 1cab618..0000000 Binary files a/main/res/images/01_Control icon/01_controlbar_icon_trim.png and /dev/null differ diff --git a/main/res/images/01_Control icon/01_controllbar_icon_close.png b/main/res/images/01_Control icon/01_controllbar_icon_close.png deleted file mode 100644 index 91b04e5..0000000 Binary files a/main/res/images/01_Control icon/01_controllbar_icon_close.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate left.png b/main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate left.png deleted file mode 100644 index 91e6ec2..0000000 Binary files a/main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate left.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate right.png b/main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate right.png deleted file mode 100644 index a7deebf..0000000 Binary files a/main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate right.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_1_controlbar_icon_detail.png b/main/res/images/01_Control icon/T01_1_controlbar_icon_detail.png deleted file mode 100644 index 9e746c8..0000000 Binary files a/main/res/images/01_Control icon/T01_1_controlbar_icon_detail.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_1_title_icon_device.png b/main/res/images/01_Control icon/T01_1_title_icon_device.png deleted file mode 100644 index 9c96403..0000000 Binary files a/main/res/images/01_Control icon/T01_1_title_icon_device.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_1_title_icon_set_as.png b/main/res/images/01_Control icon/T01_1_title_icon_set_as.png deleted file mode 100644 index 72b74da..0000000 Binary files a/main/res/images/01_Control icon/T01_1_title_icon_set_as.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_Option tray_Edit.png b/main/res/images/01_Control icon/T01_Option tray_Edit.png deleted file mode 100644 index a6aef95..0000000 Binary files a/main/res/images/01_Control icon/T01_Option tray_Edit.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_Title_icon_more.png b/main/res/images/01_Control icon/T01_Title_icon_more.png deleted file mode 100644 index 651c8e1..0000000 Binary files a/main/res/images/01_Control icon/T01_Title_icon_more.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_add.png b/main/res/images/01_Control icon/T01_controlbar_icon_add.png deleted file mode 100644 index e60bfb9..0000000 Binary files a/main/res/images/01_Control icon/T01_controlbar_icon_add.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_addtag.png b/main/res/images/01_Control icon/T01_controlbar_icon_addtag.png deleted file mode 100644 index a554ce3..0000000 Binary files a/main/res/images/01_Control icon/T01_controlbar_icon_addtag.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_delete.png b/main/res/images/01_Control icon/T01_controlbar_icon_delete.png deleted file mode 100644 index c13897d..0000000 Binary files a/main/res/images/01_Control icon/T01_controlbar_icon_delete.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_save.png b/main/res/images/01_Control icon/T01_controlbar_icon_save.png deleted file mode 100644 index 39baa6a..0000000 Binary files a/main/res/images/01_Control icon/T01_controlbar_icon_save.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_share.png b/main/res/images/01_Control icon/T01_controlbar_icon_share.png deleted file mode 100644 index f21b00c..0000000 Binary files a/main/res/images/01_Control icon/T01_controlbar_icon_share.png and /dev/null differ diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_slideshow.png b/main/res/images/01_Control icon/T01_controlbar_icon_slideshow.png deleted file mode 100644 index 79c2ebd..0000000 Binary files a/main/res/images/01_Control icon/T01_controlbar_icon_slideshow.png and /dev/null differ diff --git a/main/src/control/ivug-parameter.c b/main/src/control/ivug-parameter.c index f2c9471..fe8b8e2 100755 --- a/main/src/control/ivug-parameter.c +++ b/main/src/control/ivug-parameter.c @@ -122,10 +122,7 @@ _get_view_mode(ivug_parameter* data, const char* val) } else if(strncmp(val, IVUG_BUNDLE_VALUE_VIEW_MODE_SLIDESHOW, len) == 0) { - if(data->view_by != IVUG_VIEW_BY_ALL && - data->view_by != IVUG_VIEW_BY_FAVORITES && - data->view_by != IVUG_VIEW_BY_TAG && - data->view_by != IVUG_VIEW_BY_PLACES) + if(data->view_by == IVUG_VIEW_BY_INVAILD) { data->view_by = IVUG_VIEW_BY_FOLDER; } @@ -710,6 +707,10 @@ Filter_struct *ivug_param_create_filter(const ivug_parameter *param) filter_str->sort_type = param->sort_type; filter_str->index = param->start_index; filter_str->selected_list = param->selected_list; + if(param->filepath) + { + filter_str->filepath = strdup(param->filepath); + } if(filter_str->type == FILTER_DB) { diff --git a/main/src/include/ivug-main-view.h b/main/src/include/ivug-main-view.h index a7c6ca8..870a998 100755 --- a/main/src/include/ivug-main-view.h +++ b/main/src/include/ivug-main-view.h @@ -158,7 +158,6 @@ typedef struct { //flag bool bShowMenu; - bool bUseNFC; ivug_mode mode; ivug_view_by view_by; @@ -177,7 +176,8 @@ typedef struct { // Slide show; SlideShow *ssHandle; - char *ss_music_name; + + bool bClickPrevent; } Ivug_MainView; diff --git a/main/src/include/ivug-slideshow-view.h b/main/src/include/ivug-slideshow-view.h old mode 100644 new mode 100755 index 8f98dd6..a2a2053 --- a/main/src/include/ivug-slideshow-view.h +++ b/main/src/include/ivug-slideshow-view.h @@ -35,6 +35,7 @@ typedef struct { Media_List *mList; Ecore_Event_Handler *keydown_handler; + Ecore_Idler *homekey_idler; // Slide show; Media_Item *ss_curItem; diff --git a/main/src/slider/ivug-slider-item.cpp b/main/src/slider/ivug-slider-item.cpp index 36f127c..f11e296 100755 --- a/main/src/slider/ivug-slider-item.cpp +++ b/main/src/slider/ivug-slider-item.cpp @@ -755,6 +755,11 @@ void ivug_slider_item_play(Slide_Item* si) IV_ASSERT(si != NULL ); Media_Data *mdata = ivug_medialist_get_data(si->mitem); + if(mdata == NULL) + { + MSG_SITEM_ERROR("current data is NULL"); + return; + } MSG_SITEM_HIGH("Start sitem. Type(%d) State(%d) %s", si->type, si->state, mdata->filepath); diff --git a/main/src/view/ivug-crop-view.cpp b/main/src/view/ivug-crop-view.cpp index ed3b1fa..e3a234c 100755 --- a/main/src/view/ivug-crop-view.cpp +++ b/main/src/view/ivug-crop-view.cpp @@ -37,10 +37,6 @@ #define CROP_EDJ_FILE EDJ_PATH"/ivug-crop-view.edj" -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png" - static void _on_layout_resized(void *data, Evas *e, Evas_Object *obj, void *event_info) { IvugCropView *pCropView = static_cast(data); diff --git a/main/src/view/ivug-details-view.c b/main/src/view/ivug-details-view.c index 0bd02e9..2172b4e 100755 --- a/main/src/view/ivug-details-view.c +++ b/main/src/view/ivug-details-view.c @@ -442,6 +442,16 @@ ivug_details_view_destroy(Ivug_DetailsView *pDetailsView) MSG_DETAIL_HIGH("Removing Details VIew"); // Layout removed automatically when popping from navi item. + if (pDetailsView->genlist) { + elm_genlist_clear(pDetailsView->genlist); + pDetailsView->genlist = NULL; + } + if(pDetailsView->bg) + { + evas_object_del(pDetailsView->bg); + pDetailsView->bg = NULL; + } + if(pDetailsView->layout) { evas_object_del(pDetailsView->layout); @@ -455,12 +465,21 @@ ivug_details_view_destroy(Ivug_DetailsView *pDetailsView) void ivug_details_view_update(Ivug_DetailsView *pDetailsView, const char *new_path) { + MSG_IVUG_HIGH("ivug_details_view_update"); + free(*(pDetailsView->filename)); *(pDetailsView->filename) = ecore_file_strip_ext(ecore_file_file_get(new_path)); free(*(pDetailsView->path)); *(pDetailsView->path) = strdup(new_path); - - elm_genlist_realized_items_update(pDetailsView->genlist); + //elm_genlist_realized_items_update(pDetailsView->genlist); + Elm_Object_Item *item = NULL; + if (pDetailsView->genlist) { + item = elm_genlist_first_item_get(pDetailsView->genlist); + while (item) { + elm_genlist_item_update(item); + item = elm_genlist_item_next_get(item); + } + } } diff --git a/main/src/view/ivug-main-view-toolbar.cpp b/main/src/view/ivug-main-view-toolbar.cpp index f587967..77c5d84 100755 --- a/main/src/view/ivug-main-view-toolbar.cpp +++ b/main/src/view/ivug-main-view-toolbar.cpp @@ -20,21 +20,6 @@ #include "ivug-slider.h" -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" - -#define ICON_PATH_DELETE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_delete.png" -#define ICON_PATH_SHARE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_share.png" -#define ICON_PATH_SETAS CONTROL_ICON_DIRECTORY_PATH"/T01_1_title_icon_set_as.png" -#define ICON_PATH_ADDTAG CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_addtag.png" -#define ICON_PATH_SLIDESHOW CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_slideshow.png" -#define ICON_PATH_EDITOR CONTROL_ICON_DIRECTORY_PATH"/T01_Option tray_Edit.png" -#define ICON_PATH_TRIM CONTROL_ICON_DIRECTORY_PATH"/01_controlbar_icon_trim.png" -#define ICON_PATH_INFO CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_detail.png" -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_CLOSE CONTROL_ICON_DIRECTORY_PATH"/01_controllbar_icon_close.png" -#define ICON_PATH_MORE CONTROL_ICON_DIRECTORY_PATH"/T01_Title_icon_more.png" - - #define MIME_TYPE_LEN (255) #define MIME_TYPE_3GPP "video/3gpp" #define PATH_CAMERA_LOCAL "/opt/usr/media/Camera" diff --git a/main/src/view/ivug-main-view.cpp b/main/src/view/ivug-main-view.cpp index 83e6580..4b9ea37 100755 --- a/main/src/view/ivug-main-view.cpp +++ b/main/src/view/ivug-main-view.cpp @@ -1512,12 +1512,6 @@ ivug_main_view_destroy(Ivug_MainView *pMainView) pMainView->popup = NULL; } - if (pMainView->ss_music_name) - { - free(pMainView->ss_music_name); - pMainView->ss_music_name = NULL; - } - if (pMainView->ext_ug) { MSG_MAIN_HIGH("External UG Destroy"); diff --git a/main/src/view/ivug-name-view.c b/main/src/view/ivug-name-view.c index 7fce7d9..d47ae6a 100755 --- a/main/src/view/ivug-name-view.c +++ b/main/src/view/ivug-name-view.c @@ -25,11 +25,6 @@ #include "ivug-util.h" -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" - -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_CLOSE CONTROL_ICON_DIRECTORY_PATH"/01_controllbar_icon_close.png" - static void _on_timeout_response(void *data, Evas_Object *obj, void *event_info) { diff --git a/main/src/view/ivug-setas-view-callerid.cpp b/main/src/view/ivug-setas-view-callerid.cpp index b329e66..89a9c87 100755 --- a/main/src/view/ivug-setas-view-callerid.cpp +++ b/main/src/view/ivug-setas-view-callerid.cpp @@ -42,19 +42,12 @@ #define SETAS_INTERVAL_TIME 0.1 #define SETAS_INTERVAL_TIME_FIRST_LOAD 0.3 -#define POPUP_ICON_DIRECTORY_PATH IMAGE_PATH"/Popup_icon" -#define ICON_PATH_ROTATE_LEFT POPUP_ICON_DIRECTORY_PATH"/T01_1_popup_icon_Rotate left.png" -#define ICON_PATH_ROTATE_RIGHT POPUP_ICON_DIRECTORY_PATH"/T01_1_popup_icon_Rotate right.png" - -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png" - #define CROP_BOX_INTERVAL_TIME 0.3 typedef struct { Evas_Object *layout; Evas_Object *notify; + Evas_Object *notify_area; Evas_Object *photocam; Evas_Object *contents_area; @@ -243,7 +236,10 @@ _on_photocam_loaded(void *data, Evas_Object *obj, void *event_info) evas_object_smart_callback_call(pSetAsData->layout, "loaded", NULL); - pSetAsData->notify = ivug_notify_static_create(pSetAsData->contents_area, IDS_CALLER_ID_NOTIFY, NOTIFY_ALIGN_BOTTOM); + pSetAsData->notify_area = const_cast(edje_object_part_object_get(_EDJ(pSetAsData->layout), + "setasview.contents.swallow.notify")); + + pSetAsData->notify = ivug_notify_static_create(pSetAsData->notify_area, IDS_CALLER_ID_NOTIFY, NOTIFY_ALIGN_BOTTOM); int x, y, w, h; ivug_image_region_get(pSetAsData->photocam, &x, &y, &w, &h); @@ -454,7 +450,7 @@ Evas_Object *_ivug_setas_callerid_create_layout(Evas_Object *parent) MSG_SETAS_ERROR("Cannot create contets_area."); } - elm_object_part_content_set(pSetAsData->layout, "setasview.contents", pSetAsData->contents_area); + elm_object_part_content_set(pSetAsData->layout, "setasview.contents.swallow", pSetAsData->contents_area); evas_object_data_set(pSetAsData->layout, "pSetAsData", pSetAsData); evas_object_event_callback_add(pSetAsData->layout, EVAS_CALLBACK_MOVE, _on_moved, pSetAsData->layout); diff --git a/main/src/view/ivug-setas-view-wallpaper.cpp b/main/src/view/ivug-setas-view-wallpaper.cpp index e00f52a..d793485 100755 --- a/main/src/view/ivug-setas-view-wallpaper.cpp +++ b/main/src/view/ivug-setas-view-wallpaper.cpp @@ -40,12 +40,6 @@ #define SETAS_INTERVAL_TIME 0.1 #define SETAS_INTERVAL_TIME_FIRST_LOAD 0.3 -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" -#define ICON_PATH_ROTATE_LEFT CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_Rotate left.png" -#define ICON_PATH_ROTATE_RIGHT CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_Rotate right.png" -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png" - typedef struct { Evas_Object *layout; Evas_Object *photocam; diff --git a/main/src/view/ivug-slideshow-view.cpp b/main/src/view/ivug-slideshow-view.cpp index f4e76e6..b45330a 100755 --- a/main/src/view/ivug-slideshow-view.cpp +++ b/main/src/view/ivug-slideshow-view.cpp @@ -93,6 +93,20 @@ static bool _destory_slideshow_and_ug(Ivug_SlideShowView *pSSView, return true; } +static Eina_Bool __stop_slideshow_cb(void *data) +{ + Ivug_SlideShowView *pSSView = (Ivug_SlideShowView *)data; + if (pSSView && (pSSView->ssHandle)) { + if(pSSView->homekey_idler) + { + ecore_idler_del(pSSView->homekey_idler); + pSSView->homekey_idler = NULL; + } + ivug_ss_stop(pSSView->ssHandle); + } + return ECORE_CALLBACK_CANCEL; +} + static Eina_Bool _on_key_down(void *user_data, int type, void *event) { if (!user_data) { @@ -112,7 +126,9 @@ static Eina_Bool _on_key_down(void *user_data, int type, void *event) { MSG_IMAGEVIEW_HIGH("Home key"); /*home key,we need to stop slideshow also*/ - ivug_ss_stop(pSSView->ssHandle); + if (pSSView->homekey_idler == NULL) { + pSSView->homekey_idler = ecore_idler_add(__stop_slideshow_cb, pSSView); + } } else if (!strcmp(key_event->keyname, KEY_POWER)) { @@ -446,6 +462,11 @@ ivug_slideshow_view_destroy(Ivug_SlideShowView *pSSView) ecore_event_handler_del(pSSView->keydown_handler); pSSView->keydown_handler = NULL; } + if(pSSView->homekey_idler) + { + ecore_idler_del(pSSView->homekey_idler); + pSSView->homekey_idler = NULL; + } if ( pSSView->mList ) { diff --git a/medialist/src/ivug-data-list.h b/medialist/src/ivug-data-list.h old mode 100644 new mode 100755 index 05e93bb..d2e765d --- a/medialist/src/ivug-data-list.h +++ b/medialist/src/ivug-data-list.h @@ -17,6 +17,7 @@ #ifndef __IVUG_DATA_LIST_H__ #define __IVUG_DATA_LIST_H__ +#include "ivug-define.h" #include "ivug-medialist.h" #ifdef __cplusplus