Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am etk_list_viewer.c layout_etk_simple.c
Log Message:
* Move interaction dialog handler to layout
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- Makefile.am 5 Apr 2006 06:09:11 -0000 1.31
+++ Makefile.am 5 Apr 2006 06:28:00 -0000 1.32
@@ -97,6 +97,7 @@
if HAVE_ETK
layout_etk_simple_la_SOURCES = layout_etk_simple.c
$(top_srcdir)/src/entropy_debug.c \
$(top_srcdir)/src/dialogs/etk_progress_dialog.c \
+
$(top_srcdir)/src/dialogs/etk_interaction_dialog.c \
$(top_srcdir)/src/dialogs/etk_location_add_dialog.c \
$(top_srcdir)/src/dialogs/etk_mime_dialog_main.c \
$(top_srcdir)/src/dialogs/etk_file_cache_debug_dialog.c
@@ -113,7 +114,6 @@
etk_list_la_SOURCES = etk_list_viewer.c \
$(top_srcdir)/src/entropy_gui.c \
$(top_srcdir)/src/entropy_debug.c \
-
$(top_srcdir)/src/dialogs/etk_interaction_dialog.c \
$(top_srcdir)/src/dialogs/etk_directory_add_dialog.c \
$(top_srcdir)/src/dialogs/etk_properties_dialog.c
etk_list_la_CFLAGS = @ETK_CFLAGS@
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- etk_list_viewer.c 5 Apr 2006 06:09:11 -0000 1.57
+++ etk_list_viewer.c 5 Apr 2006 06:28:00 -0000 1.58
@@ -5,7 +5,6 @@
#include <limits.h>
#include <time.h>
#include <Etk.h>
-#include "etk_user_interaction_dialog.h"
#include "etk_directory_add_dialog.h"
#include "etk_properties_dialog.h"
@@ -790,11 +789,6 @@
}
break;
- case ENTROPY_NOTIFY_USER_INTERACTION_YES_NO_ABORT: {
- entropy_etk_user_interaction_dialog_new((entropy_file_operation*)el);
- }
- break;
-
case ENTROPY_NOTIFY_THUMBNAIL_REQUEST:{
/*Only bother if we have a thumbnail, and a component */
@@ -930,11 +924,6 @@
entropy_core_component_event_register (instance,
entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_FILE_STAT_AVAILABLE));
-
- /*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,
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- layout_etk_simple.c 5 Apr 2006 06:09:11 -0000 1.36
+++ layout_etk_simple.c 5 Apr 2006 06:28:00 -0000 1.37
@@ -3,6 +3,7 @@
#include "entropy_gui.h"
#include "etk_location_add_dialog.h"
#include "etk_progress_dialog.h"
+#include "etk_user_interaction_dialog.h"
#include "etk_mime_dialog.h"
#include "etk_file_cache_dialog.h"
#include <dlfcn.h>
@@ -355,6 +356,11 @@
}
break;
+
+ case ENTROPY_NOTIFY_USER_INTERACTION_YES_NO_ABORT: {
+
entropy_etk_user_interaction_dialog_new((entropy_file_operation*)el);
+ }
+ break;
}
}
@@ -413,10 +419,17 @@
/*Register this instance (the layout itself), to receive events that can be
safely handled
* by the layout (and reduce the clutter in the child plugins)
* i.e. PROGRESS events, Stat for properties, Overwrite yes/no/etc events,
etc*/
+
+ /*Handle progress events*/
entropy_core_component_event_register (layout,
entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_FILE_PROGRESS));
+ /*We want to know if the backend needs feedback */
+ entropy_core_component_event_register (layout,
+ entropy_core_gui_event_get
+
(ENTROPY_GUI_EVENT_USER_INTERACTION_YES_NO_ABORT));
+
/*Etk related init */
window = etk_window_new ();
@@ -483,8 +496,6 @@
etk_box_pack_start(ETK_BOX(vbox), menubar, ETK_FALSE, ETK_FALSE, 0);
etk_box_pack_start(ETK_BOX(vbox), gui->paned, TRUE, TRUE, 0);
-
- //etk_widget_size_request_set(ETK_WIDGET(window), 800,600);
/*Tree init*/
gui->tree = etk_tree_new();
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
