From 8b79db520b99ec13a5be314f036854187c0bb085 Mon Sep 17 00:00:00 2001 From: Taejin Woo Date: Mon, 24 Jun 2013 19:28:38 +0900 Subject: [PATCH] Apply the dark theme Fix the problem that not shown the scan button Change-Id: I2c8872244096154488257cbc9f95444948faf298 --- src/ui/bt-main-view.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/ui/bt-main-view.c b/src/ui/bt-main-view.c index 66e8de6..a498149 100644 --- a/src/ui/bt-main-view.c +++ b/src/ui/bt-main-view.c @@ -2846,29 +2846,24 @@ int _bt_main_draw_list_view(bt_ug_data *ugd) evas_object_show(title); elm_object_item_part_content_set(navi_it, "elm.swallow.title", title); - /* Will modify this code after applying EFL changes */ -#ifndef NEW_TOOL_BAR - /* BT_STR_SCAN will be changed to icon */ - btn = _bt_create_button(navi, "naviframe/toolbar/default", BT_STR_SCAN, - NULL, __bt_main_controlbar_btn_cb, - (void *)ugd); - ugd->scan_btn = btn; - - elm_object_item_part_content_set(navi_it, "toolbar_button1", btn); - elm_naviframe_item_pop_cb_set(navi_it, __bt_main_quit_btn_cb, ugd); -#else + /* create toolbar for scan button*/ toolbar = elm_toolbar_add(navi); elm_object_style_set(toolbar, "default"); elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND); elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE); + segmentedBtn = elm_button_add(toolbar); + elm_object_style_set(segmentedBtn, "toolbar/default"); + elm_object_text_set(segmentedBtn, BT_STR_SCAN); + evas_object_smart_callback_add(segmentedBtn, "clicked", + __bt_main_controlbar_btn_cb, ugd); + btn = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL); elm_object_item_part_content_set(btn, "object", segmentedBtn); elm_object_item_part_content_set(navi_it, "toolbar", toolbar); ugd->scan_btn = segmentedBtn; -#endif ugd->navi_it = navi_it; ugd->navi_bar = navi; -- 2.7.4