From: juhee,park Date: Mon, 9 May 2016 07:13:01 +0000 (+0900) Subject: [TSAM-2388]add-viewer/the app name display as 'org.tizen.app.widget' X-Git-Tag: submit/tizen/20160511.022544^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F68655%2F2;p=profile%2Fmobile%2Fapps%2Fnative%2Fhomescreen-efl.git [TSAM-2388]add-viewer/the app name display as 'org.tizen.app.widget' Signed-off-by: juhee,park Change-Id: Iaad98ee102e7b3a6276b4fb79bdaf49afb5a20c7 --- diff --git a/inc/add_viewer/widget.h b/inc/add_viewer/widget.h index c5d7c2f..63164ac 100644 --- a/inc/add_viewer/widget.h +++ b/inc/add_viewer/widget.h @@ -22,6 +22,7 @@ typedef struct { char *widget_id; char *app_id; + char *label; Eina_List *preview_list; Elm_Object_Item *genlist_item; diff --git a/src/add_viewer/list_view.c b/src/add_viewer/list_view.c index f86489e..ff3aaaa 100644 --- a/src/add_viewer/list_view.c +++ b/src/add_viewer/list_view.c @@ -125,7 +125,7 @@ static char *__gl_text_get_cb(void *data, Evas_Object *obj, const char *part) return NULL; if(!strcmp(part, "elm.text")) - return strdup(widget->widget_id); + return strdup(widget->label); return strdup("widget name not found"); } @@ -195,7 +195,7 @@ static Evas_Object *__list_view_widget_box_create(Evas_Object *obj, widget_t *wi return NULL; } - elm_object_part_text_set(preview_layout, "text", widget->widget_id); + elm_object_part_text_set(preview_layout, "text", widget->label); //elm_box_pack_end(main_box, preview_layout); diff --git a/src/add_viewer/widget.c b/src/add_viewer/widget.c old mode 100644 new mode 100755 index fe8cf94..69d8556 --- a/src/add_viewer/widget.c +++ b/src/add_viewer/widget.c @@ -73,7 +73,7 @@ static int __widget_compare_widget_id_cb(const void *data1, const void *data2) widget_t *w1 = (widget_t *)data1; widget_t *w2 = (widget_t *)data2; - res = strcmp(w1->widget_id, w2->widget_id); + res = strcmp(w1->label, w2->label); if (res < 0) return -1; else if (res > 0) return 1; @@ -146,6 +146,9 @@ static int __widget_list_widget_append(const char *appid, const char *widget_id, widget->size_types_count = types_count; widget->app_id = strdup(appid); widget->widget_id = strdup(widget_id); + widget->label = widget_service_get_name(widget->widget_id, NULL); + if (!widget->label || strlen(widget->label) == 0) + widget->label = strdup(widget_id); widget_list = eina_list_sorted_insert(widget_list, __widget_compare_widget_id_cb, widget); //widget_list = eina_list_append(widget_list, widget); @@ -168,6 +171,7 @@ static void __widget_list_widget_remove(widget_t *widget) eina_list_free(widget->preview_list); free(widget->app_id); free(widget->widget_id); + free(widget->label); free(widget); }