hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=fe2ad1f07b2120ef32b1d514584238180fa17f22
commit fe2ad1f07b2120ef32b1d514584238180fa17f22
Author: ChunEon Park <her...@hermet.pe.kr>
Date: Wed Jul 1 12:04:48 2015 +0900
change Enventor_Path_Type interface.
changed names for enum value consistency.
---
src/bin/main.c | 10 +++++-----
src/bin/menu.c | 5 +++--
src/bin/newfile.c | 2 +-
src/lib/Enventor_Legacy.h | 10 +++++-----
src/lib/build.c | 14 +++++++-------
src/lib/edc_editor.c | 2 +-
src/lib/enventor_smart.c | 2 +-
7 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 3e80188..abe0786 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -58,16 +58,16 @@ enventor_common_setup(Evas_Object *enventor)
enventor_object_auto_complete_set(enventor, config_auto_complete_get());
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
- enventor_object_path_set(enventor, ENVENTOR_OUT_EDJ, list);
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_EDJ, list);
eina_list_free(list);
- enventor_object_path_set(enventor, ENVENTOR_RES_IMAGE,
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_IMAGE,
config_edc_img_path_list_get());
- enventor_object_path_set(enventor, ENVENTOR_RES_SOUND,
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_SOUND,
config_edc_snd_path_list_get());
- enventor_object_path_set(enventor, ENVENTOR_RES_FONT,
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_FONT,
config_edc_fnt_path_list_get());
- enventor_object_path_set(enventor, ENVENTOR_RES_DATA,
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_DATA,
config_edc_dat_path_list_get());
}
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 9252b87..dd9ee5a 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -428,7 +428,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj,
void *event_info)
{
config_edc_path_set(selected);
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
- enventor_object_path_set(md->enventor, ENVENTOR_OUT_EDJ, list);
+ enventor_object_path_set(md->enventor, ENVENTOR_PATH_TYPE_EDJ, list);
eina_list_free(list);
if (!enventor_object_save(md->enventor, selected))
{
@@ -448,7 +448,8 @@ fileselector_save_done_cb(void *data, Evas_Object *obj,
void *event_info)
{
Eina_List *edj_pathes = NULL;
edj_pathes = eina_list_append(edj_pathes, selected);
- enventor_object_path_set(md->enventor, ENVENTOR_OUT_EDJ, edj_pathes);
+ enventor_object_path_set(md->enventor, ENVENTOR_PATH_TYPE_EDJ,
+ edj_pathes);
enventor_object_modified_set(md->enventor, EINA_TRUE);
enventor_object_save(md->enventor, config_edc_path_get());
eina_list_free(edj_pathes);
diff --git a/src/bin/newfile.c b/src/bin/newfile.c
index 09ec9d4..d3e7e09 100644
--- a/src/bin/newfile.c
+++ b/src/bin/newfile.c
@@ -46,7 +46,7 @@ newfile_set(Evas_Object *enventor, Eina_Bool template_new)
config_edc_path_set(path);
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
- enventor_object_path_set(enventor, ENVENTOR_OUT_EDJ, list);
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_EDJ, list);
eina_list_free(list);
}
success = eina_file_copy(buf, path,
diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h
index d2bb2ce..d582a6f 100644
--- a/src/lib/Enventor_Legacy.h
+++ b/src/lib/Enventor_Legacy.h
@@ -18,11 +18,11 @@
typedef enum
{
- ENVENTOR_OUT_EDJ = 0,
- ENVENTOR_RES_IMAGE,
- ENVENTOR_RES_SOUND,
- ENVENTOR_RES_FONT,
- ENVENTOR_RES_DATA,
+ ENVENTOR_PATH_TYPE_EDJ = 0,
+ ENVENTOR_PATH_TYPE_IMAGE,
+ ENVENTOR_PATH_TYPE_SOUND,
+ ENVENTOR_PATH_TYPE_FONT,
+ ENVENTOR_PATH_TYPE_DATA,
ENVENTOR_PATH_TYPE_LAST
} Enventor_Path_Type;
diff --git a/src/lib/build.c b/src/lib/build.c
index 880cef9..81911ea 100644
--- a/src/lib/build.c
+++ b/src/lib/build.c
@@ -79,16 +79,16 @@ build_cmd_set(build_data *bd)
Eina_Strbuf *strbuf_dat = NULL;
Eina_Strbuf *strbuf = NULL;
//Image
- strbuf_img = strbuf_path_get(bd, ENVENTOR_RES_IMAGE, " -id ");
+ strbuf_img = strbuf_path_get(bd, ENVENTOR_PATH_TYPE_IMAGE, " -id ");
if (!strbuf_img) goto err;
- strbuf_snd = strbuf_path_get(bd, ENVENTOR_RES_SOUND, " -sd ");
+ strbuf_snd = strbuf_path_get(bd, ENVENTOR_PATH_TYPE_SOUND, " -sd ");
if (!strbuf_snd) goto err;
- strbuf_fnt = strbuf_path_get(bd, ENVENTOR_RES_FONT, " -fd ");
+ strbuf_fnt = strbuf_path_get(bd, ENVENTOR_PATH_TYPE_FONT, " -fd ");
if (!strbuf_fnt) goto err;
- strbuf_dat = strbuf_path_get(bd, ENVENTOR_RES_DATA, " -dd ");
+ strbuf_dat = strbuf_path_get(bd, ENVENTOR_PATH_TYPE_DATA, " -dd ");
if (!strbuf_dat) goto err;
strbuf = eina_strbuf_new();
@@ -101,7 +101,7 @@ build_cmd_set(build_data *bd)
eina_strbuf_append_printf(strbuf,
"edje_cc -fastcomp %s %s -id %s/images -sd %s/sounds -fd %s/fonts -dd
%s/data %s %s %s %s",
bd->edc_path,
- (char *) eina_list_data_get(bd->pathes_list[ENVENTOR_OUT_EDJ]),
+ (char *) eina_list_data_get(bd->pathes_list[ENVENTOR_PATH_TYPE_EDJ]),
elm_app_data_dir_get(),
elm_app_data_dir_get(),
elm_app_data_dir_get(),
@@ -211,7 +211,7 @@ build_path_set(Enventor_Path_Type type, const Eina_List
*pathes)
Eina_List *l;
//don't allow null edj path
- if (!pathes && (type == ENVENTOR_OUT_EDJ)) return EINA_FALSE;
+ if (!pathes && (type == ENVENTOR_PATH_TYPE_EDJ)) return EINA_FALSE;
EINA_LIST_FREE(bd->pathes_list[type], path)
eina_stringshare_del(path);
@@ -228,7 +228,7 @@ const char *
build_edj_path_get(void)
{
build_data *bd = g_bd;
- return eina_list_data_get(bd->pathes_list[ENVENTOR_OUT_EDJ]);
+ return eina_list_data_get(bd->pathes_list[ENVENTOR_PATH_TYPE_EDJ]);
}
const char *
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index acc5af8..660d465 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -438,7 +438,7 @@ image_preview_show(edit_data *ed, char *cur, Evas_Coord x,
Evas_Coord y)
char fullpath[PATH_MAX];
//1.Find the image path.
- Eina_List *list = build_path_get(ENVENTOR_RES_IMAGE);
+ Eina_List *list = build_path_get(ENVENTOR_PATH_TYPE_IMAGE);
Eina_List *l;
char *path;
Eina_Bool found = EINA_FALSE;
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 0bcc625..486a8f8 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -326,7 +326,7 @@ _enventor_object_path_set(Eo *obj EINA_UNUSED,
Enventor_Path_Type type, const Eina_List *pathes)
{
//edj file is changed
- if (type == ENVENTOR_OUT_EDJ)
+ if (type == ENVENTOR_PATH_TYPE_EDJ)
{
const char *path = eina_list_data_get(pathes);
const char *ppath = build_edj_path_get();
--
