From: Hyoyoung Chang <hyoyoung.chang@samsung.com>
Date: Mon, 29 Nov 2010 07:20:10 +0000 (+0900)
Subject: change history item retrieving method
X-Git-Tag: 2.0_alpha~201
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efe5f3fa15f468b4d25f70fba2ff232dc59211b6;p=framework%2Fuifw%2Fcbhm.git

change history item retrieving method
---

diff --git a/data/themes/cbhmdrawer.edc b/data/themes/cbhmdrawer.edc
index 6426fb1..90b9e57 100644
--- a/data/themes/cbhmdrawer.edc
+++ b/data/themes/cbhmdrawer.edc
@@ -71,7 +71,8 @@ collections
 				{
 					state: "default" 0.0;
 					rel1 { relative: 0.0 0.0; to: background; }
-					rel2 { relative: 0.0729166666 1.0; to: background; }
+					rel2 { relative: 0.0929166666 1.0; to: background; }
+					//rel2 { relative: 0.0729166666 1.0; to: background; }
 					image
 					{
 						normal: "clipboard_close_bg.png";
@@ -115,8 +116,8 @@ collections
 					state: "default" 0.0;
 					//rel1 { relative: 0.0916666666 0.0656716418; to: background; }
 					//rel2 { relative: 1.0 .3771493537; to: background; }
-					rel1 { relative: 0.0916666666 0.1056716418; to: background; }
-					rel2 { relative: 1.0 0.4171493537; to: background; }
+					rel1 { relative: 0.0856666666 0.1056716418; to: background; }
+					rel2 { relative: 0.990 0.4171493537; to: background; }
 					color: 0 0 0 0;
 				}
 			}
@@ -145,7 +146,7 @@ collections
 				description
 				{
 					state: "default" 0.0;
-					rel1 { relative: 0.0856666666 0.4505; to: "background"; }
+					rel1 { relative: 0.105 0.4505; to: "background"; }
 					rel2 { relative: 0.98725 1.0; to: "background"; }
 					image 
 					{
diff --git a/src/clipdrawer.c b/src/clipdrawer.c
index dfa9b6a..a3614f1 100644
--- a/src/clipdrawer.c
+++ b/src/clipdrawer.c
@@ -59,17 +59,42 @@ static void _list_click_paste(void *data, Evas_Object *obj, void *event_info)
 
     elm_list_item_selected_set(it, 0);
 
+	Elm_List_Item *item;
+	Eina_List *n;
+	int hc = 0;
+	EINA_LIST_FOREACH(elm_list_items_get(ad->txtlist), n, item)
+	{
+		if (item == it)
+			break;
+		hc++;
+	}
+
+	fprintf(stderr, "## this c = %d, %d\n", hc, get_current_history_position());
+
+//	int pos = get_current_history_position() - hc;
+
+	int	pos = get_current_history_position()-hc;
+	if (pos < 0)
+		pos = pos+(HISTORY_QUEUE_MAX_TXT_ITEMS);
+
+	fprintf(stderr, "## pos = %d, %s\n", pos, get_item_contents_by_pos(pos));
+	char *p = strdup(get_item_contents_by_pos(pos));
+
+	elm_selection_set(1, obj, /*ELM_SEL_FORMAT_TEXT*/1, p);
+
+/*
 	char *p = NULL;
 	int cplen;
 
 	char *cpdata = NULL;
-	cpdata = elm_list_item_label_get(it);
+	cpdata = elm_entry_utf8_to_markup(elm_list_item_label_get(it));
 	if (cpdata == NULL)
 		return;
 	cplen = strlen(cpdata);
 	p = malloc(cplen + 1);
 	snprintf(p, cplen+1, "%s", cpdata);
-	elm_selection_set(1, obj, /*ELM_SEL_FORMAT_TEXT*/1, p);
+*/
+//	elm_selection_set(1, obj, /*ELM_SEL_FORMAT_TEXT*/1, p);
 //	elm_selection_set(1, obj, /*ELM_SEL_FORMAT_MARKUP*/2, p);
 
 //	clipdrawer_lower_view(ad);
@@ -112,6 +137,7 @@ int clipdrawer_update_contents(void *data)
 {
 	struct appdata *ad = data;
 	int i, pos;
+	char *unesc = NULL;
 
 	// if delete mode, then back to normal mode
 //	if (get_clipdrawer_mode())
@@ -120,12 +146,16 @@ int clipdrawer_update_contents(void *data)
 	elm_list_clear(ad->txtlist);
 	for (i = 0; i < HISTORY_QUEUE_MAX_TXT_ITEMS; i++)
 	{
-		pos = get_current_history_position()+i;
-		if (pos > HISTORY_QUEUE_MAX_TXT_ITEMS-1)
-			pos = pos-HISTORY_QUEUE_MAX_TXT_ITEMS;
+		pos = get_current_history_position() - i;
+		if (pos < 0)
+			pos = pos+HISTORY_QUEUE_MAX_TXT_ITEMS;
+
 		if (get_item_contents_by_pos(pos) != NULL && strlen(get_item_contents_by_pos(pos)) > 0)
 		{
-			elm_list_item_append(ad->txtlist, get_item_contents_by_pos(pos), NULL, NULL, NULL, ad);
+			unesc = clipdrawer_get_plain_string_from_escaped(get_item_contents_by_pos(pos));
+			unesc = unesc ? unesc : "";
+			elm_list_item_append(ad->txtlist, unesc, NULL, NULL, NULL, ad);
+			free(unesc);
 		}
 	}
 	elm_list_go(ad->txtlist);
@@ -214,7 +244,7 @@ Evas_Object* _grid_icon_get(const void *data, Evas_Object *obj, const char *part
 	{
 		ti->delbtn = elm_check_add(obj);
 		elm_object_style_set(ti->delbtn, "extended/imagegrid");
-		elm_check_state_set(ti->delbtn, 1);
+		elm_check_state_set(ti->delbtn, EINA_TRUE);
 		evas_object_show(ti->delbtn);
 		return ti->delbtn;
 	}
diff --git a/src/xcnphandler.c b/src/xcnphandler.c
index 34ffca7..1243764 100755
--- a/src/xcnphandler.c
+++ b/src/xcnphandler.c
@@ -103,7 +103,7 @@ int get_current_history_position()
 {
 	int pos = g_history_pos-1;
 	if (pos < 0)
-		pos = HISTORY_QUEUE_MAX_TXT_ITEMS;
+		pos = HISTORY_QUEUE_MAX_TXT_ITEMS-1;
 	
 	return pos;
 }
@@ -319,6 +319,7 @@ int processing_selection_request(Ecore_X_Event_Selection_Request *ev)
 
 	/* TODO : if there are request which cbhm doesn't understand,
 	   then reply None property to requestor */
+	/* TODO : add image type */
 	if (ev->target == atomTargets) 
 	{
 //        Atom types[2] = { atomTargets, atomUTF8String };