Paths updated in setting-ringtone-profile projects

Change-Id: Ie18c76c3e2f7b13b44e165b147c895a5af2c0ad9
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-smartmanager/.cproject b/setting-smartmanager/.cproject
index 403e9830f064e9dc88e312b6aba347c734fa552d..11ca63399caba79a3e2b3174418e1a0a19a67d7b 100644 (file)
--- a/setting-smartmanager/.cproject
+++ b/setting-smartmanager/.cproject
@@ -354,7 +354,6 @@
                                                                        <listOptionValue builtIn="false" value="TIZEN_DEPRECATION"/>
                                                                        <listOptionValue builtIn="false" value="DEPRECATION_WARNING"/>
                                                                        <listOptionValue builtIn="false" value="_DEBUG"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;TZ_SYS_RO_APP=\&quot;/usr/apps/\&quot;&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;PACKAGE=\&quot;${APPID}\&quot;&quot;"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1028306498" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
@@ -394,7 +393,7 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.1863740515" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.1628915892" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1620815858" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.433557062" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
+                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.433557062" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/images&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/images&quot;"/>
                                                                </option>

diff --git a/smartmanager-battery/.cproject b/smartmanager-battery/.cproject
index 611c15bba8855bce44239e1a8164f70b55084154..2c68061981a19bea840519df657c0ef16da96525 100644 (file)
--- a/smartmanager-battery/.cproject
+++ b/smartmanager-battery/.cproject
@@ -357,9 +357,6 @@
                                                                        <listOptionValue builtIn="false" value="TIZEN_DEPRECATION"/>
                                                                        <listOptionValue builtIn="false" value="DEPRECATION_WARNING"/>
                                                                        <listOptionValue builtIn="false" value="_DEBUG"/>
-                                                                       <listOptionValue builtIn="false" value="_TZ_SYS_RO_APP=TZ_SYS_RO_APP"/>
-                                                                       <listOptionValue builtIn="false" value="TZ_SYS_RO_APP=\&quot;/usr/apps/\&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="TZ_SYS_RO_APP=\&quot;/usr/apps/\&quot;"/>
                                                                        <listOptionValue builtIn="false" value="PACKAGE=\&quot;${APPID}\&quot;"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.131964464" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
@@ -403,7 +400,7 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.698360284" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.1241935410" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.608900761" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.2118339782" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
+                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.2118339782" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/images&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/images&quot;"/>
                                                                </option>

diff --git a/smartmanager-battery/src/smartmanager-battery.c b/smartmanager-battery/src/smartmanager-battery.c
index d076cc39166a7a51f37fc08613af303a344c3431..8ebf12e028c40ee2666c14503f0745a60032b159 100644 (file)
--- a/smartmanager-battery/src/smartmanager-battery.c
+++ b/smartmanager-battery/src/smartmanager-battery.c
@@ -62,12 +62,18 @@ static bool _smartmgr_battery_app_create(void *data)
        if (err != SETTING_RETURN_SUCCESS)
            return false;
 
-       elm_theme_extension_add(NULL,
-               _TZ_SYS_RO_APP"/org.tizen.setting/res/edje/settings.edj");
-       elm_theme_extension_add(NULL,
-       _TZ_SYS_RO_APP"/org.tizen.setting/res/edje/setting-genlist.edj");
-       elm_theme_extension_add(NULL,
-       _TZ_SYS_RO_APP"/org.tizen.setting/res/edje/setting-theme.edj");
+
+       char *path = get_resource_path("/edje/settings.edj");
+       elm_theme_extension_add(NULL, path);
+       free(path);
+
+       path = get_resource_path("/edje/setting-genlist.edj");
+       elm_theme_extension_add(NULL, path);
+       free(path);
+
+       path = get_resource_path("/edje/setting-theme.edj");
+       elm_theme_extension_add(NULL, path);
+       free(path);
 
        battery_main_init(ad);
        setting_view_create(ad->main_view, ad);

