[EGIT] [tools/eflete] eflete-1.18 17/91: group_navigator: use async popup for group data add

[Andrii Kroitor]

rimmed pushed a commit to branch eflete-1.18.

http://git.enlightenment.org/tools/eflete.git/commit/?id=02e637a09229bdf1a37a6b022f44f32e598d27bd

commit 02e637a09229bdf1a37a6b022f44f32e598d27bd
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date:   Fri Sep 2 16:17:46 2016 +0300

    group_navigator: use async popup for group data add
---
 src/bin/ui/workspace/group_navigator.c | 42 ++++++++++++----------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/bin/ui/workspace/group_navigator.c 
b/src/bin/ui/workspace/group_navigator.c
index 5eef48f..c4658ba 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -1185,21 +1185,24 @@ _on_group_data_name_changed(void *data,
 
    if (resource_name_validator_status_get(pl->group_data_name_validator) != 
ELM_REG_NOERROR)
      {
-       popup_buttons_disabled_set(BTN_OK, true);
+       popup_button_disabled_set(pl->popup_win, BTN_OK, true);
        elm_object_signal_emit(obj, "validation,default,fail", "elm");
      }
    else
      {
-       popup_buttons_disabled_set(BTN_OK, false);
+       popup_button_disabled_set(pl->popup_win, BTN_OK, false);
        elm_object_signal_emit(obj, "validation,default,pass", "elm");
      }
 }
 
 static void
-_popup_add_group_data_ok_clicked(void *data,
-                                 Evas_Object *obj __UNUSED__,
-                                 void *event_info __UNUSED__)
+_popup_add_group_data_close_cb(void *data,
+                               Evas_Object *obj __UNUSED__,
+                               void *event_info)
 {
+   Popup_Button pb = (Popup_Button)event_info;
+   if (pb != BTN_OK) return;
+
    Part_List *pl = data;
    const char *name;
    Eina_Stringshare *msg;
@@ -1207,9 +1210,6 @@ _popup_add_group_data_ok_clicked(void *data,
 
    assert(pl != NULL);
 
-   if (resource_name_validator_status_get(pl->group_data_name_validator) != 
ELM_REG_NOERROR)
-      return;
-
    name = elm_entry_entry_get(pl->popup.entry_name);
    msg = eina_stringshare_printf(_("added new data item \"%s\""), name);
    change = change_add(msg);
@@ -1217,25 +1217,14 @@ _popup_add_group_data_ok_clicked(void *data,
 
    history_change_add(pl->group->history, change);
    eina_stringshare_del(msg);
-   evas_object_del(pl->popup.box);
 }
 
-Eina_Bool
-_popup_add_group_data_validator(void *data)
-{
-   Part_List *pl = (Part_List *) data;
-   _popup_add_group_data_ok_clicked(data, NULL, NULL);
-   if (resource_name_validator_status_get(pl->group_data_name_validator) != 
ELM_REG_NOERROR)
-     return false;
-   return true;
-}
-
-Evas_Object *
+static Evas_Object *
 _add_group_data_content_get(void *data, Evas_Object **to_focus)
 {
    Part_List *pl = (Part_List *) data;
    Evas_Object *box, *item;
-   BOX_ADD(ap.popup, box, false, false);
+   BOX_ADD(ap.win, box, false, false);
 
    LAYOUT_PROP_ADD(box, _("Data item name"), "popup", "1swallow")
    ENTRY_ADD(box, pl->popup.entry_name, true);
@@ -1250,7 +1239,6 @@ _add_group_data_content_get(void *data, Evas_Object 
**to_focus)
 
    pl->popup.box = box;
    if (to_focus) *to_focus = pl->popup.entry_name;
-   popup_buttons_disabled_set(BTN_OK, true);
 
    return pl->popup.box;
 }
@@ -1267,11 +1255,11 @@ _on_menu_add_group_data_clicked(void *data __UNUSED__,
    assert(pl != NULL);
 
    title = eina_stringshare_printf(_("Add New Data Item to Group \"%s\""), 
pl->group->name);
-   Popup_Button button = popup_want_action(title, NULL, 
_add_group_data_content_get,
-                                            BTN_OK | BTN_CANCEL,
-                                           _popup_add_group_data_validator, 
pl);
-   if (button == BTN_CANCEL)
-     evas_object_del(pl->popup.box);
+   pl->popup_win = popup_add(title, NULL,
+                             BTN_OK | BTN_CANCEL,
+                             _add_group_data_content_get, pl);
+   evas_object_smart_callback_add(pl->popup_win, POPUP_CLOSE_CB, 
_popup_add_group_data_close_cb, pl);
+   popup_button_disabled_set(pl->popup_win, BTN_OK, true);
    eina_stringshare_del(title);
 }
 

--