From: Soohye Shin Date: Fri, 6 Mar 2015 08:44:20 +0000 (+0900) Subject: remove bottom popup in delete bar X-Git-Tag: accepted/tizen/tv/20150306.095441^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F36421%2F1;p=profile%2Ftv%2Fapps%2Fnative%2Fhomescreen.git remove bottom popup in delete bar Change-Id: Ie925884c396630749ce0426653281e59d54f570d Signed-off-by: Soohye Shin --- diff --git a/include/defs.h b/include/defs.h index 4c840dd..9253e24 100644 --- a/include/defs.h +++ b/include/defs.h @@ -192,8 +192,6 @@ #define STYLE_LABEL_SLIDE_CENTER_22 "slide_style_22_center" #define STYLE_LABEL_SLIDE_LEFT_20 "slide_style_20_left" #define STYLE_LABEL_SLIDE_LEFT_28 "slide_style_28_left" -#define STYLE_POPUP_1LINE_2BUTTON "title.1line.2button" -#define STYLE_POPUP_BOTTOM_1LINE "bottom.1line" #define STYLE_POPUP_USER "user" #define LABEL_SLIDE_SPEED (40.0) diff --git a/src/xbar.c b/src/xbar.c index bc9477a..3e7901f 100644 --- a/src/xbar.c +++ b/src/xbar.c @@ -32,11 +32,9 @@ #define POPUP_DUR 3.0 #define TITLE_DELETE "Clear" -#define TITLE_BANNER "All items are deleted" #define TITLE_NOTIFICATION "Notification" #define TITLE_HISTORY "History" #define MESSAGE_DELETE "Are you sure you want to clear your" -#define MESSAGE_BANNER "is deleted" #define MESSAGE_NOTIFICATION "notification" #define MESSAGE_HISTORY "history" @@ -179,39 +177,9 @@ static enum engine_dbar_content_type _get_ctnt_type(struct engine_dbar_item *it) return engine_dbar_item_get_content_type(ctnt); } -static void _add_banner(struct _xbar_data *bar, char *message) -{ - Evas_Object *banner, *win; - - if (!bar || !message) { - _ERR("Invalid argument"); - return; - } - - win = elm_object_top_widget_get(bar->base); - if (!win) { - _ERR("failed to get win eo"); - return; - } - - banner = elm_popup_add(win); - if (!banner) { - _ERR("failed to create popup"); - return; - } - - elm_object_style_set(banner, STYLE_POPUP_BOTTOM_1LINE); - elm_popup_orient_set(banner, ELM_POPUP_ORIENT_BOTTOM); - elm_object_text_set(banner, message); - elm_popup_timeout_set(banner, POPUP_DUR); - elm_object_focus_allow_set(banner, EINA_FALSE); - evas_object_show(banner); -} - static void _del_item(struct _xbar_data *bar) { enum engine_dbar_content_type type; - char message[MESSAGE_MAX]; if (!bar) { _ERR("Invalid argument"); @@ -224,12 +192,7 @@ static void _del_item(struct _xbar_data *bar) return; } - snprintf(message, sizeof(message), "'%s' %s", - engine_dbar_item_get_name(bar->it), - MESSAGE_BANNER); - _free_popup(bar); - _add_banner(bar, message); } static void _del_all_item(struct _xbar_data *bar) @@ -248,7 +211,6 @@ static void _del_all_item(struct _xbar_data *bar) } _free_popup(bar); - _add_banner(bar, TITLE_BANNER); } static void _del_clicked(void *data, Evas *e, Evas_Object *obj, void *ei) @@ -351,7 +313,6 @@ static Evas_Object *_load_popup(Evas_Object *base, _ERR("failed to create popup"); return NULL; } - elm_object_style_set(popup, STYLE_POPUP_1LINE_2BUTTON); elm_object_part_text_set(popup, PART_POPUP_TEXT, TITLE_DELETE); elm_object_focus_allow_set(popup, EINA_FALSE); evas_object_show(popup);