1. New field in E_Fm2_Op_Registry_Entry named dialog, that hold pointer

   to error, abort or overwrite dialogs.
2. Glyph in fileman_opinfo theme that show have or not operation linked
   filemanager window.
3. When click on operation on fileman_opinfo, then linked efm window
   raised or attention dialog if error exist.

SVN revision: 41229

diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 7d43c270b9c256e54d56fa96659dfce887a3da76..438dce9a0f365cf5fd1fbe2abb13eff21c5afd4a 100644 (file)
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -340,19 +340,19 @@ static void         _e_fm2_icon_entry_widget_del(E_Fm2_Icon *ic);
 static void         _e_fm2_icon_entry_widget_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void         _e_fm2_icon_entry_widget_accept(E_Fm2_Icon *ic);
 
-static void _e_fm_retry_abort_dialog(int pid, const char *str);
+static E_Dialog* _e_fm_retry_abort_dialog(int pid, const char *str);
 static void _e_fm_retry_abort_delete_cb(void *obj);
 static void _e_fm_retry_abort_retry_cb(void *data, E_Dialog *dialog);
 static void _e_fm_retry_abort_abort_cb(void *data, E_Dialog *dialog);
 
-static void _e_fm_overwrite_dialog(int pid, const char *str);
+static E_Dialog* _e_fm_overwrite_dialog(int pid, const char *str);
 static void _e_fm_overwrite_delete_cb(void *obj);
 static void _e_fm_overwrite_no_cb(void *data, E_Dialog *dialog);
 static void _e_fm_overwrite_no_all_cb(void *data, E_Dialog *dialog);
 static void _e_fm_overwrite_yes_cb(void *data, E_Dialog *dialog);
 static void _e_fm_overwrite_yes_all_cb(void *data, E_Dialog *dialog);
 
-static void _e_fm_error_dialog(int pid, const char *str);
+static E_Dialog* _e_fm_error_dialog(int pid, const char *str);
 static void _e_fm_error_delete_cb(void *obj);
 static void _e_fm_error_retry_cb(void *data, E_Dialog *dialog);
 static void _e_fm_error_abort_cb(void *data, E_Dialog *dialog);
@@ -582,6 +582,7 @@ _e_fm2_op_registry_go_on(int id)
    if (!ere) return;
    ere->status = E_FM2_OP_STATUS_IN_PROGRESS;
    ere->needs_attention = 0;
+   ere->dialog = NULL;
    e_fm2_op_registry_entry_changed(ere);
 }
 
@@ -592,27 +593,30 @@ _e_fm2_op_registry_aborted(int id)
    if (!ere) return;
    ere->status = E_FM2_OP_STATUS_ABORTED;
    ere->needs_attention = 0;
+   ere->dialog = NULL;
    ere->finished = 1;
    e_fm2_op_registry_entry_changed(ere);
    // XXX e_fm2_op_registry_entry_del(id);
 }
 
 static void
-_e_fm2_op_registry_error(int id)
+_e_fm2_op_registry_error(int id, E_Dialog *dlg)
 {
    E_Fm2_Op_Registry_Entry *ere = e_fm2_op_registry_entry_get(id);
    if (!ere) return;
    ere->status = E_FM2_OP_STATUS_ERROR;
    ere->needs_attention = 1;
+   ere->dialog = dlg;
    e_fm2_op_registry_entry_changed(ere);
 }
 
 static void
-_e_fm2_op_registry_needs_attention(int id)
+_e_fm2_op_registry_needs_attention(int id, E_Dialog *dlg)
 {
    E_Fm2_Op_Registry_Entry *ere = e_fm2_op_registry_entry_get(id);
    if (!ere) return;
    ere->needs_attention = 1;
+   ere->dialog = dlg;
    e_fm2_op_registry_entry_changed(ere);
 }
 
@@ -3068,21 +3072,30 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
         break;
         
       case E_FM_OP_ERROR:/*error*/
-        printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data);
-        _e_fm_error_dialog(e->ref, e->data);
-        _e_fm2_op_registry_error(e->ref);
+          {
+             E_Dialog *dlg;
+             printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data);
+             dlg = _e_fm_error_dialog(e->ref, e->data);
+             _e_fm2_op_registry_error(e->ref, dlg);
+          }
        break;
 
       case E_FM_OP_ERROR_RETRY_ABORT:/*error*/
