Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_dialog.c e_fm.c e_includes.h
e_int_config_theme_import.c e_int_config_wallpaper_import.c
e_int_menus.c
Added Files:
e_fwin.c e_fwin.h
Log Message:
breking out fm2 into a window and scrollframe in fwin - start of a generic
filemanager window. this is more for me to test dnd code and get that all
going right etc. etc. so BEWARE. yes it doesnt do a lot of things right - i
know. am working on it. :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -3 -r1.153 -r1.154
--- Makefile.am 21 Sep 2006 10:58:42 -0000 1.153
+++ Makefile.am 29 Sep 2006 06:49:35 -0000 1.154
@@ -171,7 +171,8 @@
e_fdo_menu_to_order.h \
e_sys.h \
e_obj_dialog.h \
-e_int_config_transitions.h
+e_int_config_transitions.h \
+e_fwin.h
enlightenment_src = \
e_user.c \
@@ -318,6 +319,7 @@
e_sys.c \
e_int_config_transitions.c \
e_obj_dialog.c \
+e_fwin.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_dialog.c 23 Aug 2006 03:39:01 -0000 1.38
+++ e_dialog.c 29 Sep 2006 06:49:35 -0000 1.39
@@ -66,8 +66,8 @@
evas_object_key_grab(o, "Return", mask, ~mask, 0);
mask = 0;
evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
- mask = 0;
- evas_object_key_grab(o, "space", mask, ~mask, 0);
+// mask = 0;
+// evas_object_key_grab(o, "space", mask, ~mask, 0);
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_e_dialog_cb_key_down, dia);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- e_fm.c 29 Sep 2006 04:36:35 -0000 1.80
+++ e_fm.c 29 Sep 2006 06:49:35 -0000 1.81
@@ -2564,7 +2564,7 @@
for (l = sd->icons; l; l = l->next)
{
ic = l->data;
- if (E_INSIDE(ev->x, ev->y, ic->x, ic->y, ic->w, ic->h))
+ if (E_INSIDE(ev->x, ev->y, ic->x - ic->sd->pos.x, ic->y -
ic->sd->pos.y, ic->w, ic->h))
{
printf("OVER %s\n", ic->info.file);
if (ic->drag.dnd) return;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- e_includes.h 21 Sep 2006 10:58:42 -0000 1.131
+++ e_includes.h 29 Sep 2006 06:49:35 -0000 1.132
@@ -147,3 +147,4 @@
#include "e_sys.h"
#include "e_int_config_transitions.h"
#include "e_obj_dialog.h"
+#include "e_fwin.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_theme_import.c 22 Sep 2006 19:55:11 -0000 1.8
+++ e_int_config_theme_import.c 29 Sep 2006 06:49:35 -0000 1.9
@@ -90,8 +90,8 @@
mask = 0;
evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
mask = 0;
- evas_object_key_grab(o, "Space", mask, ~mask, 0);
- mask = 0;
+// evas_object_key_grab(o, "space", mask, ~mask, 0);
+// mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_theme_import_cb_key_down, import);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_int_config_wallpaper_import.c 22 Sep 2006 19:55:11 -0000 1.26
+++ e_int_config_wallpaper_import.c 29 Sep 2006 06:49:35 -0000 1.27
@@ -120,8 +120,8 @@
mask = 0;
evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
mask = 0;
- evas_object_key_grab(o, "Space", mask, ~mask, 0);
- mask = 0;
+// evas_object_key_grab(o, "space", mask, ~mask, 0);
+// mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_import_cb_key_down, import);
o = e_widget_list_add(evas, 0, 0);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- e_int_menus.c 28 Sep 2006 06:07:15 -0000 1.167
+++ e_int_menus.c 29 Sep 2006 06:49:35 -0000 1.168
@@ -655,6 +655,12 @@
}
static void
+_e_int_menus_fileman_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ e_fwin_new(m->zone->container, "~/", "/");
+}
+
+static void
_e_int_menus_config_pre_cb(void *data, E_Menu *m)
{
E_Menu_Item *mi;
@@ -690,6 +696,14 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/applications");
e_menu_item_callback_set(mi, _e_int_menus_applications_item_cb, NULL);
+ mi = e_menu_item_new(m);
+ e_menu_item_separator_set(mi, 1);
+
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Filemanager"));
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/fileman");
+ e_menu_item_callback_set(mi, _e_int_menus_fileman_item_cb, NULL);
+
l = evas_hash_find(_e_int_menus_augmentation, "config");
if (l)
{
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
