properly load setting-theme.edj

The loading using set_layout_file is already expanding relative path internally.
Compile setting-theme during abs build.

Change-Id: I1b2f01d68136e81f8e9ff6c1d7c857dd9b186ccc

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index e7fc36450ece084e55890dc20e08df192a8f4331..0ee8b5c9f89a3e1b9097df0028fc67e606c7bfce 100644 (file)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -222,9 +222,7 @@ static Evas_Object *_font_size_slider_get(void *data, Evas_Object *obj,
                        SETTING_TRACE("Add 5Step Slider");
 
                        Evas_Object *layout = elm_layout_add(obj);
-                       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
-                       set_layout_file(layout, path, "font_slider");
-                       free(path);
+                       set_layout_file(layout, EDJDIR"/setting-theme.edj", "font_slider");
 
                        evas_object_size_hint_weight_set(layout,
                                        EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

diff --git a/setting-main/project_def.prop b/setting-main/project_def.prop
index 8af47c611f68b68e79abc45f21375d52a6b89ccc..32d6aac3b5c5f4aae7059bd20f1235f5048baf01 100644 (file)
--- a/setting-main/project_def.prop
+++ b/setting-main/project_def.prop
@@ -49,10 +49,14 @@ USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR}
 USER_EDCS_SOUND_DIRS = ${OUTPUT_DIR} 
 USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} 
 
-# EDC Flags
-USER_EXT_EDC_KEYS = 
-
 # Resource Filter
 USER_RES_INCLUDE = 
 USER_RES_EXCLUDE = 
 
+# EDC Flags
+USER_EXT_EDC_KEYS = EDC0 
+
+USER_EXT_EDC0_EDCS = res/edje/font-slider.edc res/edje/setting-theme.edc
+USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images res/images res/icons shared/res
+USER_EXT_EDC0_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds 
+USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts 

diff --git a/setting-profile-common/src/setting-profile-common.c b/setting-profile-common/src/setting-profile-common.c
index c8e3f3dfde3a1d546d4e768fc8c6dee2690011fd..b28cde6fed48ae5c3a8e657e78939b12e649e344 100644 (file)
--- a/setting-profile-common/src/setting-profile-common.c
+++ b/setting-profile-common/src/setting-profile-common.c
@@ -671,9 +671,7 @@ static Evas_Object *__sound_slider_icon_get(void *data, Evas_Object *obj,
        if (slider == NULL)
                return NULL;
 
-       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
-       set_layout_file(layout, path, "gl_custom_item");
-       free(path);
+       set_layout_file(layout, EDJDIR"/setting-theme.edj", "gl_custom_item");
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);

diff --git a/setting-storage/res/edje/setting-theme.edj b/setting-storage/res/edje/setting-theme.edj
deleted file mode 100644 (file)
index 1f2a953..0000000
Binary files a/setting-storage/res/edje/setting-theme.edj and /dev/null differ

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 8429ba580eb8814264f277ee68712a3218ca23b3..04d38b12d407cfcd180b6628bfaecf9215ee5011 100644 (file)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -720,9 +720,7 @@ static Evas_Object *_add_datefield_new(Setting_GenGroupItem_Data *item_data,
        elm_box_padding_set(box1, ELM_SCALE_SIZE(15), ELM_SCALE_SIZE(5));
 
        Evas_Object *layout = elm_layout_add(box1);
-       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
-       set_layout_file(layout, path, "date_time_layout");
-       free(path);
+       set_layout_file(layout, EDJDIR"/setting-theme.edj", "date_time_layout");
 
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);

diff --git a/smartmanager-battery/src/smartmanager-battery-main.c b/smartmanager-battery/src/smartmanager-battery-main.c
index 42e662f1d31b97b235d9a32e1516d43b82bd9a72..af9e3ec189cdd125e6d1b26ddc1a29786cadd1f1 100644 (file)
--- a/smartmanager-battery/src/smartmanager-battery-main.c
+++ b/smartmanager-battery/src/smartmanager-battery-main.c
@@ -94,9 +94,7 @@ static Evas_Object *_itc_battery_info_content_get(
                progressbar_style = "custom_red";
 
        layout = elm_layout_add(obj);
-       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
-       set_layout_file(layout, path, "gl_custom_item_battery");
-       free(path);
+       set_layout_file(layout, EDJDIR"/setting-theme.edj", "gl_custom_item_battery");
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        progress = elm_progressbar_add(layout);