X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fsetting-plugin.c;h=c2fe5fc1796a85942f814e4243dde5b8c94fab2c;hb=b944a6cf283c3354094a85fd0f6fe5d33ab7db20;hp=776cfbbbdde4d921e308158e66a8c97c4d967447;hpb=8b5e3aef34c53f1b3491c2cc5113059ac110910f;p=apps%2Fcore%2Fpreloaded%2Fsettings.git

diff --git a/src/setting-plugin.c b/src/setting-plugin.c
index 776cfbb..c2fe5fc 100755
--- a/src/setting-plugin.c
+++ b/src/setting-plugin.c
@@ -42,15 +42,16 @@ static Setting_GenGroupItem_Data *g_list_item;	/*TEST*/
  */
 Eina_List *_g_drawer_list = NULL;
 
+#if 0
 /**
  * @return Evas_Object * obj
  */
 static void* navigationbar_func(void *data, xmlNode *xmlObj);
-
+#endif
 
 /*
  * @return void
- */ 
+ */
 static void* group_func(void *data, xmlNode *xmlObj);
 
 /*
@@ -93,6 +94,9 @@ static void* expanditem_func(void *data, xmlNode *xmlObj);
  */
 static void* settings_func(void *data, xmlNode *xmlObj);
 
+
+static void* launch_func(void *data, xmlNode *xmlObj);
+
 /**
  * do nothing
  */
@@ -100,7 +104,7 @@ static void* setting_func(void *data, xmlNode *xmlObj);
 
 static int __node_walker(PluginNode* context, xmlNode* cur);
 
-static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char* value);
+static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char* value, bool* is_end);
 
 
 static void __drawer_add(const char *type, drawer_fp draw)
@@ -113,18 +117,19 @@ static void __drawer_add(const char *type, drawer_fp draw)
 
 		_g_drawer_list = eina_list_append(_g_drawer_list, node);
 	}
+
+	FREE(node);
 }
 
 
 static drawer_fp __drawer_find(char* type)
 {
 	SETTING_TRACE_BEGIN;
+	SETTING_TRACE("node type:%s", type);
 	Eina_List *check_list = _g_drawer_list;
  	Object_Drawer *list_item = NULL;
 
 	while (check_list) {
-
-		list_item = NULL;
 		list_item = (Object_Drawer *) eina_list_data_get(check_list);
 		if (NULL == list_item)
 			continue;
@@ -134,8 +139,9 @@ static drawer_fp __drawer_find(char* type)
 			//SETTING_TRACE("list_item->type:%s", list_item->type);
 			break;
 		}
-
+		//if not matched,to check next node.
 		check_list = eina_list_next(check_list);
+		list_item = NULL;
 	}
 	//SETTING_TRACE("list_item:%p", list_item);
 	return list_item ? list_item->draw : NULL;
