From 1a012945d8a5fc7e4a6cca18de8a03c4626edba4 Mon Sep 17 00:00:00 2001 From: Michal Skorupinski Date: Wed, 12 Apr 2017 13:26:45 +0200 Subject: [PATCH] [REFACTOR] 'view_clock.c' code cleanup. Change-Id: I48bbb8b81c353d743b0985191a8203964d855e6e Signed-off-by: Michal Skorupinski --- src/view/system/view_clock.c | 201 +------------------------------------------ 1 file changed, 2 insertions(+), 199 deletions(-) diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c index fb3b41f..38653c1 100755 --- a/src/view/system/view_clock.c +++ b/src/view/system/view_clock.c @@ -38,16 +38,6 @@ enum setup_type { TYPE_MAX }; -static int id_setup_type_opt[TYPE_MAX] = { - TYPE_MANUAL, - TYPE_AUTO -}; - -static const char *str_setup_type_opt[] = { - STR_MANUAL, - STR_AUTO -}; - typedef struct { Evas_Object *win; Evas_Object *base; @@ -78,19 +68,8 @@ enum input_handler_type { /* User has moved mouse over auto/manual setup dropdown: */ static void _auto_manual_mouse_move_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev); -/*(KEYPAD/REMOTE) User has clicked/pressed auto/manual setup dropdown: */ -static void _auto_manual_setup_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, - Evas_Event_Key_Down *ev); -/*(MOUSE) User has clicked/pressed auto/manual setup dropdown: */ -static void _auto_manual_setup_clicked_cb(int id, void *data, Evas_Object *obj); -/* (KEYPAD/REMOTE) User has clicked/pressed one of the options from auto/manual setup dropdown menu: */ -static void _auto_manual_setup_option_key_down_cb(int id, void *data, Evas *e, - Evas_Object *obj, Evas_Event_Key_Down *ev); static void _any_item_back_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev); -/* (MOUSE) User has clicked/pressed one of the options from auto/manual setup dropdown menu: */ -static void _auto_manual_setup_option_mouse_cb(int id, void *data, Evas *e, Evas_Object *obj, - Evas_Event_Mouse_Down *ev); /* User has changed 12/24h hours type selection: */ static void _h_24_12_changed_cb(int id, void *data, Evas_Object *check_24); /* (MOUSE/KEYPAD/REMOTE) User has changed finished edition and clicks Done button: */ @@ -102,9 +81,6 @@ static void _disable_manual_settings(bool disable, const clock_view_priv_data *p /* Helper to make time out of widgets values: */ static void _get_time_from_controls(struct tm *result, const clock_view_priv_data *priv); /* When auto/manual setup dropdown is active, focus should be only on it*/ -static void _focused(int id, void *data, Evas_Object *obj, Elm_Object_Item *item); - - static void _dt_focused_cb(int id, void *data, Evas_Object *obj, Elm_Object_Item *item) { @@ -199,21 +175,6 @@ static void _keypad_up_cb(void *data, Evas_Object *obj, void *event_info) } - - -__attribute__((unused)) static input_handler _auto_manual_setup_input_handler = { - .mouse_move = _auto_manual_mouse_move_cb, - .key_down = _auto_manual_setup_key_down_cb, - .clicked = _auto_manual_setup_clicked_cb, - .focused = _focused -}; - -static input_handler _auto_manual_setup_option_selection_input_handler = { - .mouse_move = _auto_manual_mouse_move_cb, - .key_down = _auto_manual_setup_option_key_down_cb, - .mouse_down = _auto_manual_setup_option_mouse_cb -}; - static input_handler h_12_24_changed = { .changed = _h_24_12_changed_cb, .key_down = _any_item_back_key_down_cb @@ -235,75 +196,9 @@ static input_handler date_time_handler = { .unfocused = _dt_unfocused_cb }; -static void _destroy_setup_type_popup(clock_view_priv_data *priv) -{ - evas_object_hide(priv->setup_type_popup); - evas_object_del(priv->setup_type_popup); - priv->setup_type_popup = NULL; -} - -static void _setup_type_option_selected(clock_view_priv_data *priv, int id, - Evas_Object *obj) -{ - if (!priv) { - _ERR("priv data is NULL"); - return; - } - - _destroy_setup_type_popup(priv); - - switch (id) { - case TYPE_AUTO: - _disable_manual_settings(true, priv); - break; - case TYPE_MANUAL: - _disable_manual_settings(false, priv); - break; - default: - _ERR("Unhandled setup type."); - return; - } - - priv->cur_type = id; -} - -static void _draw_setup_type_popup(clock_view_priv_data *priv) -{ - Evas_Object *ctxpopup = NULL; - Evas_Coord x = 0, y = 0, w = 0, h = 0; - - if (!priv) { - _ERR("priv data NULL"); - return; - } - - ctxpopup = utils_add_ctxpopup(priv->base, TYPE_MAX, - id_setup_type_opt, str_setup_type_opt, - &_auto_manual_setup_option_selection_input_handler, priv, priv->cur_type); - - if (!ctxpopup) { - _ERR("Add ctxpopup failed."); - return; - } - - evas_object_move(ctxpopup, (x + w / 2), (y + h)); - evas_object_size_hint_min_set(ctxpopup, w, 0); - - priv->setup_type_popup = ctxpopup; - - elm_object_focus_set(priv->setup_type_popup, EINA_TRUE); -} - static void _set_spinner_button_style(Evas_Object *spinner) { - __attribute__((unused)) Evas_Object *button = elm_object_part_content_get(spinner, "elm.swallow.inc_button"); elm_object_style_set(spinner, "settings.datetime"); - - button = elm_object_part_content_get(spinner, "elm.swallow.dec_button"); - elm_object_style_set(spinner, "settings.datetime"); - - button = elm_object_part_content_get(spinner, "elm.swallow.text_button"); - elm_object_style_set(spinner, "settings.datetime"); } static void _dbg_datetime(Evas_Object *datetime) @@ -393,10 +288,7 @@ static void _set_datetime_focus_chain(Evas_Object *datetime, int start_field, in Evas_Object *btn = NULL; btn = _get_spinner_button(datetime, start_field); - _set_obj_focus(btn, btn, NULL, - up ? up : btn, - down ? down : btn); - + _set_obj_focus(btn, btn, NULL, up ? up : btn, down ? down : btn); prev = btn; int i; @@ -410,10 +302,7 @@ static void _set_datetime_focus_chain(Evas_Object *datetime, int start_field, in dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] (%d) BUTTON: %s", __FILE__, __LINE__, i, elm_object_text_get(btn)); - _set_obj_focus(btn, prev, NULL, - up ? up : btn, - down ? down : btn); - + _set_obj_focus(btn, prev, NULL, up ? up : btn, down ? down : btn); prev = btn; } @@ -426,7 +315,6 @@ static void _set_datetime_focus_chain(Evas_Object *datetime, int start_field, in static void _dbg_obj_focus(Evas_Object *item, int num) { Evas_Object *focus_to; - __attribute__((unused)) int i; const char *text; const char *type; Elm_Focus_Direction dir; @@ -757,66 +645,6 @@ static void _auto_manual_mouse_move_cb(int id, void *data, Evas *e, Evas_Object elm_object_focus_set(obj, EINA_TRUE); } -static void _auto_manual_setup_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, - Evas_Event_Key_Down *ev) -{ - clock_view_priv_data *priv = NULL; - - if (!obj || !ev) { - _ERR("Invalid argument."); - return; - } - - priv = (clock_view_priv_data *)data; - - if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) - || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY) - || !strcmp(ev->keyname, KEY_UP)) { - if (priv->setup_type_popup) - _destroy_setup_type_popup(priv); - else - viewmgr_pop_view(); - } else { - if (!strcmp(ev->keyname, KEY_ENTER)) - _draw_setup_type_popup(priv); - } -} - -static void _auto_manual_setup_clicked_cb(int id, void *data, Evas_Object *obj) -{ - clock_view_priv_data *priv = NULL; - - if (!data || !obj) { - _ERR("Invalid argument."); - return; - } - - priv = (clock_view_priv_data *)data; - _draw_setup_type_popup(priv); -} - -static void _auto_manual_setup_option_key_down_cb(int id, void *data, Evas *e, - Evas_Object *obj, Evas_Event_Key_Down *ev) -{ - clock_view_priv_data *priv = NULL; - - if (!data || !obj || !ev) { - _ERR("Invalid argument."); - return; - } - - priv = (clock_view_priv_data *)data; - - if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) - || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY) - ) { - _destroy_setup_type_popup(priv); - } else { - if (!strcmp(ev->keyname, KEY_ENTER)) - _setup_type_option_selected(priv, id, obj); - } -} - static void _any_item_back_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) { @@ -829,20 +657,6 @@ static void _any_item_back_key_down_cb(int id, void *data, Evas *e, viewmgr_pop_view(); } -static void _auto_manual_setup_option_mouse_cb(int id, void *data, Evas *e, Evas_Object *obj, - Evas_Event_Mouse_Down *ev) -{ - clock_view_priv_data *priv = NULL; - - if (!data || !obj) { - _ERR("Invalid argument"); - return; - } - priv = (clock_view_priv_data *)data; - - _setup_type_option_selected(priv, id, obj); -} - static void _h_24_12_changed_cb(int id, void *data, Evas_Object *check_24) { Eina_Bool state = EINA_FALSE; @@ -936,14 +750,3 @@ static void _get_time_from_controls(struct tm *result, const clock_view_priv_dat SETTING_TRACE("result->tm_sec: %d", result->tm_sec); } - -static void _focused(int id, void *data, Evas_Object *obj, Elm_Object_Item *item) -{ - clock_view_priv_data *priv = data; - if (priv && priv->setup_type_popup) - elm_object_focus_set(priv->setup_type_popup, EINA_TRUE); -} - - - - -- 2.7.4