From: shubham kumar Date: Fri, 14 Oct 2016 10:05:01 +0000 (+0530) Subject: [TSAM-8297] Rename issue Resolved X-Git-Tag: submit/tizen_mobile/20161014.132229~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F92299%2F1;p=profile%2Fmobile%2Fapps%2Fnative%2Fmyfiles.git [TSAM-8297] Rename issue Resolved Change-Id: Idcd5823fb0e285b10a5edac56c4431f1417098cd Signed-off-by: shubham kumar --- diff --git a/src/common/mf-callback.c b/src/common/mf-callback.c index 4ee6f0c..b6a20e7 100755 --- a/src/common/mf-callback.c +++ b/src/common/mf-callback.c @@ -148,8 +148,12 @@ void __mf_compress_pipe_cb(void *data, void *buffer, unsigned int nbyte) } else if (pSearchMsg->mf_sp_msg_type == MF_SEARCH_PIPE_MSG_RESULT_REPORT) { - int percentage = (((pSearchMsg->finished_count-1) * 100 )/pSearchMsg->total_count); - snprintf(count, sizeof(count), "%d/%d", pSearchMsg->finished_count-1, pSearchMsg->total_count); + int finished_count = (pSearchMsg->finished_count-1); + if (finished_count < 0) { + finished_count = 0; + } + int percentage = ((finished_count * 100 )/pSearchMsg->total_count); + snprintf(count, sizeof(count), "%d/%d", finished_count, pSearchMsg->total_count); snprintf(per, sizeof(per), "%d %%", percentage); elm_progressbar_value_set(ap->mf_FileOperation.progress_bar, (double)((double)percentage/100)); elm_object_part_text_set(ap->mf_MainWindow.pProgressLayout, "elm.text.left", per); @@ -2106,7 +2110,11 @@ void mf_callback_rename_create_cb(void *data, Evas_Object *obj, void *event_info mf_view_state_set_with_pre(ap, MORE_THUMBNAIL_RENAME); mf_popup_rename_func_reset(); - mf_popup_rename_func_set(mf_callback_rename_save_cb, params, mf_callback_cancel_cb, ap); + if (params->list_type == mf_list_shortcut) { + mf_popup_rename_func_set(mf_callback_shortcut_rename_save_cb, params, mf_callback_cancel_cb, ap); + } else { + mf_popup_rename_func_set(mf_callback_rename_save_cb, params, mf_callback_cancel_cb, ap); + } ap->mf_MainWindow.pNewFolderPopup = mf_popup_create_rename_popup(params, LABEL_RENAME_CHAP); elm_object_focus_set(ap->mf_MainWindow.pEntry, EINA_TRUE); @@ -4256,7 +4264,6 @@ Eina_Bool mf_callback_navi_backbutton_clicked_cb(void *data, Elm_Object_Item *it { MF_TRACE_BEGIN; mf_retvm_if(data == NULL, EINA_FALSE, "data is NULL"); - mf_callback_backbutton_clicked_cb(data, NULL, NULL); return EINA_FALSE; diff --git a/src/widget/mf-decompress-view.c b/src/widget/mf-decompress-view.c index 7c9f751..9707a95 100644 --- a/src/widget/mf-decompress-view.c +++ b/src/widget/mf-decompress-view.c @@ -240,6 +240,15 @@ static Evas_Object * __mf_decompress_view_create_content(void *data) return genlist; } +Eina_Bool mf_decompress_view_back_cb(void *data, Elm_Object_Item *it) +{ + mf_retvm_if(data == NULL, EINA_FALSE, "data is NULL"); + struct appdata *ap = (struct appdata *)data; + + mf_callback_cancel_cb(ap, NULL, NULL); + return EINA_FALSE; +} + void mf_decompress_view_create(void *data) { MF_TRACE_BEGIN; @@ -301,6 +310,7 @@ void mf_decompress_view_create(void *data) mf_naviframe_left_cancel_button_create(ap->mf_MainWindow.pNaviBar, ap->mf_MainWindow.pNaviItem, mf_callback_cancel_cb, ap); mf_naviframe_right_save_button_create(ap->mf_MainWindow.pNaviBar, ap->mf_MainWindow.pNaviItem, mf_callback_decompress_done_cb, ap); + mf_navi_add_back_button(ap, mf_decompress_view_back_cb); mf_navi_bar_set_ctrlbar(data); char *label = g_strdup(MF_LABEL_SELECT_ITEMS); diff --git a/src/widget/mf-genlist.c b/src/widget/mf-genlist.c index e88efd6..4512690 100755 --- a/src/widget/mf-genlist.c +++ b/src/widget/mf-genlist.c @@ -106,7 +106,11 @@ static Evas_Object *mf_rename_view_create_rename_bar(void *data, Evas_Object *pa ap->mf_MainWindow.pEntry = entry; evas_object_smart_callback_add(entry, "changed", mf_callback_genlist_imf_changed_cb, params); evas_object_smart_callback_add(entry, "preedit,changed", mf_callback_genlist_imf_preedit_change_cb, params); - evas_object_smart_callback_add(entry, "activated", mf_callback_rename_save_cb, params); + if (params->list_type == mf_list_shortcut) { + evas_object_smart_callback_add(entry, "activated", (Evas_Smart_Cb)mf_callback_shortcut_rename_save_cb, params); + } else { + evas_object_smart_callback_add(entry, "activated", (Evas_Smart_Cb)mf_callback_rename_save_cb, params); + } evas_object_smart_callback_add(entry, "maxlength,reached", mf_callback_max_len_reached_cb, params->ap); // the below is sample code for control entry. It is not mandatory. @@ -804,7 +808,7 @@ void mf_genlist_gl_selected(void *data, Evas_Object *obj, void *event_info) } ap->mf_FileOperation.rename_item = item; mf_callback_idle_rename(selected); - } else if (ap->mf_Status.more == MORE_RENAME) { + } else if (ap->mf_Status.more == MORE_RENAME && selected->list_type != mf_list_shortcut) { mf_callback_rename_save_cb(ap, NULL, NULL); return; } else if (ap->mf_Status.more != MORE_EDIT diff --git a/src/widget/mf-popup.c b/src/widget/mf-popup.c index fbd04a3..87fcf68 100755 --- a/src/widget/mf-popup.c +++ b/src/widget/mf-popup.c @@ -862,12 +862,12 @@ Evas_Object *mf_popup_create_rename_popup(void *data, char *context) char *file_name = NULL; if (params->list_type == mf_list_shortcut) { mf_media_shortcut_list_get_display_name(params->ap->mf_MainWindow.mfd_handle, params->m_ItemName->str, &file_name); + } else { + file_name = g_strdup(params->m_ItemName->str); + ap->mf_FileOperation.to_rename = g_string_new(file_name); + SAFE_FREE_CHAR(ap->mf_FileOperation.file_name_suffix); } - file_name = g_strdup(params->m_ItemName->str); - ap->mf_FileOperation.to_rename = g_string_new(file_name); - SAFE_FREE_CHAR(ap->mf_FileOperation.file_name_suffix); - //text = mf_popup_rename_text_get(file_name, &ap->mf_FileOperation.file_name_suffix, EINA_TRUE); //limit_filter_data.max_char_count = (MYFILE_FILE_NAME_CHAR_COUNT_MAX); if (params->file_type != FILE_TYPE_DIR) { @@ -890,30 +890,44 @@ Evas_Object *mf_popup_create_rename_popup(void *data, char *context) evas_object_smart_callback_add(en, "maxlength,reached", (Evas_Smart_Cb)mf_callback_max_len_reached_cb, ap); evas_object_smart_callback_add(en, "clicked", (Evas_Smart_Cb)mf_callback_clicked_cb, ap); evas_object_smart_callback_add(en, "changed", (Evas_Smart_Cb)mf_popup_create_folder_imf_changed_cb, ap); - evas_object_smart_callback_add(en, "activated", (Evas_Smart_Cb)mf_callback_rename_save_cb, rename_save_params); + if (params->list_type == mf_list_shortcut) { + evas_object_smart_callback_add(en, "activated", (Evas_Smart_Cb)mf_callback_shortcut_rename_save_cb, rename_save_params); + } else { + evas_object_smart_callback_add(en, "activated", (Evas_Smart_Cb)mf_callback_rename_save_cb, rename_save_params); + } evas_object_smart_callback_add(en, "preedit,changed", (Evas_Smart_Cb)mf_popup_create_folder_imf_changed_cb/*mf_callback_new_folder_changed_cb*/, ap); evas_object_smart_callback_add(en, "longpressed", (Evas_Smart_Cb)mf_callback_long_clicked_cb, ap); elm_entry_input_panel_return_key_type_set(en, ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE); elm_object_part_content_set(layout, "elm.swallow.content", en); + Evas_Object *btn2 = NULL; // elm_object_signal_emit(en, "elm,action,hide,search_icon", ""); Evas_Object *btn1 = mf_object_create_button(popup, - NULL, //"popup_button/default", - LABEL_CANCEL, - NULL, - (Evas_Smart_Cb)rename_cancel_cb, - rename_cancel_params, - EINA_FALSE); - - Evas_Object *btn2 = mf_object_create_button(popup, - NULL, //"popup_button/default", - LABEL_RENAME,//Change MF_LABEL_DONE to MF_BUTTON_LABEL_OK for fixing(P131029-02752). - NULL, - (Evas_Smart_Cb)mf_callback_rename_save_cb, - rename_save_params, - EINA_FALSE); + NULL, //"popup_button/default", + LABEL_CANCEL, + NULL, + (Evas_Smart_Cb)rename_cancel_cb, + rename_cancel_params, + EINA_FALSE); + if (params->list_type == mf_list_shortcut) { + btn2 = mf_object_create_button(popup, + NULL, //"popup_button/default", + LABEL_RENAME,//Change MF_LABEL_DONE to MF_BUTTON_LABEL_OK for fixing(P131029-02752). + NULL, + (Evas_Smart_Cb)mf_callback_shortcut_rename_save_cb, + rename_save_params, + EINA_FALSE); + } else { + btn2 = mf_object_create_button(popup, + NULL, //"popup_button/default", + LABEL_RENAME,//Change MF_LABEL_DONE to MF_BUTTON_LABEL_OK for fixing(P131029-02752). + NULL, + (Evas_Smart_Cb)mf_callback_rename_save_cb, + rename_save_params, + EINA_FALSE); + } ok_button = btn2; elm_object_part_content_set(popup, "button1", btn1);