rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=9268b838a9e37f0a183195f4876f720491e88521

commit 9268b838a9e37f0a183195f4876f720491e88521
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Thu Jan 14 15:32:49 2016 +0200

    project_manager: fix import edc, set correct edje_cc params
    
    @fix
    
    Change-Id: I2a00bb9a457c90cb633da66fa89d8537dcf738d5
---
 src/bin/project_manager/project_manager.c |  6 +++---
 src/bin/ui/tab_home_import_edc.c          | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/bin/project_manager/project_manager.c 
b/src/bin/project_manager/project_manager.c
index 59ffe0b..14549f3 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -515,7 +515,7 @@ _project_import_edc(void *data,
    pid_t exe_pid;
    int edje_cc_res = 0, waitpid_res = 0;
 
-   PROGRESS_SEND(_("Start import '%s' file as new project"), worker.edj);
+   PROGRESS_SEND(_("Start import '%s' file as new project"), worker.edc);
    PROGRESS_SEND(_("Creating a specifiec file and folders"));
    if (worker.func_progress)
      {
@@ -525,9 +525,9 @@ _project_import_edc(void *data,
    eina_file_mkdtemp("eflete_build_XXXXXX", &tmp_dirname);
    worker.edj = eina_stringshare_printf("%s/out.edj", tmp_dirname);
    cmd = eina_stringshare_printf("edje_cc -v %s %s %s",
-                                 worker.build_options,
                                  worker.edc,
-                                 worker.edj);
+                                 worker.edj,
+                                 worker.build_options);
    THREAD_TESTCANCEL;
    exe_cmd = ecore_exe_pipe_run(cmd, flags, NULL);
    exe_pid = ecore_exe_pid_get(exe_cmd);
diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c
index 389b7e5..9bfc8f4 100644
--- a/src/bin/ui/tab_home_import_edc.c
+++ b/src/bin/ui/tab_home_import_edc.c
@@ -308,29 +308,29 @@ _edje_cc_opt_build(void)
    EINA_LIST_FOREACH(tab_edc.img_dirs, l, dir_data)
      {
         if (elm_entry_is_empty(dir_data->entry)) continue;
-        eina_strbuf_append_printf(buf, "-id \"%s\"", 
elm_entry_entry_get(dir_data->entry));
+        eina_strbuf_append_printf(buf, " -id \"%s\"", 
elm_entry_entry_get(dir_data->entry));
      }
    EINA_LIST_FOREACH(tab_edc.fnt_dirs, l, dir_data)
      {
         if (elm_entry_is_empty(dir_data->entry)) continue;
-        eina_strbuf_append_printf(buf, "-fd \"%s\"", 
elm_entry_entry_get(dir_data->entry));
+        eina_strbuf_append_printf(buf, " -fd \"%s\"", 
elm_entry_entry_get(dir_data->entry));
      }
    EINA_LIST_FOREACH(tab_edc.snd_dirs, l, dir_data)
      {
         if (elm_entry_is_empty(dir_data->entry)) continue;
-        eina_strbuf_append_printf(buf, "-sd \"%s\"", 
elm_entry_entry_get(dir_data->entry));
+        eina_strbuf_append_printf(buf, " -sd \"%s\"", 
elm_entry_entry_get(dir_data->entry));
      }
    /*
    EINA_LIST_FOREACH(tab_edc.vbr_dirs, l, dir_data)
      {
         if (elm_entry_is_empty(dir_data->entry)) continue;
-        eina_strbuf_append_printf(buf, "-vd \"%s\"", 
elm_entry_entry_get(dir_data->entry));
+        eina_strbuf_append_printf(buf, " -vd \"%s\"", 
elm_entry_entry_get(dir_data->entry));
      }
    */
    EINA_LIST_FOREACH(tab_edc.data_dirs, l, dir_data)
      {
         if (elm_entry_is_empty(dir_data->entry)) continue;
-        eina_strbuf_append_printf(buf, "-dd \"%s\"", 
elm_entry_entry_get(dir_data->entry));
+        eina_strbuf_append_printf(buf, " -dd \"%s\"", 
elm_entry_entry_get(dir_data->entry));
      }
 
    return buf;
@@ -376,7 +376,6 @@ _progress_end(void *data, PM_Project_Result result)
         elm_entry_entry_set(tab_edc.meta.comment, N_("Created with Eflete!"));
      }
    _tabs_progress_end(data, result);
-   progress_end(NULL, result);
 }
 
 static Eina_Bool

-- 


Reply via email to