diff --git a/smartmanager-data/.cproject b/smartmanager-data/.cproject
index c8baddafb6df2d3465754d1e589f7a37604c042e..17f1d6e9ff11ab4c292982185cbe82edb91f8748 100644 (file)
--- a/smartmanager-data/.cproject
+++ b/smartmanager-data/.cproject
@@ -357,9 +357,6 @@
                                                                        <listOptionValue builtIn="false" value="TIZEN_DEPRECATION"/>
                                                                        <listOptionValue builtIn="false" value="DEPRECATION_WARNING"/>
                                                                        <listOptionValue builtIn="false" value="_DEBUG"/>
-                                                                       <listOptionValue builtIn="false" value="_TZ_SYS_RO_APP=TZ_SYS_RO_APP"/>
-                                                                       <listOptionValue builtIn="false" value="TZ_SYS_RO_APP=\&quot;/usr/apps/\&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="TZ_SYS_RO_APP=\&quot;/usr/apps/\&quot;"/>
                                                                        <listOptionValue builtIn="false" value="PACKAGE=\&quot;${APPID}\&quot;"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1428510647" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
@@ -403,7 +400,7 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.1221973430" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.48353731" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.17772167" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.1365909274" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
+                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.1365909274" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/images&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/images&quot;"/>
                                                                </option>

diff --git a/smartmanager-data/src/smartmanager-data-main-view.c b/smartmanager-data/src/smartmanager-data-main-view.c
index 9d8925ffd5add40d3a6fec1429a1113e6a7de230..8920deafaaff3f2023729080f17febd06d078c09 100755 (executable)
--- a/smartmanager-data/src/smartmanager-data-main-view.c
+++ b/smartmanager-data/src/smartmanager-data-main-view.c
@@ -63,12 +63,17 @@ static int _create(void *data)
 
        retv_if(NULL == data, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       elm_theme_extension_add(NULL,
-                       _TZ_SYS_RO_APP"/org.tizen.setting/res/edje/setting-theme.edj");
-       elm_theme_extension_add(NULL,
-                       _TZ_SYS_RO_APP"/org.tizen.setting/res/edje/setting-genlist.edj");
-       elm_theme_extension_add(NULL,
-                       _TZ_SYS_RO_APP"/org.tizen.setting/res/edje/settings.edj");
+       char *path = get_resource_path("/edje/setting-theme.edj");
+       elm_theme_extension_add(NULL, path);
+       free(path);
+
+       path = get_resource_path("/edjesetting-genlist.edj");
+       elm_theme_extension_add(NULL, path);
+       free(path);
+
+       path = get_resource_path("/edje/settings.edj");
+       elm_theme_extension_add(NULL, path);
+       free(path);
 
        ad->gl_header_itc.item_style = "group_index";
        ad->gl_header_itc.func.text_get = _apps_header_text_get;
@@ -276,10 +281,9 @@ static Evas_Object *_data_usage_item_get(void *data, Evas_Object *genlist, const
 
        layout = elm_layout_add(genlist);
 
-       elm_layout_file_set(layout,
-                       _TZ_SYS_RO_APP"/org.tizen.setting/res/edje/"
-                       "genlist_item_mobile_data_usage.edj",
-                       "genlist_item_mobile_data_usage");
+       char *path = get_resource_path("/edje/genlist_item_mobile_data_usage.edj");
+       elm_layout_file_set(layout, path, "genlist_item_mobile_data_usage");
+       free(path);
 
        if (ad->sim_1_genlist == genlist)
                _graph_layout_fill(ad, layout,
@@ -329,9 +333,9 @@ static Evas_Object *_aplication_item_get(
                return NULL;
 
        layout = elm_layout_add(genlist);
-       elm_layout_file_set(layout,
-                       _TZ_SYS_RO_APP"/org.tizen.setting/res/edje/setting-theme.edj",
-                       "gl_custom_item_icon");
+       char *path = get_resource_path("/edje/setting-theme.edj");
+       elm_layout_file_set(layout, path, "gl_custom_item_icon");
+       free(path);
 
        elm_object_part_text_set(layout, "elm.text", app_item->label);