Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
ewl_icon_local_viewer.c filesystem.c
Log Message:
* More work on filesystem operation response
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewl_icon_local_viewer.c 1 Feb 2006 08:06:02 -0000 1.54
+++ ewl_icon_local_viewer.c 1 Feb 2006 11:48:21 -0000 1.55
@@ -590,8 +590,8 @@
PACKAGE_DATA_DIR
"/icons/e17_button_detail_new_dir.png");
ewl_iconbox_context_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
- ewl_callback_append (context, EWL_CALLBACK_CLICKED,
- ewl_iconbox_file_copy_cb, instance);
+ /*ewl_callback_append (context, EWL_CALLBACK_CLICKED,
+ ewl_iconbox_file_copy_cb, instance);*/
ewl_widget_show (context);
@@ -752,6 +752,11 @@
entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_FILE_PROGRESS));
+ /*We want to know if the backend needs feedback */
+ entropy_core_component_event_register (instance,
+ entropy_core_gui_event_get
+
(ENTROPY_GUI_EVENT_USER_INTERACTION_YES_NO_ABORT));
+
/*We want to know about thumbnail available events */
entropy_core_component_event_register (instance,
entropy_core_gui_event_get
@@ -1099,6 +1104,11 @@
}
break;
+ case ENTROPY_NOTIFY_USER_INTERACTION_YES_NO_ABORT: {
+ printf("Yes/No/Abort to file copy?\n");
+ }
+ break;
+
case ENTROPY_NOTIFY_FILE_STAT_AVAILABLE:{
entropy_file_stat *file_stat = (entropy_file_stat *) ret;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- filesystem.c 1 Feb 2006 08:06:02 -0000 1.37
+++ filesystem.c 1 Feb 2006 11:48:21 -0000 1.38
@@ -357,13 +357,6 @@
else
request->type = TYPE_END;
-
- /*Build up the gui_event wrapper */
- gui_event = entropy_malloc (sizeof (entropy_gui_event));
- gui_event->event_type =
- entropy_core_gui_event_get (ENTROPY_GUI_EVENT_FILE_PROGRESS);
- gui_event->data = request;
-
/*Find who called us */
uri =
evfs_filereference_to_string (data->resp_command.file_command.
@@ -371,12 +364,17 @@
instance = ecore_hash_get (file_copy_hash, uri);
if (instance) {
+ /*Build up the gui_event wrapper */
+ gui_event = entropy_malloc (sizeof (entropy_gui_event));
+ gui_event->event_type =
+ entropy_core_gui_event_get (ENTROPY_GUI_EVENT_FILE_PROGRESS);
+ gui_event->data = request;
+
entropy_core_layout_notify_event (instance, gui_event,
ENTROPY_EVENT_LOCAL);
}
else {
printf ("Could not get file copy caller for '%s'\n", uri);
- free (gui_event);
}
if (data->progress->type == EVFS_PROGRESS_TYPE_DONE) {
@@ -392,7 +390,36 @@
break;
case EVFS_EV_OPERATION: {
+ char *uri = NULL;
+ entropy_gui_component_instance* instance;
+ entropy_gui_event* gui_event;
+
printf("EVFS requested feedback on an operation!\n");
+
+ /*Find who called us */
+ uri =
+ evfs_filereference_to_string (data->resp_command.file_command.
+ files[0]);
+ instance = ecore_hash_get (file_copy_hash, uri);
+
+ if (instance) {
+ /*Build up the gui_event wrapper */
+ gui_event = entropy_malloc (sizeof (entropy_gui_event));
+ gui_event->event_type =
+ entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_USER_INTERACTION_YES_NO_ABORT);
+ gui_event->data = NULL;
+
+
+ entropy_core_layout_notify_event (instance, gui_event,
+ ENTROPY_EVENT_LOCAL);
+
+ printf("Requesting send of operation stat to instance %p, evfs
operation ID %ld\n", instance, data->op->id);
+ }
+ else {
+ printf ("Could not get file copy caller for '%s'\n", uri);
+ //free (gui_event);
+ }
+
}
break;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