@@ -143,13 +149,16 @@ static drawer_fp __drawer_find(char* type)
 void setting_drawer_list_init()
 {
 	SETTING_TRACE_BEGIN;
+#if 0
 	/* <navigationbar> */__drawer_add("navigationbar", navigationbar_func);
+#endif
 	/* <bool>          */__drawer_add("bool", checkbox_func);
 	/* <string>        */__drawer_add("string", editbox_func);
 	/* <group>         */__drawer_add("group", group_func);
 	/* <integer>       */__drawer_add("integer", slider_func);
 	/* <label>         */__drawer_add("label", label_func);
 	/* <link>          */__drawer_add("link", link_func);
+	/* <launch>        */__drawer_add("launch", launch_func);
 	/* <extendlist>    */__drawer_add("expandlist", expandlist_func);
 	/* <extenditem>    */__drawer_add("expanditem", expanditem_func);
 	/* <settings>      */__drawer_add("settings", settings_func);
@@ -184,15 +193,35 @@ void setting_drawer_list_fini()
 #define MAX_LOCAL_BUFSIZE 128
 #define DBUS_PATH "/setting/dbus_handler"
 #define DBUS_SIGNAL_INTERFACE "org.tizen.setting.signal"
-#define DBUS_SIGNAL "test"
 
-static char* substring(const char* str, size_t begin, size_t len) 
-{ 
-  if (str == 0 || strlen(str) == 0 || strlen(str) < begin || strlen(str) < (begin+len)) 
-    return 0;  
+#define APPID_LENGTH 10
+#define APPID_POS_FROM_PATH 10
+
+static char* s_pkg_name;
 
-  return strndup(str + begin, len); 
-} 
+#if 0
+static char* substring(const char* str, size_t begin, size_t len)
+{
+  if (str == 0 || strlen(str) == 0 || strlen(str) < begin || strlen(str) < (begin+len))
+    return 0;
+
+  return strndup(str + begin, len);
+}
+#endif
+
+/**
+ * package ID
+ *
+ * ncbyusjryr.AppSetting --> package ID is ncbyusjryr
+ * "Update_" "ncbyusjryr"
+ */
+static char* get_app_string(char* path)
+{
+	SETTING_TRACE_BEGIN;
+	char* temp = substring(path, APPID_POS_FROM_PATH, APPID_LENGTH/*string size*/);
+	SETTING_TRACE("package ID : >>> %s ",temp );
+	return temp;
+}
 
 //------------------------------------------------------
 // for client - bus
@@ -210,7 +239,25 @@ static DBusHandlerResult __signal_filter(DBusConnection* conn, DBusMessage* mess
 
 	setting_main_appdata *ad = user_data;
 
-    if (dbus_message_is_signal(message, DBUS_SIGNAL_INTERFACE, DBUS_SIGNAL))
+	char* pkg_name = get_app_string(ad->plugin_path);
+
+	char str_buf[MAX_COMMON_BUFFER_LEN];
+	snprintf(str_buf, MAX_COMMON_BUFFER_LEN, "Update_%s", pkg_name);
+	s_pkg_name = strdup(str_buf);
+
+	if (pkg_name)
+	{
+		free(pkg_name);
+		pkg_name = NULL;
+	}
+
+	if (s_pkg_name == NULL)
+	{
+		SETTING_TRACE("s_pkg_name is NULL - it's abnormal operation");
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	SETTING_TRACE("s_pkg_name : %s ", s_pkg_name);
+    if (dbus_message_is_signal(message, DBUS_SIGNAL_INTERFACE, s_pkg_name))
     {
         if (dbus_message_get_args(message, &error,
                 DBUS_TYPE_UINT32, &sender_pid,
@@ -228,31 +275,36 @@ static DBusHandlerResult __signal_filter(DBusConnection* conn, DBusMessage* mess
     {
         SETTING_TRACE("received key : %s , value : %s", key, value);
 		//-------------------------------------------------------------
-		// received key : checkbox1|N/A , value : INT|1	
+		// received key : checkbox1|N/A , value : INT|1
 		//-------------------------------------------------------------
 		//char* key = "checkbox1|N/A";
-		char* ptr = strchr(key, '|');
+		char* ptr = NULL;
+
+		if (key) {
+			ptr = strchr(key, '|');
+		}
 
 		xmlDocPtr doc = NULL;
 		if (ptr && key)
-		{   
+		{
 			//parsing for : checkbox1|N/A  -> checkbox1
 			char* key_name = substring(key, 0, strlen(key)-strlen(ptr));
 			char* val_name = strchr(value, '|');
 			val_name++;
-    
+
 			// ad->plugin_path
 			// access xml file
 			doc = xmlParseFile(ad->plugin_path);
 			// generate xml tree
 			xmlNode *root = xmlDocGetRootElement(doc);
 			// find a node
-			__node_finder((PluginNode*)ad->plugin_node, root, key_name ,val_name);
-		}   
+			bool is_end = false;
+			__node_finder((PluginNode*)ad->plugin_node, root, key_name ,val_name, &is_end);
+		}
 		// update the node
 		GError *error = NULL;
 
-		/*
+#if 0
 		if(doc != NULL)
 		{
 			xmlSaveFormatFile(ad->plugin_path, doc, 1);
@@ -261,7 +313,7 @@ static DBusHandlerResult __signal_filter(DBusConnection* conn, DBusMessage* mess
 			doc = NULL;
 			SETTING_TRACE("__cfg_file_write successful");
 		}
-		*/
+#endif
 
 		// update UI
     }
@@ -272,12 +324,19 @@ static DBusHandlerResult __signal_filter(DBusConnection* conn, DBusMessage* mess
 static int __send_msg(char* key, char* value)
 {
 	DBusMessage* message;
+
 	int sender_pid = getpid();
 
 	if (bus == NULL)
 		return -1;
 
-	message = dbus_message_new_signal(DBUS_PATH, DBUS_SIGNAL_INTERFACE, DBUS_SIGNAL);
+	if (s_pkg_name == NULL)
+	{
+		SETTING_TRACE("s_pkg_name is NULL - it's abnormal operation");
+		return -1;
+	}
+
+	message = dbus_message_new_signal(DBUS_PATH, DBUS_SIGNAL_INTERFACE, s_pkg_name);
 
 	SETTING_TRACE("Sending message[%s:%s] via dbus", key ,value);
 	if (dbus_message_append_args(message,
@@ -334,60 +393,74 @@ static void __send_string_msg(xmlNode* xmlObj, char *string)
 int setting_dbus_handler_init(void* user_data)
 {
 	SETTING_TRACE_BEGIN;
-    DBusError error;
-    char rule[MAX_LOCAL_BUFSIZE];
-
-    dbus_error_init(&error);
-    bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
-    if (!bus)
-    {
-        SETTING_TRACE("Fail to connect to the D-BUS daemon: %s", error.message);
-        dbus_error_free(&error);
-        return -1;
-    }
-
-    dbus_connection_setup_with_g_main(bus, NULL);
-    snprintf(rule, MAX_LOCAL_BUFSIZE, "path='%s',type='signal',interface='%s'", DBUS_PATH, DBUS_SIGNAL_INTERFACE);
+	if (bus)
+	{
+		SETTING_TRACE("already get a bus, need release first.");
+		setting_dbus_handler_fini();
+	}
+	DBusError error;
+	memset(&error, 0, sizeof(DBusError));
+	char rule[MAX_LOCAL_BUFSIZE + 1] = {0,};
+	dbus_error_init(&error);
+	bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
+	if (!bus)
+	{
+		SETTING_TRACE("Fail to connect to the D-BUS daemon: %s", error.message);
+		dbus_error_free(&error);
+		return -1;
+	}
 
-    dbus_bus_add_match(bus, rule, &error);
-    if (dbus_error_is_set(&error))
-    {
-        SETTING_TRACE("Fail to rule set; %s", error.message);
-        dbus_error_free(&error);
-        return -1;
-    }
+	dbus_connection_setup_with_g_main(bus, NULL);
+	snprintf(rule, MAX_LOCAL_BUFSIZE, "path='%s',type='signal',interface='%s'", DBUS_PATH, DBUS_SIGNAL_INTERFACE);
 
-    if (dbus_connection_add_filter(bus, __signal_filter, user_data, NULL) == FALSE)
-    {
-        return -1;
-    }
+	dbus_bus_add_match(bus, rule, &error);
+	if (dbus_error_is_set(&error))
+	{
+		SETTING_TRACE("Fail to rule set; %s", error.message);
+		dbus_bus_remove_match(bus, rule, &error);
+		dbus_error_free(&error);
+		dbus_connection_close(bus);
+		bus = NULL;
+		return -1;
+	}
 
-    SETTING_TRACE("app signal initialized");
+	if (dbus_connection_add_filter(bus, __signal_filter, user_data, NULL) == FALSE)
+	{
+		dbus_bus_remove_match(bus, rule, &error);
+		dbus_error_free(&error);
+		dbus_connection_close(bus);
+		bus = NULL;
+		return -1;
+	}
 
-    return 0;
+	SETTING_TRACE("app signal initialized");
+	return 0;
 }
 
-
 int setting_dbus_handler_fini(void)
 {
-    DBusError error;
-    char rule[MAX_LOCAL_BUFSIZE];
-
-    dbus_error_init(&error);
-    dbus_connection_remove_filter(bus, __signal_filter, NULL);
-    snprintf(rule, MAX_LOCAL_BUFSIZE, "path='%s',type='signal',interface='%s'", DBUS_PATH, DBUS_SIGNAL_INTERFACE);
-    dbus_bus_remove_match(bus, rule, &error);
-
-    if (dbus_error_is_set(&error))
-    {
-        SETTING_TRACE("Fail to rule unset: %s", error.message);
-        dbus_error_free(&error);
-        return -1;
-    }
+	//do safty checking first.
+	setting_retvm_if(!bus, 0, "!bus");
+	DBusError error;
+	memset(&error, 0, sizeof(DBusError));
+	char rule[MAX_LOCAL_BUFSIZE + 1] = {0, };
+
+	dbus_error_init(&error);
+	//dbus_connection_remove_filter(bus, __signal_filter, NULL);
+	snprintf(rule, MAX_LOCAL_BUFSIZE, "path='%s',type='signal',interface='%s'", DBUS_PATH, DBUS_SIGNAL_INTERFACE);
+	dbus_bus_remove_match(bus, rule, &error);
+
+	if (dbus_error_is_set(&error))
+	{
+		SETTING_TRACE("Fail to rule unset: %s", error.message);
+		dbus_error_free(&error);
+		//return -1;
+	}
 
-    dbus_connection_close(bus);
-    SETTING_TRACE("app signal finalized");
-    return 0;
+	dbus_connection_close(bus);
+	bus = NULL;
+	SETTING_TRACE("app signal finalized");
+	return 0;
 }
 
 /////////////////////////////
@@ -405,7 +478,6 @@ static int __cfg_file_write(Draw_Data *pd)
 	if(pd->doc != NULL)
 	{
 		xmlSaveFormatFile(pd->cfg_file, pd->doc, 1);
-		// TODO: make sure this is right
 		//xmlFreeDoc(pd->doc);
 		//pd->doc = NULL;
 		SETTING_TRACE("__cfg_file_write successful");
@@ -430,18 +502,21 @@ static void ___click_softkey_back_cb(void *data, Evas_Object *obj,
 
 	setting_plugin_destroy(node);
 
-//	pd->scroller = NULL;
-//	pd->navi_bar = NULL;
-//	pd->cfg_file = NULL;
+	pd->scroller = NULL;
+	pd->navi_bar = NULL;
+	pd->cfg_file = NULL;
+
 
-//	pd->root = NULL;
+
+
+	pd->root = NULL;
 }
 
 
 static void* group_func(void *data, xmlNode *xmlObj)
 {
 	SETTING_TRACE_BEGIN;
-	ret_if(!data || !xmlObj);
+	retv_if(!data || !xmlObj, NULL);
 
 	PluginNode* node = (PluginNode*)data;
 	Draw_Data *pd = node->pd;
@@ -481,21 +556,22 @@ static void* group_func(void *data, xmlNode *xmlObj)
 
 static void* __link_list_cb(void *data, Evas_Object *obj, void *event_info)
 {
-	ret_if(data == NULL);
-	retm_if(event_info == NULL, "Invalid argument: event info is NULL");
+	SETTING_TRACE_BEGIN;
+	retv_if(data == NULL, NULL);
+	retvm_if(event_info == NULL, NULL, "Invalid argument: event info is NULL");
 	Elm_Object_Item *item = (Elm_Object_Item *) event_info;
 	elm_genlist_item_selected_set(item, 0);
 	Setting_GenGroupItem_Data *list_item =
 	    (Setting_GenGroupItem_Data *) elm_object_item_data_get(item);
 
 	xmlNode* xmlObj = data;
-	ret_if(!xmlObj);
+	retv_if(!xmlObj, NULL);
 	const char *link_file = (char*)xmlGetProp(xmlObj, "value");
 
 	if(!link_file)
 	{
 		SETTING_TRACE_ERROR("Invalidate liked file");
-		return;
+		return NULL;
 	}
 	char file[1024] = {0,};
 	snprintf(file, sizeof(file), "%s/%s", PLUGIN_CFG_DIR, link_file);
@@ -509,11 +585,38 @@ static void* __link_list_cb(void *data, Evas_Object *obj, void *event_info)
 	return NULL;
 }
 
+static void* __launch_list_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	SETTING_TRACE_BEGIN;
+	retv_if(data == NULL, NULL);
+	retvm_if(event_info == NULL, NULL, "Invalid argument: event info is NULL");
+	Elm_Object_Item *item = (Elm_Object_Item *) event_info;
+	elm_genlist_item_selected_set(item, 0);
+	Setting_GenGroupItem_Data *list_item =
+	    (Setting_GenGroupItem_Data *) elm_object_item_data_get(item);
+
+	xmlNode* xmlObj = data;
+	retv_if(!xmlObj, NULL);
+	const char *key_str = (char*)xmlGetProp(xmlObj, "id");
+	const char *title_str = (char*)xmlGetProp(xmlObj, "title");
+	const char *appid_str = (char*)xmlGetProp(xmlObj, "appid");
+	const char *operation_str = (char*)xmlGetProp(xmlObj, "operation");
+
+
+	service_h svc = NULL;
+	service_create(&svc);
+	service_set_app_id(svc, appid_str);  							// xml property – appid
+	service_set_operation(svc, operation_str); 						// property : operation
+	service_send_launch_request(svc, NULL, NULL);
+	service_destroy(svc);
+
+	return NULL;
+}
 
 static void* label_func(void *data, xmlNode *xmlObj)
 {
 	SETTING_TRACE_BEGIN;
-	ret_if(!data || !xmlObj);
+	retv_if(!data || !xmlObj, NULL);
 	PluginNode* node = (PluginNode*)data;
 	Draw_Data *pd = node->pd;
 
@@ -531,12 +634,12 @@ static void* label_func(void *data, xmlNode *xmlObj)
 static void* link_func(void *data, xmlNode *xmlObj)
 {
 	SETTING_TRACE_BEGIN;
-	ret_if(!data || !xmlObj);
+	retv_if(!data || !xmlObj, NULL);
 	PluginNode* node = (PluginNode*)data;
 	Draw_Data *pd = node->pd;
 
 	const char *key_str = (char*)xmlGetProp(xmlObj, "id");
-	Setting_GenGroupItem_Data * obj = 
+	Setting_GenGroupItem_Data * obj =
 		setting_create_Gendial_field_def(pd->scroller, &(itc_1text),
 						 __link_list_cb,
 						 xmlObj, SWALLOW_Type_INVALID, NULL, NULL,
@@ -545,6 +648,23 @@ static void* link_func(void *data, xmlNode *xmlObj)
 	return (void*)obj;
 };
 
+static void* launch_func(void *data, xmlNode *xmlObj)
+{
+	SETTING_TRACE_BEGIN;
+	retv_if(!data || !xmlObj, NULL);
+	PluginNode* node = (PluginNode*)data;
+	Draw_Data *pd = node->pd;
+
+	const char *title_str = (char*)xmlGetProp(xmlObj, "title");
+
+	Setting_GenGroupItem_Data * obj =
+		setting_create_Gendial_field_def(pd->scroller, &(itc_1text),
+						 __launch_list_cb,
+						 xmlObj, SWALLOW_Type_INVALID, NULL, NULL,
+						 0, title_str, NULL, NULL);
+
+	return (void*)obj;
+};
 
 static void __slider_stop_cb(void *data, Evas_Object *obj,
 				    void *event_info)
@@ -578,7 +698,7 @@ static void __slider_stop_cb(void *data, Evas_Object *obj,
 static void* slider_func(void *data, xmlNode *xmlObj)
 {
 	SETTING_TRACE_BEGIN;
-	ret_if(!data || !xmlObj);
+	retv_if(!data || !xmlObj, NULL);
 	PluginNode* node = (PluginNode*)data;
 	Draw_Data *pd = node->pd;
 
@@ -617,16 +737,17 @@ static void* slider_func(void *data, xmlNode *xmlObj)
 	return (void*)list_item;
 };
 
+#if 0
 /*
   elm_object_item_data_set(item_to_update->item, item_to_update);
   elm_genlist_item_update(item_to_update->item);
 */
 static void* navigationbar_func(void *data, xmlNode *xmlObj)
 {
+#if 1
 	SETTING_TRACE_BEGIN;
 	ret_if(!data || !xmlObj);
 
-	//Draw_Data *pd = node->pd;
 	PluginNode* node = (PluginNode*)data;
 	Draw_Data *pd = node->pd;
 
@@ -643,7 +764,10 @@ static void* navigationbar_func(void *data, xmlNode *xmlObj)
 		{
 			if (!xmlStrcmp(cur->name, (const xmlChar*)"button")) {
 				btn[i] = xmlGetProp(cur, "title");
-				SETTING_TRACE("------>>> node type : Element, name=%s id=%s / btn[%d] = %s ", cur->name,xmlGetProp(cur, "id"), i, btn[i]);
+				SETTING_TRACE("------>>> node type : Element, name=%s id=%s / btn[%d] = %s ",
+								cur->name,xmlGetProp(cur, "id"),
+								i,
+								btn[i]);
 				i++;
 			}
 			cur = cur->next;
@@ -659,10 +783,10 @@ static void* navigationbar_func(void *data, xmlNode *xmlObj)
 						   ___click_softkey_back_cb, data, &pd->scroller,
 						   &(pd->navi_bar));
 
-	//return (void*)(pd->ly_main);
+#endif
 	return NULL;
 };
-
+#endif
 
 static void __check_mouse_up_cb(void *data, Evas_Object *obj,
 					     void *event_info)
@@ -715,7 +839,7 @@ static void __chk_btn_cb(void *data, Evas_Object *obj,
 
 	const char *id = (char*)xmlGetProp(xmlObj, "id");
 	const char *title = (char*)xmlGetProp(xmlObj, "title");
-	SETTING_TRACE(" >>>> id:%s , title:%s", id, title);
+	//SETTING_TRACE(" >>>> id:%s , title:%s", id, title);
 	__send_int_msg(xmlObj, list_item->chk_status);
 	__cfg_file_write((Draw_Data *)list_item->belongs_to);
 	return;
@@ -725,7 +849,7 @@ static void __chk_btn_cb(void *data, Evas_Object *obj,
 static void* checkbox_func(void *data, xmlNode *xmlObj)
 {
 	SETTING_TRACE_BEGIN;
-	ret_if(!data || !xmlObj);
+	retv_if(!data || !xmlObj, NULL);
 
 	PluginNode* node = (PluginNode*)data;
 	Draw_Data *pd = node->pd;
@@ -781,7 +905,11 @@ static void __entry_unfocus_cb(void *data, Evas_Object *obj, void *event_info)
 	Setting_GenGroupItem_Data *list_item = data;
 
 	xmlNode* xmlObj = list_item->userdata;
-	ret_if(!xmlObj);
+	if(!xmlObj) {
+		FREE(entry_str_utf8);
+		return;
+	}
+
 	xmlAttrPtr newattr;
 	const char *title = (char*)xmlSetProp(xmlObj, "value",entry_str_utf8);
 
@@ -836,7 +964,7 @@ static void __editbox_changed_cb(void *data, Evas_Object *obj,
 static void* editbox_func(void *data, xmlNode *xmlObj)
 {
 	SETTING_TRACE_BEGIN;
-	ret_if(!data || !xmlObj);
+	retv_if(!data || !xmlObj, NULL);
 
 	PluginNode* node = (PluginNode*)data;
 	Draw_Data *pd = node->pd;
@@ -844,14 +972,44 @@ static void* editbox_func(void *data, xmlNode *xmlObj)
 	const char *title = (char*)xmlGetProp(xmlObj, "title");
 	const char *key_str= (char*)xmlGetProp(xmlObj, "value");
 
-	// TODO: minlength
-	// TODO: maxlength
-	Setting_GenGroupItem_Data *list_item =
-	    setting_create_Gendial_field_def(pd->scroller, &(itc_1icon),
-	    				     __editbox_list_cb,
-					     pd, SWALLOW_Type_LAYOUT_ENTRY,
-					     NULL, NULL, 0, title, key_str,
-					     __editbox_changed_cb);
+	const char *minlength= (char*)xmlGetProp(xmlObj, "minlength");
+	const char *maxlength= (char*)xmlGetProp(xmlObj, "maxlength");
+
+	int max_len = -1;
+	if (maxlength)
+	{
+		max_len = atoi(maxlength);
+		SETTING_TRACE(" >> MAXLENGTH FILTER IS AVAILABLE !!!! maxlength = %d", max_len);
+	}
+
+	Setting_GenGroupItem_Data *list_item = NULL;
+
+	if (max_len == -1)
+	{
+		// without maxlength filter
+		list_item = setting_create_Gendial_field_def(pd->scroller, &(itc_1icon),
+								 __editbox_list_cb,
+							 pd, SWALLOW_Type_LAYOUT_ENTRY,
+							 NULL, NULL, 0, title, key_str,
+							 __editbox_changed_cb);
+
+	} else {
+		// add max length filter
+		list_item = setting_create_Gendial_field_entry(
+									pd->scroller,
+									&(itc_1icon),
+									__editbox_list_cb,
+									pd,
+									SWALLOW_Type_LAYOUT_ENTRY,
+									NULL, NULL, 0, title, key_str, __editbox_changed_cb,
+									ELM_INPUT_PANEL_LAYOUT_NORMAL,
+									false,
+									false,
+									max_len,
+									0,
+									NULL, NULL);
+
+	}
 	if (list_item) {
 		list_item->userdata = xmlObj;
 		list_item->stop_change_cb = __entry_unfocus_cb;
@@ -884,7 +1042,8 @@ static void __expanditem_func_sel_cb(void *data, Evas_Object *obj, void *event_i
 	ret_if(!xmlObj);
 
 	xmlAttrPtr newattr;
-	newattr = xmlSetProp(xmlObj, "string", data_parentItem->sub_desc);
+	//newattr = xmlSetProp(xmlObj, "string", data_parentItem->sub_desc);
+	newattr = xmlSetProp(xmlObj, "value", data_parentItem->sub_desc);
 
 	__send_string_msg(xmlObj, data_parentItem->sub_desc);
 	__cfg_file_write((Draw_Data *)data_parentItem->belongs_to);
@@ -903,9 +1062,11 @@ static void __expanditem_func_exp_cb(void *data, Evas_Object *obj, void *event_i
 	Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(parentItem);	/* parent data */
 	Evas_Object *scroller = elm_object_item_widget_get(parentItem);
 
+
 	xmlNode *xmlObj = data_parentItem->userdata;
-	char *value = (char*)xmlGetProp(xmlObj, "string");
-	int i=0;
+	//char *value = (char*)xmlGetProp(xmlObj, "string");
+	char *value = (char*)xmlGetProp(xmlObj, "value");
+	SETTING_TRACE(">>> value = %s", value);
 	Evas_Object *rgd = NULL;
 
 	if (xmlObj->children && !data_parentItem->rgd) {//to protect from entering repeatly
@@ -914,7 +1075,6 @@ static void __expanditem_func_exp_cb(void *data, Evas_Object *obj, void *event_i
 		rgd = elm_radio_add(scroller);
 		elm_radio_value_set(rgd, -1);
 
-		int i;
 		char *type;
 		char *subitem_title = NULL;
 		int subitem_index = 0;
@@ -925,21 +1085,26 @@ static void __expanditem_func_exp_cb(void *data, Evas_Object *obj, void *event_i
 				type = (char*)xmlGetProp(cur, "type");
 				if (0 == safeStrCmp(type, "radio")) {
 					subitem_title = (char*)xmlGetProp(cur, "title");
-					setting_create_Gendial_exp_sub_field(scroller,
-										 &(itc_1icon_1text_sub),
-										 __expanditem_func_sel_cb, NULL, parentItem,
-										 SWALLOW_Type_1RADIO, rgd,
-										 subitem_index,
-										 subitem_title, NULL);
+					Setting_GenGroupItem_Data *list_item =
+											setting_create_Gendial_exp_sub_field(scroller,
+													&(itc_1icon_1text_sub),
+													__expanditem_func_sel_cb, NULL, parentItem,
+													SWALLOW_Type_1RADIO, rgd,
+													subitem_index,
+													subitem_title, NULL);
+
+					// SETTING_TRACE(">>> value = %s, subitem_title = %s ", value, subitem_title);
+
 					if (0 == safeStrCmp(value, subitem_title)) {
 						sel_idx = subitem_index;
+						SETTING_TRACE("%d is selected in Radio Group", sel_idx);
 					}
+					data_parentItem->childs = eina_list_append(data_parentItem->childs, list_item);
 					subitem_index++;
+
 				} else {
 					SETTING_TRACE("invalid type[:%s]", type);
 				}
-
-				i++;
 			}
 			cur = cur->next;
 		}
@@ -970,44 +1135,86 @@ static void* settings_func(void *data, xmlNode *xmlObj)
 	return NULL;
 }
 
+
+static Evas_Object *setting_create_win_layout2(Evas_Object *win_layout, Evas_Object *win_obj)
+{
+
+    Evas_Object *layout = NULL;
+    //Evas_Object *conform = elm_conformant_add(win_obj);
+    //setting_main_appdata *ad = (setting_main_appdata *) data;
+
+    /*  Base Layout */
+    layout = elm_layout_add(win_obj);
+    //evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    setting_retvm_if(layout == NULL, FALSE, "layout == NULL");
+
+    elm_layout_theme_set(layout, "layout", "application", "default");
+    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);
+    //elm_win_resize_object_add(win_obj, conform);
+    //elm_object_content_set(conform, layout);
+
+    Evas_Object *bg = setting_create_bg(layout, win_obj, "group_list");
+    elm_object_part_content_set(layout, "elm.swallow.bg", bg);
+    evas_object_show(layout);
+    //evas_object_show(conform);
+
+    //ad->conformant = conform;
+    return layout;
+}
+
+
+Evas_Object *setting_create_layout_navi_bar2(Evas_Object *win_layout, Evas_Object *win_obj, char *title_str, char *lbutton_str, char *rbutton_str, char *mbutton_str, setting_call_back_func lbutton_click_cb, setting_call_back_func rbutton_click_cb, setting_call_back_func mbutton_click_cb, void *cb_data, Evas_Object *eo_view,	/*any container obj constructed on any evas obj */
+					    Evas_Object **navi_bar,
+					    Evas_Object **titleobj)
+{
+
+	Evas_Object *layout = setting_create_win_layout2(win_layout, win_obj);
+	*navi_bar = setting_create_navi_bar(layout);
+
+	setting_create_navi_bar_buttons(title_str,
+					lbutton_str, rbutton_str, mbutton_str,
+					lbutton_click_cb, rbutton_click_cb,
+					mbutton_click_cb, cb_data, eo_view /*content */ ,
+					*navi_bar, NULL);
+	return layout;
+}
+
 // <setting>
 static void* setting_func(void *data, xmlNode *xmlObj)
 {
-#if 0/*{{{*/
-	// DO NOTHING
-	//----------------------------------------------------------------
+	SETTING_TRACE_BEGIN;
+	retv_if(!data || !xmlObj, NULL);
+
+#if 1
+	PluginNode* node = (PluginNode*)data;
+	Draw_Data *pd = node->pd;
+
 	// [DATA] title, btn[0], btn[1]
-	Draw_Data *pd = data;
 	const char *title = (char*)xmlGetProp(xmlObj, "title");
-	char *btn[2] = {0, };
+	char *btn[2] = {/* 0 */"OK", /* 1 */"NO"};
+
+	SETTING_TRACE("before setting_create_layout_navi_bar_genlist");
 
-	// find child nodes named 'elements'
-#if 0
-	if (xmlObj->children) {
-		xmlNode* cur = xmlObj->children;
-		int i =0;
-		while (cur != NULL)
-		{
-			if (!xmlStrcmp(cur->name, (const xmlChar*)"button")) {
-				btn[i] = xmlGetProp(cur, "title");
-				SETTING_TRACE("------>>> node type : Element, name=%s id=%s / btn[%d] = %s ", cur->name,xmlGetProp(cur, "id"), i, btn[i]);
-				i++;
-			}
-			cur = cur->next;
-		}
-	}
-#endif
-	//----------------------------------------------------------------
 	// [UI] with DATA
-	pd->ly_main = setting_create_layout_navi_bar_genlist(pd->win_get,
-						   pd->win_get,
-						   _(title),
-						   _("NO"), _("YES"),
-						   ___click_softkey_back_cb,
-						   ___click_softkey_back_cb, pd, &pd->scroller,
-						   &(pd->navi_bar));
-#endif/*}}}*/
+	pd->scroller = elm_genlist_add(pd->win_get);
+	retvm_if(pd->scroller == NULL, NULL,
+		 "Cannot set scroller object  as contento of layout");
+	elm_object_style_set(pd->scroller, "dialogue");
+	elm_genlist_clear(pd->scroller);	/* first to clear list */
+
+
+	SETTING_TRACE("_(title):%s", _(title));
+	pd->ly_main = setting_create_layout_navi_bar2(pd->win_get, pd->win_get,
+					   _(title),
+					   _("IDS_COM_BODY_BACK"), NULL, NULL,
+					   ___click_softkey_back_cb,
+					   NULL, NULL,
+					   data, pd->scroller,
+					   &(pd->navi_bar), NULL);
+	SETTING_TRACE("after setting_create_layout_navi_bar_genlist");
 
+#endif
 	return NULL;
 }
 
@@ -1021,7 +1228,7 @@ static void* expanditem_func(void *data, xmlNode *xmlObj)
 static void* expandlist_func(void *data, xmlNode *xmlObj)
 {
 	SETTING_TRACE_BEGIN;
-	ret_if(!data || !xmlObj);
+	retv_if(!data || !xmlObj, NULL);
 
 	PluginNode* node = (PluginNode*)data;
 	Draw_Data *pd = node->pd;
@@ -1046,7 +1253,7 @@ static void* expandlist_func(void *data, xmlNode *xmlObj)
 }
 
 
-/////////////
+
 static int __node_walker(PluginNode* context, xmlNode* cur)
 {
 	//SETTING_TRACE_BEGIN;
@@ -1056,15 +1263,14 @@ static int __node_walker(PluginNode* context, xmlNode* cur)
 	xmlNode *cur_node = NULL;
 	for (cur_node = cur; cur_node;cur_node = cur_node->next) {
 		if (cur_node->type == XML_ELEMENT_NODE) {
-			SETTING_TRACE("node type : Element, name=%s id=%s", cur_node->name,xmlGetProp(cur_node, "id"));
-
+			// SETTING_TRACE("node type : %s id= %s", cur_node->name,xmlGetProp(cur_node, "id"));
 			drawer_fp  fp = __drawer_find(cur_node->name);
 			if (fp)
 			{
-				// type check 
+				// type check
 				void* vret = fp(context, cur_node); // draw it
 
-				if (vret) 
+				if (vret)
 				{
 					Setting_GenGroupItem_Data* genlist_node = (Setting_GenGroupItem_Data* )vret;
 					//SETTING_TRACE("add node to Eina List name : %s, id : ", cur_node->name, xmlGetProp(cur_node, "id"));
@@ -1072,8 +1278,7 @@ static int __node_walker(PluginNode* context, xmlNode* cur)
 					// id, object
 					// add list
 					char* key_name = xmlGetProp(cur_node, "id");
-					eina_hash_add(context->ui_list, strdup(key_name),(void*)genlist_node); 
-					//context->ui_list= eina_list_append(context->ui_list, genlist_node);
+					eina_hash_add(context->ui_list, strdup(key_name),(void*)genlist_node);
 				}
 			}
 		}
@@ -1085,16 +1290,18 @@ static int __node_walker(PluginNode* context, xmlNode* cur)
 /**
  * @param id_str [in] "id"
  * @param value [in] value to be udpated
+ * @see __expanditem_func_sel_cb
  */
-// refer to __expanditem_func_sel_cb
-static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char* value)
+static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char* value, bool* is_end)
 {
-	//SETTING_TRACE_BEGIN;
+	SETTING_TRACE_BEGIN;
 	xmlNode *cur_node = NULL;
+
+	if (*is_end == true) return 0;
+
 	for (cur_node = cur; cur_node;cur_node = cur_node->next) {
 		if (cur_node->type == XML_ELEMENT_NODE) {
 
-			//SETTING_TRACE("node type : Element, name=%s id=%s", cur_node->name,xmlGetProp(cur_node, "id"));
 			char* id_name = (char*)xmlGetProp(cur_node, "id");
 			if ( id_name && 0 == strcmp(id_str, id_name))
 			{
@@ -1108,7 +1315,7 @@ static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char*
 				if ( 0 == strcmp (cur_node->name, "integer"))
 				{
 					SETTING_TRACE(">>>>> UPDATE SLIDER CONTROL %x --- %s ",context->ui_list, id_name);
-					Setting_GenGroupItem_Data* item_to_update = (Setting_GenGroupItem_Data*)eina_hash_find(context->ui_list, id_name); 
+					Setting_GenGroupItem_Data* item_to_update = (Setting_GenGroupItem_Data*)eina_hash_find(context->ui_list, id_name);
 					if 	(item_to_update)
 					{
 						item_to_update->chk_status = atoi(value);
@@ -1119,12 +1326,12 @@ static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char*
 					} else {
 						SETTING_TRACE("item_to_update is NULL");
 					}
-				}				
+				}
 				// case : toggle
 				if ( 0 == strcmp (cur_node->name, "bool"))
 				{
 					SETTING_TRACE(">>>>> UPDATE TOGGLE CONTROL %x --- %s ",context->ui_list, id_name);
-					Setting_GenGroupItem_Data* item_to_update = (Setting_GenGroupItem_Data*)eina_hash_find(context->ui_list, id_name); 
+					Setting_GenGroupItem_Data* item_to_update = (Setting_GenGroupItem_Data*)eina_hash_find(context->ui_list, id_name);
 					if 	(item_to_update)
 					{
 						item_to_update->chk_status = atoi(value);
@@ -1136,21 +1343,22 @@ static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char*
 						SETTING_TRACE("item_to_update is NULL");
 					}
 				}
-				// case : edit control		
+				// case : edit control
 				if ( 0 == strcmp (cur_node->name, "string"))
 				{
 					SETTING_TRACE(">>>>> UPDATE EDIT CONTROL CONTROL %x --- %s ",context->ui_list, id_name);
-					Setting_GenGroupItem_Data* item_to_update = (Setting_GenGroupItem_Data*)eina_hash_find(context->ui_list, id_name); 
+					Setting_GenGroupItem_Data* item_to_update = (Setting_GenGroupItem_Data*)eina_hash_find(context->ui_list, id_name);
 					if 	(item_to_update)
 					{
 						char* old_string = item_to_update->sub_desc;
 						item_to_update->sub_desc = strdup(value);
 						SETTING_TRACE(">>>   o-------------0 STRING VALUE = %s ", value);
-						
+
 						// free old string
 
 						elm_object_item_data_set(item_to_update->item, item_to_update);
 						elm_genlist_item_update(item_to_update->item);
+
 					} else {
 						SETTING_TRACE("item_to_update is NULL");
 					}
@@ -1165,7 +1373,7 @@ static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char*
 				if ( 0 == strcmp (cur_node->name, "expandlist"))
 				{
 					SETTING_TRACE(">>>>> UPDATE EXPAND LIST CONTROL %x --- %s ",context->ui_list, id_name);
-					Setting_GenGroupItem_Data* item_to_update = (Setting_GenGroupItem_Data*)eina_hash_find(context->ui_list, id_name); 
+					Setting_GenGroupItem_Data* item_to_update = (Setting_GenGroupItem_Data*)eina_hash_find(context->ui_list, id_name);
 					if 	(item_to_update)
 					{
 						char* old_string = item_to_update->sub_desc;
@@ -1173,15 +1381,44 @@ static int __node_finder(PluginNode* context, xmlNode* cur, char* id_str, char*
 						SETTING_TRACE(">>>   o-------------0 EXPAND LIST VALUE = %s ", value);
 
 						// free old string
+						// string update
 						elm_object_item_data_set(item_to_update->item, item_to_update);
 						elm_genlist_item_update(item_to_update->item);
+
+						// TODO: need to update child elements
+						// item_to_update->childs ---> expanded list
+						if (item_to_update->childs)
+						{
+							Eina_List *li = item_to_update->childs;
+							int radio_index = 0;
+							while(li)
+							{
+								Setting_GenGroupItem_Data* node = eina_list_data_get(li);
+								// do something more
+								// SETTING_TRACE(">>> RADIO LIST STRING VALUE = %s ", node->keyStr);
+								// set position of radio button
+								if (strcmp(node->keyStr, value) == 0)
+								{
+									elm_radio_value_set(node->rgd, radio_index);
+								}
+								elm_object_item_data_set(item_to_update->item, item_to_update);
+								elm_genlist_item_update(item_to_update->item);
+
+								// go next
+								li = eina_list_next(li);
+								radio_index++;
+							}
+
+						}
 					} else {
 						SETTING_TRACE("item_to_update is NULL");
 					}
 				}
+
+				*is_end = true;
 			}
 		}
-		__node_finder(context, cur_node->children, id_str, value); 	/* RECURSIVE */
+		__node_finder(context, cur_node->children, id_str, value, is_end); 	/* RECURSIVE */
 	}
 	return 0;
 }
@@ -1194,7 +1431,7 @@ static unsigned int _plugin_string_key_length(const char*key)
 	return (int)strlen(key) + 1;
 }
 
-static int _plugin_string_key_cmp(const char* key1, int key1_length, 
+static int _plugin_string_key_cmp(const char* key1, int key1_length,
 									const char* key2, int key2_length)
 {
 	return strcmp(key1, key2);
@@ -1202,8 +1439,12 @@ static int _plugin_string_key_cmp(const char* key1, int key1_length,
 
 static void _plugin_entry_free_cb(void* data)
 {
-//	free(data);
-//	data = NULL;
+    Setting_GenGroupItem_Data* node = (Setting_GenGroupItem_Data*) data;
+	if (node->childs)
+	{
+		eina_list_free(node->childs);
+		node->childs = NULL;
+	}
 }
 
 //static PluginNode* g_context;
@@ -1213,6 +1454,12 @@ PluginNode* setting_plugin_create()
 	PluginNode *node = calloc(1, sizeof(PluginNode));
 
 	Draw_Data *pd = calloc(1, sizeof(Draw_Data));
+
+	if (node && !pd) {
+		free(node);
+		node = NULL;
+	}
+
 	setting_retvm_if(!pd, -1, "Create Draw_Data obj failed");
 	//eina_init();
 
@@ -1235,29 +1482,21 @@ void setting_plugin_destroy(PluginNode* node)
 			SETTING_TRACE("node->pd is NOT NULL")
 			if(node->pd->doc != NULL) {
 				xmlSaveFormatFile(node->plugin_path, node->pd->doc, 1);
-				// TODO: make sure this is right
 				xmlFreeDoc(node->pd->doc);
 				node->pd->doc = NULL;
 				SETTING_TRACE("__cfg_file_write successful");
 			}
 
-			SETTING_TRACE("before freeing node->pd");
 			free(node->pd);
 			node->pd = NULL;
-			SETTING_TRACE("after freeing node->pd");
 		}
 
-		SETTING_TRACE("before freeing ui_list");
 		if (node->ui_list) {
 			eina_hash_free(node->ui_list);
 			node->ui_list = NULL;
 		}
-		SETTING_TRACE("after freeing ui_list");
-
-		SETTING_TRACE("before freeing node");
 		free(node);
 		node = NULL;
-		SETTING_TRACE("after freeing node");
 	}
 }
 
@@ -1266,16 +1505,15 @@ static Eina_Bool _plugin_foreach_cb(const Eina_Hash *hash, const void*key, void*
 {
     Setting_GenGroupItem_Data* node = (Setting_GenGroupItem_Data*) data;
 	SETTING_TRACE("%s --- %s ", (char*)key, node->keyStr);
-
 	return EINA_TRUE;
 }
 
 
 void setting_plugin_debug(PluginNode* context)
 {
-	SETTING_TRACE("HASH TABLE -------------------------------------");
+//	SETTING_TRACE("HASH TABLE -------------------------------------");
 	eina_hash_foreach(context->ui_list,_plugin_foreach_cb, NULL);
-	SETTING_TRACE("HASH TABLE -------------------------------------");
+//	SETTING_TRACE("HASH TABLE -------------------------------------");
 
 }
 
@@ -1297,6 +1535,9 @@ void setting_plugin_update(PluginNode* context)
 }
 
 
+/**
+ * set modifiable
+ */
 bool setting_plugin_load(PluginNode* context, const char *cfg_file)
 {
 	SETTING_TRACE("cfg_file:%s", cfg_file)