-        printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data);
-        _e_fm_retry_abort_dialog(e->ref, (char *)e->data);
-        _e_fm2_op_registry_error(e->ref);
+          {
+             E_Dialog *dlg;
+             printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data);
+             dlg = _e_fm_retry_abort_dialog(e->ref, (char *)e->data);
+             _e_fm2_op_registry_error(e->ref, dlg);
+          }
        break;
 
       case E_FM_OP_OVERWRITE:/*overwrite*/
-        printf("%s:%s(%d) Overwrite from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data);
-        _e_fm_overwrite_dialog(e->ref, (char *)e->data);
-        _e_fm2_op_registry_needs_attention(e->ref);
+          {
+             E_Dialog *dlg;
+             printf("%s:%s(%d) Overwrite from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data);
+             dlg = _e_fm_overwrite_dialog(e->ref, (char *)e->data);
+             _e_fm2_op_registry_needs_attention(e->ref, dlg);
+          }
        break;
 
       case E_FM_OP_PROGRESS:/*progress*/
@@ -8964,7 +8977,8 @@ _e_fm2_file_do_rename(const char *text, E_Fm2_Icon *ic)
      }
 }
 
-static void _e_fm_retry_abort_dialog(int pid, const char *str)
+static E_Dialog* 
+_e_fm_retry_abort_dialog(int pid, const char *str)
 {
    E_Manager *man;
    E_Container *con;
@@ -8973,9 +8987,9 @@ static void _e_fm_retry_abort_dialog(int pid, const char *str)
    char text[4096 + PATH_MAX];
 
    man = e_manager_current_get();
-   if (!man) return;
+   if (!man) return NULL;
    con = e_container_current_get(man);
-   if (!con) return;
+   if (!con) return NULL;
 
    id = malloc(sizeof(int));
    *id = pid;
@@ -8996,7 +9010,7 @@ static void _e_fm_retry_abort_dialog(int pid, const char *str)
    e_dialog_text_set(dialog, text);
    e_win_centered_set(dialog->win, 1);
    e_dialog_show(dialog);
-
+   return dialog;
 }
 
 static void _e_fm_retry_abort_delete_cb(void *obj)
@@ -9021,7 +9035,7 @@ static void _e_fm_retry_abort_abort_cb(void *data, E_Dialog *dialog)
    e_object_del(E_OBJECT(dialog));
 }
 
-static void
+static E_Dialog*
 _e_fm_overwrite_dialog(int pid, const char *str)
 {
    E_Manager *man;
@@ -9031,9 +9045,9 @@ _e_fm_overwrite_dialog(int pid, const char *str)
    char text[4096 + PATH_MAX];
 
    man = e_manager_current_get();
-   if (!man) return;
+   if (!man) return NULL;
    con = e_container_current_get(man);
-   if (!con) return;
+   if (!con) return NULL;
 
    id = malloc(sizeof(int));
    *id = pid;
@@ -9055,6 +9069,7 @@ _e_fm_overwrite_dialog(int pid, const char *str)
    e_dialog_text_set(dialog, text);
    e_win_centered_set(dialog->win, 1);
    e_dialog_show(dialog);
+   return dialog;
 }
 
 static void
@@ -9100,7 +9115,7 @@ _e_fm_overwrite_yes_all_cb(void *data, E_Dialog *dialog)
    e_object_del(E_OBJECT(dialog));
 }
 
-static void
+static E_Dialog*
 _e_fm_error_dialog(int pid, const char *str)
 {
    E_Manager *man;
@@ -9110,9 +9125,9 @@ _e_fm_error_dialog(int pid, const char *str)
    char text[4096 + PATH_MAX];
 
    man = e_manager_current_get();
-   if (!man) return;
+   if (!man) return NULL;
    con = e_container_current_get(man);
-   if (!con) return;
+   if (!con) return NULL;
 
    id = malloc(sizeof(int));
    *id = pid;
@@ -9135,6 +9150,7 @@ _e_fm_error_dialog(int pid, const char *str)
    e_dialog_text_set(dialog, text);
    e_win_centered_set(dialog->win, 1);
    e_dialog_show(dialog);
+   return dialog;
 }
 
 static void
@@ -9822,6 +9838,7 @@ _e_fm2_operation_abort_internal(E_Fm2_Op_Registry_Entry *ere)
    ere->status = E_FM2_OP_STATUS_ABORTED;
    ere->finished = 1;
    ere->needs_attention = 0;
+   ere->dialog = NULL;
    e_fm2_op_registry_entry_changed(ere);
    _e_fm_client_send(E_FM_OP_ABORT, ere->id, NULL, 0);   
 }

