From: arya.k <arya.kumar@samsung.com>
Date: Wed, 14 Oct 2015 05:09:00 +0000 (+0530)
Subject: Resource Client tizen sample applications UI updated.
X-Git-Tag: 1.2.0+RC1~883
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f4cf7d9793ec85f19c31641f490bf34a2e99b78;p=platform%2Fupstream%2Fiotivity.git

Resource Client tizen sample applications UI updated.

Change-Id: I122d11e4f055432ff59f8c42f2689afeaa6ac8e5
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
---

diff --git a/service/resource-container/examples/tizen/ContainerClientApp/.cproject b/service/resource-container/examples/tizen/ContainerClientApp/.cproject
index f656f95..7bd6df1 100644
--- a/service/resource-container/examples/tizen/ContainerClientApp/.cproject
+++ b/service/resource-container/examples/tizen/ContainerClientApp/.cproject
@@ -98,7 +98,6 @@
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1501991974" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;C:\boost_1_56_0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;..\..\..\..\..\resource-encapsulation\src\resourceBroker\include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;..\..\..\..\..\resource-encapsulation\src\resourceCache\include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;..\..\..\..\..\resource-encapsulation\src\common\utils\include&quot;"/>
diff --git a/service/resource-container/examples/tizen/ContainerClientApp/src/clientmain.cpp b/service/resource-container/examples/tizen/ContainerClientApp/src/clientmain.cpp
index d4e6f42..d9c1130 100644
--- a/service/resource-container/examples/tizen/ContainerClientApp/src/clientmain.cpp
+++ b/service/resource-container/examples/tizen/ContainerClientApp/src/clientmain.cpp
@@ -77,7 +77,7 @@ create_list_view(appdata_s *ad)
     // This button is set for devices which doesn't have H/W back key.
     btn = elm_button_add(nf);
     elm_object_style_set(btn, "naviframe/end_btn/default");
-    nf_it = elm_naviframe_item_push(nf, "Resource Encapsulation", btn, NULL, list, NULL);
+    nf_it = elm_naviframe_item_push(nf, "Container Client", btn, NULL, list, NULL);
     elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, ad->win);
 }
 
diff --git a/service/resource-container/examples/tizen/ContainerClientApp/src/containerclient.cpp b/service/resource-container/examples/tizen/ContainerClientApp/src/containerclient.cpp
index b85eb44..6596a8e 100644
--- a/service/resource-container/examples/tizen/ContainerClientApp/src/containerclient.cpp
+++ b/service/resource-container/examples/tizen/ContainerClientApp/src/containerclient.cpp
@@ -236,7 +236,7 @@ void containerCreateUI(void *data, Evas_Object *obj, void *event_info)
     evas_object_size_hint_align_set(log_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
     elm_object_part_content_set(layout, "log", log_entry);
 
-    nf_it = elm_naviframe_item_push(nf, "Resource Container", NULL, NULL, scroller, NULL);
+    nf_it = elm_naviframe_item_push(nf, "Container Client", NULL, NULL, scroller, NULL);
     elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, NULL);
 
     // Show the UI list of group APIs
diff --git a/service/resource-container/examples/tizen/ContainerServerApp/inc/container.h b/service/resource-container/examples/tizen/ContainerServerApp/inc/container.h
index 5639986..31eb0cb 100644
--- a/service/resource-container/examples/tizen/ContainerServerApp/inc/container.h
+++ b/service/resource-container/examples/tizen/ContainerServerApp/inc/container.h
@@ -27,8 +27,6 @@ using namespace std;
 
 void *showContainerAPIs(void *data);
 
-void containerCreateUI(void *data);
-
 static void startContainer(void *data, Evas_Object *obj, void *event_info);
 
 static void stopContainer(void *data, Evas_Object *obj, void *event_info);
diff --git a/service/resource-container/examples/tizen/ContainerServerApp/inc/rcmain.h b/service/resource-container/examples/tizen/ContainerServerApp/inc/rcmain.h
index 22d080f..ea7886f 100644
--- a/service/resource-container/examples/tizen/ContainerServerApp/inc/rcmain.h
+++ b/service/resource-container/examples/tizen/ContainerServerApp/inc/rcmain.h
@@ -43,6 +43,6 @@ using namespace OC;
 
 #define ELM_DEMO_EDJ "opt/usr/apps/org.tizen.containerserver/res/ui_controls.edj"
 
-void containerCreateUI(void *data, Evas_Object *obj, void *event_info);
+void containerCreateUI(void *data);
 
 #endif // RCMAIN_H__
diff --git a/service/resource-container/examples/tizen/ContainerServerApp/src/container.cpp b/service/resource-container/examples/tizen/ContainerServerApp/src/container.cpp
index a6f06a0..eb5572b 100644
--- a/service/resource-container/examples/tizen/ContainerServerApp/src/container.cpp
+++ b/service/resource-container/examples/tizen/ContainerServerApp/src/container.cpp
@@ -563,7 +563,7 @@ static void startContainer(void *data, Evas_Object *obj, void *event_info)
             s_containerFlag = true;
             s_hueBundleFlag = true;
             logMessage += "CONTAINER STARTED<br>";
-            logMessage += "ADD AND START BUNDLES<br>";
+            logMessage += "HUE BUNDLE STARTED<br>";
         }
         else
         {
@@ -625,11 +625,13 @@ naviframe_pop_cb(void *data, Elm_Object_Item *it)
         evas_object_del(listnew);
         listnew = NULL;
     }
+
+    ui_app_exit();
     return EINA_TRUE;
 }
 
 // Method to set up server screens
-void containerCreateUI(void *data, Evas_Object *obj, void *event_info)
+void containerCreateUI(void *data)
 {
     s_containerFlag = false;
     s_hueBundleFlag = false;
@@ -681,6 +683,6 @@ void containerCreateUI(void *data, Evas_Object *obj, void *event_info)
     evas_object_size_hint_align_set(log_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
     elm_object_part_content_set(layout, "log", log_entry);
 
-    nf_it = elm_naviframe_item_push(nf, "Resource Container", NULL, NULL, scroller, NULL);
+    nf_it = elm_naviframe_item_push(nf, "Container Server", NULL, NULL, scroller, NULL);
     elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, NULL);
 }
diff --git a/service/resource-container/examples/tizen/ContainerServerApp/src/rcmain.cpp b/service/resource-container/examples/tizen/ContainerServerApp/src/rcmain.cpp
index c845270..330a42f 100644
--- a/service/resource-container/examples/tizen/ContainerServerApp/src/rcmain.cpp
+++ b/service/resource-container/examples/tizen/ContainerServerApp/src/rcmain.cpp
@@ -65,16 +65,15 @@ create_list_view(appdata_s *ad)
     elm_list_mode_set(list, ELM_LIST_COMPRESS);
     evas_object_smart_callback_add(list, "selected", list_selected_cb, NULL);
 
-    // Main Menu Items Here
-    elm_list_item_append(list, "Resource Container", NULL, NULL, containerCreateUI, nf);
-
     elm_list_go(list);
 
     // This button is set for devices which doesn't have H/W back key.
     btn = elm_button_add(nf);
     elm_object_style_set(btn, "naviframe/end_btn/default");
-    nf_it = elm_naviframe_item_push(nf, "Resource Encapsulation", btn, NULL, list, NULL);
+    nf_it = elm_naviframe_item_push(nf, "Container Server", btn, NULL, list, NULL);
     elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, ad->win);
+
+    containerCreateUI(nf);
 }