Remove (un)focusED callbacks and edje signals, use focus instead

By default elementary already emits an elm,action,focus signal. Using
our own signal handler and signal 'focused' was good for a proof of
concept, but is no longer needed as we can respond to the stock signals.

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>

1 files changed, 0 insertions, 34 deletions

diff --git a/src/eulogium.c b/src/eulogium.c
index 1f62496..d89885d 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -17,16 +17,6 @@
 
 #define COPYRIGHT "Copyright © 2015 Olliver Schinagl <o.schinagl@ultimaker.com> and various contributors (see AUTHORS)."
 
-static void _button_focus_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-	elm_widget_signal_emit(obj, "elm,state,focused", "elm");
-}
-
-static void _button_unfocus_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-	elm_widget_signal_emit(obj, "elm,state,unfocused", "elm");
-}
-
 Evas_Object *eulogium_button_list_add(Evas_Object *parent)
 {
 	Evas_Object *list, *box;
@@ -61,8 +51,6 @@ Evas_Object *eulogium_button_list_prepend(Evas_Object *list, const char *label,
 		elm_object_part_content_set(button, "icon", icon);
 	if (func)
 		evas_object_smart_callback_add(button, "clicked", func, data);
-	evas_object_smart_callback_add(button, "focused", _button_focus_cb, NULL);
-	evas_object_smart_callback_add(button, "unfocused", _button_unfocus_cb, NULL);
 	evas_object_show(button);
 
 	if (l)
@@ -94,8 +82,6 @@ Evas_Object *eulogium_button_list_sorted_insert(Evas_Object *list, const char *l
 		elm_object_part_content_set(button, "icon", icon);
 	if (func)
 		evas_object_smart_callback_add(button, "clicked", func, data);
-	evas_object_smart_callback_add(button, "focused", _button_focus_cb, NULL);
-	evas_object_smart_callback_add(button, "unfocused", _button_unfocus_cb, NULL);
 	evas_object_show(button);
 
 	if (l)
@@ -249,8 +235,6 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5);
 	elm_object_text_set(object, "TUNE"); /* TODO create tune button */
 	evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_smart_callback_add(object, "focused", _button_focus_cb, NULL);
-	evas_object_smart_callback_add(object, "unfocused", _button_unfocus_cb, NULL);
 	evas_object_show(object);
 	elm_table_pack(table, object, 0, 5, 1, 1);
 
@@ -264,8 +248,6 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5);
 	elm_object_text_set(object, "PAUSE"); /* TODO create pause button */
 	evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_smart_callback_add(object, "focused", _button_focus_cb, NULL);
-	evas_object_smart_callback_add(object, "unfocused", _button_unfocus_cb, NULL);
 	evas_object_show(object);
 	elm_table_pack(table, object, 2, 5, 1, 1);
 
@@ -519,8 +501,6 @@ Evas_Object *eulogium_multi_text_menu(struct eulogium_data *eulogium, Evas_Objec
 	_bottom = elm_button_add(parent);
 	elm_object_text_set(_bottom, button ? button->text : "NEXT"); /* change to txtdata->buttontext */
 	evas_object_smart_callback_add(_bottom, "clicked", _eulogium_multi_text_next_cb, multi_text_next_cb_data);
-	evas_object_smart_callback_add(_bottom, "focused", _button_focus_cb, NULL);
-	evas_object_smart_callback_add(_bottom, "unfocused", _button_unfocus_cb, NULL);
 	evas_object_show(_bottom);
 
 	return eulogium_split_screen(parent, _top, _bottom);
@@ -633,8 +613,6 @@ Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Obj
 		evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		elm_object_text_set(object, "PLA"); /* Materials need to be handled differently */
 		evas_object_smart_callback_add(object, "clicked", _cb_material_set, "PLA");
-		evas_object_smart_callback_add(object, "focused", _button_focus_cb, NULL);
-		evas_object_smart_callback_add(object, "unfocused", _button_unfocus_cb, NULL);
 		evas_object_show(object);
 		elm_box_pack_end(box, object);
 
@@ -643,8 +621,6 @@ Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Obj
 		evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		elm_object_text_set(object, "ABS");
 		evas_object_smart_callback_add(object, "clicked", _cb_material_set, "ABS");
-		evas_object_smart_callback_add(object, "focused", _button_focus_cb, NULL);
-		evas_object_smart_callback_add(object, "unfocused", _button_unfocus_cb, NULL);
 		evas_object_show(object);
 		elm_box_pack_end(box, object);
 
@@ -685,8 +661,6 @@ Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Obj
 		evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		elm_object_text_set(object, screen_data->screen[pagenum].prev_button);
 		evas_object_smart_callback_add(object, "clicked", _cb_content_prev_set, eulogium);
-		evas_object_smart_callback_add(object, "focused", _button_focus_cb, NULL);
-		evas_object_smart_callback_add(object, "unfocused", _button_unfocus_cb, NULL);
 		evas_object_show(object);
 		elm_box_pack_end(_bottom, object);
 	}
@@ -696,8 +670,6 @@ Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Obj
 		evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		elm_object_text_set(object, screen_data->screen[pagenum].next_button);
 		evas_object_smart_callback_add(object, "clicked", _eulogium_multi_screen_next_cb, multi_screen_next_cb_data);
-		evas_object_smart_callback_add(object, "focused", _button_focus_cb, NULL);
-		evas_object_smart_callback_add(object, "unfocused", _button_unfocus_cb, NULL);
 		evas_object_show(object);
 		elm_box_pack_end(_bottom, object);
 	}
@@ -719,8 +691,6 @@ Evas_Object *eulogium_tripple_button_menu(Evas_Object *parent, const struct butt
 	evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	elm_object_text_set(object, left->text);
 	evas_object_smart_callback_add(object, "clicked", left->cb.func, left->cb.data);
-	evas_object_smart_callback_add(object, "focused", _button_focus_cb, NULL);
-	evas_object_smart_callback_add(object, "unfocused", _button_unfocus_cb, NULL);
 	evas_object_data_set(object, "type", "b");
 	evas_object_show(object);
 	elm_box_pack_end(_top, object);
@@ -738,16 +708,12 @@ Evas_Object *eulogium_tripple_button_menu(Evas_Object *parent, const struct butt
 	elm_object_text_set(object, right->text);
 	evas_object_data_set(object, "type", "b");
 	evas_object_smart_callback_add(object, "clicked", right->cb.func, right->cb.data);
-	evas_object_smart_callback_add(object, "focused", _button_focus_cb, NULL);
-	evas_object_smart_callback_add(object, "unfocused", _button_unfocus_cb, NULL);
 	evas_object_show(object);
 	elm_box_pack_end(_top, object);
 
 	_bottom = elm_button_add(parent);
 	elm_object_text_set(_bottom, bottom->text);
 	evas_object_smart_callback_add(_bottom, "clicked", bottom->cb.func, bottom->cb.data);
-	evas_object_smart_callback_add(_bottom, "focused", _button_focus_cb, NULL);
-	evas_object_smart_callback_add(_bottom, "unfocused", _button_unfocus_cb, NULL);
 	evas_object_show(_bottom);
 
 	return eulogium_split_screen(parent, _top, _bottom);