Enlightenment CVS committal

Author  : lordchaos
Project : e17
Module  : proto

Dir     : e17/proto/entropy/src/plugins


Modified Files:
        Makefile.am etk_list_viewer.c etk_structure_viewer.c 
        filesystem.c 


Log Message:
* ETK Progress dialog

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Makefile.am 20 Feb 2006 06:48:36 -0000      1.19
+++ Makefile.am 22 Feb 2006 13:09:47 -0000      1.20
@@ -79,12 +79,15 @@
 layout_etk_simple_la_LIBADD   = @ETK_LIBS@
 
 etk_structure_viewer_la_SOURCES    = $(top_srcdir)/src/entropy_gui.c \
+                               $(top_srcdir)/src/dialogs/etk_progress_dialog.c 
\
                                 etk_structure_viewer.c 
$(top_srcdir)/src/entropy_debug.c
 etk_structure_viewer_la_CFLAGS     = @ETK_CFLAGS@
 etk_structure_viewer_la_LDFLAGS    = -module -avoid-version
 etk_structure_viewer_la_LIBADD     = @ETK_LIBS@
 
-etk_list_la_SOURCES      =      etk_list_viewer.c 
$(top_srcdir)/src/entropy_gui.c \
+etk_list_la_SOURCES      =      etk_list_viewer.c \
+                               $(top_srcdir)/src/dialogs/etk_progress_dialog.c 
\
+                               $(top_srcdir)/src/entropy_gui.c \
                                         $(top_srcdir)/src/entropy_debug.c
 etk_list_la_CFLAGS       = @ETK_CFLAGS@
 etk_list_la_LDFLAGS      = -module -avoid-version
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_list_viewer.c   21 Feb 2006 12:11:33 -0000      1.15
+++ etk_list_viewer.c   22 Feb 2006 13:09:47 -0000      1.16
@@ -22,6 +22,8 @@
 
   Ecore_List *gui_events;
   Ecore_List *files;           /*The entropy_generic_file references we copy. 
*/
+
+  entropy_file_progress_window* progress;
   
   Etk_Widget *last_selected_label;
 };
@@ -331,6 +333,24 @@
      }
      break;      
 
+    case ENTROPY_NOTIFY_FILE_PROGRESS:{
+       entropy_etk_file_list_viewer *view = comp->data;
+       entropy_file_progress *progress = el;
+
+       if (!view->progress)
+               view->progress = entropy_etk_progress_window_create();
+
+       entropy_etk_progress_dialog_show(view->progress);
+       entropy_etk_progress_dialog_set_file_from_to(view->progress, 
progress->file_from, progress->file_to);
+       entropy_etk_progress_dialog_set_progress_pct(view->progress, 
&progress->progress);
+
+       if (progress->type == TYPE_END)
+               entropy_etk_progress_dialog_hide(view->progress);
+
+       
+     }
+     break;
+
      case ENTROPY_NOTIFY_THUMBNAIL_REQUEST:{
           /*Only bother if we have a thumbnail, and a component */
              if (el && comp) {
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_structure_viewer.c      21 Feb 2006 12:02:54 -0000      1.7
+++ etk_structure_viewer.c      22 Feb 2006 13:09:48 -0000      1.8
@@ -3,6 +3,7 @@
 #include <dlfcn.h>
 #include <limits.h>
 #include <Etk.h>
+#include "etk_progress_dialog.h"
 
 static int etk_callback_setup = 0;
 static Ecore_Hash* instance_map_hash;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- filesystem.c        21 Feb 2006 10:45:18 -0000      1.43
+++ filesystem.c        22 Feb 2006 13:09:48 -0000      1.44
@@ -350,9 +350,6 @@
        entropy_malloc (sizeof (entropy_file_progress));
       char *uri = NULL;
 
-      //printf("Progress for file '%s' is %f percent\n", 
-      //              (char*)data->resp_command.file_command.files[0]->path, 
data->progress.file_progress);
-
       ecore_list_goto_first(data->file_list.list);
       request->file_from = 
evfs_filereference_to_entropy_generic_file(ecore_list_current(data->file_list.list));
       ecore_list_next(data->file_list.list);




-------------------------------------------------------
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

Reply via email to