Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am etk_icon_viewer.c
Log Message:
* Add context menu to etk icon viewer, in anticipation of double click support
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- Makefile.am 23 Apr 2006 11:16:31 -0000 1.38
+++ Makefile.am 30 Apr 2006 07:23:36 -0000 1.39
@@ -135,6 +135,7 @@
$(top_srcdir)/src/entropy_gui.c \
$(top_srcdir)/src/entropy_debug.c \
$(top_srcdir)/src/dialogs/etk_directory_add_dialog.c \
+
$(top_srcdir)/src/dialogs/etk_file_context_menu.c \
$(top_srcdir)/src/dialogs/etk_properties_dialog.c
etk_iconbox_la_CFLAGS = @ETK_CFLAGS@
etk_iconbox_la_LDFLAGS = -module -avoid-version
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_icon_viewer.c 12 Apr 2006 11:47:04 -0000 1.8
+++ etk_icon_viewer.c 30 Apr 2006 07:23:36 -0000 1.9
@@ -7,6 +7,7 @@
#include <Etk.h>
#include "etk_directory_add_dialog.h"
#include "etk_properties_dialog.h"
+#include "entropy_etk_context_menu.h"
typedef struct entropy_etk_iconbox_viewer entropy_etk_iconbox_viewer;
struct entropy_etk_iconbox_viewer
@@ -181,15 +182,22 @@
viewer = instance->data;
event = event_info;
- if (!(icon = etk_iconbox_icon_get_at_xy(ETK_ICONBOX(viewer->iconbox),
+ if (!(icon = etk_iconbox_icon_get_at_xy(ETK_ICONBOX(viewer->iconbox),
event->canvas.x, event->canvas.y, ETK_FALSE, ETK_TRUE, ETK_TRUE)))
- return;
+ return;
+
file = etk_iconbox_icon_data_get(icon);
- printf("File is %p\n", file);
- if (file) {
- entropy_event_action_file(file,instance);
+ if (event->button == 1) {
+ if (file) {
+ entropy_event_action_file(file,instance);
+ }
+ } else if (event->button == 3) {
+ etk_iconbox_unselect_all(icon->iconbox);
+ etk_iconbox_icon_select(icon);
+
+ entropy_etk_context_menu_popup(instance, file);
}
}
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs