Black theme applyed

Change-Id: I55648caae124ba0157dd00a8f2aaa95557f1300c

6 files changed, 29 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index fa1a66f..2989db4 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ug-setting-wifidirect-efl (1.1.1) precise; urgency=low
+
+  * Black theme applied
+  * Git: rsa/apps/home/ug-wifi-direct
+  * Tag: libug-setting-wifidirect-efl_1.1.1
+
+ -- Gibyoung Kim <laskgb.kim@samsung.com>  Tue, 25 Jun 2013 22:39:42 +0900
+
 ug-setting-wifidirect-efl (1.1.0) precise; urgency=low
 
   * added HW back key handling
diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index d552352..64b1310 100755
--- a/packaging/libug-setting-wifidirect-efl.spec
+++ b/packaging/libug-setting-wifidirect-efl.spec
@@ -3,7 +3,7 @@
 
 Name:       libug-setting-wifidirect-efl
 Summary:    Wi-Fi Direct setting UI gadget 
-Version:    1.1.0
+Version:    1.1.1
 Release:    1
 Group:      TO_BE_FILLED
 License:    Flora License
@@ -43,7 +43,6 @@ BuildRequires:  pkgconfig(capi-system-device)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(syspopup-caller)
 BuildRequires:  pkgconfig(efl-assist)
-BuildRequires:  efl-assist-devel
 BuildRequires:  cmake
 BuildRequires:  gettext-devel
 
diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c
index 9e3d187..f286b7d 100755
--- a/popup-wifidirect/src/wfd-app-popup-view.c
+++ b/popup-wifidirect/src/wfd-app-popup-view.c
@@ -334,7 +334,6 @@ static Evas_Object *wfd_draw_pop_type_c(Evas_Object * win, wfd_popup_t * pop)
 	Evas_Object *btn1 = NULL, *btn2 = NULL;
 
 	popup = elm_popup_add(win);
-
 	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	elm_object_text_set(popup, pop->text);
 
@@ -533,7 +532,6 @@ Evas_Object *wfd_draw_pop_type_display(Evas_Object * win, wfd_popup_t * pop)
 	static wfd_wps_display_popup_t wps_display_popup;
 
 	popup = elm_popup_add(win);
-
 	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, 0.0);
 
 	Evas_Object *box = elm_box_add(popup);
@@ -647,7 +645,6 @@ Evas_Object *wfd_draw_pop_type_keypad(Evas_Object * win, wfd_popup_t * pop)
 
 	pinpopup = elm_popup_add(layout);
 	assertm_if(NULL == pinpopup, "pinpopup is NULL!!");
-
 	evas_object_size_hint_weight_set(pinpopup, EVAS_HINT_EXPAND, 0.0);
 	elm_object_part_text_set(pinpopup, "title,text", _("IDS_WFD_POP_TITILE_CONNECTION"));
 
@@ -836,4 +833,4 @@ void wfd_prepare_popup(int type, void *userdata)
 
 	__WDPOP_LOG_FUNC_EXIT__;
 	return;
-}
+}
\ No newline at end of file
diff --git a/ug-wifidirect/include/wfd_ug_view.h b/ug-wifidirect/include/wfd_ug_view.h
index c6a51e7..c81c9d7 100644
--- a/ug-wifidirect/include/wfd_ug_view.h
+++ b/ug-wifidirect/include/wfd_ug_view.h
@@ -201,7 +201,7 @@ void _wifid_create_multiconnect_view(struct ug_data *ugd);
  *	@param[in] obj the pointer to the evas object
  *	@param[in] event_info the pointer to the event information
  */
-void _back_btn_cb(void *data, Evas_Object * obj, void *event_info);
+Eina_Bool _back_btn_cb(void *data, Elm_Object_Item *it);
 
 /**
  *	This function let the ug call it when click 'scan' button
diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index 1be7fab..78594dd 100755
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -517,7 +517,7 @@ void _activation_cb(int error_code, wifi_direct_device_state_e device_state, voi
 		wfd_ug_view_refresh_button(ugd->scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
 	}
 
-	if (ugd->multi_connect_btn) {
+	if (ugd->multi_scan_btn) {
 		wfd_ug_view_refresh_button(ugd->multi_scan_btn, _("IDS_WFD_BUTTON_SCAN"), TRUE);
 	}
 
diff --git a/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c
index 0acfa8c..63f9339 100755
--- a/ug-wifidirect/src/wfd_ug_main_view.c
+++ b/ug-wifidirect/src/wfd_ug_main_view.c
@@ -40,14 +40,14 @@
  *	@param[in] obj the pointer to the evas object
  *	@param[in] event_info the pointer to the event information
  */
