rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=e02c171c28d9490d53924aaf03337bd8ab11a952
commit e02c171c28d9490d53924aaf03337bd8ab11a952 Author: Vitalii Vorobiov <vi.vorob...@samsung.com> Date: Thu Sep 8 15:07:55 2016 +0300 project_manager: better fix of editor usage when Project is not created yet quick fix @fix --- src/bin/project_manager/group_manager.c | 2 ++ src/bin/project_manager/project_manager.c | 8 ++++++-- src/bin/project_manager/project_manager_import_edj.c | 4 ---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bin/project_manager/group_manager.c b/src/bin/project_manager/group_manager.c index bb054ce..0b897be 100644 --- a/src/bin/project_manager/group_manager.c +++ b/src/bin/project_manager/group_manager.c @@ -413,8 +413,10 @@ gm_state_add(Project *pro, Part *part, const char *state_name, double state_valu /* Colorclass can be specified but not defined in edc. If colorclass don't exist yet adding it */ \ TODO("move this code to colorclass resource manager"); \ + you_shall_not_pass_editor_signals(NULL); \ if (editor_color_class_add(pro->global_object, name, false)) \ ERR("Something wrong happened"); \ + you_shall_pass_editor_signals(NULL); \ Colorclass_Resource *res = (Colorclass_Resource *)resource_add(name, RESOURCE_TYPE_COLORCLASS); \ res->color1.r = res->color1.g = res->color1.b = res->color1.a = 255; \ res->color2.r = res->color2.g = res->color2.b = res->color2.a = 255; \ diff --git a/src/bin/project_manager/project_manager.c b/src/bin/project_manager/project_manager.c index 2c5e5a0..2f87579 100644 --- a/src/bin/project_manager/project_manager.c +++ b/src/bin/project_manager/project_manager.c @@ -385,7 +385,9 @@ _project_special_group_add(Project *project) ret = edje_object_file_set(edje_edit_obj, project->saved_edj, eina_list_data_get(list)); assert(true == ret); + you_shall_not_pass_editor_signals(NULL); CRIT_ON_FAIL(editor_internal_group_add(edje_edit_obj)); + you_shall_pass_editor_signals(NULL); edje_edit_string_list_free(list); evas_object_del(edje_edit_obj); @@ -411,12 +413,12 @@ _project_dummy_sample_add(Project *project) edje_object_file_set(edje_edit_obj, project->saved_edj, EFLETE_INTERNAL_GROUP_NAME); snprintf(buf, sizeof(buf), "%s"EFLETE_DUMMY_SAMPLE_NAME, ap.path.sound_path); + you_shall_not_pass_editor_signals(NULL); if (editor_sound_sample_add(edje_edit_obj, EFLETE_DUMMY_SAMPLE_NAME, buf, false)) { - you_shall_not_pass_editor_signals(NULL); CRIT_ON_FAIL(editor_save(edje_edit_obj)); - you_shall_pass_editor_signals(NULL); } + you_shall_pass_editor_signals(NULL); evas_object_del(edje_edit_obj); ecore_evas_free(project->ecore_evas); @@ -441,7 +443,9 @@ _project_dummy_image_add(Project *project) edje_object_file_set(edje_edit_obj, project->saved_edj, EFLETE_INTERNAL_GROUP_NAME); snprintf(buf, sizeof(buf), "%s"EFLETE_DUMMY_IMAGE_NAME, ap.path.image_path); + you_shall_not_pass_editor_signals(NULL); CRIT_ON_FAIL(editor_image_add(edje_edit_obj, buf, false)); + you_shall_pass_editor_signals(NULL); evas_object_del(edje_edit_obj); ecore_evas_free(project->ecore_evas); diff --git a/src/bin/project_manager/project_manager_import_edj.c b/src/bin/project_manager/project_manager_import_edj.c index 1650c2d..dda8e56 100644 --- a/src/bin/project_manager/project_manager_import_edj.c +++ b/src/bin/project_manager/project_manager_import_edj.c @@ -135,13 +135,9 @@ _edje_pick_end_cb(void *data, _project_edj_file_copy(ptd); _copy_meta_data_to_pro(ptd); - - you_shall_not_pass_editor_signals(NULL); _project_special_group_add(ptd->project); _project_dummy_image_add(ptd->project); _project_dummy_sample_add(ptd->project); - you_shall_pass_editor_signals(NULL); - _project_open_internal(ptd); ecore_file_unlink(ptd->source_edj); --