diff --git a/src/bin/e_fm_op_registry.h b/src/bin/e_fm_op_registry.h
index d7b39935b8ca690de47564b158a1354f3594185c..f05345c754082f4d83280dcd5ca194dd8dd66f2f 100644 (file)
--- a/src/bin/e_fm_op_registry.h
+++ b/src/bin/e_fm_op_registry.h
@@ -34,6 +34,7 @@ struct _E_Fm2_Op_Registry_Entry
    E_Fm_Op_Type op;
    E_Fm2_Op_Status status;
    Eina_Bool needs_attention:1;
+   E_Dialog *dialog;
    Eina_Bool finished:1;
    
    // service callbacks

diff --git a/src/modules/fileman_opinfo/e-module-fileman_opinfo.edj b/src/modules/fileman_opinfo/e-module-fileman_opinfo.edj
index cdaf15280d74ce551daed9676fc6d0d6761148b7..918b591dd0329c2b337ec83381cbe63fe6993b66 100644 (file)
Binary files a/src/modules/fileman_opinfo/e-module-fileman_opinfo.edj and b/src/modules/fileman_opinfo/e-module-fileman_opinfo.edj differ

diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c
index bf76b2f7bcc36044afaac3259a320f2347423225..acc924c718ac51610a4e15c334faa2e193040cb8 100644 (file)
--- a/src/modules/fileman_opinfo/e_mod_main.c
+++ b/src/modules/fileman_opinfo/e_mod_main.c
@@ -45,6 +45,7 @@ static int  _opinfo_op_registry_free_data_delayed(void *data);
 static void _opinfo_op_registry_abort_cb         (void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _opinfo_op_registry_summary_cb       (void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _opinfo_op_registry_detailed_cb      (void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _opinfo_op_registry_window_jump_cb   (void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _opinfo_op_registry_update_status    (Instance *inst);
 
 /********************   GLOBALS   ******************************************/
@@ -77,6 +78,12 @@ _opinfo_op_registry_listener(void *data, const E_Fm2_Op_Registry_Entry *ere)
          edje_object_signal_emit(o, "e,action,icon,unknow", "e");
    }
    
+   // Update has/none linked efm window
+   if (e_win_evas_object_win_get(ere->e_fm))
+      edje_object_signal_emit(o, "state,set,window,exist", "fileman_opinfo");
+   else
+      edje_object_signal_emit(o, "state,set,window,absent", "fileman_opinfo");
+   
    // Update information text
    switch (ere->status)
    {
@@ -211,6 +218,39 @@ _opinfo_op_registry_detailed_cb(void *data, Evas_Object *obj, const char *emissi
    e_box_pack_options_set(obj, 1, 0, 1, 0, 0.0, 0.0, mw, xh, 9999, xh);
 }
 
+static void 
+_opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   int id = (int)data;
+   E_Fm2_Op_Registry_Entry *ere;
+   E_Win *win;
+   
+   if (!id) return;
+   ere = e_fm2_op_registry_entry_get(id);
+   if (!ere) return;
+
+   // if attention dialog is present then raise it, otherwise raise the efm window
+   win = (ere->needs_attention && ere->dialog) ? ere->dialog->win
+                                               : e_win_evas_object_win_get(ere->e_fm);
+   if (!win) return;
+   
+   if (win->border)
+     {
+        if (win->border->iconic)
+           e_border_uniconify(win->border);
+        if (win->border->shaded)
+           e_border_unshade(win->border, win->border->shade.dir);
+     }
+   else
+     e_win_show(win);
+   e_win_raise(win);
+   e_desk_show(win->border->desk);
+   e_border_focus_set_with_pointer(win->border);
+   
+   if (ere->needs_attention && e_config->pointer_slide)
+      e_border_pointer_warp_to_center(win->border);
+}
+
 static int
 _opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
 {
@@ -242,6 +282,8 @@ _opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
                                    _opinfo_op_registry_summary_cb, inst);
    edje_object_signal_callback_add(o, "state,request,detailed", "fileman_opinfo",
                                    _opinfo_op_registry_detailed_cb, inst);
+   edje_object_signal_callback_add(o, "e,fm,window,jump", "",
+                                   _opinfo_op_registry_window_jump_cb, (void*)ere->id);
    
    e_fm2_op_registry_entry_listener_add(ere, _opinfo_op_registry_listener,
                                         o, _opinfo_op_registry_free_data);