-void _back_btn_cb(void *data, Evas_Object * obj, void *event_info)
+Eina_Bool _back_btn_cb(void *data, Elm_Object_Item *it)
 {
 	__WDUG_LOG_FUNC_ENTER__;
 	struct ug_data *ugd = (struct ug_data *) data;
 
 	if (!ugd) {
 		WDUG_LOGE("The param is NULL\n");
-		return;
+		return FALSE;
 	}
 
 	wfd_ug_view_free_peers(ugd);
@@ -57,7 +57,7 @@ void _back_btn_cb(void *data, Evas_Object * obj, void *event_info)
 	ret = service_create(&service);
 	if (ret) {
 		WDUG_LOGE("Failed to create service");
-		return;
+		return FALSE;
 	}
 
 	wfd_refresh_wifi_direct_state(ugd);
@@ -72,7 +72,7 @@ void _back_btn_cb(void *data, Evas_Object * obj, void *event_info)
 	ug_destroy_me(ugd->ug);
 
 	__WDUG_LOG_FUNC_EXIT__;
-	return;
+	return FALSE;
 }
 
 /**
@@ -95,7 +95,7 @@ void _scan_btn_cb(void *data, Evas_Object *obj, void *event_info)
 		return;
 	}
 
-	btn_text = (char *)elm_object_text_get(obj);
+	btn_text = elm_object_item_part_text_get(ugd->scan_btn, "default");
 	if (NULL == btn_text) {
 		WDUG_LOGE("Incorrect button text(NULL)\n");
 		return;
@@ -382,8 +382,8 @@ void wfd_ug_view_refresh_button(void *obj, const char *text, int enable)
 	}
 
 	WDUG_LOGD("Set the attributes of button: text[%s], enabled[%d]\n", text, enable);
-	elm_object_text_set(obj, text);
-	elm_object_disabled_set(obj, !enable);
+	elm_object_item_part_text_set(obj, "default", text);
+	elm_object_item_disabled_set(obj, !enable);
 
 	__WDUG_LOG_FUNC_EXIT__;
 }
@@ -1207,13 +1207,17 @@ void create_wfd_ug_view(void *data)
 		ugd->wfd_onoff = TRUE;
 	}
 
-	navi_item = elm_naviframe_item_push(ugd->naviframe, _("IDS_WFD_HEADER_WIFI_DIRECT"), ugd->back_btn, NULL, ugd->genlist, NULL);
+	navi_item = elm_naviframe_item_push(ugd->naviframe, _("IDS_WFD_HEADER_WIFI_DIRECT"), NULL/*ugd->back_btn*/, NULL, ugd->genlist, NULL);
+	elm_naviframe_item_pop_cb_set(navi_item, _back_btn_cb, ugd);
 	/* create scan button */
-	ugd->scan_btn = elm_button_add(ugd->naviframe);
-	elm_object_style_set(ugd->scan_btn, "naviframe/toolbar/default");
-	elm_object_text_set(ugd->scan_btn, _("IDS_WFD_BUTTON_SCAN"));
-	evas_object_smart_callback_add(ugd->scan_btn, "clicked", _scan_btn_cb, (void *)ugd);
-	elm_object_item_part_content_set(navi_item, "toolbar_button1", ugd->scan_btn);
+	Evas_Object *toolbar = elm_toolbar_add(ugd->naviframe);
+	elm_object_style_set(toolbar, "default");
+	elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
+	elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
+	elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_NONE);
+
+	ugd->scan_btn = elm_toolbar_item_append(toolbar, NULL, _("IDS_WFD_BUTTON_SCAN"), _scan_btn_cb, (void*) ugd);
+	elm_object_item_part_content_set(navi_item, "toolbar", toolbar);
 
 	__WDUG_LOG_FUNC_EXIT__;
 }