rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=684a1230681d63b5e3925f521dda675f929f8e98
commit 684a1230681d63b5e3925f521dda675f929f8e98 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Thu Jul 30 10:03:36 2015 +0300 Project manager: update the progres messages Change-Id: I545eadf0a3eaaa7e726359e545e0e8efc197250e --- src/bin/project_manager/project_manager.c | 107 +++++++++++++++--------------- 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/src/bin/project_manager/project_manager.c b/src/bin/project_manager/project_manager.c index 558d678..62fd4a4 100644 --- a/src/bin/project_manager/project_manager.c +++ b/src/bin/project_manager/project_manager.c @@ -334,7 +334,6 @@ _project_edj_file_copy(Project_Thread *worker) WORKER_LOCK_TAKE; src = eina_stringshare_ref(worker->edj); dst = eina_stringshare_ref(worker->project->saved_edj); - PROGRESS_SEND(_("Importing...")); WORKER_LOCK_RELEASE; result = ecore_file_cp(src, dst); DBG("Copy the .edj file to project folder."); @@ -480,7 +479,8 @@ _project_import_edj(void *data, THREAD_TESTCANCEL; WORKER_LOCK_TAKE; - PROGRESS_SEND("%s", _("Creating a specifiec file and folders...")); + PROGRESS_SEND(_("Start import '%s' file as new project"), worker->edj); + PROGRESS_SEND(_("Creating a specifiec file and folders")); WORKER_LOCK_RELEASE; worker->project = _project_files_create(worker); TODO("Add correct error handling here (if project == NULL). Probably we should add negative TC where directory already exist"); @@ -490,7 +490,7 @@ _project_import_edj(void *data, WORKER_LOCK_RELEASE; THREAD_TESTCANCEL; WORKER_LOCK_TAKE; - PROGRESS_SEND("%s", _("Importing...")); + PROGRESS_SEND(_("Import processing")); WORKER_LOCK_RELEASE; _project_edj_file_copy(worker); _copy_meta_data_to_pro(worker); @@ -503,6 +503,7 @@ _project_import_edj(void *data, pm_project_resource_export(worker->project, NULL); _project_linked_images_copy(worker); edje_file_cache_flush(); + PROGRESS_SEND(_("Import finished. Project '%s' created"), worker->project->name); WORKER_LOCK_RELEASE; END_SEND(PM_PROJECT_SUCCESS); @@ -583,6 +584,8 @@ _project_import_edc(void *data, assert(worker != NULL); WORKER_LOCK_TAKE; + PROGRESS_SEND(_("Start import '%s' file as new project"), worker->edj); + PROGRESS_SEND(_("Creating a specifiec file and folders")); if (worker->func_progress) { cb_msg_stdout = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _exe_data, worker); @@ -614,9 +617,6 @@ _project_import_edc(void *data, } THREAD_TESTCANCEL; - WORKER_LOCK_TAKE; - PROGRESS_SEND("%s", _("Creating a specifiec file and folders...")); - WORKER_LOCK_RELEASE; worker->project = _project_files_create(worker); TODO("Add correct error handling here (if project == NULL). Probably we should add negative TC where directory already exist"); WORKER_LOCK_TAKE; @@ -624,7 +624,7 @@ _project_import_edc(void *data, WORKER_LOCK_RELEASE; THREAD_TESTCANCEL; WORKER_LOCK_TAKE; - PROGRESS_SEND("%s", _("Importing...")); + PROGRESS_SEND("%s", _("Import processing")); WORKER_LOCK_RELEASE; _project_edj_file_copy(worker); ecore_file_recursive_rm(tmp_dirname); @@ -639,6 +639,7 @@ _project_import_edc(void *data, pm_project_resource_export(worker->project, NULL); _project_linked_images_copy(worker); edje_file_cache_flush(); + PROGRESS_SEND(_("Import finished. Project '%s' created"), worker->project->name); WORKER_LOCK_RELEASE; END_SEND(PM_PROJECT_SUCCESS) @@ -801,58 +802,53 @@ _project_save(void *data, edje_edit_obj = worker->project->global_object; - WORKER_LOCK_TAKE; - PROGRESS_SEND("Saving..."); - WORKER_LOCK_RELEASE; ecore_thread_main_loop_begin(); WORKER_LOCK_TAKE; - pm_save_to_dev(worker->project, NULL, true); - eina_file_close(worker->project->mmap_file); - Uns_List *it; - Eina_List *add_list = NULL, *l; - EINA_LIST_FOREACH(worker->project->nsimage_list, l, it) - { - if (it->act_type == ACTION_TYPE_ADD) - add_list = eina_list_append(add_list, eina_stringshare_add(ecore_file_file_get(it->data))); - } - - /* saving */ - dest = eina_stringshare_printf("%s/images", worker->project->develop_path); - _image_resources_export(worker->project, add_list, dest, NULL, worker->project->dev, edje_edit_obj); - edje_edit_string_list_free(add_list); - EINA_LIST_FREE(worker->project->nsimage_list, it) - free(it); - eina_stringshare_del(dest); - - list = edje_edit_sound_samples_list_get(edje_edit_obj); - dest = eina_stringshare_printf("%s/sounds", worker->project->develop_path); - _sound_resources_export(list, dest, NULL, edje_edit_obj); - edje_edit_string_list_free(list); - eina_stringshare_del(dest); - - list = edje_edit_fonts_list_get(edje_edit_obj); - dest = eina_stringshare_printf("%s/fonts", worker->project->develop_path); - _font_resources_export(list, dest, NULL, worker->project->dev, edje_edit_obj); - edje_edit_string_list_free(list); - eina_stringshare_del(dest); - - ecore_file_cp(worker->project->dev, worker->project->saved_edj); - - /* reloading dev*/ - worker->project->mmap_file = eina_file_open(worker->project->dev, false); - if (worker->project->current_style) - { - edje_object_mmap_set(worker->project->current_style->obj, - worker->project->mmap_file, - worker->project->current_style->full_group_name); - } + PROGRESS_SEND(_("Save project '%s'"), worker->project->name); + pm_save_to_dev(worker->project, NULL, true); + eina_file_close(worker->project->mmap_file); + Uns_List *it; + Eina_List *add_list = NULL, *l; + EINA_LIST_FOREACH(worker->project->nsimage_list, l, it) + { + if (it->act_type == ACTION_TYPE_ADD) + add_list = eina_list_append(add_list, eina_stringshare_add(ecore_file_file_get(it->data))); + } + /* saving */ + dest = eina_stringshare_printf("%s/images", worker->project->develop_path); + _image_resources_export(worker->project, add_list, dest, NULL, worker->project->dev, edje_edit_obj); + edje_edit_string_list_free(add_list); + EINA_LIST_FREE(worker->project->nsimage_list, it) + free(it); + eina_stringshare_del(dest); + + list = edje_edit_sound_samples_list_get(edje_edit_obj); + dest = eina_stringshare_printf("%s/sounds", worker->project->develop_path); + _sound_resources_export(list, dest, NULL, edje_edit_obj); + edje_edit_string_list_free(list); + eina_stringshare_del(dest); + + list = edje_edit_fonts_list_get(edje_edit_obj); + dest = eina_stringshare_printf("%s/fonts", worker->project->develop_path); + _font_resources_export(list, dest, NULL, worker->project->dev, edje_edit_obj); + edje_edit_string_list_free(list); + eina_stringshare_del(dest); + + ecore_file_cp(worker->project->dev, worker->project->saved_edj); + + /* reloading dev*/ + worker->project->mmap_file = eina_file_open(worker->project->dev, false); + if (worker->project->current_style) + { + edje_object_mmap_set(worker->project->current_style->obj, + worker->project->mmap_file, + worker->project->current_style->full_group_name); + } + PROGRESS_SEND("Save done"); WORKER_LOCK_RELEASE; ecore_thread_main_loop_end(); - WORKER_LOCK_TAKE; - PROGRESS_SEND("Saved."); - WORKER_LOCK_RELEASE; END_SEND(PM_PROJECT_SUCCESS); return NULL; } @@ -1590,12 +1586,13 @@ _develop_export(void *data, assert(worker != NULL); WORKER_LOCK_TAKE; - PROGRESS_SEND(_("Export edj...")); + PROGRESS_SEND(_("Export project as develop file")); + PROGRESS_SEND(_("Export to file '%s'"), worker->edj); edje_edit_save_all(worker->project->global_object); eina_file_copy(worker->project->dev, worker->edj, EINA_FILE_COPY_PERMISSION | EINA_FILE_COPY_XATTR, NULL, NULL); - PROGRESS_SEND("Saved."); + PROGRESS_SEND("Export done"); WORKER_LOCK_RELEASE; END_SEND(PM_PROJECT_SUCCESS); --