E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_hints.c Log Message: Fix typo generated by invalid search and replace. === RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -3 -r1.98 -r1.99 --- e_hints.c 30 Jun 2008 08:48:29 - 1.98 +++ e_hints.c 5 Jul 2008 09:22:14 - 1.99 @@ -44,7 +44,7 @@ /*ecore_x_netwm_supported(roots[supported_num], ECORE_X_ATOM_NET_RESTACK_WINDOW, 1);*/ supported[supported_num++] = ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS; - /* Applsupported_numcatsupported_numon Wsupported_numndow Propertsupported_numes */ + /* Application Window Properties */ supported[supported_num++] = ECORE_X_ATOM_NET_WM_NAME; supported[supported_num++] = ECORE_X_ATOM_NET_WM_VISIBLE_NAME; supported[supported_num++] = ECORE_X_ATOM_NET_WM_ICON_NAME; - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_fm_mime.c e_fm_mime.h
Log Message:
Add e_fm2_mime_handler_test() to run a mime handler's internal test funciton
When as right click an icon, we need to run the test function to determine of
context entries need to go into the menu or not. (previously, only the glob /
mime check was being done)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -3 -r1.218 -r1.219
--- e_fm.c 14 Oct 2007 17:31:27 - 1.218
+++ e_fm.c 15 Oct 2007 12:35:56 - 1.219
@@ -359,7 +359,7 @@
static void _e_fm2_client_mount(const char *udi, const char *mountpoint);
static void _e_fm2_client_unmount(const char *udi);
static void _e_fm2_sel_rect_update(void *data);
-static inline void _e_fm2_context_menu_append(Evas_List *l, E_Menu *mn,
E_Fm2_Icon *ic);
+static inline void _e_fm2_context_menu_append(Evas_Object *obj, const char
*path, Evas_List *l, E_Menu *mn, E_Fm2_Icon *ic);
static int _e_fm2_context_list_sort(void *data1, void *data2);
static char *_e_fm2_meta_path = NULL;
@@ -6877,14 +6877,16 @@
{
/* see if we have any mime handlers registered for this file */
l = e_fm2_mime_handler_mime_handlers_get(ic-info.mime);
-_e_fm2_context_menu_append(l, mn, ic);
+snprintf(buf, sizeof(buf), %s/%s, sd-realpath, ic-info.file);
+_e_fm2_context_menu_append(obj, buf, l, mn, ic);
if (l) evas_list_free(l);
}
/* see if we have any glob handlers registered for this file */
snprintf(buf, sizeof(buf), *%s, strrchr(ic-info.file, '.'));
l = e_fm2_mime_handler_glob_handlers_get(buf);
- _e_fm2_context_menu_append(l, mn, ic);
+ snprintf(buf, sizeof(buf), %s/%s, sd-realpath, ic-info.file);
+ _e_fm2_context_menu_append(obj, buf, l, mn, ic);
if (l) evas_list_free(l);
if (sd-icon_menu.end.func)
@@ -6918,7 +6920,7 @@
}
static inline void
-_e_fm2_context_menu_append(Evas_List *l, E_Menu *mn, E_Fm2_Icon *ic)
+_e_fm2_context_menu_append(Evas_Object *obj, const char *path, Evas_List *l,
E_Menu *mn, E_Fm2_Icon *ic)
{
Evas_List *ll = NULL;
E_Menu_Item *mi;
@@ -6926,16 +6928,24 @@
if (!l) return;
l = evas_list_sort(l, -1, _e_fm2_context_list_sort);
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
-
+
for (ll = l; ll; ll = ll-next)
{
E_Fm2_Mime_Handler *handler = NULL;
E_Fm2_Context_Menu_Data *md = NULL;
handler = ll-data;
- if (!handler) continue;
+ if ((!handler) || (!e_fm2_mime_handler_test(handler, obj, path)))
continue;
+
+ if (ll == l)
+ {
+/* only append the separator if this is the first item */
+/* we do this in here because we dont want to add a separator
+ * when we have no context entries */
+mi = e_menu_item_new(mn);
+e_menu_item_separator_set(mi, 1);
+ }
+
md = E_NEW(E_Fm2_Context_Menu_Data, 1);
if (!md) continue;
_e_fm2_menu_contexts = evas_list_append(_e_fm2_menu_contexts, md);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_fm_mime.c 14 Oct 2007 18:20:49 - 1.24
+++ e_fm_mime.c 15 Oct 2007 12:35:56 - 1.25
@@ -342,6 +342,16 @@
}
}
+/* run a handlers test function */
+EAPI Evas_Bool
+e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const
char *path)
+{
+ if ((!handler) || (!obj) || (!path)) return 0;
+ if (!handler-test_func) return 1;
+
+ return handler-test_func(obj, path, handler-test_data);
+}
+
/* local subsystem functions */
/* used to loop a glob hash and determine if the glob handler matches the
filename */
static Evas_Bool
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_fm_mime.h 14 Oct 2007 15:17:32 - 1.10
+++ e_fm_mime.h 15 Oct 2007 12:35:56 - 1.11
@@ -27,6 +27,7 @@
EAPI Evas_Bool e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const
char *mime);
EAPI Evas_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const
char *glob);
EAPI Evas_Bool e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler,
Evas_Object *obj, const char *path);
+EAPI Evas_Bool e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler,
Evas_Object *obj, const char *path);
EAPI void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const
char *path, const char *mime);
EAPI void
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_mime.c e_fm_mime.h
Log Message:
Skeleton code for upcoming context sensitive menus in EFM. This does nothing
and should be disregarded right now. (=
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_fm_mime.c 12 Oct 2007 08:17:40 - 1.14
+++ e_fm_mime.c 14 Oct 2007 12:22:52 - 1.15
@@ -115,6 +115,84 @@
icon_map = NULL;
}
+static Evas_Hash *_mime_handlers = NULL;
+static Evas_Hash *_glob_handlers = NULL;
+
+/* create (allocate), set properties, and return a new mime handler */
+EAPI E_Fm_Mime_Handler *
+e_fm_mime_handler_new(const char *label, const char *icon_group, void
(*action_func) (Evas_Object *obj, const char *path, void *data), int
(test_func) (Evas_Object *obj, const char *path, void *data))
+{
+ E_Fm_Mime_Handler *handler;
+
+ if (!label || !action_func)
+ return NULL;
+
+ handler = E_NEW( E_Fm_Mime_Handler, 1);
+ if (!handler)
+ return NULL;
+
+ handler-label = strdup(label);
+ handler-icon_group = icon_group ? strdup(icon_group) : NULL;
+ handler-action_func = action_func;
+ handler-test_func = test_func;
+
+ /* TODO: add data for both action_cb and test_cb */
+
+ return handler;
+}
+
+/* associate a certain mime type with a handler */
+EAPI int
+e_fm_mime_handler_mime_add(E_Fm_Mime_Handler *handler, const char *mime)
+{
+ Evas_List *handlers;
+
+ if (!handler || !mime)
+ return 0;
+
+ /* if there's an entry for this mime already, then append to its list */
+ if ((handlers = evas_hash_find(_mime_handlers, mime)))
+ {
+ handlers = evas_list_append(handlers, handler);
+ _mime_handlers = evas_hash_modify(_mime_handlers, mime, handlers);
+ }
+ else
+ {
+ /* no previous entry for this mime, lets add one */
+ handlers = NULL;
+ handlers = evas_list_append(handlers, handler);
+ _mime_handlers = evas_hash_add(_mime_handlers, mime, handlers);
+ }
+
+ return 1;
+}
+
+/* associate a certain glob with a handler */
+EAPI int
+e_fm_mime_handler_glob_add(E_Fm_Mime_Handler *handler, const char *glob)
+{
+ Evas_List *handlers;
+
+ if (!handler || !glob)
+ return 0;
+
+ /* if there's an entry for this glob already, then append to its list */
+ if ((handlers = evas_hash_find(_glob_handlers, glob)))
+ {
+ handlers = evas_list_append(handlers, handler);
+ _glob_handlers = evas_hash_modify(_glob_handlers, glob, handlers);
+ }
+ else
+ {
+ /* no previous entry for this mime, lets add one */
+ handlers = NULL;
+ handlers = evas_list_append(handlers, handler);
+ _glob_handlers = evas_hash_add(_mime_handlers, glob, handlers);
+ }
+
+ return 1;
+}
+
/* local subsystem functions */
static Evas_Bool
_e_fm_mime_icon_foreach(Evas_Hash *hash, const char *key, void *data, void
*fdata)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_fm_mime.h 4 Nov 2006 02:31:53 - 1.3
+++ e_fm_mime.h 14 Oct 2007 12:22:52 - 1.4
@@ -1,15 +1,28 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
- */
-#ifdef E_TYPEDEFS
-
-#else
-#ifndef E_FM_MIME_H
-#define E_FM_MIME_H
-
-EAPI const char *e_fm_mime_filename_get(const char *fname);
-EAPI const char *e_fm_mime_icon_get(const char *mime);
-EAPI void e_fm_mime_icon_cache_flush(void);
-
-#endif
-#endif
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+#else
+#ifndef E_FM_MIME_H
+#define E_FM_MIME_H
+
+typedef struct _E_Fm_Mime_Handler E_Fm_Mime_Handler;
+
+struct _E_Fm_Mime_Handler
+{
+ const char *label, *icon_group;
+ void (*action_func) (Evas_Object *obj, const char *path, void *data);
+ int (*test_func) (Evas_Object *obj, const char *path, void *data);
+};
+
+EAPI const char *e_fm_mime_filename_get(const char *fname);
+EAPI const char *e_fm_mime_icon_get(const char *mime);
+EAPI void e_fm_mime_icon_cache_flush(void);
+
+EAPI E_Fm_Mime_Handler *e_fm_mime_handler_new(const char *label, const char
*icon_group, void (*action_func) (Evas_Object *obj, const char *path, void
*data), int (test_func) (Evas_Object *obj, const char *path, void *data));
+EAPI int e_fm_mime_handler_mime_add(E_Fm_Mime_Handler *handler, const char
*mime);
+EAPI int e_fm_mime_handler_glob_add(E_Fm_Mime_Handler *handler, const char
*glob);
+
+#endif
+#endif
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_mime.c e_fm_mime.h
Log Message:
Add data pointers to test / action callbacks.
Add function to call a handler.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_fm_mime.c 14 Oct 2007 12:45:23 - 1.17
+++ e_fm_mime.c 14 Oct 2007 12:59:26 - 1.18
@@ -121,8 +121,10 @@
/* create (allocate), set properties, and return a new mime handler */
EAPI E_Fm_Mime_Handler *
e_fm_mime_handler_new(const char *label, const char *icon_group,
- void (*action_func) (Evas_Object *obj, const char *path,
void *data),
- int (test_func) (Evas_Object *obj, const char *path, void
*data))
+ void (*action_func) (Evas_Object *obj, const char *path,
void *data),
+ void *action_data,
+ int (test_func) (Evas_Object *obj, const char *path, void
*data),
+ void *test_data)
{
E_Fm_Mime_Handler *handler;
@@ -134,10 +136,10 @@
handler-label = evas_stringshare_add(label);
handler-icon_group = icon_group ? evas_stringshare_add(icon_group) : NULL;
handler-action_func = action_func;
+ handler-action_data = action_data;
handler-test_func = test_func;
-
- /* TODO: add data for both action_cb and test_cb */
-
+ handler-test_data = test_data;
+
return handler;
}
@@ -151,7 +153,7 @@
}
/* associate a certain mime type with a handler */
-EAPI int
+EAPI Evas_Bool
e_fm_mime_handler_mime_add(E_Fm_Mime_Handler *handler, const char *mime)
{
Evas_List *handlers = NULL;
@@ -175,7 +177,7 @@
}
/* associate a certain glob with a handler */
-EAPI int
+EAPI Evas_Bool
e_fm_mime_handler_glob_add(E_Fm_Mime_Handler *handler, const char *glob)
{
Evas_List *handlers = NULL;
@@ -197,7 +199,29 @@
return 1;
}
-
+
+/* call a certain handler */
+EAPI Evas_Bool
+e_fm_mime_handler_call(E_Fm_Mime_Handler *handler, Evas_Object *obj, const
char *path)
+{
+ if (!handler || !obj || !path || !handler-action_func)
+ return 0;
+
+ if (handler-test_func)
+ {
+ if (handler-test_func(obj, path, handler-test_data))
+ {
+handler-action_func(obj, path, handler-action_data);
+return 1;
+ }
+ else
+ return 0;
+ }
+
+ handler-action_func(obj, path, handler-action_data);
+ return 1;
+}
+
/* local subsystem functions */
static Evas_Bool
_e_fm_mime_icon_foreach(Evas_Hash *hash, const char *key, void *data, void
*fdata)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_fm_mime.h 14 Oct 2007 12:45:23 - 1.5
+++ e_fm_mime.h 14 Oct 2007 12:59:26 - 1.6
@@ -1,29 +1,33 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
- */
-#ifdef E_TYPEDEFS
-
-#else
-#ifndef E_FM_MIME_H
-#define E_FM_MIME_H
-
-typedef struct _E_Fm_Mime_Handler E_Fm_Mime_Handler;
-
-struct _E_Fm_Mime_Handler
-{
- const char *label, *icon_group;
- void (*action_func) (Evas_Object *obj, const char *path, void *data);
- int (*test_func) (Evas_Object *obj, const char *path, void *data);
-};
-
-EAPI const char *e_fm_mime_filename_get(const char *fname);
-EAPI const char *e_fm_mime_icon_get(const char *mime);
-EAPI void e_fm_mime_icon_cache_flush(void);
-
-EAPI E_Fm_Mime_Handler *e_fm_mime_handler_new(const char *label, const char
*icon_group, void (*action_func) (Evas_Object *obj, const char *path, void
*data), int (test_func) (Evas_Object *obj, const char *path, void *data));
-EAPI void e_fm_mime_handler_free(E_Fm_Mime_Handler *handler);
-EAPI int e_fm_mime_handler_mime_add(E_Fm_Mime_Handler *handler, const char
*mime);
-EAPI int e_fm_mime_handler_glob_add(E_Fm_Mime_Handler *handler, const char
*glob);
-
-#endif
-#endif
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+#else
+#ifndef E_FM_MIME_H
+#define E_FM_MIME_H
+
+typedef struct _E_Fm_Mime_Handler E_Fm_Mime_Handler;
+
+struct _E_Fm_Mime_Handler
+{
+ const char *label, *icon_group;
+ void (*action_func) (Evas_Object *obj, const char *path, void *data);
+ int (*test_func) (Evas_Object *obj, const char *path, void *data);
+ void *action_data;
+ void *test_data;
+};
+
+EAPI const char *e_fm_mime_filename_get(const char *fname);
+EAPI const char *e_fm_mime_icon_get(const char *mime);
+EAPI void e_fm_mime_icon_cache_flush(void);
+
+EAPI E_Fm_Mime_Handler *e_fm_mime_handler_new(const char *label, const char
*icon_group, void (*action_func) (Evas_Object *obj, const char *path, void
*data), void *action_data, int (test_func) (Evas_Object *obj, const char
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_mime.c e_fm_mime.h
Log Message:
Add functions to get list of handlers for glob and mime.
Add function sto call all handlers for a mime / glob.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_fm_mime.c 14 Oct 2007 13:39:39 - 1.19
+++ e_fm_mime.c 14 Oct 2007 14:12:03 - 1.20
@@ -199,6 +199,64 @@
return 1;
}
+/* delete a certain handler for a certian mime */
+EAPI void
+e_fm_mime_handler_mime_del(E_Fm_Mime_Handler *handler, const char *mime)
+{
+ Evas_List *handlers = NULL;
+
+ if ((!handler) || (!mime)) return;
+
+ /* if there's an entry for this mime already, then append to its list */
+ if ((handlers = evas_hash_find(_mime_handlers, mime)))
+ {
+ handlers = evas_list_remove(handlers, handler);
+ if (handlers)
+ _mime_handlers = evas_hash_modify(_mime_handlers, mime, handlers);
+ else
+ _mime_handlers = evas_hash_del(_mime_handlers, mime, handlers);
+ }
+}
+
+/* delete a certain handler for a certain glob */
+EAPI void
+e_fm_mime_handler_glob_del(E_Fm_Mime_Handler *handler, const char *glob)
+{
+ Evas_List *handlers = NULL;
+
+ if ((!handler) || (!glob)) return;
+
+ /* if there's an entry for this glob already, then append to its list */
+ if ((handlers = evas_hash_find(_glob_handlers, glob)))
+ {
+ handlers = evas_list_remove(handlers, handler);
+ if (handlers)
+ _glob_handlers = evas_hash_modify(_glob_handlers, glob, handlers);
+ else
+ _glob_handlers = evas_hash_del(_glob_handlers, glob, handlers);
+ }
+}
+
+/* get the list of mime handlers for a mime */
+EAPI Evas_List *
+e_fm_mime_handler_mime_handlers_get(const char *mime)
+{
+ if ((!mime) || (!_mime_handlers))
+ return NULL;
+
+ return evas_hash_find(_mime_handlers, mime);
+}
+
+/* get the list of glob handlers for a glob */
+EAPI Evas_List *
+e_fm_mime_handler_glob_handlers_get(const char *glob)
+{
+ if ((!glob) || (!_glob_handlers))
+ return NULL;
+
+ return evas_hash_find(_glob_handlers, glob);
+}
+
/* call a certain handler */
EAPI Evas_Bool
e_fm_mime_handler_call(E_Fm_Mime_Handler *handler, Evas_Object *obj, const
char *path)
@@ -221,39 +279,53 @@
return 1;
}
+/* call all handlers related to a certain mime */
EAPI void
-e_fm_mime_handler_mime_del(E_Fm_Mime_Handler *handler, const char *mime)
+e_fm_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path,
const char *mime)
{
- Evas_List *handlers = NULL;
+ Evas_List *handlers;
+ Evas_List *l;
- if ((!handler) || (!mime)) return;
+ if ((!obj) || (!path) || (!mime))
+ return;
- /* if there's an entry for this mime already, then append to its list */
- if ((handlers = evas_hash_find(_mime_handlers, mime)))
+ handlers = e_fm_mime_handler_mime_handlers_get(mime);
+ if (!handlers)
+ return;
+
+ for (l = handlers; l; l = l-next)
{
- handlers = evas_list_remove(handlers, handler);
- if (handlers)
- _mime_handlers = evas_hash_modify(_mime_handlers, mime, handlers);
- else
- _mime_handlers = evas_hash_del(_mime_handlers, mime, handlers);
+ E_Fm_Mime_Handler *handler;
+
+ handler = l-data;
+ if (!handler) continue;
+
+ e_fm_mime_handler_call(handler, obj, path);
}
}
+/* call all handlers related to a certain glob */
EAPI void
-e_fm_mime_handler_glob_del(E_Fm_Mime_Handler *handler, const char *glob)
+e_fm_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path,
const char *glob)
{
- Evas_List *handlers = NULL;
+ Evas_List *handlers;
+ Evas_List *l;
- if ((!handler) || (!glob)) return;
+ if ((!obj) || (!path) || (!glob))
+ return;
- /* if there's an entry for this glob already, then append to its list */
- if ((handlers = evas_hash_find(_glob_handlers, glob)))
+ handlers = e_fm_mime_handler_glob_handlers_get(glob);
+ if (!handlers)
+ return;
+
+ for (l = handlers; l; l = l-next)
{
- handlers = evas_list_remove(handlers, handler);
- if (handlers)
- _glob_handlers = evas_hash_modify(_glob_handlers, glob, handlers);
- else
- _glob_handlers = evas_hash_del(_glob_handlers, glob, handlers);
+ E_Fm_Mime_Handler *handler;
+
+ handler = l-data;
+ if (!handler) continue;
+
+ e_fm_mime_handler_call(handler, obj, path);
}
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_fm_mime.h 14 Oct 2007 13:39:39 - 1.7
+++ e_fm_mime.h 14 Oct 2007 14:12:03 - 1.8
@@
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_mime.h Log Message: Add functions to get list of handlers for glob and mime. Add function sto call all handlers for a mime / glob. === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_fm_mime.h 14 Oct 2007 14:12:03 - 1.8 +++ e_fm_mime.h 14 Oct 2007 14:13:12 - 1.9 @@ -28,6 +28,7 @@ EAPI Evas_Bool e_fm_mime_handler_glob_add(E_Fm_Mime_Handler *handler, const char *glob); EAPI Evas_Bool e_fm_mime_handler_call(E_Fm_Mime_Handler *handler, Evas_Object *obj, const char *path); EAPI void e_fm_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime); +EAPI void e_fm_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob); EAPI void e_fm_mime_handler_mime_del(E_Fm_Mime_Handler *handler, const char *mime); EAPI void e_fm_mime_handler_glob_del(E_Fm_Mime_Handler *handler, const char *glob); EAPI Evas_List *e_fm_mime_handler_mime_handlers_get(const char *mime); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_mime.c e_fm_mime.h
Log Message:
Rename from fm / Fm to fm2 / Fm2 to stay consistent with code.
Change glob get function to do glob matching.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_fm_mime.c 14 Oct 2007 14:12:03 - 1.20
+++ e_fm_mime.c 14 Oct 2007 15:17:32 - 1.21
@@ -3,7 +3,16 @@
*/
#include e.h
+/* local types */
+typedef struct _E_Fm2_Mime_Handler_Tuple E_Fm2_Mime_Handler_Tuple;
+struct _E_Fm2_Mime_Handler_Tuple
+{
+ Evas_List *list;
+ const char *str;
+};
+
/* local subsystem functions */
+static Evas_Bool _e_fm2_mime_handler_glob_match(Evas_Hash *hash, const char
*key, void *data, void *fdata);
static Evas_Bool _e_fm_mime_icon_foreach(Evas_Hash *hash, const char *key,
void *data, void *fdata);
static Evas_Hash *icon_map = NULL;
@@ -118,18 +127,18 @@
}
/* create (allocate), set properties, and return a new mime handler */
-EAPI E_Fm_Mime_Handler *
-e_fm_mime_handler_new(const char *label, const char *icon_group,
+EAPI E_Fm2_Mime_Handler *
+e_fm2_mime_handler_new(const char *label, const char *icon_group,
void (*action_func) (Evas_Object *obj, const char *path,
void *data),
void *action_data,
int (test_func) (Evas_Object *obj, const char *path, void
*data),
void *test_data)
{
- E_Fm_Mime_Handler *handler;
+ E_Fm2_Mime_Handler *handler;
if ((!label) || (!action_func)) return NULL;
- handler = E_NEW(E_Fm_Mime_Handler, 1);
+ handler = E_NEW(E_Fm2_Mime_Handler, 1);
if (!handler) return NULL;
handler-label = evas_stringshare_add(label);
@@ -143,7 +152,7 @@
}
EAPI void
-e_fm_mime_handler_free(E_Fm_Mime_Handler *handler)
+e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler)
{
if (!handler) return;
evas_stringshare_del(handler-label);
@@ -153,7 +162,7 @@
/* associate a certain mime type with a handler */
EAPI Evas_Bool
-e_fm_mime_handler_mime_add(E_Fm_Mime_Handler *handler, const char *mime)
+e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime)
{
Evas_List *handlers = NULL;
@@ -177,7 +186,7 @@
/* associate a certain glob with a handler */
EAPI Evas_Bool
-e_fm_mime_handler_glob_add(E_Fm_Mime_Handler *handler, const char *glob)
+e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob)
{
Evas_List *handlers = NULL;
@@ -201,7 +210,7 @@
/* delete a certain handler for a certian mime */
EAPI void
-e_fm_mime_handler_mime_del(E_Fm_Mime_Handler *handler, const char *mime)
+e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime)
{
Evas_List *handlers = NULL;
@@ -220,7 +229,7 @@
/* delete a certain handler for a certain glob */
EAPI void
-e_fm_mime_handler_glob_del(E_Fm_Mime_Handler *handler, const char *glob)
+e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob)
{
Evas_List *handlers = NULL;
@@ -239,7 +248,7 @@
/* get the list of mime handlers for a mime */
EAPI Evas_List *
-e_fm_mime_handler_mime_handlers_get(const char *mime)
+e_fm2_mime_handler_mime_handlers_get(const char *mime)
{
if ((!mime) || (!_mime_handlers))
return NULL;
@@ -247,19 +256,28 @@
return evas_hash_find(_mime_handlers, mime);
}
-/* get the list of glob handlers for a glob */
+/* get the list of glob handlers for a glob. NOTE: the list should be
free()'ed */
EAPI Evas_List *
-e_fm_mime_handler_glob_handlers_get(const char *glob)
+e_fm2_mime_handler_glob_handlers_get(const char *glob)
{
+ E_Fm2_Mime_Handler_Tuple *tuple;
+ Evas_List *handlers;
+
if ((!glob) || (!_glob_handlers))
return NULL;
-
- return evas_hash_find(_glob_handlers, glob);
+
+ tuple = E_NEW(E_Fm2_Mime_Handler_Tuple, 1);
+ tuple-list = NULL;
+ tuple-str = glob;
+ evas_hash_foreach(_glob_handlers, _e_fm2_mime_handler_glob_match, tuple);
+ handlers = tuple-list;
+ E_FREE(tuple);
+ return handlers;
}
/* call a certain handler */
EAPI Evas_Bool
-e_fm_mime_handler_call(E_Fm_Mime_Handler *handler, Evas_Object *obj, const
char *path)
+e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const
char *path)
{
if (!handler || !obj || !path || !handler-action_func)
return 0;
@@ -281,7 +299,7 @@
/* call all handlers related to a certain mime */
EAPI void
-e_fm_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path,
const char *mime)
+e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path,
const char *mime)
{
Evas_List *handlers;
Evas_List *l;
@@ -289,24 +307,24 @@
if ((!obj) || (!path) || (!mime))
return;
- handlers =
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_mime.c
Log Message:
Append the individual handlers to the list of handlers, not the list as a
whole.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_fm_mime.c 14 Oct 2007 15:17:32 - 1.21
+++ e_fm_mime.c 14 Oct 2007 15:25:57 - 1.22
@@ -12,7 +12,7 @@
};
/* local subsystem functions */
-static Evas_Bool _e_fm2_mime_handler_glob_match(Evas_Hash *hash, const char
*key, void *data, void *fdata);
+static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash, const
char *key, void *data, void *fdata);
static Evas_Bool _e_fm_mime_icon_foreach(Evas_Hash *hash, const char *key,
void *data, void *fdata);
static Evas_Hash *icon_map = NULL;
@@ -269,7 +269,7 @@
tuple = E_NEW(E_Fm2_Mime_Handler_Tuple, 1);
tuple-list = NULL;
tuple-str = glob;
- evas_hash_foreach(_glob_handlers, _e_fm2_mime_handler_glob_match, tuple);
+ evas_hash_foreach(_glob_handlers, _e_fm2_mime_handler_glob_match_foreach,
tuple);
handlers = tuple-list;
E_FREE(tuple);
return handlers;
@@ -349,13 +349,23 @@
/* local subsystem functions */
/* used to loop a glob hash and determine if the glob handler matches the
filename */
-static Evas_Bool _e_fm2_mime_handler_glob_match(Evas_Hash *hash, const char
*key, void *data, void *fdata)
+static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash, const
char *key, void *data, void *fdata)
{
E_Fm2_Mime_Handler_Tuple *tuple;
tuple = fdata;
if (e_util_glob_match(tuple-str, key))
- tuple-list = evas_list_append(tuple-list, data);
+ {
+ Evas_List *handlers;
+ Evas_List *l;
+
+ handlers = data;
+ for (l = handlers; l; l = l-next)
+ {
+if (handlers-data)
+ tuple-list = evas_list_append(tuple-list, handlers-data);
+ }
+ }
return 1;
}
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: ++TODO === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.547 retrieving revision 1.548 diff -u -3 -r1.547 -r1.548 --- TODO17 Jun 2007 01:11:11 - 1.547 +++ TODO6 Jul 2007 11:52:10 - 1.548 @@ -42,6 +42,8 @@ ESSENTIAL FEATURES --- +* after creating a background with the bg config dialog, we need to be able + to change its properties (stretch, tile, center, etc...) * fm2 removable devices seem to be mounted as root, not user, thus no write * fm2 theme needs to not suck * fwin initial placement needs to be near icon that spawned the fwin - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: POTFILES.in Log Message: fixies, thanks drexil === RCS file: /cvs/e/e17/apps/e/po/POTFILES.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- POTFILES.in 24 Jun 2007 17:27:05 - 1.20 +++ POTFILES.in 5 Jul 2007 12:17:45 - 1.21 @@ -53,9 +53,6 @@ src/bin/e_int_config_theme.c src/bin/e_int_config_theme_import.c src/bin/e_int_config_transitions.c -src/bin/e_int_config_wallpaper.c -src/bin/e_int_config_wallpaper_gradient.c -src/bin/e_int_config_wallpaper_import.c src/bin/e_int_config_window_display.c src/bin/e_int_config_window_manipulation.c src/bin/e_int_config_winlist.c - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: eap_to_desktop Log Message: this works on bsd now === RCS file: /cvs/e/e17/apps/e/eap_to_desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eap_to_desktop 17 Sep 2006 21:04:11 - 1.2 +++ eap_to_desktop 19 Sep 2006 19:38:44 - 1.3 @@ -7,8 +7,6 @@ # WARNING - this can make E unresponsive for a few minutes. Have patience. # Don't use this on module.eaps, as the icon ends up in the wrong place. - - WD=`pwd` FILENAME=`basename $@ .eap` @@ -16,7 +14,7 @@ rm -fr /tmp/convert.eap/$FILENAME mkdir -p /tmp/convert.eap/$FILENAME cp $FILENAME.eap /tmp/convert.eap/$FILENAME -pushd /tmp/convert.eap/$FILENAME /dev/null +cd /tmp/convert.eap/$FILENAME /dev/null eet -d $FILENAME.eap /dev/null NAME=`cat app/info/name 2/dev/null` @@ -32,50 +30,51 @@ ICLASS=`cat app/icon/class 2/dev/null` echo [Desktop Entry] $FILENAME.desktop -if [ $NAME ]; then +if [ ! -z $NAME ]; then echo Name=$NAME $FILENAME.desktop fi -if [ $GENERIC ]; then +if [ ! -z $GENERIC ]; then echo GenericName=$GENERIC $FILENAME.desktop fi -if [ $COMMENT ]; then +if [ ! -z $COMMENT ]; then echo Comment=$COMMENT $FILENAME.desktop fi -if [ $EXEC ]; then +if [ ! -z $EXEC ]; then echo Exec=$EXEC $FILENAME.desktop fi -if [ $STARTUP == 0 ]; then +if [ $STARTUP = 0 ]; then echo StartupNotify=false $FILENAME.desktop fi -if [ $STARTUP == 1 ]; then +if [ $STARTUP = 1 ]; then echo StartupNotify=true $FILENAME.desktop fi -if [ $WAIT == 0 ]; then +if [ $WAIT = 0 ]; then echo X-Enlightenment-WaitExit=false $FILENAME.desktop fi -if [ $WAIT == 1 ]; then +if [ $WAIT = 1 ]; then echo X-Enlightenment-WaitExit=true $FILENAME.desktop fi -if [ $WNAME ]; then + +if [ ! -z $WNAME ]; then echo X-Enlightenment-WIndowName=$WNAME $FILENAME.desktop fi -if [ $WCLASS ]; then +if [ ! -z $WCLASS ]; then echo StartupWMClass=$WCLASS $FILENAME.desktop fi -if [ $WTITLE ]; then +if [ ! -z $WTITLE ]; then echo X-Enlightenment-WindowTitle=$WTITLE $FILENAME.desktop fi -if [ $WROLE ]; then +if [ ! -z $WROLE ]; then echo X-Enlightenment-WindowRole=$WROLE $FILENAME.desktop fi -if [ $ICLASS ]; then +if [ ! -z $ICLASS ]; then echo X-Enlightenment-IconClass=$ICLASS $FILENAME.desktop fi echo Icon=$FILENAME $FILENAME.desktop cp -f $FILENAME.desktop $WD -popd /dev/null +cd $WD /dev/null mv $FILENAME.eap ~/.e/e/icons/$FILENAME.edj rm -fr /tmp/convert.eap/$FILENAME - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c
Log Message:
battery hasnt been working on my fbsd laptop for a couple monthes, couldnt be
bothered fixing, just did.
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- e_mod_main.c14 Aug 2006 15:22:45 - 1.85
+++ e_mod_main.c19 Aug 2006 09:07:33 - 1.86
@@ -932,7 +932,7 @@
len = sizeof(life);
if (sysctl(mib_life, 4, life, len, NULL, 0) == -1)
/* ERROR */
- level = -1;
+ level = -1;
bat_val = life;
@@ -1008,7 +1008,7 @@
stat-alarm = 1;
}
}
- if (!level)
+ if (level == -1)
{
stat-reading = strdup(_(BAD DRIVER));
stat-time = strdup(--:--);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e.h Log Message: this stuff only works with glibc, bsds compile now === RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- e.h 10 Jun 2006 22:05:50 - 1.48 +++ e.h 10 Jun 2006 23:32:50 - 1.49 @@ -41,9 +41,11 @@ # include memcheck.h #endif +#ifdef __GLIBC__ #ifdef OBJECT_PARANOIA_CHECK #include execinfo.h #include setjmp.h +#endif #endif #include Evas.h ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c
Log Message:
fix battery + freebsd
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_mod_main.c20 Apr 2006 11:48:42 - 1.72
+++ e_mod_main.c20 Apr 2006 11:52:40 - 1.73
@@ -204,7 +204,7 @@
battery_config-battery_check_mode = CHECK_APM;
}
}
- switch (ef-battery_check_mode)
+ switch (battery_config-battery_check_mode)
{
case CHECK_ACPI:
ret = _battery_bsd_acpi_check();
---
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps.c Log Message: - use new ecore_file_download api === RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -3 -r1.128 -r1.129 --- e_apps.c25 Mar 2006 05:28:57 - 1.128 +++ e_apps.c7 Apr 2006 12:27:20 - 1.129 @@ -563,7 +563,7 @@ if (!_e_app_is_eapp(file)) continue; snprintf(buf, sizeof(buf), %s/%s, _e_apps_path_all, ecore_file_get_file(file)); - if (!ecore_file_download(file, buf, NULL, NULL)) continue; + if (!ecore_file_download(file, buf, NULL, NULL, NULL)) continue; } } --- 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=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_int_config_keybindings.c
Log Message:
- alt+left/right arrow is not a very good idea for a binding, it breaks
firefox, irssi, etc.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -3 -r1.157 -r1.158
--- e_config.c 20 Mar 2006 03:18:29 - 1.157
+++ e_config.c 28 Mar 2006 07:25:12 - 1.158
@@ -784,12 +784,14 @@
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, r,
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
window_shaded_toggle, NULL);
+/* These fuck with other bindings like firefox, irssi, bitchx etc...
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, Left,
E_BINDING_MODIFIER_ALT, 0,
desk_linear_flip_by, -1);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, Right,
E_BINDING_MODIFIER_ALT, 0,
desk_linear_flip_by, 1);
+*/
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, F1,
E_BINDING_MODIFIER_ALT, 0,
desk_linear_flip_to, 0);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_config_keybindings.c 26 Mar 2006 03:48:52 - 1.15
+++ e_int_config_keybindings.c 28 Mar 2006 07:25:12 - 1.16
@@ -98,11 +98,12 @@
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{Flip Desktop By, desk_flip_by, NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{Flip Desktop To, desk_flip_to, NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
-
+/* These fuck with a lot of bindings like firefox, irssi, bitchx etc...
{Switch To Left Desktop, desk_linear_flip_by, -1, _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{Switch To Right Desktop, desk_linear_flip_by, 1, _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
+*/
{Flip Desktop Linearly..., desk_linear_flip_by, NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{Switch To Desktop 0, desk_linear_flip_to, 0, _DEFAULT_ACTION,
---
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=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman_smart.c e_fileman_smart.h Log Message: - remove the E_Drag code for now, its not working - start new xdnd implementation (not working now, but no more hangs) === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -3 -r1.121 -r1.122 --- e_fileman_smart.c 22 Jan 2006 18:14:50 - 1.121 +++ e_fileman_smart.c 7 Feb 2006 01:52:02 - 1.122 @@ -128,6 +128,7 @@ static void_e_fm_icon_mouse_out_cb (void *data, Evas *e, Evas_Object *obj, void *event_info); static void_e_fm_icon_mouse_move_cb (void *data, Evas *e, Evas_Object *obj, void *event_info); static int _e_fm_win_mouse_up_cb(void *data, int type, void *event); +static int _e_fm_win_mouse_move_cb(void *data, int type, void *event); static void_e_fm_string_replace(const char *src, const char *key, const char *replacement, char *result, size_t resultsize); @@ -139,12 +140,13 @@ static void_e_fm_icon_select_right(E_Fm_Smart_Data *sd); static void_e_fm_icon_run(E_Fm_Smart_Data *sd); -static int _e_fm_drop_enter_cb (void *data, int type, void *event); -static int _e_fm_drop_leave_cb (void *data, int type, void *event); -static int _e_fm_drop_position_cb (void *data, int type, void *event); -static int _e_fm_drop_drop_cb (void *data, int type, void *event); -static int _e_fm_drop_selection_cb (void *data, int type, void *event); -static void_e_fm_drop_done_cb (E_Drag *drag, int dropped); +static int _e_fm_xdnd_enter_cb (void *data, int type, void *event); +static int _e_fm_xdnd_leave_cb (void *data, int type, void *event); +static int _e_fm_xdnd_position_cb (void *data, int type, void *event); +static int _e_fm_xdnd_status_cb(void *data, int type, void *event); +static int _e_fm_xdnd_drop_cb (void *data, int type, void *event); +static int _e_fm_xdnd_selection_cb (void *data, int type, void *event); +static int _e_fm_xdnd_finished_cb (void *data, int type, void *event); static int _e_fm_files_sort_name_cb(void *d1, void *d2); static int _e_fm_files_sort_modtime_cb (void *d1, void *d2); @@ -162,6 +164,7 @@ static int _e_fm_init_assoc(E_Fm_Smart_Data *sd); static Ecore_Event_Handler *e_fm_mouse_up_handler = NULL; +static Ecore_Event_Handler *e_fm_mouse_move_handler = NULL; static double e_fm_grab_time = 0; static Evas_Smart *e_fm_smart = NULL; static char*meta_path = NULL; @@ -586,24 +589,32 @@ sd-event_handlers = evas_list_append(sd-event_handlers, ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER, - _e_fm_drop_enter_cb, + _e_fm_xdnd_enter_cb, sd)); sd-event_handlers = evas_list_append(sd-event_handlers, ecore_event_handler_add(ECORE_X_EVENT_XDND_LEAVE, - _e_fm_drop_leave_cb, + _e_fm_xdnd_leave_cb, +sd)); + sd-event_handlers = evas_list_append(sd-event_handlers, + ecore_event_handler_add(ECORE_X_EVENT_XDND_STATUS, + _e_fm_xdnd_status_cb, sd)); sd-event_handlers = evas_list_append(sd-event_handlers, ecore_event_handler_add(ECORE_X_EVENT_XDND_POSITION, - _e_fm_drop_position_cb, + _e_fm_xdnd_position_cb, sd)); sd-event_handlers = evas_list_append(sd-event_handlers, ecore_event_handler_add(ECORE_X_EVENT_XDND_DROP, - _e_fm_drop_drop_cb, + _e_fm_xdnd_drop_cb,
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_border.edc
Log Message:
add a pixel border to the default theme for people that want minimal borders.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_border.edc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- default_border.edc 6 Jan 2006 13:56:45 - 1.26
+++ default_border.edc 2 Feb 2006 11:44:13 - 1.27
@@ -4784,19 +4784,71 @@
action: STATE_SET default 0.0;
target: title_hung;
}
- }
+ }
}
-
-
-
-
-
-
-
-
-
-
+group {
+ name: widgets/border/pixel/border;
+ // ALSO:
+ // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped
+ data {
+// this tells e the border is shaped
+// item: shaped 1;
+ }
+ parts {
+ part {
+name: pixel;
+type: RECT;
+description {
+ state: default 0.0;
+ visible: 1;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ color: 0 0 0 255;
+}
+ }
+ part {
+name: whole;
+type: RECT;
+description {
+ state: default 0.0;
+ visible: 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+}
+ }
+ part {
+name: client;
+type: SWALLOW;
+description {
+ state:default 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 11;
+ to: pixel;
+
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -2 -2;
+ to: pixel;
+ }
+}
+ }
+ }
+}
FULL_SIZE_BORDER_BUTTON(close)
FULL_SIZE_BORDER_BUTTON(minimize)
---
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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_apps.h e_eap_editor.c e_fileman_file.c
e_fileman_file.h e_fileman_icon.c e_fileman_smart.c
Log Message:
- patch from mista (Efm)
- allow eap image w/h to be changable.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- e_apps.c13 Jan 2006 06:38:43 - 1.112
+++ e_apps.c14 Jan 2006 21:05:43 - 1.113
@@ -72,6 +72,9 @@
static char*_e_apps_path_trash = NULL;
static Evas_List *_e_apps_start_pending = NULL;
+#define EAP_MIN_WIDTH 8
+#define EAP_MIN_HEIGHT 8
+
#define EAP_EDC_TMPL \
images {\n \
image: \%s\ COMP;\n \
@@ -234,6 +237,8 @@
/* no image for now */
a-image = NULL;
+a-width = 0;
+a-height = 0;
/* record the path */
a-path = evas_stringshare_add(path);
@@ -289,6 +294,13 @@
return a;
}
+EAPI void
+e_app_image_size_set(E_App *a, int w, int h)
+{
+ a-width = w;
+ a-height = h;
+}
+
EAPI int
e_app_is_parent(E_App *parent, E_App *app)
{
@@ -1022,10 +1034,6 @@
eet_close(ef);
}
-/*
- * We also need to fix startup-notify and wait-exit as they currently
- * dont save too.
- */
EAPI void
e_app_fields_save(E_App *a)
{
@@ -1119,16 +1127,20 @@
iw = 0; ih = 0;
evas_object_image_size_get(im, iw, ih);
alpha = evas_object_image_alpha_get(im);
+ if(a-width = EAP_MIN_WIDTH)
+ a-width = EAP_MIN_WIDTH;
+ if(a-height = EAP_MIN_HEIGHT)
+ a-height = EAP_MIN_HEIGHT;
if ((iw 0) (ih 0))
{
/* we need to change the sizes */
-ecore_evas_resize(buf, 48, 48);
-evas_object_image_fill_set(im, 0, 0, 48, 48);
-evas_object_resize(im, 48, 48);
+ecore_evas_resize(buf, a-width, a-height);
+evas_object_image_fill_set(im, 0, 0, a-width, a-height);
+evas_object_resize(im, a-height, a-width);
evas_object_move(im, 0, 0);
evas_object_show(im);
data = ecore_evas_buffer_pixels_get(buf);
-eet_data_image_write(ef, images/0, (void *)data, 48, 48, alpha,
1, 0, 0);
+eet_data_image_write(ef, images/0, (void *)data, a-width,
a-height, alpha, 1, 0, 0);
}
}
@@ -1320,7 +1332,13 @@
else ipart[0] = '\0';
if (a-image)
- fprintf(out, EAP_EDC_TMPL, a-image, 48, 48, a-image);
+ {
+ if(a-width = 0)
+ a-width = EAP_MIN_WIDTH;
+ if(a-height = 0)
+ a-height = EAP_MIN_HEIGHT;
+ fprintf(out, EAP_EDC_TMPL, a-image, a-width, a-height, a-image);
+ }
else
fprintf(out, EAP_EDC_TMPL_EMPTY);
fclose(out);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_apps.h15 Dec 2005 07:12:00 - 1.26
+++ e_apps.h14 Jan 2006 21:05:43 - 1.27
@@ -63,6 +63,8 @@
unsigned char deleted : 1; /* this app's file is deleted from disk */
char *image; /* used when we're saving a image into the eap */
+ int width; /* used for saving eap's image width in edje */
+ int height; /* used for saving eap's image height in edje */
};
struct _E_App_Instance
@@ -79,6 +81,7 @@
EAPI E_App *e_app_new (const char *path,
int scan_subdirs);
EAPI E_App *e_app_empty_new (const char *path);
+EAPI voide_app_image_size_set(E_App *a, int w, int
h);
EAPI int e_app_is_parent (E_App *parent, E_App
*app);
EAPI int e_app_equals(E_App *app1, E_App
*app2);
EAPI voide_app_subdir_scan (E_App *a, int
scan_subdirs);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_eap_editor.c 7 Jan 2006 10:39:45 - 1.20
+++ e_eap_editor.c 14 Jan 2006 21:05:43 - 1.21
@@ -161,6 +161,10 @@
eap-startup_notify = cfdata-startup_notify;
eap-wait_exit = cfdata-wait_exit;
+ /* FIXME: hardcoded until the eap editor provides fields to change it */
+ eap-width = 128;
+ eap-height = 128;
+
e_app_fields_save(eap);
return 1;
@@ -213,6 +217,10 @@
if (cfdata-wrole) eap-win_role = evas_stringshare_add(cfdata-wrole);
if (cfdata-iclass) eap-icon_class =
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_icon_canvas.c
Log Message:
efm:
- patch from mista [EMAIL PROTECTED] to fix last line not showing in efm
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_canvas.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_icon_canvas.c 19 Dec 2005 14:11:28 - 1.6
+++ e_icon_canvas.c 28 Dec 2005 22:00:12 - 1.7
@@ -246,7 +246,7 @@
li-y = sd-yc;
sd-xc += li-w + sd-xs;
- sd-vh = sd-yc - sd-y;
+ sd-vh = (sd-yc - sd-y) + li-h;
}
else
{
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_icon_canvas.c
Log Message:
EFM:
- fix white window bug. please confirm if you still get it.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_canvas.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_icon_canvas.c 13 Dec 2005 14:56:21 - 1.4
+++ e_icon_canvas.c 19 Dec 2005 13:05:23 - 1.5
@@ -109,7 +109,6 @@
sd-frozen--;
//if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
-
return sd-frozen;
}
@@ -485,6 +484,8 @@
Evas_Coord x, y, w, h, maxw, maxh;
Evas_List *l;
+ _e_icon_canvas_smart_resize(sd-obj, sd-w, sd-h);
+
return;
if (!sd-changed) return;
@@ -616,6 +617,13 @@
tile-items = NULL;
sd-tiles[tx][ty] = tile;
+ if(E_INTERSECTS(sd-viewport.x, sd-viewport.y,
+ sd-viewport.w, sd-viewport.h,
+ tile-x, tile-y, tile-w, tile-h))
+ {
+ _e_icon_canvas_tile_show(tile);
+ }
+
return tile;
}
@@ -861,17 +869,12 @@
sd-viewport.w, sd-viewport.h,
t-x, t-y, t-w, t-h))
{
- Evas_List *l;
- Evas_Coord ox, oy;
-
if(t-visible == 1 !sd-xy_frozen)
continue;
_e_icon_canvas_tile_show(t);
}
else
{
- Evas_List *l;
-
if(!t-visible)
continue;
_e_icon_canvas_tile_hide(t);
@@ -917,24 +920,15 @@
sd-viewport.w, sd-viewport.h,
t-x, t-y, t-w, t-h))
{
- Evas_List *l;
- Evas_Coord ox, oy, dx, dy;
-
if(t-visible == 1)
continue;
- t-visible = 1;
- for(l = t-items; l; l = l-next)
-_e_icon_canvas_icon_show(l-data);
+ _e_icon_canvas_tile_show(t);
}
else
{
- Evas_List *l;
-
if(!t-visible)
continue;
- t-visible = 0;
- for(l = t-items; l; l = l-next)
-_e_icon_canvas_icon_hide(l-data);
+ _e_icon_canvas_tile_hide(t);
}
}
}
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c e_icon_canvas.c
Log Message:
EFM:
- e_icon_canvas cleanup and more work on white bug problem
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- e_fileman_smart.c 13 Dec 2005 14:56:21 - 1.114
+++ e_fileman_smart.c 19 Dec 2005 14:11:27 - 1.115
@@ -1529,7 +1529,7 @@
_e_fm_file_free(sd-files-data);
sd-files = evas_list_remove_list(sd-files, sd-files);
}
- e_icon_canvas_reset(sd-layout);
+ e_icon_canvas_reset(sd-layout);
/* Get new files */
if (sd-monitor) ecore_file_monitor_del(sd-monitor);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_canvas.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_icon_canvas.c 19 Dec 2005 13:05:23 - 1.5
+++ e_icon_canvas.c 19 Dec 2005 14:11:28 - 1.6
@@ -108,7 +108,7 @@
return -1;
sd-frozen--;
- //if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
+ if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
return sd-frozen;
}
@@ -138,7 +138,7 @@
sd-vw = w;
sd-vh = 0;
sd-changed = 1;
- //if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
+ if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
}
void
@@ -155,7 +155,7 @@
sd-vw = 0;
sd-vh = h;
sd-changed = 1;
- //if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
+ if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
}
void
@@ -318,7 +318,7 @@
sd-changed = 1;
- //if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
+ if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
}
void
@@ -342,9 +342,9 @@
if ((!obj) || !(sd = evas_object_smart_data_get(obj)))
return;
-
- sd-xc = sd-x + sd-xs;
- sd-yc = sd-y + sd-ys;
+
+ sd-xc = sd-viewport.x + sd-xs;
+ sd-yc = sd-viewport.y + sd-ys;
sd-mw = 0;
sd-mh = 0;
@@ -376,6 +376,9 @@
}
}
}
+
+ sd-x = sd-viewport.x;
+ sd-y = sd-viewport.y;
}
void
@@ -412,7 +415,7 @@
sd-viewport.obj = viewport;
evas_object_geometry_get(sd-viewport.obj, (sd-viewport.x),
(sd-viewport.y),
(sd-viewport.w), (sd-viewport.h));
- //if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
+ if (sd-frozen = 0) _e_icon_canvas_reconfigure(sd);
}
Evas_Object *
@@ -481,87 +484,37 @@
static void
_e_icon_canvas_reconfigure(E_Smart_Data *sd)
{
- Evas_Coord x, y, w, h, maxw, maxh;
- Evas_List *l;
-
- _e_icon_canvas_smart_resize(sd-obj, sd-w, sd-h);
-
- return;
-
- if (!sd-changed) return;
-
- x = sd-x + sd-xs;
- y = sd-y + sd-ys;
- w = sd-vw;
- h = sd-vh;
- maxw = 0;
- maxh = 0;
+ int i, j;
-#if 0
- while(sd-xlist.list)
- sd-xlist.list = evas_list_remove_list(sd-xlist.list, sd-xlist.list);
- while(sd-xlist.list)
- sd-ylist.list = evas_list_remove_list(sd-ylist.list, sd-ylist.list);
+ if(!sd-changed) return;
- if (sd-fixed == 0)
-{
- for (l = sd-items; l; l = l-next)
- {
- E_Icon_Canvas_Item *li;
- Evas_Object *obj;
-
- obj = l-data;
- li = evas_object_data_get(obj, e_icon_canvas_data);
-
- if(li-h maxh) maxh = li-h;
-
- if(x sd-x + w || x + li-w sd-x + w)
- {
- x = sd-x + sd-xs;
- y += maxh + sd-ys;
- maxh = 0;
- }
-
- li-x = x;
- li-y = y;
-
- _e_icon_canvas_pack(sd, obj);
-
- x += li-w + sd-xs;
- }
- sd-vh = y - sd-y;
-}
- else
-{
- for (l = sd-items; l; l = l-next)
- {
- E_Icon_Canvas_Item *li;
- Evas_Object *obj;
-
- obj = l-data;
- li = evas_object_data_get(obj, e_icon_canvas_data);
-
- if(li-w maxw) maxw = li-w;
-
- if(y sd-y + h || y + li-h sd-y + h)
- {
- y = sd-y + sd-ys;
- x += maxw + sd-xs;
- maxw = 0;
- }
-
- li-x = x;
- li-y = y;
-
- _e_icon_canvas_pack(sd, obj);
-
- y += li-h + sd-ys;
- }
- sd-vw = x - sd-x;
-}
-#endif
- sd-xc = x;
- sd-yc = y;
+ for(i = 0; i TILE_NUM; i++)
+ {
+ for(j = 0; j TILE_NUM; j++)
+ {
+if(sd-tiles[i][j])
+ {
+ E_Icon_Canvas_Tile *t;
+
+ t = sd-tiles[i][j];
+
+
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_configure.c e_icon.c e_includes.h
e_int_config_background.c e_thumb.c
Added Files:
e_int_config_theme.c e_int_config_theme.h
Log Message:
- misc checks
- add theme selector (basic mode only) from Chady
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- Makefile.am 17 Dec 2005 11:21:53 - 1.88
+++ Makefile.am 19 Dec 2005 14:42:43 - 1.89
@@ -121,6 +121,7 @@
e_int_config_window_manipulation.h \
e_int_config_window_display.h \
e_int_config_background.h \
+e_int_config_theme.h \
e_int_config_menus.h \
e_deskpreview.h \
e_exebuf.h \
@@ -226,6 +227,7 @@
e_int_config_window_manipulation.c \
e_int_config_window_display.c \
e_int_config_background.c \
+e_int_config_theme.c \
e_int_config_menus.c \
e_deskpreview.c \
e_exebuf.c \
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_configure.c 18 Dec 2005 10:44:55 - 1.17
+++ e_configure.c 19 Dec 2005 14:42:43 - 1.18
@@ -64,6 +64,7 @@
e_configure_standard_item_add(eco, enlightenment/e, _(Window
Manipulation), e_int_config_window_manipulation);
e_configure_standard_item_add(eco, enlightenment/e, _(Window Display),
e_int_config_window_display);
e_configure_standard_item_add(eco, enlightenment/desktops, _(Background
Settings), e_int_config_background);
+ e_configure_standard_item_add(eco, enlightenment/themes, _(Theme
Selector), e_int_config_theme);
e_configure_standard_item_add(eco, enlightenment/modules, _(Module
Settings), e_int_config_modules);
/* FIXME: we should have a way for modules to hook in here and add their
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_icon.c22 Nov 2005 09:27:25 - 1.10
+++ e_icon.c19 Dec 2005 14:42:43 - 1.11
@@ -42,6 +42,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
/* smart code here */
evas_object_image_file_set(sd-obj, file, NULL);
_e_icon_smart_reconfigure(sd);
@@ -53,6 +54,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
/* smart code here */
evas_object_image_file_set(sd-obj, file, key);
_e_icon_smart_reconfigure(sd);
@@ -64,6 +66,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
/* smart code here */
if (sd-obj) evas_object_del(sd-obj);
sd-obj = edje_object_add(evas_object_evas_get(obj));
@@ -77,6 +80,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
/* smart code here */
if (sd-obj) evas_object_del(sd-obj);
sd-obj = o;
@@ -90,6 +94,7 @@
char *file;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return NULL;
if (!strcmp(evas_object_type_get(sd-obj), edje))
{
edje_object_file_get(sd-obj, (const char **)file, NULL);
@@ -105,6 +110,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (!strcmp(evas_object_type_get(sd-obj), edje))
return;
evas_object_image_smooth_scale_set(sd-obj, smooth);
@@ -116,6 +122,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return 0;
if (!strcmp(evas_object_type_get(sd-obj), edje))
return 0;
return evas_object_image_smooth_scale_get(sd-obj);
@@ -127,6 +134,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (!strcmp(evas_object_type_get(sd-obj), edje))
return;
evas_object_image_alpha_set(sd-obj, alpha);
@@ -138,6 +146,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return 0;
if (!strcmp(evas_object_type_get(sd-obj), edje))
return 0;
return evas_object_image_alpha_get(sd-obj);
@@ -149,6 +158,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
return evas_object_image_size_get(sd-obj, w, h);
}
@@ -168,6 +178,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (((sd-fill_inside) (fill_inside)) ||
((!sd-fill_inside) (!fill_inside))) return;
sd-fill_inside = fill_inside;
@@ -180,6 +191,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (!strcmp(evas_object_type_get(sd-obj), edje))
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c e_icon_canvas.c
Log Message:
metadata + positioning:
- disable this for now so we can debug other things, them come back to it.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- e_fileman_smart.c 8 Dec 2005 13:03:06 - 1.113
+++ e_fileman_smart.c 13 Dec 2005 14:56:21 - 1.114
@@ -3292,6 +3292,11 @@
Eet_File *ef;
char buf[PATH_MAX];
char *hash;
+
+ /***
+* DISABLE FOR NOW
+***/
+ return 0;
if (!sd-dir) return 0;
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_canvas.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_icon_canvas.c 8 Dec 2005 13:03:06 - 1.3
+++ e_icon_canvas.c 13 Dec 2005 14:56:21 - 1.4
@@ -190,6 +190,7 @@
void
e_icon_canvas_pack_at_location(Evas_Object *obj, Evas_Object *child,
Evas_Object *(*create)(void *data), void (*destroy)(Evas_Object *obj, void
*data), void *data, Evas_Coord x, Evas_Coord y)
{
+#if 0
E_Smart_Data *sd;
E_Icon_Canvas_Item *li;
@@ -211,6 +212,10 @@
sd-vh = li-y + li-h;
_e_icon_canvas_pack(sd, li);
+#endif
+
+ e_icon_canvas_pack(obj, child, create, destroy, data);
+
}
void
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_thumb.c
Log Message:
- dont forget to close the eet file.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_thumb.c 8 Dec 2005 07:55:10 - 1.16
+++ e_thumb.c 8 Dec 2005 08:03:58 - 1.17
@@ -153,6 +153,7 @@
eet_file = _e_thumb_file_id(file);
if(!eet_file)
{
+eet_close(ef);
if(w) *w = -1;
if(h) *h = -1;
return;
@@ -160,6 +161,7 @@
ef = eet_open(eet_file, EET_FILE_MODE_READ);
if (!ef)
{
+eet_close(ef);
if(w) *w = -1;
if(h) *h = -1;
return;
@@ -170,6 +172,7 @@
ef = eet_open(file, EET_FILE_MODE_READ);
if (!ef)
{
+eet_close(ef);
if(w) *w = -1;
if(h) *h = -1;
return;
@@ -178,10 +181,12 @@
if(!eet_data_image_header_read(ef, /thumbnail/data/, w, h, NULL, NULL,
NULL, NULL))
{
+ eet_close(ef);
if(w) *w = -1;
if(h) *h = -1;
return;
}
+ eet_close(ef);
}
/* return true if the saved thumb exists OR if its an eap */
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_thumb.c
Log Message:
- remove trailing slash, thanks kiwi
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_thumb.c 8 Dec 2005 08:03:58 - 1.17
+++ e_thumb.c 8 Dec 2005 11:16:47 - 1.18
@@ -178,7 +178,7 @@
return;
}
}
- if(!eet_data_image_header_read(ef, /thumbnail/data/, w, h, NULL, NULL,
+ if(!eet_data_image_header_read(ef, /thumbnail/data, w, h, NULL, NULL,
NULL, NULL))
{
eet_close(ef);
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c e_icon_canvas.c
Log Message:
- better cleanups
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- e_fileman_smart.c 5 Dec 2005 22:20:34 - 1.112
+++ e_fileman_smart.c 8 Dec 2005 13:03:06 - 1.113
@@ -1768,9 +1768,13 @@
static void
_e_fm_file_free(E_Fm_Icon *icon)
{
- e_icon_canvas_unpack(icon-icon_obj);
- evas_object_del(icon-icon_obj);
- e_object_del(E_OBJECT(icon-file));
+ if(icon-icon_obj)
+ {
+ e_icon_canvas_unpack(icon-icon_obj);
+ evas_object_del(icon-icon_obj);
+ }
+ if(icon-file)
+ e_object_del(E_OBJECT(icon-file));
/*
if (file-menu)
e_object_del(E_OBJECT(file-menu));
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_canvas.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_icon_canvas.c 5 Dec 2005 22:20:34 - 1.2
+++ e_icon_canvas.c 8 Dec 2005 13:03:06 - 1.3
@@ -334,6 +334,7 @@
e_icon_canvas_reset(Evas_Object *obj)
{
E_Smart_Data *sd;
+ int i, j;
if ((!obj) || !(sd = evas_object_smart_data_get(obj)))
return;
@@ -343,15 +344,34 @@
sd-mw = 0;
sd-mh = 0;
-#if 0
while (sd-items)
-{
- Evas_Object *child;
-
- child = sd-items-data;
- e_icon_canvas_unpack(child);
-}
-#endif
+ {
+ E_Icon_Canvas_Item *li;
+
+ li = sd-items-data;
+ if(li-obj)
+ e_icon_canvas_unpack(li-obj);
+ else
+ sd-items = evas_list_remove(sd-items, li);
+ //free(li);
+ }
+
+ for(i = 0; i TILE_NUM; i++)
+ {
+ for(j = 0; j TILE_NUM; j++)
+ {
+if(sd-tiles[i][j])
+ {
+ E_Icon_Canvas_Tile *t;
+
+ t = sd-tiles[i][j];
+ while(t-items)
+ t-items = evas_list_remove(t-items, t-items-data);
+ free(sd-tiles[i][j]);
+ sd-tiles[i][j] = NULL;
+ }
+ }
+ }
}
void
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
- image propagation fix. ugly but works for now.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_eap_editor.c 6 Dec 2005 22:50:41 - 1.18
+++ e_eap_editor.c 7 Dec 2005 23:53:02 - 1.19
@@ -9,6 +9,7 @@
Evas_Object *img;
Evas_Object *img_widget;
+ int img_set;
E_App_Edit_CFData *cfdata;
};
@@ -236,7 +237,7 @@
o = e_widget_frametable_add(evas, _(Icon), 0);
- if(!editor-img)
+ if(!editor-img || editor-img_set != 1)
{
editor-img = e_icon_add(evas);
if(eap-path)
@@ -245,7 +246,7 @@
e_icon_fill_inside_set(editor-img, 1);
}
}
- else
+ else if(editor-img_set)
{
editor-img = e_icon_add(evas);
e_icon_file_set(editor-img, cfdata-image);
@@ -411,7 +412,8 @@
E_App_Edit *editor;
editor = data;
- printf(selected: %s\n, file);
+ editor-img_set = 1;
+ printf(selected: %s\n, file);
}
void
@@ -420,5 +422,6 @@
E_App_Edit *editor;
editor = data;
+ editor-img_set = 1;
printf(hilited: %s\n, file);
}
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_thumb.c
Log Message:
- add method to fetch a thumb's width and height without having to decode the
pixels.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_thumb.c 22 Nov 2005 09:27:25 - 1.15
+++ e_thumb.c 8 Dec 2005 07:55:10 - 1.16
@@ -138,6 +138,52 @@
return strdup(thumb);
}
+/* return the width and height of a thumb, if from_eet is set, then we
+ * assume that the file being passed is the thumb's eet
+ */
+void
+e_thumb_geometry_get(char *file, int *w, int *h, int from_eet)
+{
+ Eet_File *ef;
+
+ if(!from_eet)
+ {
+ char *eet_file;
+
+ eet_file = _e_thumb_file_id(file);
+ if(!eet_file)
+ {
+if(w) *w = -1;
+if(h) *h = -1;
+return;
+ }
+ ef = eet_open(eet_file, EET_FILE_MODE_READ);
+ if (!ef)
+ {
+if(w) *w = -1;
+if(h) *h = -1;
+return;
+ }
+ }
+ else
+ {
+ ef = eet_open(file, EET_FILE_MODE_READ);
+ if (!ef)
+ {
+if(w) *w = -1;
+if(h) *h = -1;
+return;
+ }
+ }
+ if(!eet_data_image_header_read(ef, /thumbnail/data/, w, h, NULL, NULL,
+ NULL, NULL))
+ {
+ if(w) *w = -1;
+ if(h) *h = -1;
+ return;
+ }
+}
+
/* return true if the saved thumb exists OR if its an eap */
int
e_thumb_exists(char *file)
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_thumb.h Log Message: - add a protoype in the .h file === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_thumb.h 22 Nov 2005 09:27:25 - 1.4 +++ e_thumb.h 8 Dec 2005 07:57:07 - 1.5 @@ -12,6 +12,7 @@ EAPI int e_thumb_shutdown(void); EAPI const char *e_thumb_dir_get(void); EAPI char *e_thumb_file_get(char *file); +EAPI void e_thumb_geometry_get(char *file, int *w, int *h, int from_eet); EAPI int e_thumb_exists(char *file); EAPI int e_thumb_create(char *file, Evas_Coord w, Evas_Coord h); EAPI Evas_Object *e_thumb_evas_object_get(char *file, Evas *evas, Evas_Coord width, Evas_Coord height, int shrink); --- 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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_file_selector.c
Log Message:
now how did that get away...
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_eap_editor.c 5 Dec 2005 22:20:33 - 1.16
+++ e_eap_editor.c 6 Dec 2005 10:07:55 - 1.17
@@ -399,8 +399,7 @@
E_App_Edit *editor;
editor = data;
- printf(selected: %s\n, file);
-
+ printf(selected: %s\n, file);
}
void
@@ -408,7 +407,6 @@
{
E_App_Edit *editor;
-// editor = data;
- printf(hilited: %s\n, file);
-
+ editor = data;
+ printf(hilited: %s\n, file);
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_selector.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_file_selector.c 5 Dec 2005 22:20:33 - 1.6
+++ e_file_selector.c 6 Dec 2005 10:07:55 - 1.7
@@ -235,6 +235,7 @@
sd-func(sd-parent, file, sd-func_data);
}
+static void
_e_file_selector_hilited_cb(Evas_Object *obj, char *file, void *data)
{
E_Smart_Data *sd;
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_ipc_handlers.h e_ipc_handlers_list.h
e_widget_iconsel.c
Log Message:
More eap editor work.
- small fix to hilite cb for iconsel
- propagate values between advanced / basic
- add -start-eap-edit to e_remote
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_eap_editor.c 6 Dec 2005 10:07:55 - 1.17
+++ e_eap_editor.c 6 Dec 2005 22:50:41 - 1.18
@@ -68,6 +68,7 @@
if (!editor) return;
editor-eap = a;
+ editor-img = NULL;
/* methods */
v.create_cfdata = _e_eap_edit_create_data;
@@ -95,6 +96,7 @@
IFDUP(cfdata-editor-eap-win_class, cfdata-wclass);
IFDUP(cfdata-editor-eap-win_title, cfdata-wtitle);
IFDUP(cfdata-editor-eap-win_role, cfdata-wrole);
+ IFDUP(cfdata-editor-eap-icon_class, cfdata-iclass);
IFDUP(cfdata-editor-eap-path, cfdata-path);
cfdata-startup_notify = cfdata-editor-eap-startup_notify;
cfdata-wait_exit = cfdata-editor-eap-wait_exit;
@@ -127,6 +129,7 @@
E_FREE(cfdata-wclass);
E_FREE(cfdata-wtitle);
E_FREE(cfdata-wrole);
+ E_FREE(cfdata-iclass);
E_FREE(cfdata-path);
E_FREE(cfdata-image);
free(data);
@@ -233,10 +236,19 @@
o = e_widget_frametable_add(evas, _(Icon), 0);
- editor-img = e_icon_add(evas);
- if(eap-path)
- {
- e_icon_file_key_set(editor-img, eap-path, images/0);
+ if(!editor-img)
+ {
+ editor-img = e_icon_add(evas);
+ if(eap-path)
+ {
+e_icon_file_key_set(editor-img, eap-path, images/0);
+e_icon_fill_inside_set(editor-img, 1);
+ }
+ }
+ else
+ {
+editor-img = e_icon_add(evas);
+ e_icon_file_set(editor-img, cfdata-image);
e_icon_fill_inside_set(editor-img, 1);
}
@@ -408,5 +420,5 @@
E_App_Edit *editor;
editor = data;
- printf(hilited: %s\n, file);
+ printf(hilited: %s\n, file);
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- e_ipc_handlers.h4 Dec 2005 12:03:58 - 1.113
+++ e_ipc_handlers.h6 Dec 2005 22:50:41 - 1.114
@@ -857,6 +857,31 @@
#endif
#undef HDL
//
+#define HDL E_IPC_EAP_EDIT_START
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP(-start-eap-edit, 1, Starts the Eap editor on the eap 'OPT1', 0, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_STRING(params[0], HDL);
+#elif (TYPE == E_WM_IN)
+ STRING(s, HDL);
+ E_App *a;
+ if(ecore_file_exists(s))
+ {
+ a = e_app_new(s, 0);
+ if(a)
+ e_eap_edit_show(e_container_current_get(e_manager_current_get()), a);
+ }
+ else
+{
+ a = e_app_empty_new(s);
+ if(a)
+e_eap_edit_show(e_container_current_get(e_manager_current_get()), a);
+}
+ END_STRING(s);
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+//
#define HDL E_IPC_OP_MODULE_LOAD
#if (TYPE == E_REMOTE_OPTIONS)
OP(-module-load, 1, Loads the module named 'OPT1' into memory, 0, HDL)
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers_list.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- e_ipc_handlers_list.h 24 Nov 2005 04:23:31 - 1.39
+++ e_ipc_handlers_list.h 6 Dec 2005 22:50:41 - 1.40
@@ -352,3 +352,5 @@
#define E_IPC_OP_CACHE_FLUSH_INTERVAL_SET 330
#define E_IPC_OP_CACHE_FLUSH_INTERVAL_GET 331
#define E_IPC_OP_CACHE_FLUSH_INTERVAL_GET_REPLY 332
+
+#define E_IPC_EAP_EDIT_START 333
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_iconsel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_widget_iconsel.c 5 Dec 2005 22:20:34 - 1.7
+++ e_widget_iconsel.c 6 Dec 2005 22:50:41 - 1.8
@@ -300,7 +300,7 @@
return;
if (wd-hilite_func)
- wd-hilite_func(wd-obj, file, wd-select_data);
+ wd-hilite_func(wd-obj, file, wd-hilite_data);
//e_icon_file_set(wd-o_icon, file);
E_FREE(*(wd-valptr));
---
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!
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_file_dialog.c e_file_dialog.h
e_file_selector.c e_file_selector.h e_fileman.c
e_fileman_smart.c e_fileman_smart.h e_icon_canvas.c
e_widget_fileman.c e_widget_iconsel.c e_widget_iconsel.h
Log Message:
Continue working on the eap editor and file dialog.
- add hilite propagation (single click file, press ok is now the same as double
clicking the file directly)
- eap editor saves new eaps if you give them a path, simple - advanced doesnt
relay the info between each other yet.
Going to try to do a bit every night.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_eap_editor.c 4 Dec 2005 12:03:58 - 1.15
+++ e_eap_editor.c 5 Dec 2005 22:20:33 - 1.16
@@ -44,6 +44,7 @@
static Evas_Object *_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd,
Evas *evas, void *data);
static Evas_Object *_e_eap_edit_advanced_create_widgets(E_Config_Dialog
*cfd, Evas *evas, void *data);
static void _e_eap_edit_select_cb(Evas_Object *obj, char *file, void
*data);
+static void _e_eap_edit_hilite_cb(Evas_Object *obj, char *file, void
*data);
#define IFDUP(src, dst) if (src) dst = strdup(src); else dst = NULL
@@ -242,6 +243,7 @@
editor-img_widget = e_widget_iconsel_add(evas, editor-img, 48, 48,
(cfdata-image));
e_widget_iconsel_select_callback_add(editor-img_widget,
_e_eap_edit_select_cb, editor);
+ e_widget_iconsel_hilite_callback_add(editor-img_widget,
_e_eap_edit_hilite_cb, editor);
e_widget_frametable_object_append(o, editor-img_widget,
0, 0, 1, 1,
1, 1, 1, 1);
@@ -400,3 +402,13 @@
printf(selected: %s\n, file);
}
+
+void
+_e_eap_edit_hilite_cb(Evas_Object *obj, char *file, void *data)
+{
+ E_App_Edit *editor;
+
+// editor = data;
+ printf(hilited: %s\n, file);
+
+}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_file_dialog.c 4 Dec 2005 12:03:58 - 1.9
+++ e_file_dialog.c 5 Dec 2005 22:20:33 - 1.10
@@ -10,6 +10,7 @@
static void _e_file_dialog_button2_click(void *data, E_Dialog *dia);
static void _e_file_dialog_free(E_File_Dialog *dia);
static void _e_file_dialog_file_select_cb(Evas_Object *obj, char *file, void
*data);
+static void _e_file_dialog_file_hilite_cb(Evas_Object *obj, char *file, void
*data);
E_File_Dialog *
e_file_dialog_new(E_Container *con)
@@ -41,6 +42,7 @@
dia-con = con;
dia-file = NULL;
dia-select_func = NULL;
+ dia-hilite_func = NULL;
dia-select_data = NULL;
evas = dia-dia-win-evas;
@@ -55,6 +57,7 @@
fm = e_widget_fileman_add(evas, (dia-file));
e_widget_fileman_select_callback_add(fm, _e_file_dialog_file_select_cb,
dia);
+ e_widget_fileman_hilite_callback_add(fm, _e_file_dialog_file_hilite_cb,
dia);
e_widget_list_object_append(ol, fm, 1, 1, 0.0);
e_widget_min_size_get(ol, w, h);
@@ -86,6 +89,13 @@
dia-select_data = data;
}
+void
+e_file_dialog_hilite_callback_add(E_File_Dialog *dia, void
(*func)(E_File_Dialog *dia, char *file, void *data), void *data)
+{
+ dia-hilite_func = func;
+ dia-hilite_data = data;
+}
+
/* local subsystem functions */
static void
@@ -96,7 +106,7 @@
dia = data;
if(dia-select_func dia-file)
dia-select_func(dia, dia-file, dia-select_data);
- _e_file_dialog_free(dia);
+ _e_file_dialog_free(dia);
}
static void
@@ -114,8 +124,20 @@
if(dia-select_func)
dia-select_func(dia, file, dia-select_data);
- printf(e_file_dialog: %s\n, file);
+ printf(e_file_dialog (select) : %s\n, file);
+
+}
+
+static void
+_e_file_dialog_file_hilite_cb(Evas_Object *obj, char *file, void *data)
+{
+ E_File_Dialog *dia;
+
+ dia = data;
+ if(dia-hilite_func)
+ dia-hilite_func(dia, file, dia-hilite_data);
+ printf(e_file_dialog (hilite) : %s\n, file);
}
static void
@@ -123,5 +145,5 @@
{
e_object_unref(E_OBJECT(dia-dia));
E_FREE(dia-file);
- free(dia);
+ //free(dia);
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_file_dialog.h 28 Oct 2005 23:37:13 - 1.2
+++ e_file_dialog.h 5 Dec 2005 22:20:33 - 1.3
@@ -22,12 +22,15 @@
void (*select_func)(E_File_Dialog *dia, char *file, void *data);
void
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_file_selector.c
Log Message:
- tiny fix for eap editor, this beings out another issue to address. when we
save metadata for a dir, we save icon positions. the eap editor is a small
window by default so icons will look out of place. need to think about it and
find a good way to solve it.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_selector.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_file_selector.c 4 Nov 2005 21:05:23 - 1.4
+++ e_file_selector.c 4 Dec 2005 09:47:49 - 1.5
@@ -118,6 +118,7 @@
{
E_Smart_Data *sd;
Evas *evas;
+ char *home;
sd = calloc(1, sizeof(E_Smart_Data));
if (!sd) return;
@@ -136,6 +137,12 @@
evas_object_smart_member_add(sd-frame, obj);
sd-files = e_fm_add(evas);
+
+ /* temp fix until this is handled properly */
+ home = e_user_homedir_get();
+ e_fm_dir_set(sd-files, home);
+ E_FREE(home);
+
e_fm_selector_enable(sd-files, _e_file_selector_selected_cb, sd);
evas_object_smart_member_add(sd-files, obj);
---
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://ads.osdn.com/?ad_id=7637alloc_id=16865op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_file_dialog.c e_fileman_smart.c Log Message: translation, thanks Massimo. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_file_dialog.c 6 Nov 2005 03:40:24 - 1.7 +++ e_file_dialog.c 4 Dec 2005 11:46:08 - 1.8 @@ -46,11 +46,11 @@ ol = e_widget_list_add(evas, 0, 1); - list = e_widget_framelist_add(evas, Places, 0); + list = e_widget_framelist_add(evas, _(Places), 0); e_widget_framelist_content_align_set(list, 0.5, 0.0); - e_widget_framelist_object_append(list, e_widget_button_add(evas, strdup(Home), fileman/home, NULL, NULL, NULL)); - e_widget_framelist_object_append(list, e_widget_button_add(evas, strdup(Desktop), fileman/desktop, NULL, NULL, NULL)); - e_widget_framelist_object_append(list, e_widget_button_add(evas, strdup(Icons), fileman/folder, NULL, NULL, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, strdup(_(Home)), fileman/home, NULL, NULL, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, strdup(_(Desktop)), fileman/desktop, NULL, NULL, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, strdup(_(Icons)), fileman/folder, NULL, NULL, NULL)); e_widget_list_object_append(ol, list, 1, 0, 0.0); fm = e_widget_fileman_add(evas, (dia-file)); @@ -60,8 +60,8 @@ e_widget_min_size_get(ol, w, h); e_dialog_content_set(dia-dia, ol, w, h); - e_dialog_button_add(dia-dia, Ok, NULL, _e_file_dialog_button1_click, dia); - e_dialog_button_add(dia-dia, Cancel, NULL, _e_file_dialog_button2_click, dia); + e_dialog_button_add(dia-dia, _(Ok), NULL, _e_file_dialog_button1_click, dia); + e_dialog_button_add(dia-dia, _(Cancel), NULL, _e_file_dialog_button2_click, dia); return dia; } === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.110 retrieving revision 1.111 diff -u -3 -r1.110 -r1.111 --- e_fileman_smart.c 3 Dec 2005 12:25:06 - 1.110 +++ e_fileman_smart.c 4 Dec 2005 11:46:09 - 1.111 @@ -928,10 +928,10 @@ char text[PATH_MAX + 256]; dia = e_dialog_new(icon-sd-win-container); - e_dialog_button_add(dia, Ok, NULL, NULL, NULL); + e_dialog_button_add(dia, _(Ok), NULL, NULL, NULL); e_dialog_button_focus_num(dia, 1); - e_dialog_title_set(dia, Error); - snprintf(text, PATH_MAX + 256, Could not delete brb%s/b, icon-file-path); + e_dialog_title_set(dia, _(Error)); + snprintf(text, PATH_MAX + 256, _(Could not delete brb%s/b), icon-file-path); e_dialog_text_set(dia, text); e_dialog_show(dia); return; @@ -1023,11 +1023,11 @@ icon = data; dia = e_dialog_new(icon-sd-win-container); - e_dialog_button_add(dia, Yes, NULL, _e_fm_file_delete_yes_cb, icon); - e_dialog_button_add(dia, No, NULL, NULL, NULL); + e_dialog_button_add(dia, _(Yes), NULL, _e_fm_file_delete_yes_cb, icon); + e_dialog_button_add(dia, _(No), NULL, NULL, NULL); e_dialog_button_focus_num(dia, 1); - e_dialog_title_set(dia, Confirm); - snprintf(text, PATH_MAX + 256, Are you sure you want to delete brb%s/b ?, icon-file-name); + e_dialog_title_set(dia, _(Confirm)); + snprintf(text, PATH_MAX + 256, _( Are you sure you want to delete brb%s/b ?), icon-file-name); e_dialog_text_set(dia, text); e_dialog_show(dia); } @@ -1332,22 +1332,22 @@ o = e_widget_list_add(evas, 0, 0); of = e_widget_frametable_add(evas, _(File Info:), 0); - ob = e_widget_label_add(evas, Owner:); + ob = e_widget_label_add(evas, _(Owner:)); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); ob = e_widget_label_add(evas, strdup(usr-pw_name)); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, Group:); + ob = e_widget_label_add(evas, _(Group:)); e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); ob = e_widget_label_add(evas, strdup(grp-gr_name)); e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, Last Access:); + ob = e_widget_label_add(evas, _(Last Access:)); e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); ob = e_widget_label_add(evas, lastaccess); e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, Last Modified:); + ob = e_widget_label_add(evas, _(Last Modified:)); e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1); ob = e_widget_label_add(evas, lastmod);
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c Log Message: - int patch by Massimo Maiurana [EMAIL PROTECTED] === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_eap_editor.c 4 Nov 2005 21:06:31 - 1.13 +++ e_eap_editor.c 27 Nov 2005 21:24:48 - 1.14 @@ -230,7 +230,7 @@ o = e_widget_frametable_add(evas, _(Basic Info), 0); - e_widget_frametable_object_append(o, e_widget_label_add(evas, App name), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(App name)), 0, 0, 1, 1, 1, 1, 1, 1); @@ -240,7 +240,7 @@ 1, 0, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_label_add(evas, Executable), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Executable)), 0, 1, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(o, e_widget_entry_add(evas, (cfdata-exe)), @@ -272,7 +272,7 @@ o = e_widget_frametable_add(evas, _(General), 0); /*- general info -*/ - e_widget_frametable_object_append(o, e_widget_label_add(evas, Generic Info), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Generic Info)), 0, 0, 1, 1, 1, 1, 1, 1); entry = e_widget_entry_add(evas, (cfdata-generic)); @@ -281,7 +281,7 @@ 1, 0, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_label_add(evas, Comment), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Comment)), 0, 1, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(o, e_widget_entry_add(evas, (cfdata-comment)), @@ -295,7 +295,7 @@ o = e_widget_frametable_add(evas, _(Window), 0); - e_widget_frametable_object_append(o, e_widget_label_add(evas, Window Name), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Window Name)), 0, 0, 1, 1, 1, 1, 1, 1); entry = e_widget_entry_add(evas, (cfdata-wname)); @@ -304,21 +304,21 @@ 1, 0, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_label_add(evas, Window Class), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Window Class)), 0, 1, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(o, e_widget_entry_add(evas, (cfdata-wclass)), 1, 1, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_label_add(evas, Window Title), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Window Title)), 0, 2, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(o, e_widget_entry_add(evas, (cfdata-wtitle)), 1, 2, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_label_add(evas, Window Role), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Window Role)), 0, 3, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(o, e_widget_entry_add(evas, (cfdata-wrole)), @@ -331,7 +331,7 @@ o = e_widget_frametable_add(evas, _(Icon), 0); - e_widget_frametable_object_append(o, e_widget_label_add(evas, Icon Class), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Icon Class)), 0, 0, 1, 1, 1, 1, 1, 1); entry = e_widget_entry_add(evas, (cfdata-iclass)); @@ -340,7 +340,7 @@ 1, 0, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_label_add(evas, Path), + e_widget_frametable_object_append(o, e_widget_label_add(evas, _(Path)), 0, 1, 1, 1, 1, 1, 1, 1); @@ -355,11 +355,11 @@ o = e_widget_frametable_add(evas, _(Misc), 0); - e_widget_frametable_object_append(o, e_widget_check_add(evas, Startup Notify, (cfdata-startup_notify)), + e_widget_frametable_object_append(o, e_widget_check_add(evas, _(Startup Notify),
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_configure.c e_fileman.c e_fileman_icon.c e_fileman_smart.c e_fileman_smart.h e_icon.c e_icon.h e_includes.h e_int_menus.c e_thumb.c e_thumb.h e_widget_image.c e_widget_image.h Added Files: e_icon_grid.c e_icon_grid.h e_int_config_background.c e_int_config_background.h Removed Files: e_icon_layout.c e_icon_layout.h Log Message: - make e_thumb fork internally - add queue / dequeue calls to e_thumb - change e_icon_layout to e_icon_grid - add e_icon_canvas which will eventually allow for free icon placement and optimized scrolling using a tiles principle - add new calls to e_widget_image - add new bg selector (broken because of a segv on cancel press, needs fixing) NOTES: - bg selector needs fixing. - efm still needs work, will segv if you scroll while files are generated - other efm bugs exist so I would advise that you dont use it atm - if we dont need e_icon_grid (strict grid layout) we should remove it. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.82 retrieving revision 1.83 diff -u -3 -r1.82 -r1.83 --- Makefile.am 21 Nov 2005 12:44:19 - 1.82 +++ Makefile.am 22 Nov 2005 09:27:25 - 1.83 @@ -97,9 +97,10 @@ e_widget_image.h \ e_config_dialog.h \ e_int_config_focus.h \ +e_icon_grid.h \ +e_icon_canvas.h \ e_int_config_desks.h \ e_configure.h \ -e_icon_layout.h \ e_int_border_locks.h \ e_thumb.h \ e_int_border_remember.h \ @@ -117,7 +118,8 @@ e_slider.h \ e_widget_slider.h \ e_int_config_window_manipulation.h \ -e_int_config_window_display.h +e_int_config_window_display.h \ +e_int_config_background.h enlightenment_src = \ e_user.c \ @@ -195,9 +197,10 @@ e_widget_image.c \ e_config_dialog.c \ e_int_config_focus.c \ +e_icon_grid.c \ +e_icon_canvas.c \ e_int_config_desks.c \ e_configure.c \ -e_icon_layout.c \ e_int_border_locks.c \ e_thumb.c \ e_int_border_remember.c \ @@ -216,6 +219,7 @@ e_widget_slider.c \ e_int_config_window_manipulation.c \ e_int_config_window_display.c \ +e_int_config_background.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_configure.c 21 Nov 2005 12:44:19 - 1.13 +++ e_configure.c 22 Nov 2005 09:27:25 - 1.14 @@ -62,6 +62,7 @@ e_configure_standard_item_add(eco, enlightenment/e, _(Desktop Settings), e_int_config_desks); e_configure_standard_item_add(eco, enlightenment/e, _(Window Manipulation), e_int_config_window_manipulation); e_configure_standard_item_add(eco, enlightenment/e, _(Window Display), e_int_config_window_display); + //e_configure_standard_item_add(eco, enlightenment/desktops, _(Background Settings), e_int_config_background); /* FIXME: we should have a way for modules to hook in here and add their * own entries === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_fileman.c 9 Nov 2005 02:00:33 - 1.26 +++ e_fileman.c 22 Nov 2005 09:27:25 - 1.27 @@ -88,7 +88,6 @@ evas_event_freeze(fileman-evas); fileman-smart = e_fm_add(fileman-evas); e_fm_e_win_set(fileman-smart, fileman-win); - e_fm_dir_set(fileman-smart, dir); fileman-main = e_scrollframe_add(fileman-evas); e_scrollframe_custom_theme_set(fileman-main, base/themes/fileman, @@ -102,6 +101,8 @@ e_win_resize_callback_set(fileman-win, _e_fileman_resize_cb); e_win_resize(fileman-win, 570, 355); + e_fm_dir_set(fileman-smart, dir); + ecore_x_dnd_aware_set(fileman-win-evas_win, 1); evas_event_thaw(fileman-evas); === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- e_fileman_icon.c10 Nov 2005 11:52:26 - 1.23 +++ e_fileman_icon.c22 Nov 2005 09:27:25 - 1.24 @@ -26,6 +26,8 @@ unsigned charvisible : 1; int type; + + E_Fm_Icon_Metadata *meta; }; /* local subsystem functions */ @@ -40,13 +42,9 @@ /* Create icons */ static void _e_fm_icon_icon_mime_get(E_Smart_Data *sd); - -static void _e_fm_icon_thumb_generate(void); -static int _e_fm_icon_thumb_cb_exe_exit(void *data, int type, void *event); - -static void _e_fm_icon_type_set(E_Smart_Data *sd); - -static void _e_fm_icon_meta_fill(E_Fm_Icon_Metadata *m, E_Smart_Data
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Added Files: e_icon_canvas.c e_icon_canvas.h Log Message: - add canvas files. --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today Register for a JBoss Training Course. Free Certification Exam for All Training Attendees Through End of 2005. For more info visit: http://ads.osdn.com/?ad_id=7628alloc_id=16845op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: nl.po Log Message: dont forget \n === RCS file: /cvsroot/enlightenment/e17/apps/e/po/nl.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- nl.po 13 Nov 2005 00:28:56 - 1.5 +++ nl.po 13 Nov 2005 12:01:09 - 1.6 @@ -714,7 +714,7 @@ #: src/bin/e_main.c:368 msgid Enlightenment cannot initialize the Thumbnailing system.\n -msgstr Enlightenment kan zijn Thumbnailing systeem niet instellen +msgstr Enlightenment kan zijn Thumbnailing systeem niet instellen\n #: src/bin/e_main.c:377 msgid Enlightenment cannot initialize the File manager.\n --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- add metadata structs to icons
- add metadata per dir
- small theme change
- bug: i have something wrong with saving the eet list. can anyone find out
what it is?
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- default_fileman.edc 9 Nov 2005 08:08:05 - 1.28
+++ default_fileman.edc 10 Nov 2005 09:12:58 - 1.29
@@ -100,6 +100,7 @@
signal: clicked; \
source: ; \
action: STATE_SET clicked 0.0; \
+transition: LINEAR 0.1; \
target: icon; \
} \
program { \
@@ -107,6 +108,7 @@
signal: unclicked; \
source: ; \
action: STATE_SET default 0.0; \
+transition: LINEAR 0.1; \
target: icon; \
} \
program { \
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_icon.h e_fileman_smart.c
e_icon_layout.c e_icon_layout.h
Log Message:
- add metadata structs to icons
- add metadata per dir
- small theme change
- bug: i have something wrong with saving the eet list. can anyone find out
what it is?
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_fileman_icon.c8 Nov 2005 06:47:48 - 1.21
+++ e_fileman_icon.c10 Nov 2005 09:12:58 - 1.22
@@ -3,6 +3,26 @@
*/
#include e.h
+#define NEWD(str, typ) \
+ eet_data_descriptor_new(str, sizeof(typ), \
+ (void *(*) (void *))evas_list_next, \
+ (void *(*) (void *, void *))evas_list_append, \
+ (void *(*) (void *))evas_list_data, \
+ (void *(*) (void *))evas_list_free, \
+ (void (*) (void *, int (*) (void *, const char
*, void *, void *), void *))evas_hash_foreach, \
+ (void *(*) (void *, const char *, void
*))evas_hash_add, \
+ (void (*) (void *))evas_hash_free)
+
+#define FREED(eed) \
+ if (eed) \
+ { \
+ eet_data_descriptor_free((eed)); \
+ (eed) = NULL; \
+ }
+#define NEWI(str, it, type) \
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_e_fm_icon_meta_edd, E_Fm_Icon_Metadata, str,
it, type)
+
+
typedef struct _E_Smart_Data E_Smart_Data;
struct _E_Smart_Data
@@ -46,6 +66,7 @@
static void _e_fm_icon_type_set(E_Smart_Data *sd);
+static void _e_fm_icon_meta_fill(E_Fm_Icon_Metadata *m, E_Smart_Data *sd);
/* local subsystem globals */
static Evas_Smart *e_smart = NULL;
@@ -55,10 +76,19 @@
static Evas_List *event_handlers = NULL;
+static Eet_Data_Descriptor *_e_fm_icon_meta_edd = NULL;
+
/* externally accessible functions */
int
e_fm_icon_init(void)
{
+ _e_fm_icon_meta_edd = NEWD(E_Fm_Icon_Metadata, E_Fm_Icon_Metadata);
+ NEWI(x, x, EET_T_INT);
+ NEWI(y, y, EET_T_INT);
+ NEWI(w, w, EET_T_INT);
+ NEWI(h, h, EET_T_INT);
+ NEWI(nm, name, EET_T_STRING);
+
event_handlers = evas_list_append(event_handlers,
ecore_event_handler_add(ECORE_EVENT_EXE_EXIT,
_e_fm_icon_thumb_cb_exe_exit,
@@ -69,6 +99,7 @@
int
e_fm_icon_shutdown(void)
{
+ FREED(_e_fm_icon_meta_edd);
while (event_handlers)
{
ecore_event_handler_del(event_handlers-data);
@@ -109,7 +140,10 @@
e_fm_icon_type_set(Evas_Object *obj, int type)
{
E_Smart_Data *sd;
-
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+
if(sd-type == type)
return;
@@ -136,7 +170,8 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
- e_object_ref(E_OBJECT(file));
+ if(!sd-file)
+ e_object_ref(E_OBJECT(file));
sd-file = file;
file-icon_object = obj;
@@ -187,6 +222,51 @@
}
void
+e_fm_icon_appear_cb(Evas_Object *obj, void *data)
+{
+ E_Smart_Data *sd;
+
+ evas_object_show(obj);
+ return;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+ if(sd-visible) return;
+ sd-visible = 1;
+
+ sd-icon_object = edje_object_add(sd-evas);
+ evas_object_smart_member_add(sd-icon_object, obj);
+
+ sd-event_object = evas_object_rectangle_add(sd-evas);
+ evas_object_color_set(sd-event_object, 0, 0, 0, 0);
+ evas_object_smart_member_add(sd-event_object, obj);
+ evas_object_smart_data_set(obj, sd);
+
+ e_fm_icon_file_set(obj, sd-file);
+ evas_object_show(obj);
+}
+
+void
+e_fm_icon_disappear_cb(Evas_Object *obj, void *data)
+{
+ E_Smart_Data *sd;
+
+ evas_object_hide(obj);
+ return;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+ if(!sd-visible) return;
+ sd-visible = 0;
+
+ if (sd-event_object) evas_object_del(sd-event_object);
+ if (sd-icon_object) evas_object_del(sd-icon_object);
+ if (sd-image_object) evas_object_del(sd-image_object);
+ if (sd-thumb_object) evas_object_del(sd-thumb_object);
+ E_FREE(sd-saved_title);
+}
+
+void
e_fm_icon_title_set(Evas_Object *obj, const char *title)
{
E_Smart_Data *sd;
@@ -256,6 +336,32 @@
if (sd-image_object) edje_object_signal_emit(sd-image_object, source,
emission);
}
+E_Fm_Icon_Metadata *
+e_fm_icon_meta_generate(Evas_Object *obj)
+{
+ E_Smart_Data *sd;
+ E_Fm_Icon_Metadata *m;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+
+ m = calloc(1, sizeof(E_Fm_Icon_Metadata));
+ if (!m) return NULL;
+ _e_fm_icon_meta_fill(m, sd);
+
+ return m;
+}
+
+void
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_smart.c e_icon_layout.c
Log Message:
- fix bug in edd creation, metadata works now.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_fileman_icon.c10 Nov 2005 09:12:58 - 1.22
+++ e_fileman_icon.c10 Nov 2005 11:52:26 - 1.23
@@ -3,26 +3,6 @@
*/
#include e.h
-#define NEWD(str, typ) \
- eet_data_descriptor_new(str, sizeof(typ), \
- (void *(*) (void *))evas_list_next, \
- (void *(*) (void *, void *))evas_list_append, \
- (void *(*) (void *))evas_list_data, \
- (void *(*) (void *))evas_list_free, \
- (void (*) (void *, int (*) (void *, const char
*, void *, void *), void *))evas_hash_foreach, \
- (void *(*) (void *, const char *, void
*))evas_hash_add, \
- (void (*) (void *))evas_hash_free)
-
-#define FREED(eed) \
- if (eed) \
- { \
- eet_data_descriptor_free((eed)); \
- (eed) = NULL; \
- }
-#define NEWI(str, it, type) \
- EET_DATA_DESCRIPTOR_ADD_BASIC(_e_fm_icon_meta_edd, E_Fm_Icon_Metadata, str,
it, type)
-
-
typedef struct _E_Smart_Data E_Smart_Data;
struct _E_Smart_Data
@@ -82,13 +62,6 @@
int
e_fm_icon_init(void)
{
- _e_fm_icon_meta_edd = NEWD(E_Fm_Icon_Metadata, E_Fm_Icon_Metadata);
- NEWI(x, x, EET_T_INT);
- NEWI(y, y, EET_T_INT);
- NEWI(w, w, EET_T_INT);
- NEWI(h, h, EET_T_INT);
- NEWI(nm, name, EET_T_STRING);
-
event_handlers = evas_list_append(event_handlers,
ecore_event_handler_add(ECORE_EVENT_EXE_EXIT,
_e_fm_icon_thumb_cb_exe_exit,
@@ -99,7 +72,6 @@
int
e_fm_icon_shutdown(void)
{
- FREED(_e_fm_icon_meta_edd);
while (event_handlers)
{
ecore_event_handler_del(event_handlers-data);
@@ -706,5 +678,5 @@
m-y = sd-y;
m-w = sd-w;
m-h = sd-h;
- m-name = strdup(sd-file-name);
+ m-name = strdup(sd-file-name);
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- e_fileman_smart.c 10 Nov 2005 09:12:58 - 1.106
+++ e_fileman_smart.c 10 Nov 2005 11:52:26 - 1.107
@@ -73,7 +73,7 @@
#define NEWI(str, it, type) \
EET_DATA_DESCRIPTOR_ADD_BASIC(_e_fm_dir_meta_edd, E_Fm_Dir_Metadata, str,
it, type)
#define NEWL(str, it, type) \
- EET_DATA_DESCRIPTOR_ADD_LIST(_e_fm_icon_meta_edd, E_Fm_Dir_Metadata, str,
it, type)
+ EET_DATA_DESCRIPTOR_ADD_LIST(_e_fm_dir_meta_edd, E_Fm_Dir_Metadata, str,
it, type)
typedef struct _E_Fm_Smart_DataE_Fm_Smart_Data;
typedef struct _E_Fm_Icon E_Fm_Icon;
@@ -165,6 +165,7 @@
Evas_List *event_handlers;
Evas_List *files;
+ Evas_List *files_raw;
Ecore_File_Monitor *monitor;
E_Fm_Arrange arrange;
@@ -1424,16 +1425,44 @@
static void
_e_fm_dir_set(E_Fm_Smart_Data *sd, const char *dir)
{
- Evas_List *l;
+ Evas_List *l;
+ Ecore_List *list;
+ Ecore_Sheap*heap;
+ char *f;
+ int type;
+ DIR*dir2;
+ struct dirent *dp;
E_Event_Fm_Reconfigure *ev;
E_Event_Fm_Directory_Change *ev2;
- DIR *dir2;
if (!dir) return;
if ((sd-dir) (!strcmp(sd-dir, dir))) return;
if (!(dir2 = opendir(dir))) return;
+ type = E_FM_FILE_TYPE_NORMAL;
+ list = ecore_list_new();
+ ecore_list_set_free_cb(list, free);
+ /* TODO: use sorting function here */
+ heap = ecore_sheap_new(ECORE_COMPARE_CB(strcmp), ecore_list_nodes(list));
+ while(dp = readdir(dir2))
+ {
+ if ((!strcmp(dp-d_name, .) || (!strcmp (dp-d_name, ..
continue;
+ if ((dp-d_name[0] == '.') (!(type E_FM_FILE_TYPE_HIDDEN)))
continue;
+ f = strdup(dp-d_name);
+ ecore_list_append(list, f);
+ }
+ closedir(dir2);
+
+ heap = ecore_sheap_new(ECORE_COMPARE_CB(strcasecmp),
ecore_list_nodes(list));
+ while ((f = ecore_list_remove_first(list)))
+ ecore_sheap_insert(heap, f);
+
+ while ((f = ecore_sheap_extract(heap)))
+ sd-files_raw = evas_list_append(sd-files_raw, f);
+
+ ecore_sheap_destroy(heap);
+
if (sd-dir) free (sd-dir);
sd-dir = strdup(dir);
@@ -1456,9 +1485,7 @@
printf(META: file = %s\n, im-name);
}
}
-
-
-
+
/*
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_entry.c
Log Message:
patch from Holger Hanrath [EMAIL PROTECTED]
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_entry.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_widget_entry.c7 Nov 2005 00:13:54 - 1.6
+++ e_widget_entry.c10 Nov 2005 13:01:02 - 1.7
@@ -85,10 +85,15 @@
_e_wid_text_change(void *data, Evas_Object *entry, char *key)
{
E_Widget_Data *wd;
+ const char *text;
wd = data;
E_FREE(*(wd-valptr));
- *(wd-valptr) = strdup(e_entry_text_get(wd-o_entry));
+ text = e_entry_text_get(wd-o_entry);
+ if (!text)
+ *(wd-valptr) = strdup();
+ else
+ *(wd-valptr) = strdup(text);
e_widget_change(wd-obj);
}
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- stretch item swallow when we dont have scrollbar
- emit proper signals on mouse down / up
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- e_fileman_smart.c 9 Nov 2005 02:00:33 - 1.104
+++ e_fileman_smart.c 9 Nov 2005 08:08:05 - 1.105
@@ -1735,6 +1735,8 @@
{
E_Fm_Smart_Data *sd;
Evas_Event_Mouse_Down *ev;
+ E_Fm_Icon *icon;
+ Evas_List *l;
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
@@ -1745,7 +1747,13 @@
if(!strcmp(edje_object_part_state_get(sd-edje_obj, typebuffer, NULL),
shown))
{
edje_object_signal_emit(sd-edje_obj, typebuf_hide, );
- edje_object_part_text_set(sd-edje_obj, text, );
+ edje_object_part_text_set(sd-edje_obj, text, );
+ for (l = sd-files; l; l = l-next)
+ {
+icon = l-data;
+e_fm_icon_signal_emit(icon-icon_object, default, );
+ }
+ edje_object_signal_emit(sd-edje_obj, default, );
}
switch (ev-button)
@@ -2132,16 +2140,24 @@
{
E_Fm_Icon *icon;
Evas_Event_Mouse_Move *ev;
+ Evas_List *l;
- ev = event_info;
+ ev = event_info;
icon = data;
-
+
if(!strcmp(edje_object_part_state_get(icon-sd-edje_obj, typebuffer,
NULL), shown))
- {
+ {
+ E_Fm_Icon *i;
edje_object_signal_emit(icon-sd-edje_obj, typebuf_hide, );
edje_object_part_text_set(icon-sd-edje_obj, text, );
+ for (l = icon-sd-files; l; l = l-next)
+ {
+i = l-data;
+e_fm_icon_signal_emit(i-icon_object, default, );
+ }
+ edje_object_signal_emit(icon-sd-edje_obj, default, );
}
-
+
if(icon-sd-win)
icon-sd-drag.start = 0;
}
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- stretch item swallow when we dont have scrollbar
- emit proper signals on mouse down / up
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- default_fileman.edc 9 Nov 2005 02:00:33 - 1.27
+++ default_fileman.edc 9 Nov 2005 08:08:05 - 1.28
@@ -429,9 +429,20 @@
}
rel2 {
relative: 1.0 1.0;
- offset: -16 0;
+ offset: -16 -1;
}
}
+description {
+state: hidden 0.0;
+rel1 {
+ relative: 0 0;
+ offset: 0 0;
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+}
+ }
}
part {
name: sb_vbar;
@@ -914,6 +925,7 @@
source: show;
action: STATE_SET default 0.0;
target: sb_vbar;
+target: item;
}
program {
name: sb_vbar_hide;
@@ -921,6 +933,7 @@
source: hide;
action: STATE_SET hidden 0.0;
target: sb_vbar;
+target: item;
}
program {
name: sb_hbar_show;
@@ -928,6 +941,7 @@
source: show;
action: STATE_SET default 0.0;
target: sb_hbar;
+ target: item;
}
program {
name: sb_hbar_hide;
@@ -935,6 +949,7 @@
source: hide;
action: STATE_SET hidden 0.0;
target: sb_hbar;
+target: item;
}
program {
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- close typebuffer if we click on an icon (mouse up) or on the canvas (mouse
down). the reason i have mouse up on the icon is that sometimes you click and
wait (read it or look at it) then raise you finger off the mouse button. this
doesnt apply to the bg because then you can click and drag to show the rubber
band so we hide it directly.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- e_fileman_smart.c 8 Nov 2005 00:53:33 - 1.100
+++ e_fileman_smart.c 8 Nov 2005 13:19:46 - 1.101
@@ -1739,6 +1739,12 @@
ev = event_info;
sd = data;
+ if(!strcmp(edje_object_part_state_get(sd-edje_obj, typebuffer, NULL),
shown))
+ {
+ edje_object_signal_emit(sd-edje_obj, typebuf_hide, );
+ edje_object_part_text_set(sd-edje_obj, text, );
+ }
+
switch (ev-button)
{
case 1:
@@ -1940,7 +1946,7 @@
sd = data;
ev = event_info;
-
+
if (sd-selection.band.enabled)
{
sd-selection.band.enabled = 0;
@@ -2127,6 +2133,12 @@
ev = event_info;
icon = data;
+ if(!strcmp(edje_object_part_state_get(icon-sd-edje_obj, typebuffer,
NULL), shown))
+ {
+ edje_object_signal_emit(icon-sd-edje_obj, typebuf_hide, );
+ edje_object_part_text_set(icon-sd-edje_obj, text, );
+ }
+
if(icon-sd-win)
icon-sd-drag.start = 0;
}
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- regex are kewl for regex geeks, globs are better for every day users (=
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- e_fileman_smart.c 8 Nov 2005 13:19:46 - 1.101
+++ e_fileman_smart.c 8 Nov 2005 22:56:54 - 1.102
@@ -9,6 +9,7 @@
#include pwd.h
#include grp.h
#include regex.h
+#include glob.h
/* TODO:
*
@@ -235,7 +236,9 @@
static void_e_fm_icon_mouse_move_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static int _e_fm_win_mouse_up_cb(void *data, int type,
void *event);
-static void_e_fm_icon_select_regex(E_Fm_Smart_Data *sd, char
*glob);
+static void_e_fm_string_replace(const char *src, const char
*key, const char *replacement, char *result, size_t resultsize);
+
+static void_e_fm_icon_select_glob(E_Fm_Smart_Data *sd, char
*glb);
static void_e_fm_icon_select_up(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_down(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_left(E_Fm_Smart_Data *sd);
@@ -2301,64 +2304,65 @@
result[resultlen] = '\0';
}
-
static void
-_e_fm_icon_select_regex(E_Fm_Smart_Data *sd, char *glob)
+_e_fm_icon_select_glob(E_Fm_Smart_Data *sd, char *glb)
{
- E_Fm_Icon *icon;
+ E_Fm_Icon *icon, *anchor;
Evas_List *l;
- char *regex, *tregex;
- regex_t reg, *creg;
- int stars, i;
-
- stars = 0;
- for(i = 0; i strlen(glob); i++)
- if(glob[i] == '*')
- stars++;
-
- tregex = calloc(strlen(glob) + stars + 1, sizeof(char));
- _e_fm_string_replace(glob, *, .*, tregex, (strlen(glob) + stars +
1)*sizeof(char));
- regex = calloc(strlen(tregex) + 3, sizeof(char));
- snprintf(regex, (strlen(tregex) + 3)*sizeof(char), ^%s$, tregex);
- if(regcomp(reg, regex, REG_NOSUB | REG_EXTENDED))
+ char *glbpath;
+ Evas_Coord x, y, w, h;
+ E_Event_Fm_Reconfigure *ev;
+ int i;
+ glob_t globbuf;
+
+ anchor = NULL;
+ ev = NULL;
+ glbpath = E_NEW(char, strlen(sd-dir) + strlen(glb) + 2);
+ snprintf(glbpath, strlen(sd-dir) + strlen(glb) + 2, %s/%s, sd-dir, glb);
+ if(glob(glbpath, 0, NULL, globbuf))
return;
- _e_fm_selections_clear(sd);
+
+ _e_fm_selections_clear(sd);
for (l = sd-files; l; l = l-next)
{
- icon = l-data;
- creg = reg;
- if(!regexec(creg, icon-file-name, 0, NULL, 0))
- {
-_e_fm_selections_add(l-data, l);
- }
- }
-
- return;
-#if 0
-position:
- {
- Evas_Coord x, y, w, h;
- icon = l-data;
- evas_object_geometry_get(icon-icon_object, x, y, w, h);
- if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
+ icon = l-data;
+ for(i = 0; i globbuf.gl_pathc; i++)
{
-E_Event_Fm_Reconfigure *ev;
-
-ev = E_NEW(E_Event_Fm_Reconfigure, 1);
-if (ev)
- {
- ev-object = sd-object;
- ev-x = sd-x;
- ev-y = sd-child.y - (sd-y - (y - sd-icon_info.y_space));
- ev-w = sd-w;
- ev-h = sd-h;
- ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
- }
+char *file;
+
+file = ecore_file_get_file(globbuf.gl_pathv[i]);
+if(!strcmp(icon-file-name, file))
+ {
+ _e_fm_selections_add(l-data, l);
+ if(!anchor)
+{
+ evas_object_geometry_get(icon-icon_object, x, y, w,
h);
+
+ if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
+ {
+ev = E_NEW(E_Event_Fm_Reconfigure, 1);
+if (ev)
+ {
+ anchor = icon;
+ ev-object = sd-object;
+ ev-x = sd-x;
+ ev-y = sd-child.y - (sd-y - (y -
sd-icon_info.y_space));
+ ev-w = sd-w;
+ ev-h = sd-h;
+ }
+ }
+}
+ }
}
}
-#endif
+
+ if(anchor ev)
+ ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
}
+/* do we keep this? might come in handy if we need to jump to a file starting
+ * with a certain char
+ */
static void
__e_fm_icon_goto_key(E_Fm_Smart_Data *sd,
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman_smart.c Log Message: - remove regex.h === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -3 -r1.102 -r1.103 --- e_fileman_smart.c 8 Nov 2005 22:56:54 - 1.102 +++ e_fileman_smart.c 8 Nov 2005 22:59:01 - 1.103 @@ -8,7 +8,6 @@ #include dirent.h #include pwd.h #include grp.h -#include regex.h #include glob.h /* TODO: --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman.c e_fileman.h e_fileman_smart.c e_ipc_handlers.h
e_ipc_handlers_list.h
Log Message:
- add more signals to icons / bg (need to properly rename them to make more
sense)
- add dynamic glob matches to typebuffer (can get slow with 10,000 files, as
expected, should be faster when we optimize e_icon_layout)
- add ability to start efm from e_remote (thanks ngc)
- add some edje effects.
- add a test idea for dynamic selection: when you bring up the typebuffer,
everything goes into dark mode, and your searches light up dynamically as
they are found while you type.
- question: should A be equal to *A* in the typebuffer? ngc and rephorm
suggested this could be an option and if we do add a * manually then this
case will be invalidated.
- note: when browsing 10,000+ files, the slowness of the dir loading occurs
due to the fact that ecore_file's monitor will loop thru all the files and do
an insertion sort. raster said we can fix this with some work on the monitor
code.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_fileman.c 6 Nov 2005 14:40:58 - 1.25
+++ e_fileman.c 9 Nov 2005 02:00:33 - 1.26
@@ -28,10 +28,20 @@
static void _e_fileman_scroll_child_size_get(Evas_Object *obj, Evas_Coord *x,
Evas_Coord *y);
static int _e_fileman_reconfigure_cb(void *data, int type, void *event);
-
E_Fileman *
e_fileman_new(E_Container *con)
{
+ char dir[PATH_MAX];
+
+ if (!getcwd(dir, sizeof(dir)))
+ return NULL;
+
+ return e_fileman_new_to_dir(con, dir);
+}
+
+E_Fileman *
+e_fileman_new_to_dir(E_Container *con, char *path)
+{
E_Fileman *fileman;
E_Manager *man;
char dir[PATH_MAX];
@@ -44,8 +54,12 @@
if (!con) con = e_container_number_get(man, 0);
if (!con) return NULL;
}
- if (!getcwd(dir, sizeof(dir)))
- return NULL;
+
+ snprintf(dir, PATH_MAX, %s, path);
+
+ if(!ecore_file_is_dir(dir))
+ if (!getcwd(dir, sizeof(dir)))
+ return NULL;
fileman = E_OBJECT_ALLOC(E_Fileman, E_FILEMAN_TYPE, _e_fileman_free);
if (!fileman) return NULL;
@@ -72,8 +86,9 @@
e_win_title_set(fileman-win, dir);
evas_event_freeze(fileman-evas);
- fileman-smart = e_fm_add(fileman-evas);
+ fileman-smart = e_fm_add(fileman-evas);
e_fm_e_win_set(fileman-smart, fileman-win);
+ e_fm_dir_set(fileman-smart, dir);
fileman-main = e_scrollframe_add(fileman-evas);
e_scrollframe_custom_theme_set(fileman-main, base/themes/fileman,
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_fileman.h 26 Oct 2005 00:19:51 - 1.5
+++ e_fileman.h 9 Nov 2005 02:00:33 - 1.6
@@ -38,6 +38,7 @@
};
EAPI E_Fileman *e_fileman_new(E_Container *con);
+EAPI E_Fileman *e_fileman_new_to_dir(E_Container *con, char *path);
EAPI void e_fileman_show(E_Fileman *fileman);
EAPI void e_fileman_hide(E_Fileman *fileman);
EAPI void e_fileman_selector_enable(E_Fileman *fileman, void
(*func)(E_Fileman *fileman, char *file, void *data), void *data);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- e_fileman_smart.c 8 Nov 2005 22:59:01 - 1.103
+++ e_fileman_smart.c 9 Nov 2005 02:00:33 - 1.104
@@ -237,6 +237,7 @@
static void_e_fm_string_replace(const char *src, const char
*key, const char *replacement, char *result, size_t resultsize);
+static void_e_fm_autocomplete(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_glob(E_Fm_Smart_Data *sd, char
*glb);
static void_e_fm_icon_select_up(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_down(E_Fm_Smart_Data *sd);
@@ -2154,7 +2155,7 @@
ev = event_info;
icon = data;
- e_fm_icon_signal_emit(icon-icon_object, hilight, );
+ e_fm_icon_signal_emit(icon-icon_object, mousein, );
}
static void
@@ -2166,7 +2167,7 @@
ev = event_info;
icon = data;
- e_fm_icon_signal_emit(icon-icon_object, default, );
+ e_fm_icon_signal_emit(icon-icon_object, mouseout, );
}
static void
@@ -2304,6 +2305,12 @@
}
static void
+_e_fm_autocomplete(E_Fm_Smart_Data *sd)
+{
+ /* TODO */
+}
+
+static void
_e_fm_icon_select_glob(E_Fm_Smart_Data *sd, char *glb)
{
E_Fm_Icon *icon, *anchor;
@@ -2318,10 +2325,21 @@
ev = NULL;
glbpath = E_NEW(char, strlen(sd-dir) + strlen(glb) + 2);
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- add more signals to icons / bg (need to properly rename them to make more
sense)
- add dynamic glob matches to typebuffer (can get slow with 10,000 files, as
expected, should be faster when we optimize e_icon_layout)
- add ability to start efm from e_remote (thanks ngc)
- add some edje effects.
- add a test idea for dynamic selection: when you bring up the typebuffer,
everything goes into dark mode, and your searches light up dynamically as
they are found while you type.
- question: should A be equal to *A* in the typebuffer? ngc and rephorm
suggested this could be an option and if we do add a * manually then this
case will be invalidated.
- note: when browsing 10,000+ files, the slowness of the dir loading occurs
due to the fact that ecore_file's monitor will loop thru all the files and do
an insertion sort. raster said we can fix this with some work on the monitor
code.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- default_fileman.edc 8 Nov 2005 00:00:25 - 1.26
+++ default_fileman.edc 9 Nov 2005 02:00:33 - 1.27
@@ -37,6 +37,29 @@
normal: e17_icon_fileman_TYPE.png; \
} \
} \
+description { \
+ state:disabled 0.0; \
+inherit: default 0.0; \
+color: 128 128 128 255; \
+} \
+ } \
+ } \
+ programs { \
+ program { \
+name: disable; \
+signal: disable; \
+source: ; \
+action: STATE_SET disabled 0.0; \
+transition: LINEAR 0.1; \
+target: icon; \
+ } \
+ program { \
+name: default; \
+signal: default; \
+source: ; \
+action: STATE_SET default 0.0; \
+transition: LINEAR 0.1; \
+target: icon; \
} \
} \
} \
@@ -64,6 +87,11 @@
normal: e17_icon_fileman_TYPE_clicked.png; \
} \
} \
+description { \
+ state:disabled 0.0; \
+inherit: default 0.0; \
+color: 128 128 128 255; \
+} \
} \
} \
programs { \
@@ -81,6 +109,22 @@
action: STATE_SET default 0.0; \
target: icon; \
} \
+ program { \
+name: disable; \
+signal: disable; \
+source: ; \
+action: STATE_SET disabled 0.0; \
+transition: LINEAR 0.1; \
+target: icon; \
+ } \
+ program { \
+name: default; \
+signal: default; \
+source: ; \
+action: STATE_SET default 0.0; \
+transition: LINEAR 0.1; \
+target: icon; \
+ } \
} \
} \
@@ -171,17 +215,30 @@
type: SWALLOW;
description {
state: default 0.0;
-}
+}
+ }
+ part {
+name: background_overlay;
+type: RECT;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ visible: 0;
+}
+description {
+ state: selecting 0.0;
+ inherit: default 0.0;
+ visible: 1;
+ color: 0 0 0 128;
+}
}
-
part {
name: icons;
type: SWALLOW;
description {
state: default 0.0;
}
- }
-
+ }
part {
name: typebuffer;
mouse_events: 0;
@@ -252,8 +309,24 @@
action: STATE_SET default 0.0;
transition: LINEAR 0.2;
target: typebuffer;
- target: text;
+ target: text;
}
+program {
+ name: default;
+ signal: default;
+ source: ;
+ action: STATE_SET default 0.0;
+ transition: LINEAR 0.1;
+ target: background_overlay;
+}
+program {
+ name: selecting;
+ signal: selecting;
+ source: ;
+ action: STATE_SET selecting 0.0;
+ transition: LINEAR 0.1;
+ target: background_overlay;
+}
}
}
}
@@ -1015,7 +1088,6 @@
mouse_events: 1;
description {
state: default 0.0;
- visible: 0;
rel1 {
relative: 0.0 0.0;
offset: 0 0;
@@ -1028,11 +1100,12 @@
normal: e17_button.png;
border: 8 8 8 8;
}
+ color: 255 255 255 0;
}
description {
state: clicked 0.0;
inherit: default 0.0;
- visible: 1;
+
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_entry.edc default_fileman.edc
Log Message:
- efm smart uses its own edje
- fix x, y in win (move)
- clean up efm code
- add basics for typebuffer
- allow icon_layout to sort internall (no unpack / pack)
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_entry.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- default_entry.edc 7 Nov 2005 00:09:20 - 1.3
+++ default_entry.edc 7 Nov 2005 15:31:07 - 1.4
@@ -86,7 +86,7 @@
target: entry_focus;
}
program {
- name: button_unfocus;
+ name: entry_unfocus;
signal: focus_out;
source: ;
action: STATE_SET default 0.0;
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- default_fileman.edc 6 Nov 2005 13:53:46 - 1.24
+++ default_fileman.edc 7 Nov 2005 15:31:08 - 1.25
@@ -149,6 +149,7 @@
image: e17_button.png COMP;
image: e17_fileman_thumb_bg.png COMP;
image: e17_mini_button_shadow2.png COMP;
+ image: e17_fileman_typebuf.png COMP;
}
styles
@@ -162,6 +163,67 @@
}
}
+group {
+ name: fileman/smart;
+ parts {
+ part {
+name: background;
+type: SWALLOW;
+description {
+ state: default 0.0;
+}
+ }
+
+ part {
+name: icons;
+type: SWALLOW;
+description {
+ state: default 0.0;
+}
+ }
+
+ part {
+name: typebuffer;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ min: 96 64;
+ max: 384 64;
+ visible: 0;
+ align: 0.5 0.5;
+ image {
+ normal: e17_fileman_typebuf.png;
+ border: 17 17 17 17;
+ }
+}
+description {
+ state: shown 0.0;
+ inherit: default 0.0;
+ visible: 1;
+}
+ }
+ }
+
+ programs {
+ program {
+name: typebuf_show;
+signal: typebuf_show;
+source: ;
+action: STATE_SET shown 0.0;
+transition: LINEAR 0.2;
+target: typebuffer;
+ }
+ program {
+name: typebuf_hide;
+signal: typebuf_hide;
+source: ;
+action: STATE_SET default 0.0;
+transition: LINEAR 0.2;
+target: typebuffer;
+ }
+ }
+}
+
group {
name: fileman/main;
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_icon.h e_fileman_smart.c
e_icon_layout.c e_icon_layout.h e_win.c
Log Message:
- efm smart uses its own edje
- fix x, y in win (move)
- clean up efm code
- add basics for typebuffer
- allow icon_layout to sort internall (no unpack / pack)
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_fileman_icon.c4 Nov 2005 21:03:54 - 1.19
+++ e_fileman_icon.c7 Nov 2005 15:31:08 - 1.20
@@ -117,6 +117,17 @@
_e_fm_icon_type_set(sd);
}
+E_Fm_File *
+e_fm_icon_file_get(Evas_Object *obj)
+{
+ E_Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+
+ return sd-file;
+}
+
void
e_fm_icon_file_set(Evas_Object *obj, E_Fm_File *file)
{
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_fileman_icon.h4 Nov 2005 03:33:22 - 1.5
+++ e_fileman_icon.h7 Nov 2005 15:31:08 - 1.6
@@ -18,6 +18,7 @@
EAPI int e_fm_icon_init(void);
EAPI int e_fm_icon_shutdown(void);
EAPI Evas_Object *e_fm_icon_add(Evas *evas);
+EAPI E_Fm_File *e_fm_icon_file_get(Evas_Object *obj);
EAPI void e_fm_icon_file_set(Evas_Object *obj, E_Fm_File *file);
EAPI void e_fm_icon_title_set(Evas_Object *obj, const char *title);
EAPI void e_fm_icon_type_set(Evas_Object *obj, int type);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- e_fileman_smart.c 7 Nov 2005 00:21:12 - 1.94
+++ e_fileman_smart.c 7 Nov 2005 15:31:08 - 1.95
@@ -115,8 +115,9 @@
E_Win *win;
Evas *evas;
- Evas_Object *bg;
- Evas_Object *clip;
+ Evas_Object *edje_obj;
+ Evas_Object *event_obj;
+ Evas_Object *clip_obj;
Evas_Object *layout;
Evas_Object *object;
Evas_Object *entry_object;
@@ -254,6 +255,7 @@
static int _e_fm_files_sort_name_cb(void *d1, void *d2);
static int _e_fm_files_sort_modtime_cb (void *d1, void *d2);
+static int _e_fm_files_sort_layout_name_cb(void *d1, void
*d2);
static void_e_fm_selector_send_file (E_Fm_Icon *icon);
@@ -483,13 +485,18 @@
e_fm_background_set(Evas_Object *object, Evas_Object *bg)
{
E_Fm_Smart_Data *sd;
+ Evas_Object *swallow;
return;
if ((!object) || !(sd = evas_object_smart_data_get(object)))
return;
- sd-bg = bg;
+ swallow = NULL;
+ swallow = edje_object_part_swallow_get(sd-edje_obj, background);
+ if(swallow)
+ edje_object_part_unswallow(sd-edje_obj, swallow);
+ edje_object_part_swallow(sd-edje_obj, background, bg);
}
/* local subsystem functions */
@@ -514,38 +521,41 @@
sd-evas = evas_object_evas_get(object);
sd-frozen = 0;
sd-is_selector = 0;
- //sd-bg = edje_object_add(sd-evas);
- sd-bg = evas_object_rectangle_add(sd-evas);
- evas_object_color_set(sd-bg, 0, 0, 0, 0);
- evas_object_smart_member_add(sd-bg, object);
- evas_object_show(sd-bg);
- e_theme_edje_object_set(sd-selection.band.obj,
- base/theme/fileman/background,
- fileman/background);
- evas_object_event_callback_add(sd-bg, EVAS_CALLBACK_MOUSE_DOWN,
+ sd-edje_obj = edje_object_add(sd-evas);
+ evas_object_repeat_events_set(sd-edje_obj, 1);
+ e_theme_edje_object_set(sd-edje_obj,
+ base/theme/fileman,
+ fileman/smart);
+ evas_object_smart_member_add(sd-edje_obj, object);
+ evas_object_show(sd-edje_obj);
+
+ sd-event_obj = evas_object_rectangle_add(sd-evas);
+ evas_object_smart_member_add(sd-event_obj, object);
+ evas_object_color_set(sd-event_obj, 0, 0, 0, 0);
+ evas_object_stack_below(sd-event_obj, sd-edje_obj);
+ evas_object_show(sd-event_obj);
+ evas_object_event_callback_add(sd-event_obj, EVAS_CALLBACK_MOUSE_DOWN,
_e_fm_mouse_down_cb, sd);
- evas_object_event_callback_add(sd-bg, EVAS_CALLBACK_MOUSE_UP,
+ evas_object_event_callback_add(sd-event_obj, EVAS_CALLBACK_MOUSE_UP,
_e_fm_mouse_up_cb, sd);
- evas_object_event_callback_add(sd-bg, EVAS_CALLBACK_MOUSE_MOVE,
+ evas_object_event_callback_add(sd-event_obj, EVAS_CALLBACK_MOUSE_MOVE,
_e_fm_mouse_move_cb, sd);
-
sd-layout = e_icon_layout_add(sd-evas);
-
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Added Files: e17_fileman_typebuf.png Log Message: oops, thanks devilhorns (= --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- more work on typebuffer
- you can do things like '*a*' or 'A*' and they will get selected.
- todo:
* replace TEXT part with something better (size limitations)
* add more logic to typebuffer
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- e_fileman_smart.c 7 Nov 2005 15:31:08 - 1.95
+++ e_fileman_smart.c 8 Nov 2005 00:00:30 - 1.96
@@ -8,6 +8,7 @@
#include dirent.h
#include pwd.h
#include grp.h
+#include regex.h
/* TODO:
*
@@ -238,7 +239,7 @@
static void_e_fm_icon_mouse_move_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static int _e_fm_win_mouse_up_cb(void *data, int type,
void *event);
-static void_e_fm_icon_goto_key(E_Fm_Smart_Data *sd, char *c);
+static void_e_fm_icon_select_regex(E_Fm_Smart_Data *sd, char
*glob);
static void_e_fm_icon_select_up(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_down(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_left(E_Fm_Smart_Data *sd);
@@ -1468,9 +1469,9 @@
sd-files = evas_list_sort(sd-files,
evas_list_count(sd-files),
_e_fm_files_sort_name_cb);
- e_icon_layout_sort(sd-layout, _e_fm_files_sort_layout_name_cb);
+// e_icon_layout_sort(sd-layout, _e_fm_files_sort_layout_name_cb);
+
-/*
e_icon_layout_freeze(sd-layout);
e_icon_layout_reset(sd-layout);
@@ -1480,7 +1481,7 @@
e_icon_layout_pack(sd-layout, icon-icon_object);
}
e_icon_layout_thaw(sd-layout);
-*/
+
sd-timer = NULL;
return 0;
}
@@ -2258,11 +2259,104 @@
return 0;
}
+static void
+_e_fm_string_replace(const char *src, const char *key, const char
*replacement, char *result, size_t resultsize)
+{
+ size_t resultlen;
+ size_t keylen;
+
+ if(resultsize 0) return;
+
+ /* special case to prevent infinite loop if key==replacement== */
+ if(strcmp(key, replacement) == 0)
+ {
+ snprintf(result, resultsize, %s, src);
+ return;
+ }
+
+ keylen = strlen(key);
+
+ resultlen = 0;
+ while(*src != '\0' resultlen+1 resultsize)
+ {
+ if(strncmp(src, key, keylen) == 0)
+ {
+snprintf(result+resultlen, resultsize-resultlen, %s,
replacement);
+resultlen += strlen(result+resultlen);
+src += keylen;
+ }
+ else
+ {
+result[resultlen++] = *src++;
+ }
+ }
+ result[resultlen] = '\0';
+}
+
+
static void
-_e_fm_icon_goto_key(E_Fm_Smart_Data *sd, char *c)
+_e_fm_icon_select_regex(E_Fm_Smart_Data *sd, char *glob)
{
E_Fm_Icon *icon;
Evas_List *l;
+ char *regex, *tregex;
+ regex_t reg, *creg;
+ int stars, i;
+
+ stars = 0;
+ for(i = 0; i strlen(glob); i++)
+ if(glob[i] == '*')
+ stars++;
+
+ tregex = calloc(strlen(glob) + stars + 1, sizeof(char));
+ _e_fm_string_replace(glob, *, .*, tregex, (strlen(glob) + stars +
1)*sizeof(char));
+ regex = calloc(strlen(tregex) + 3, sizeof(char));
+ snprintf(regex, (strlen(tregex) + 3)*sizeof(char), ^%s$, tregex);
+ regcomp(reg, regex, REG_NOSUB | REG_EXTENDED);
+ _e_fm_selections_clear(sd);
+ for (l = sd-files; l; l = l-next)
+ {
+ icon = l-data;
+ creg = reg;
+ if(!regexec(creg, icon-file-name, 0, NULL, 0))
+ {
+_e_fm_selections_add(l-data, l);
+ }
+ }
+
+ return;
+#if 0
+position:
+ {
+ Evas_Coord x, y, w, h;
+ icon = l-data;
+ evas_object_geometry_get(icon-icon_object, x, y, w, h);
+ if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
+ {
+E_Event_Fm_Reconfigure *ev;
+
+ev = E_NEW(E_Event_Fm_Reconfigure, 1);
+if (ev)
+ {
+ ev-object = sd-object;
+ ev-x = sd-x;
+ ev-y = sd-child.y - (sd-y - (y - sd-icon_info.y_space));
+ ev-w = sd-w;
+ ev-h = sd-h;
+ ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
+ }
+ }
+ }
+#endif
+}
+
+static void
+__e_fm_icon_goto_key(E_Fm_Smart_Data *sd, char *c)
+{
+ E_Fm_Icon *icon;
+ Evas_List *l;
+
+ return;
if(sd-selection.current.ptr)
{
@@ -2624,8 +2718,6 @@
ev = event_info;
sd = data;
-
- edje_object_signal_emit(sd-object, typebuf_show, );
if (!strcmp(ev-keyname, Up))
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Modified Files: Makefile.am Log Message: - more work on typebuffer - you can do things like '*a*' or 'A*' and they will get selected. - todo: * replace TEXT part with something better (size limitations) * add more logic to typebuffer === RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/images/Makefile.am,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- Makefile.am 5 Nov 2005 13:45:08 - 1.42 +++ Makefile.am 8 Nov 2005 00:00:29 - 1.43 @@ -332,6 +332,7 @@ e17_fileman_bg_shadow.png \ e17_fileman_rubberband.png \ e17_fileman_thumb_bg.png \ +e17_fileman_typebuf.png \ e17_icon_fileman_c.png \ e17_icon_fileman_file.png \ e17_icon_fileman_file_clicked.png \ --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- more work on typebuffer
- you can do things like '*a*' or 'A*' and they will get selected.
- todo:
* replace TEXT part with something better (size limitations)
* add more logic to typebuffer
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- default_fileman.edc 7 Nov 2005 15:31:08 - 1.25
+++ default_fileman.edc 8 Nov 2005 00:00:25 - 1.26
@@ -188,9 +188,13 @@
description {
state: default 0.0;
min: 96 64;
- max: 384 64;
- visible: 0;
+ max: 384 64;
+ /* if we enable this, then we will zoom in / out */
+ //min: 24 16;
+ //max: 24 16;
+ visible: 1;
align: 0.5 0.5;
+ color: 255 255 255 0;
image {
normal: e17_fileman_typebuf.png;
border: 17 17 17 17;
@@ -199,31 +203,60 @@
description {
state: shown 0.0;
inherit: default 0.0;
+ min: 96 64;
+ max: 384 64;
visible: 1;
+ color: 255 255 255 255;
}
- }
- }
-
- programs {
- program {
-name: typebuf_show;
-signal: typebuf_show;
-source: ;
-action: STATE_SET shown 0.0;
-transition: LINEAR 0.2;
-target: typebuffer;
}
- program {
-name: typebuf_hide;
-signal: typebuf_hide;
-source: ;
-action: STATE_SET default 0.0;
-transition: LINEAR 0.2;
-target: typebuffer;
+ part {
+name: text;
+type: TEXT;
+effect:SHADOW;
+description {
+ state: default 0.0;
+ fixed: 1 1;
+ align: 0.5 0.5;
+ color: 0 0 0 0;
+ color3: 255 255 255 0;
+ text {
+ text: No Title;
+ size: 12;
+ font: Edje-Vera;
+ align:0.5 0.5;
+ elipsis: 0.0;
+ min: 1 1;
+ }
+}
+description {
+ state: shown 0.0;
+ inherit: default 0.0;
+ color: 0 0 0 255;
+ color3: 255 255 255 128;
+}
+ }
+ programs {
+program {
+ name: typebuf_show;
+ signal: typebuf_show;
+ source: ;
+ action: STATE_SET shown 0.0;
+ transition: LINEAR 0.2;
+ target: typebuffer;
+ target: text;
+}
+program {
+ name: typebuf_hide;
+ signal: typebuf_hide;
+ source: ;
+ action: STATE_SET default 0.0;
+ transition: LINEAR 0.2;
+ target: typebuffer;
+ target: text;
+}
}
}
}
-
group {
name: fileman/main;
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
use string, not key
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- e_fileman_smart.c 8 Nov 2005 00:00:30 - 1.96
+++ e_fileman_smart.c 8 Nov 2005 00:06:30 - 1.97
@@ -2797,7 +2797,7 @@
}
else
{
-edje_object_part_text_set(sd-edje_obj, text, ev-key);
+edje_object_part_text_set(sd-edje_obj, text, ev-string);
}
if(strcmp(edje_object_part_state_get(sd-edje_obj, typebuffer, NULL),
shown))
edje_object_signal_emit(sd-edje_obj, typebuf_show, );
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- dont do anything if the regex failes to compile
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- e_fileman_smart.c 8 Nov 2005 00:06:30 - 1.97
+++ e_fileman_smart.c 8 Nov 2005 00:25:13 - 1.98
@@ -2312,7 +2312,8 @@
_e_fm_string_replace(glob, *, .*, tregex, (strlen(glob) + stars +
1)*sizeof(char));
regex = calloc(strlen(tregex) + 3, sizeof(char));
snprintf(regex, (strlen(tregex) + 3)*sizeof(char), ^%s$, tregex);
- regcomp(reg, regex, REG_NOSUB | REG_EXTENDED);
+ if(regcomp(reg, regex, REG_NOSUB | REG_EXTENDED))
+ return;
_e_fm_selections_clear(sd);
for (l = sd-files; l; l = l-next)
{
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- if typebuffer is active, left / right should move cursor (no movement yet,
but doesnt move selection any more)
- if typebuffer is active, up / down might do some sort of history scrolling,
for now, they just close the typebuffer
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- e_fileman_smart.c 8 Nov 2005 00:25:13 - 1.98
+++ e_fileman_smart.c 8 Nov 2005 00:47:22 - 1.99
@@ -2721,13 +2721,39 @@
sd = data;
if (!strcmp(ev-keyname, Up))
- _e_fm_icon_select_up(sd);
+ {
+ if(!strcmp(edje_object_part_state_get(sd-edje_obj, typebuffer,
NULL), shown))
+ {
+edje_object_signal_emit(sd-edje_obj, typebuf_hide, );
+edje_object_part_text_set(sd-edje_obj, text, );
+ }
+ else
+ _e_fm_icon_select_up(sd);
+ }
else if (!strcmp(ev-keyname, Down))
- _e_fm_icon_select_down(sd);
+ {
+ if(!strcmp(edje_object_part_state_get(sd-edje_obj, typebuffer,
NULL), shown))
+ {
+edje_object_signal_emit(sd-edje_obj, typebuf_hide, );
+edje_object_part_text_set(sd-edje_obj, text, );
+ }
+ else
+ _e_fm_icon_select_down(sd);
+ }
else if (!strcmp(ev-keyname, Left))
- _e_fm_icon_select_left(sd);
+ {
+ if(!strcmp(edje_object_part_state_get(sd-edje_obj, typebuffer,
NULL), shown))
+ {}
+ else
+ _e_fm_icon_select_left(sd);
+ }
else if (!strcmp(ev-keyname, Right))
- _e_fm_icon_select_right(sd);
+ {
+ if(!strcmp(edje_object_part_state_get(sd-edje_obj, typebuffer,
NULL), shown))
+ {}
+ else
+ _e_fm_icon_select_right(sd);
+ }
else if (!strcmp(ev-keyname, Escape))
{
if(!strcmp(edje_object_part_state_get(sd-edje_obj, typebuffer,
NULL), shown))
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman_smart.c Log Message: todo-- === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.99 retrieving revision 1.100 diff -u -3 -r1.99 -r1.100 --- e_fileman_smart.c 8 Nov 2005 00:47:22 - 1.99 +++ e_fileman_smart.c 8 Nov 2005 00:53:33 - 1.100 @@ -22,10 +22,6 @@ * - is the offset code working properly? i have a feeling we're displayin * more icons that the visible space can take and they are being hidden. * - * - add typebuffer like in evidence. - * - * - keyboard shortcuts for directory and file navigation. - * * - allow for icon movement inside the canvas * * - add metadata system which allows us to save icon positions and will --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c e_icon_layout.c
Log Message:
- optimize e_icon_layout (still need to do unpack)
- optimize loading of large folders (10,000+ files load well now)
Please test and report bugs. I have found a couple myself but havent traced
them down yet.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- e_fileman_smart.c 5 Nov 2005 12:42:59 - 1.88
+++ e_fileman_smart.c 6 Nov 2005 13:09:54 - 1.89
@@ -122,6 +122,10 @@
Evas_Object *entry_object;
char *dir;
+ DIR *dir2;
+
+ double timer_int;
+ Ecore_Timer *timer;
Evas_List *event_handlers;
@@ -208,7 +212,7 @@
static void_e_fm_file_delete (E_Fm_Icon *icon);
static void_e_fm_dir_set(E_Fm_Smart_Data *sd,
const char *dir);
-static Evas_List *_e_fm_dir_files_get (E_Fm_Smart_Data *sd,
int type);
+static int_e_fm_dir_files_get (void *data);
static char *_e_fm_dir_pop(const char *path);
static void_e_fm_file_free (E_Fm_Icon *icon);
static void_e_fm_dir_monitor_cb (void *data,
Ecore_File_Monitor *ecore_file_monitor, Ecore_File_Event event, const char
*path);
@@ -496,6 +500,9 @@
sd-icon_info.x_space = 12;
sd-icon_info.y_space = 10;
+ sd-timer_int = 0.001;
+ sd-timer = NULL;
+
sd-evas = evas_object_evas_get(object);
sd-frozen = 0;
sd-is_selector = 0;
@@ -606,6 +613,14 @@
e_config_domain_save(efm, sd-conf.main_edd, sd-conf.main);
+ if(sd-timer)
+ {
+ if(sd-dir2)
+ closedir(sd-dir2);
+ ecore_timer_del(sd-timer);
+ sd-timer = NULL;
+ }
+
if (sd-monitor) ecore_file_monitor_del(sd-monitor);
sd-monitor = NULL;
@@ -621,7 +636,7 @@
_e_fm_file_free(sd-files-data);
sd-files = evas_list_remove_list(sd-files, sd-files);
}
-
+
evas_object_del(sd-selection.band.obj);
evas_object_del(sd-clip);
evas_object_del(sd-bg);
@@ -1317,10 +1332,13 @@
Evas_List *l;
E_Event_Fm_Reconfigure *ev;
E_Event_Fm_Directory_Change *ev2;
+ DIR *dir2;
if (!dir) return;
if ((sd-dir) (!strcmp(sd-dir, dir))) return;
+ if (!(dir2 = opendir(dir))) return;
+
if (sd-dir) free (sd-dir);
sd-dir = strdup(dir);
@@ -1336,9 +1354,9 @@
_e_fm_file_free(sd-files-data);
sd-files = evas_list_remove_list(sd-files, sd-files);
}
+ e_icon_layout_reset(sd-layout);
/* Get new files */
- sd-files = _e_fm_dir_files_get(sd, E_FM_FILE_TYPE_NORMAL);
if (sd-monitor) ecore_file_monitor_del(sd-monitor);
sd-monitor = ecore_file_monitor_add(sd-dir, _e_fm_dir_monitor_cb, sd);
@@ -1346,8 +1364,8 @@
if (strcmp(sd-dir, /))
{
E_Fm_Icon *icon;
- char path[PATH_MAX];
-
+ char path[PATH_MAX];
+
icon = E_NEW(E_Fm_Icon, 1);
if (icon)
{
@@ -1357,79 +1375,45 @@
icon-file-type = E_FM_FILE_TYPE_DIRECTORY;
icon-icon_object = e_fm_icon_add(sd-evas);
icon-sd = sd;
-e_fm_icon_file_set(icon-icon_object, icon-file);
-//evas_object_resize(icon-icon_object,
-//sd-icon_info.w,
-//sd-icon_info.h);
+e_fm_icon_file_set(icon-icon_object, icon-file);
sd-files = evas_list_prepend(sd-files, icon);
+e_icon_layout_pack(sd-layout, icon-icon_object);
+evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_DOWN, _e_fm_icon_mouse_down_cb, icon);
+evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_UP, _e_fm_icon_mouse_up_cb, icon);
+evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_IN, _e_fm_icon_mouse_in_cb, icon);
+evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_OUT, _e_fm_icon_mouse_out_cb, icon);
}
- }
-
- /* Add icons to layout */
- e_icon_layout_freeze(sd-layout);
- for (l = sd-files; l; l = l-next)
- {
- E_Fm_Icon *icon;
-
- icon = l-data;
-
- //evas_object_resize(icon-icon_object,
- // sd-icon_info.w,
- // sd-icon_info.h);
- evas_object_show(icon-icon_object);
- e_icon_layout_pack(sd-layout, icon-icon_object);
- evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_DOWN, _e_fm_icon_mouse_down_cb, icon);
- evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_UP, _e_fm_icon_mouse_up_cb, icon);
-
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- fix dnd
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- e_fileman_smart.c 6 Nov 2005 13:09:54 - 1.89
+++ e_fileman_smart.c 6 Nov 2005 13:38:46 - 1.90
@@ -234,7 +234,7 @@
static void_e_fm_icon_mouse_up_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void_e_fm_icon_mouse_in_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void_e_fm_icon_mouse_out_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
-static int _e_fm_win_mouse_move_cb (void *data, int type,
void *event);
+static void_e_fm_icon_mouse_move_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static int _e_fm_win_mouse_up_cb(void *data, int type,
void *event);
static int _e_fm_drop_enter_cb (void *data, int type, void
*event);
@@ -570,12 +570,7 @@
sd-event_handlers = evas_list_append(sd-event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
_e_fm_drop_selection_cb,
-sd));
- sd-event_handlers = evas_list_append(sd-event_handlers,
-
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
-
_e_fm_win_mouse_move_cb,
-sd));
-
+sd));
sd-monitor = NULL;
sd-position = 0.0;
@@ -1381,7 +1376,7 @@
evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_DOWN, _e_fm_icon_mouse_down_cb, icon);
evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_UP, _e_fm_icon_mouse_up_cb, icon);
evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_IN, _e_fm_icon_mouse_in_cb, icon);
-evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_OUT, _e_fm_icon_mouse_out_cb, icon);
+evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_OUT, _e_fm_icon_mouse_out_cb, icon);
}
}
@@ -1435,6 +1430,7 @@
evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_UP, _e_fm_icon_mouse_up_cb, icon);
evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_IN, _e_fm_icon_mouse_in_cb, icon);
evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_OUT, _e_fm_icon_mouse_out_cb, icon);
+ evas_object_event_callback_add(icon-icon_object,
EVAS_CALLBACK_MOUSE_MOVE, _e_fm_icon_mouse_move_cb, sd);
evas_object_show(icon-icon_object);
e_icon_layout_pack(sd-layout, icon-icon_object);
}
@@ -1854,19 +1850,19 @@
{
E_Fm_Smart_Data *sd;
Evas_Event_Mouse_Move *ev;
-
+
ev = event_info;
sd = data;
-
+
if (!sd-selection.band.obj)
return;
-
+
if (sd-selection.band.enabled)
{
Evas_Coord x, y, w, h;
-
+
evas_object_geometry_get(sd-selection.band.obj, x, y, w, h);
-
+
if ((ev-cur.canvas.x sd-selection.band.x)
(ev-cur.canvas.y sd-selection.band.y))
{
@@ -1884,7 +1880,7 @@
/* growing towards bottom right */
w = ev-cur.canvas.x - sd-selection.band.x;
h = ev-cur.canvas.y - sd-selection.band.y;
-
+
evas_object_resize(sd-selection.band.obj, w, h);
}
else if ((ev-cur.canvas.x sd-selection.band.x)
@@ -1909,7 +1905,7 @@
sd-selection.band.x - ev-cur.canvas.x,
ev-cur.canvas.y - sd-selection.band.y);
}
-
+
evas_object_geometry_get(sd-selection.band.obj, x, y, w, h);
_e_fm_selections_rect_add(sd, x, y, w, h);
}
@@ -2132,28 +2128,16 @@
e_fm_icon_signal_emit(icon-icon_object, default, );
}
-static int
-_e_fm_win_mouse_move_cb(void *data, int type, void *event)
+static void
+_e_fm_icon_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
E_Fm_Smart_Data *sd;
E_Fm_Icon *icon;
- Ecore_X_Event_Mouse_Move *ev;
+ Evas_Event_Mouse_Move *ev;
- ev = event;
+ ev = event_info;
sd = data;
- /* FIXME: use evas callbacks here - not ecore_x events. ONLY use the
-* ecore_x events ONCE you GRAB
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- aspect ratio
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- default_fileman.edc 6 Nov 2005 03:40:24 - 1.23
+++ default_fileman.edc 6 Nov 2005 13:53:46 - 1.24
@@ -215,6 +215,7 @@
description
{
state: default 0.0;
+ aspect: 1.0 1.0;
color: 255 255 255 64;
rel1 {
relative: 0 0;
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman.c e_fileman_smart.c
Log Message:
-m pressing a key like i will take you to images and C takes you to
Code. Wrapping is also supported.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_fileman.c 5 Nov 2005 12:42:59 - 1.24
+++ e_fileman.c 6 Nov 2005 14:40:58 - 1.25
@@ -85,7 +85,7 @@
_e_fileman_scroll_child_size_get);
e_win_resize_callback_set(fileman-win, _e_fileman_resize_cb);
- e_win_resize(fileman-win, 640, 480);
+ e_win_resize(fileman-win, 570, 355);
ecore_x_dnd_aware_set(fileman-win-evas_win, 1);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- e_fileman_smart.c 6 Nov 2005 13:38:46 - 1.90
+++ e_fileman_smart.c 6 Nov 2005 14:40:58 - 1.91
@@ -237,6 +237,13 @@
static void_e_fm_icon_mouse_move_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static int _e_fm_win_mouse_up_cb(void *data, int type,
void *event);
+static void_e_fm_icon_select_up(E_Fm_Smart_Data *sd);
+static void_e_fm_icon_select_down(E_Fm_Smart_Data *sd);
+static void_e_fm_icon_select_left(E_Fm_Smart_Data *sd);
+static void_e_fm_icon_select_right(E_Fm_Smart_Data *sd);
+static void_e_fm_icon_goto_key(E_Fm_Smart_Data *sd, char *c);
+
+
static int _e_fm_drop_enter_cb (void *data, int type, void
*event);
static int _e_fm_drop_leave_cb (void *data, int type, void
*event);
static int _e_fm_drop_position_cb (void *data, int type, void
*event);
@@ -2227,6 +2234,69 @@
}
static void
+_e_fm_icon_goto_key(E_Fm_Smart_Data *sd, char *c)
+{
+ E_Fm_Icon *icon;
+ Evas_List *l;
+
+ if(sd-selection.current.ptr)
+ {
+ l = sd-selection.current.ptr;
+ icon = sd-selection.current.file;
+ if(icon-file-name[0] == c[0] l-next)
+ l = l-next;
+ else
+ l = sd-selection.current.ptr;
+ }
+ else
+ l = sd-files;
+
+ for(l; l; l = l-next)
+ {
+ icon = l-data;
+ if(icon-file-name[0] == c[0])
+ {
+_e_fm_selections_clear(sd);
+_e_fm_selections_add(l-data, l);
+goto position;
+ }
+ }
+ for(l = sd-files; l != sd-selection.current.ptr; l = l-next)
+ {
+ icon = l-data;
+ if(icon-file-name[0] == c[0])
+ {
+_e_fm_selections_clear(sd);
+_e_fm_selections_add(l-data, l);
+goto position;
+ }
+ }
+
+ return;
+position:
+ {
+ Evas_Coord x, y, w, h;
+ icon = l-data;
+ evas_object_geometry_get(icon-icon_object, x, y, w, h);
+ if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
+ {
+E_Event_Fm_Reconfigure *ev;
+
+ev = E_NEW(E_Event_Fm_Reconfigure, 1);
+if (ev)
+ {
+ ev-object = sd-object;
+ ev-x = sd-x;
+ ev-y = sd-child.y - (sd-y - (y - sd-icon_info.y_space));
+ ev-w = sd-w;
+ ev-h = sd-h;
+ ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
+ }
+ }
+ }
+}
+
+static void
_e_fm_icon_select_up(E_Fm_Smart_Data *sd)
{
Evas_List *l;
@@ -2290,7 +2360,7 @@
ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
}
}
- }
+ }
}
else
_e_fm_selections_add(sd-files-data, sd-files);
@@ -2536,7 +2606,9 @@
else if (!strcmp(ev-keyname, Right))
_e_fm_icon_select_right(sd);
else if (!strcmp(ev-keyname, Return))
- _e_fm_icon_run(sd);
+ _e_fm_icon_run(sd);
+ else if(strlen(ev-keyname) == 1)
+ _e_fm_icon_goto_key(sd, ev-string);
}
static int
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- bind BackSpace to go back 1 dir
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- e_fileman_smart.c 6 Nov 2005 14:40:58 - 1.91
+++ e_fileman_smart.c 6 Nov 2005 14:46:39 - 1.92
@@ -2595,7 +2595,7 @@
E_Fm_Smart_Data *sd;
ev = event_info;
- sd = data;
+ sd = data;
if (!strcmp(ev-keyname, Up))
_e_fm_icon_select_up(sd);
@@ -2607,6 +2607,19 @@
_e_fm_icon_select_right(sd);
else if (!strcmp(ev-keyname, Return))
_e_fm_icon_run(sd);
+ else if (!strcmp(ev-keyname, BackSpace))
+ {
+ char *fullname;
+
+ fullname = _e_fm_dir_pop(sd-dir);
+ if (fullname)
+ {
+if (sd-win)
+ e_win_title_set(sd-win, fullname);
+_e_fm_dir_set(sd, fullname);
+free(fullname);
+ }
+ }
else if(strlen(ev-keyname) == 1)
_e_fm_icon_goto_key(sd, ev-string);
}
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- some first / last icon selection fixes
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- e_fileman_smart.c 6 Nov 2005 14:46:39 - 1.92
+++ e_fileman_smart.c 6 Nov 2005 15:35:06 - 1.93
@@ -237,11 +237,12 @@
static void_e_fm_icon_mouse_move_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static int _e_fm_win_mouse_up_cb(void *data, int type,
void *event);
+static void_e_fm_icon_goto_key(E_Fm_Smart_Data *sd, char *c);
static void_e_fm_icon_select_up(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_down(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_left(E_Fm_Smart_Data *sd);
static void_e_fm_icon_select_right(E_Fm_Smart_Data *sd);
-static void_e_fm_icon_goto_key(E_Fm_Smart_Data *sd, char *c);
+static void_e_fm_icon_run(E_Fm_Smart_Data *sd);
static int _e_fm_drop_enter_cb (void *data, int type, void
*event);
@@ -2334,11 +2335,12 @@
_e_fm_selections_clear(sd);
_e_fm_selections_add(l-data, l);
}
- else
+ else if(!l)
{
-_e_fm_selections_clear(sd);
-_e_fm_selections_add(sd-files-data, sd-files);
- }
+if(!evas_key_modifier_is_set(evas_key_modifier_get(sd-evas),
Control))
+ _e_fm_selections_clear(sd);
+ _e_fm_selections_add(sd-files-data, sd-files);
+ }
if(l)
{
E_Fm_Icon *icon;
@@ -2370,7 +2372,7 @@
_e_fm_icon_select_down(E_Fm_Smart_Data *sd)
{
Evas_List *l;
-
+
if(sd-selection.current.ptr)
{
E_Fm_Icon *icon;
@@ -2404,9 +2406,10 @@
_e_fm_selections_clear(sd);
_e_fm_selections_add(l-data, l);
}
- else
+ else if(!l)
{
-_e_fm_selections_clear(sd);
+if(!evas_key_modifier_is_set(evas_key_modifier_get(sd-evas),
Control))
+ _e_fm_selections_clear(sd);
_e_fm_selections_add((evas_list_last(sd-files))-data,
evas_list_last(sd-files));
}
if(l)
@@ -2414,6 +2417,7 @@
E_Fm_Icon *icon;
Evas_Coord x, y, w, h;
icon = l-data;
+printf(going to %s\n, icon-file-name);
evas_object_geometry_get(icon-icon_object, x, y, w, h);
if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
{
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c e_entry.h e_widget_entry.c e_widget_entry.h
Log Message:
- fix e_widget_entry's focus
- add on_change callback to e_widget_entry
- tidy up some e_entry code
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_entry.c 31 Oct 2005 09:31:04 - 1.12
+++ e_entry.c 7 Nov 2005 00:09:20 - 1.13
@@ -86,13 +86,13 @@
const char*
e_editable_text_text_get(Evas_Object *object)
{
- E_Editable_Text_Smart_Data *editable_text_sd;
+ E_Editable_Text_Smart_Data *sd;
Evas_Textblock_Cursor *cursor;
- if ((!object) || !(editable_text_sd = evas_object_smart_data_get(object)))
+ if ((!object) || !(sd = evas_object_smart_data_get(object)))
return ;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd-text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(sd-text_object);
return evas_textblock_cursor_node_text_get(cursor);
}
@@ -104,13 +104,13 @@
void
e_editable_text_text_set(Evas_Object *object, const char *text)
{
- E_Editable_Text_Smart_Data *editable_text_sd;
+ E_Editable_Text_Smart_Data *sd;
- if ((!object) || (!text) || !(editable_text_sd =
evas_object_smart_data_get(object)))
+ if ((!object) || (!text) || !(sd = evas_object_smart_data_get(object)))
return;
- evas_object_textblock_text_markup_set(editable_text_sd-text_object, text);
- editable_text_sd-cursor_at_the_end = 1;
+ evas_object_textblock_text_markup_set(sd-text_object, text);
+ sd-cursor_at_the_end = 1;
_e_editable_text_size_update(object);
_e_editable_text_cursor_position_update(object);
}
@@ -123,18 +123,18 @@
void
e_editable_text_insert(Evas_Object *object, const char *text)
{
- E_Editable_Text_Smart_Data *editable_text_sd;
+ E_Editable_Text_Smart_Data *sd;
Evas_Textblock_Cursor *cursor;
- if ((!object) || !(editable_text_sd = evas_object_smart_data_get(object)))
+ if ((!object) || !(sd = evas_object_smart_data_get(object)))
return;
if ((!text) || ((strlen(text) = 1) (*text 0x20)))
return;
printf(Insert: \%s\, %c\n, text, *text);
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd-text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(sd-text_object);
- if (editable_text_sd-cursor_at_the_end)
+ if (sd-cursor_at_the_end)
evas_textblock_cursor_text_append(cursor, text);
else
evas_textblock_cursor_text_prepend(cursor, text);
@@ -149,17 +149,17 @@
void
e_editable_text_delete_char_before(Evas_Object *object)
{
- E_Editable_Text_Smart_Data *editable_text_sd;
+ E_Editable_Text_Smart_Data *sd;
Evas_Textblock_Cursor *cursor;
if ((!object) ||
- (!(editable_text_sd = evas_object_smart_data_get(object))) ||
+ (!(sd = evas_object_smart_data_get(object))) ||
(_e_editable_text_is_empty(object)))
return;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd-text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(sd-text_object);
- if ((editable_text_sd-cursor_at_the_end) ||
(evas_textblock_cursor_char_prev(cursor)))
+ if ((sd-cursor_at_the_end) || (evas_textblock_cursor_char_prev(cursor)))
evas_textblock_cursor_char_delete(cursor);
_e_editable_text_size_update(object);
@@ -173,20 +173,20 @@
void
e_editable_text_delete_char_after(Evas_Object *object)
{
- E_Editable_Text_Smart_Data *editable_text_sd;
+ E_Editable_Text_Smart_Data *sd;
Evas_Textblock_Cursor *cursor;
if ((!object) ||
- (!(editable_text_sd = evas_object_smart_data_get(object))) ||
+ (!(sd = evas_object_smart_data_get(object))) ||
(_e_editable_text_is_empty(object)))
return;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd-text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(sd-text_object);
- if (!editable_text_sd-cursor_at_the_end)
+ if (!sd-cursor_at_the_end)
{
if (!evas_textblock_cursor_char_next(cursor))
- editable_text_sd-cursor_at_the_end = 1;
+ sd-cursor_at_the_end = 1;
else
evas_textblock_cursor_char_prev(cursor);
evas_textblock_cursor_char_delete(cursor);
@@ -203,16 +203,16 @@
void
e_editable_text_cursor_move_at_start(Evas_Object *object)
{
- E_Editable_Text_Smart_Data *editable_text_sd;
+ E_Editable_Text_Smart_Data *sd;
Evas_Textblock_Cursor *cursor;
if ((!object) ||
- (!(editable_text_sd = evas_object_smart_data_get(object))) ||
+ (!(sd = evas_object_smart_data_get(object))) ||
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_entry.edc
Log Message:
- fix e_widget_entry's focus
- add on_change callback to e_widget_entry
- tidy up some e_entry code
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_entry.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default_entry.edc 7 Oct 2005 08:36:07 - 1.2
+++ default_entry.edc 7 Nov 2005 00:09:20 - 1.3
@@ -79,7 +79,7 @@
programs {
program {
name: entry_focus;
- signal: focus;
+ signal: focus_in;
source: ;
action: STATE_SET focus 0.0;
transition: LINEAR 0.2;
@@ -87,7 +87,7 @@
}
program {
name: button_unfocus;
- signal: unfocus;
+ signal: focus_out;
source: ;
action: STATE_SET default 0.0;
transition: LINEAR 0.2;
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_entry.c Log Message: oops === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_entry.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_widget_entry.c7 Nov 2005 00:09:20 - 1.5 +++ e_widget_entry.c7 Nov 2005 00:13:54 - 1.6 @@ -88,7 +88,7 @@ wd = data; E_FREE(*(wd-valptr)); - *(wd-valptr) = strdup(e_entry_text_get(entry)); + *(wd-valptr) = strdup(e_entry_text_get(wd-o_entry)); e_widget_change(wd-obj); } --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c
Log Message:
- raise change cb when we press backspace or delete
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_entry.c 7 Nov 2005 00:09:20 - 1.13
+++ e_entry.c 7 Nov 2005 00:19:58 - 1.14
@@ -774,9 +774,17 @@
obj = sd-entry_object;
if (strcmp(key_event-keyname, BackSpace) == 0)
- e_editable_text_delete_char_before(obj);
+ {
+ e_editable_text_delete_char_before(obj);
+ if(sd-change_func)
+ sd-change_func(sd-change_data, obj, );
+ }
else if (strcmp(key_event-keyname, Delete) == 0)
- e_editable_text_delete_char_after(obj);
+ {
+ e_editable_text_delete_char_after(obj);
+ if(sd-change_func)
+ sd-change_func(sd-change_data, obj, );
+ }
else if (strcmp(key_event-keyname, Left) == 0)
e_editable_text_cursor_move_left(obj);
else if (strcmp(key_event-keyname, Right) == 0)
@@ -792,7 +800,8 @@
if(key_event-string strcmp(key_event-keyname, Escape))
{
if(*(key_event-string) = 32 *(key_event-string) = 126)
- sd-change_func(sd-change_data, obj, (char *)key_event-string);
+ if(sd-change_func)
+sd-change_func(sd-change_data, obj, (char
*)key_event-string);
}
}
}
@@ -832,6 +841,9 @@
sd = malloc(sizeof(E_Entry_Smart_Data));
if (!sd) return;
+ sd-change_func = NULL;
+ sd-change_data = NULL;
+
sd-entry_object = e_editable_text_add(evas);
evas_object_smart_member_add(sd-entry_object, object);
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
printf--
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- e_fileman_smart.c 6 Nov 2005 15:35:06 - 1.93
+++ e_fileman_smart.c 7 Nov 2005 00:21:12 - 1.94
@@ -2416,8 +2416,8 @@
{
E_Fm_Icon *icon;
Evas_Coord x, y, w, h;
+
icon = l-data;
-printf(going to %s\n, icon-file-name);
evas_object_geometry_get(icon-icon_object, x, y, w, h);
if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
{
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman.c e_fileman_smart.c
Log Message:
- move keyboard code to evas callbacks, thanks raster
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_fileman.c 5 Nov 2005 01:01:26 - 1.21
+++ e_fileman.c 5 Nov 2005 11:13:13 - 1.22
@@ -72,7 +72,7 @@
e_win_title_set(fileman-win, dir);
evas_event_freeze(fileman-evas);
- fileman-smart = e_fm_add(fileman-evas);
+ fileman-smart = e_fm_add(fileman-evas);
e_fm_e_win_set(fileman-smart, fileman-win);
fileman-main = e_scrollframe_add(fileman-evas);
@@ -91,6 +91,10 @@
evas_event_thaw(fileman-evas);
+ evas_object_focus_set(fileman-main, 0);
+ //evas_object_focus_set(fileman-smart, 1);
+ evas_object_propagate_events_set(fileman-smart, 0);
+
fileman-event_handlers = evas_list_append(fileman-event_handlers,
ecore_event_handler_add(E_EVENT_FM_RECONFIGURE,
_e_fileman_reconfigure_cb,
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- e_fileman_smart.c 5 Nov 2005 01:51:20 - 1.86
+++ e_fileman_smart.c 5 Nov 2005 11:13:13 - 1.87
@@ -222,6 +222,7 @@
static void_e_fm_fake_mouse_up_all_later (Evas *evas);
static void_e_fm_fake_mouse_up_cb(void *data);
+static void_e_fm_key_down_cb(void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void_e_fm_mouse_down_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void_e_fm_mouse_move_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void_e_fm_mouse_up_cb(void *data, Evas *e,
Evas_Object *obj, void *event_info);
@@ -231,7 +232,6 @@
static void_e_fm_icon_mouse_out_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static int _e_fm_win_mouse_move_cb (void *data, int type,
void *event);
static int _e_fm_win_mouse_up_cb(void *data, int type,
void *event);
-static int _e_fm_win_key_down_cb(void *data, int type,
void *event);
static int _e_fm_drop_enter_cb (void *data, int type, void
*event);
static int _e_fm_drop_leave_cb (void *data, int type, void
*event);
@@ -519,7 +519,6 @@
evas_object_repeat_events_set(sd-layout, 1);
evas_object_smart_member_add(sd-layout, object);
e_icon_layout_spacing_set(sd-layout, sd-icon_info.x_space,
sd-icon_info.y_space);
- evas_object_stack_above(sd-layout, sd-bg);
evas_object_show(sd-layout);
sd-clip = evas_object_rectangle_add(sd-evas);
@@ -538,6 +537,11 @@
base/theme/fileman/rubberband,
fileman/rubberband);
+ evas_object_focus_set(sd-object, 1);
+ evas_object_event_callback_add(sd-object,
EVAS_CALLBACK_KEY_DOWN,_e_fm_key_down_cb, sd);
+
+ evas_object_stack_below(sd-bg, sd-layout);
+
sd-event_handlers = NULL;
sd-event_handlers = evas_list_append(sd-event_handlers,
@@ -564,10 +568,6 @@
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
_e_fm_win_mouse_move_cb,
sd));
- sd-event_handlers = evas_list_append(sd-event_handlers,
-
ecore_event_handler_add(ECORE_X_EVENT_KEY_DOWN,
-
_e_fm_win_key_down_cb,
-sd));
sd-monitor = NULL;
sd-position = 0.0;
@@ -647,7 +647,7 @@
sd-y = y;
evas_object_move(sd-bg, x, y);
evas_object_move(sd-clip, x, y);
- evas_object_move(sd-layout, sd-x - sd-child.x, sd-y - sd-child.y);
+ evas_object_move(sd-layout, sd-x - sd-child.x, sd-y - sd-child.y);
}
static void
@@ -2354,7 +2354,7 @@
if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
{
E_Event_Fm_Reconfigure *ev;
-
+ printf(!E_CONTAINS %s\n, icon-file-name);
ev = E_NEW(E_Event_Fm_Reconfigure, 1);
if (ev)
{
@@ -2524,32 +2524,24 @@
}
}
-static int
-_e_fm_win_key_down_cb(void *data, int type, void *event)
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman.c Log Message: - oops, forgot to save file. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- e_fileman.c 5 Nov 2005 11:13:13 - 1.22 +++ e_fileman.c 5 Nov 2005 11:33:00 - 1.23 @@ -92,7 +92,7 @@ evas_event_thaw(fileman-evas); evas_object_focus_set(fileman-main, 0); - //evas_object_focus_set(fileman-smart, 1); + evas_object_focus_set(fileman-smart, 1); evas_object_propagate_events_set(fileman-smart, 0); fileman-event_handlers = evas_list_append(fileman-event_handlers, --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: zh_CN.po Log Message: -add \n === RCS file: /cvsroot/enlightenment/e17/apps/e/po/zh_CN.po,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- zh_CN.po4 Nov 2005 03:20:43 - 1.26 +++ zh_CN.po4 Nov 2005 09:43:55 - 1.27 @@ -711,7 +711,7 @@ #: src/bin/e_main.c:369 msgid Enlightenment cannot initialize the Thumbnailing system.\n -msgstr Enlightenment 无法建立它的缩略图系统。 +msgstr Enlightenment 无法建立它的缩略图系统。\n #: src/bin/e_main.c:378 msgid Enlightenment cannot initialize the File manager.\n --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman_icon.c e_fileman_smart.c e_icon_layout.c Log Message: - temp fix until icons are properly done === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_fileman_icon.c4 Nov 2005 03:33:22 - 1.15 +++ e_fileman_icon.c4 Nov 2005 14:58:03 - 1.16 @@ -139,10 +139,7 @@ sd-ih, 1); evas_object_smart_member_add(sd-thumb_object, sd-obj); - sd-image_object = edje_object_add(sd-evas); -edje_extern_object_min_size_set(sd-image_object, sd-iw, sd-ih); -edje_extern_object_max_size_set(sd-image_object, sd-iw, sd-ih); e_theme_edje_object_set(sd-image_object, base/theme/fileman, fileman/icon_thumb); edje_object_part_swallow(sd-image_object, icon_swallow, @@ -161,12 +158,9 @@ } _e_fm_icon_type_set(sd); - - edje_object_size_min_calc(sd-icon_object, icon_w, icon_h); - printf(INTERNAL SIZE: %d %d\n, icon_w, icon_h); - //evas_object_resize(sd-icon_object, icon_w, icon_h); - //evas_object_resize(sd-event_object, icon_w, icon_h); - //evas_object_resize(sd-obj, icon_w, icon_h); + evas_object_resize(sd-icon_object, 64, 64); + evas_object_resize(sd-event_object, 64, 64); + evas_object_resize(sd-obj, 64, 64); } void @@ -438,7 +432,9 @@ else e_theme_edje_object_set(sd-image_object, base/theme/fileman, icons/fileman/file); } + evas_object_resize(sd-image_object, sd-iw, sd-ih); edje_extern_object_min_size_set(sd-image_object, sd-iw, sd-ih); + edje_extern_object_max_size_set(sd-image_object, sd-iw, sd-ih); } static void === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- e_fileman_smart.c 4 Nov 2005 03:33:22 - 1.78 +++ e_fileman_smart.c 4 Nov 2005 14:58:03 - 1.79 @@ -491,8 +491,8 @@ if (!sd) return; sd-object = object; - sd-icon_info.w = 48; - sd-icon_info.h = 48; + sd-icon_info.w = 64; + sd-icon_info.h = 64; sd-icon_info.x_space = 12; sd-icon_info.y_space = 10; @@ -1385,9 +1385,10 @@ icon-file-type = E_FM_FILE_TYPE_DIRECTORY; icon-icon_object = e_fm_icon_add(sd-evas); icon-sd = sd; -e_fm_icon_file_set(icon-icon_object, icon-file); -e_fm_icon_size_min_calc(icon-icon_object, w, h); -evas_object_resize(icon-icon_object, 64, 64); +e_fm_icon_file_set(icon-icon_object, icon-file); +//evas_object_resize(icon-icon_object, +//sd-icon_info.w, +//sd-icon_info.h); sd-files = evas_list_prepend(sd-files, icon); } } @@ -1402,14 +1403,11 @@ icon = l-data; - evas_object_resize(icon-icon_object, sd-icon_info.w, sd-icon_info.h); - //e_fm_icon_image_resize(icon-icon_object, sd-icon_info.w, sd-icon_info.h); + //evas_object_resize(icon-icon_object, + // sd-icon_info.w, + // sd-icon_info.h); evas_object_show(icon-icon_object); - evas_object_geometry_get(icon-icon_object, NULL, NULL, icon_w, icon_h); - D((_e_fm_dir_set: Icon, w=%d h=%d\n, icon_w, icon_h)); - e_icon_layout_pack(sd-layout, icon-icon_object); - evas_object_event_callback_add(icon-icon_object, EVAS_CALLBACK_MOUSE_DOWN, _e_fm_icon_mouse_down_cb, icon); evas_object_event_callback_add(icon-icon_object, EVAS_CALLBACK_MOUSE_UP, _e_fm_icon_mouse_up_cb, icon); evas_object_event_callback_add(icon-icon_object, EVAS_CALLBACK_MOUSE_IN, _e_fm_icon_mouse_in_cb, icon); @@ -1480,10 +1478,9 @@ icon-icon_object = e_fm_icon_add(sd-evas); icon-sd = sd; e_fm_icon_file_set(icon-icon_object, icon-file); - e_fm_icon_image_resize(icon-icon_object, sd-icon_info.w, sd-icon_info.h); - e_fm_icon_size_min_calc(icon-icon_object, w, h); - printf(icon size: %d %d\n, w, h); - //evas_object_resize(icon-icon_object, w, h); + //evas_object_resize(icon-icon_object, + //sd-icon_info.w, + //sd-icon_info.h); files = evas_list_append(files, icon); } } @@ -1561,9 +1558,7 @@ icon-sd = sd; e_icon_layout_freeze(sd-layout); e_fm_icon_file_set(icon-icon_object, icon-file); - //e_fm_icon_image_resize(icon-icon_object,
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- temp fix until icons are properly done
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- default_fileman.edc 4 Nov 2005 03:33:22 - 1.20
+++ default_fileman.edc 4 Nov 2005 14:58:03 - 1.21
@@ -25,7 +25,6 @@
#define FILEMAN_ICON(TYPE) \
group { \
name: icons/fileman/TYPE; \
- max: 48 48; \
parts { \
part { \
name: icon; \
@@ -34,7 +33,6 @@
state:default 0.0; \
aspect: 1.0 1.0; \
align: 0.5 0.0; \
- max: 48 48; \
image { \
normal: e17_icon_fileman_TYPE.png; \
} \
@@ -46,7 +44,6 @@
#define FILEMAN_ICON_CLICKABLE(TYPE) \
group { \
name: icons/fileman/TYPE; \
- max: 48 48; \
parts { \
part { \
name: icon; \
@@ -55,7 +52,6 @@
state:default 0.0; \
align: 0.5 0.0; \
aspect: 1.0 1.0; \
- max: 48 48; \
image { \
normal: e17_icon_fileman_TYPE.png; \
} \
@@ -64,7 +60,6 @@
state:clicked 0.0; \
align: 0.5 0.0; \
aspect: 1.0 1.0; \
- max: 48 48; \
image { \
normal: e17_icon_fileman_TYPE_clicked.png; \
} \
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman_smart.c Log Message: - getting the event window doesnt work this way === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -3 -r1.81 -r1.82 --- e_fileman_smart.c 4 Nov 2005 21:09:38 - 1.81 +++ e_fileman_smart.c 4 Nov 2005 22:53:08 - 1.82 @@ -2432,7 +2432,10 @@ // make this call generic if (!sd-win) return 1; - if (ev-win != sd-win-evas_win) return 1; + // this doesnt work: + //if (ev-win != sd-win-evas_win) return 1; + if(ev-win != ecore_evas_software_x11_subwindow_get(sd-win-ecore_evas)) + return 1; if (!strcmp(ev-keysymbol, Up)) _e_fm_icon_select_up(sd); --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman.c e_fileman_smart.c e_fileman_smart.h
Log Message:
- more work on keyboard nav, now window scrolls when we move with keys. still
have bug in top topmost first item and lowermost right item.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_fileman.c 4 Nov 2005 21:04:20 - 1.20
+++ e_fileman.c 5 Nov 2005 01:01:26 - 1.21
@@ -26,7 +26,8 @@
static void _e_fileman_scroll_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord
*y);
static void _e_fileman_scroll_max_get(Evas_Object *obj, Evas_Coord *x,
Evas_Coord *y);
static void _e_fileman_scroll_child_size_get(Evas_Object *obj, Evas_Coord *x,
Evas_Coord *y);
-
+static int _e_fileman_reconfigure_cb(void *data, int type, void *event);
+
E_Fileman *
e_fileman_new(E_Container *con)
@@ -90,6 +91,12 @@
evas_event_thaw(fileman-evas);
+ fileman-event_handlers = evas_list_append(fileman-event_handlers,
+
ecore_event_handler_add(E_EVENT_FM_RECONFIGURE,
+
_e_fileman_reconfigure_cb,
+ fileman));
+
+
D((e_fileman_new: ok\n));
return fileman;
@@ -192,3 +199,15 @@
fileman-selector.func(fileman, file, fileman-selector.data);
//e_object_del(E_OBJECT(fileman));
}
+
+static int
+ _e_fileman_reconfigure_cb(void *data, int type, void *event)
+{
+ E_Event_Fm_Reconfigure *ev;
+ E_Fileman *fileman;
+
+ fileman = data;
+ ev = event;
+
+ e_scrollframe_child_region_show(fileman-main, ev-x, ev-y, ev-w, ev-h);
+}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- e_fileman_smart.c 4 Nov 2005 23:59:52 - 1.83
+++ e_fileman_smart.c 5 Nov 2005 01:01:26 - 1.84
@@ -645,7 +645,6 @@
sd-x = x;
sd-y = y;
-
evas_object_move(sd-bg, x, y);
evas_object_move(sd-clip, x, y);
evas_object_move(sd-layout, sd-x - sd-child.x, sd-y - sd-child.y);
@@ -685,7 +684,7 @@
ev-object = sd-object;
ev-w = sd-child.w;
ev-h = sd-child.h;
- ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
+ //ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
}
}
@@ -765,7 +764,7 @@
ev-object = sd-object;
ev-w = sd-child.w;
ev-h = sd-child.h;
- ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
+ //ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
}
}
@@ -1413,7 +1412,7 @@
ev-object = sd-object;
ev-w = sd-child.w;
ev-h = sd-child.h;
- ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
+ //ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
}
}
@@ -2263,6 +2262,28 @@
_e_fm_selections_clear(sd);
_e_fm_selections_add(l-data, l);
}
+ if(l)
+ {
+E_Fm_Icon *icon;
+Evas_Coord x, y, w, h;
+icon = l-data;
+evas_object_geometry_get(icon-icon_object, x, y, w, h);
+if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
+ {
+ E_Event_Fm_Reconfigure *ev;
+
+ ev = E_NEW(E_Event_Fm_Reconfigure, 1);
+ if (ev)
+ {
+ ev-object = sd-object;
+ ev-x = sd-x;
+ ev-y = sd-child.y - (sd-y - (y -
sd-icon_info.y_space));
+ ev-w = sd-w;
+ ev-h = sd-h;
+ ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
+ }
+ }
+ }
}
else
_e_fm_selections_add(sd-files-data, sd-files);
@@ -2306,6 +2327,28 @@
_e_fm_selections_clear(sd);
_e_fm_selections_add(l-data, l);
}
+ if(l)
+ {
+E_Fm_Icon *icon;
+Evas_Coord x, y, w, h;
+icon = l-data;
+evas_object_geometry_get(icon-icon_object, x, y, w, h);
+if(!E_CONTAINS(sd-x, sd-y, sd-w, sd-h, x, y, w, h))
+ {
+ E_Event_Fm_Reconfigure *ev;
+
+ ev = E_NEW(E_Event_Fm_Reconfigure, 1);
+ if (ev)
+ {
+ ev-object = sd-object;
+ ev-x = sd-x;
+ ev-y = sd-child.y +
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- fix first / last element nav via keyboard
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- e_fileman_smart.c 5 Nov 2005 01:01:26 - 1.84
+++ e_fileman_smart.c 5 Nov 2005 01:31:05 - 1.85
@@ -2262,6 +2262,11 @@
_e_fm_selections_clear(sd);
_e_fm_selections_add(l-data, l);
}
+ else
+ {
+_e_fm_selections_clear(sd);
+_e_fm_selections_add(sd-files-data, sd-files);
+ }
if(l)
{
E_Fm_Icon *icon;
@@ -2327,6 +2332,11 @@
_e_fm_selections_clear(sd);
_e_fm_selections_add(l-data, l);
}
+ else
+ {
+_e_fm_selections_clear(sd);
+_e_fm_selections_add((evas_list_last(sd-files))-data,
evas_list_last(sd-files));
+ }
if(l)
{
E_Fm_Icon *icon;
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Modified Files: Makefile.am Added Files: e17_fileman_thumb_bg.png Log Message: - work on icon thumbs, give them their own theme part. === RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/images/Makefile.am,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- Makefile.am 2 Nov 2005 02:12:00 - 1.40 +++ Makefile.am 3 Nov 2005 15:26:46 - 1.41 @@ -331,6 +331,7 @@ e17_fileman_bg.png \ e17_fileman_bg_shadow.png \ e17_fileman_rubberband.png \ +e17_fileman_thumb_bg.png \ e17_icon_fileman_c.png \ e17_icon_fileman_file.png \ e17_icon_fileman_file_clicked.png \ --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_smart.c
Log Message:
- work on icon thumbs, give them their own theme part.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_fileman_icon.c2 Nov 2005 09:17:44 - 1.13
+++ e_fileman_icon.c3 Nov 2005 15:26:46 - 1.14
@@ -20,6 +20,7 @@
Evas_Object *image_object;
Evas_Object *entry_object;
Evas_Object *title_object;
+ Evas_Object *thumb_object;
E_Fm_File *file;
@@ -131,10 +132,20 @@
{
sd-thumb_path = e_thumb_file_get(sd-file-path);
if (e_thumb_exists(sd-file-path))
- sd-image_object = e_thumb_evas_object_get(sd-file-path,
-sd-evas,
-sd-iw,
-sd-ih);
+ {
+sd-thumb_object = e_thumb_evas_object_get(sd-file-path,
+ sd-evas,
+ sd-iw,
+ sd-ih);
+evas_object_smart_member_add(sd-thumb_object, sd-obj);
+
+sd-image_object = edje_object_add(sd-evas);
+edje_extern_object_min_size_set(sd-image_object, sd-iw, sd-ih);
+e_theme_edje_object_set(sd-image_object, base/theme/fileman,
+fileman/icon_thumb);
+edje_object_part_swallow(sd-image_object, icon_swallow,
+ sd-thumb_object);
+ }
else
{
thumb_files = evas_list_append(thumb_files, sd);
@@ -307,6 +318,11 @@
evas_object_smart_member_del(sd-title_object);
evas_object_del(sd-title_object);
}
+ if (sd-thumb_object)
+ {
+ evas_object_smart_member_del(sd-thumb_object);
+ evas_object_del(sd-thumb_object);
+ }
E_FREE(sd-saved_title);
if (sd-file) e_object_unref(E_OBJECT(sd-file));
free(sd);
@@ -453,11 +469,23 @@
if ((ext) || (ecore_file_exists(sd-thumb_path)))
{
if (sd-image_object) evas_object_del(sd-image_object);
- sd-image_object = e_thumb_evas_object_get(sd-file-path,
+
+ sd-thumb_object = e_thumb_evas_object_get(sd-file-path,
sd-evas,
- sd-iw, sd-ih);
+ sd-iw,
+ sd-ih);
+ evas_object_smart_member_add(sd-thumb_object, sd-obj);
+
+ sd-image_object = edje_object_add(sd-evas);
+ edje_extern_object_min_size_set(sd-image_object, sd-iw, sd-ih);
+ e_theme_edje_object_set(sd-image_object, base/theme/fileman,
+ fileman/icon_thumb);
+ edje_object_part_swallow(sd-image_object, icon_swallow,
+sd-thumb_object);
edje_object_part_swallow(sd-icon_object, icon_swallow,
sd-image_object);
+ edje_object_part_swallow(sd-icon_object, icon_title,
+sd-title_object);
}
pid = -1;
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- e_fileman_smart.c 3 Nov 2005 06:17:08 - 1.76
+++ e_fileman_smart.c 3 Nov 2005 15:26:46 - 1.77
@@ -1858,7 +1858,7 @@
fileman/button/properties);
ecore_evas_geometry_get(sd-win-ecore_evas, x, y, w, h);
-
+
e_menu_activate_mouse(sd-menu, sd-win-border-zone,
ev-output.x + x, ev-output.y + y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev-timestamp);
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- work on icon thumbs, give them their own theme part.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- default_fileman.edc 2 Nov 2005 11:10:37 - 1.18
+++ default_fileman.edc 3 Nov 2005 15:26:46 - 1.19
@@ -152,6 +152,8 @@
image: e17_logo.png COMP;
image: e17_button.png COMP;
+ image: e17_fileman_thumb_bg.png COMP;
+ image: e17_mini_button_shadow2.png COMP;
}
styles
@@ -1065,6 +1067,336 @@
}
}
+
+group {
+ name: fileman/icon_thumb;
+ parts {
+ part {
+name: icon_box_shadow;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ rel1 {
+ to: icon_box;
+ relative: 0.0 0.0;
+ offset: 3 3;
+ }
+ rel2 {
+ to: icon_box;
+ relative: 1.0 1.0;
+ offset: 3 3;
+ }
+image {
+ normal: e17_mini_button_shadow2.png;
+ border: 6 6 6 6;
+ }
+}
+ }
+ part {
+name: icon_box;
+type: RECT;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ align: 0.5 0.5;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -6 -6;
+ }
+ color: 0 0 0 255;
+}
+ }
+ part {
+name: icon_box_bg;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ rel1 {
+ to: icon_box;
+ relative: 0.0 0.0;
+ offset: 1 1;
+ }
+ rel2 {
+ to: icon_box;
+ relative: 1.0 1.0;
+ offset: -2 -2;
+ }
+image {
+ normal: e17_fileman_thumb_bg.png;
+ }
+ fill {
+ smooth: 0;
+ size {
+ relative: 0 0;
+ offset: 32 32;
+ }
+ }
+}
+ }
+ part {
+name: icon_swallow;
+type: SWALLOW;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ rel1 {
+ to: icon_box_bg;
+ }
+ rel2 {
+ to: icon_box_bg;
+ }
+}
+ }
+ }
+}
+
+group {
+ name: fileman/icon_thumb_normal2;
+ min: 48 48;
+ max: 128 ;
+ parts {
+ part {
+/* this is used for debugging */
+name: ghost;
+type: RECT;
+description {
+ state: default 0.0;
+ visible: 0;
+ color: 128 128 128 128;
+}
+ }
+/*
+ part {
+name: icon_bg;
+mouse_events: 0;
+description {
+ min: 48 48;
+ max: 48 48;
+ align: 0.5 0.0;
+ state: default 0.0;
+ rel1 {
+ to: icon_swallow;
+ offset: 5 5;
+ }
+ image {
+ normal: e17_fileman_thumb_bg.png;
+ }
+}
+ }
+*/
+ part {
+name: icon_box_shadow;
+mouse_events: 0;
+description {
+ min: 56 56;
+ max: 56 56;
+ state: default 0.0;
+ rel1 {
+ to: icon_box;
+ relative: 0.0 0.0;
+ offset: 2 2;
+ }
+ rel2 {
+ to: icon_box;
+ relative: 1.0 1.0;
+ offset: 3 3;
+ }
+image {
+ normal: e17_mini_button_shadow2.png;
+ border: 6 6 6 6;
+ }
+}
+ }
+ part {
+name: icon_box;
+type: RECT;
+mouse_events: 0;
+description {
+ min: 52 52;
+ max: 52 52;
+ state: default 0.0;
+ rel1 {
+ to: icon_swallow;
+ relative: 0.0 0.0;
+ offset: -2 -2;
+ }
+ rel2 {
+ to: icon_swallow;
+ relative: 1.0 1.0;
+ offset: 2 2;
+ }
+ color: 0 0 0 255;
+}
+ }
+ part {
+name: icon_box_bg;
+mouse_events: 0;
+description {
+ min: 50 50;
+ max: 50 50;
+ state: default 0.0;
+ rel1 {
+ to:
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_icon.h e_fileman_smart.c e_icon.c
e_icon.h e_thumb.c e_thumb.h
Log Message:
- being icon overhaul
- icons look bad for now, until everthing is fixed.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_fileman_icon.c3 Nov 2005 15:26:46 - 1.14
+++ e_fileman_icon.c4 Nov 2005 03:33:22 - 1.15
@@ -136,11 +136,13 @@
sd-thumb_object = e_thumb_evas_object_get(sd-file-path,
sd-evas,
sd-iw,
- sd-ih);
+ sd-ih,
+ 1);
evas_object_smart_member_add(sd-thumb_object, sd-obj);
sd-image_object = edje_object_add(sd-evas);
edje_extern_object_min_size_set(sd-image_object, sd-iw, sd-ih);
+edje_extern_object_max_size_set(sd-image_object, sd-iw, sd-ih);
e_theme_edje_object_set(sd-image_object, base/theme/fileman,
fileman/icon_thumb);
edje_object_part_swallow(sd-image_object, icon_swallow,
@@ -160,7 +162,8 @@
_e_fm_icon_type_set(sd);
- //edje_object_size_min_calc(sd-icon_object, icon_w, icon_h);
+ edje_object_size_min_calc(sd-icon_object, icon_w, icon_h);
+ printf(INTERNAL SIZE: %d %d\n, icon_w, icon_h);
//evas_object_resize(sd-icon_object, icon_w, icon_h);
//evas_object_resize(sd-event_object, icon_w, icon_h);
//evas_object_resize(sd-obj, icon_w, icon_h);
@@ -179,6 +182,7 @@
//if (sd-icon_object) edje_object_part_text_set(sd-icon_object,
icon_title, title);
if(sd-icon_object)
{
+#if 0
Evas_Textblock_Style *e_editable_text_style;
Evas_Coord fw, fh, il, ir, it, ib;
@@ -187,7 +191,7 @@
evas_object_textblock_style_set(sd-title_object,
e_editable_text_style);
- evas_object_textblock_text_markup_set(sd-title_object, sd-file-name);
+ evas_object_textblock_text_markup_set(sd-title_object, title);
evas_object_resize(sd-title_object, sd-w, 1);
evas_object_textblock_size_formatted_get(sd-title_object, fw, fh);
@@ -200,6 +204,8 @@
evas_object_resize(sd-icon_object, sd-w, sd-h);
evas_object_resize(sd-obj, sd-w, sd-h);
edje_object_part_swallow(sd-icon_object, icon_title,
sd-title_object);
+#endif
+ edje_object_part_text_set(sd-icon_object, icon_title, title);
}
}
@@ -253,7 +259,16 @@
sd-ih = h;
evas_object_resize(sd-image_object, w, h);
}
+
+void
+e_fm_icon_size_min_calc(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
+{
+ E_Smart_Data *sd;
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+ edje_object_size_min_calc(sd-icon_object, w, h);
+}
/* local subsystem functions */
static void
@@ -361,7 +376,7 @@
evas_object_resize(sd-event_object, sd-w, sd-h);
if (sd-icon_object) evas_object_resize(sd-icon_object, sd-w, sd-h);
-
+ printf(resize to %d %d\n, sd-w, sd-h);
//if (sd-image_object) evas_object_resize(sd-image_object, w, h);
}
@@ -417,12 +432,13 @@
if (!e_theme_edje_object_set(sd-image_object,
base/theme/fileman, part))
e_theme_edje_object_set(sd-image_object, base/theme/fileman,
icons/fileman/file);
-
+
free(ext);
}
else
e_theme_edje_object_set(sd-image_object, base/theme/fileman,
icons/fileman/file);
}
+ edje_extern_object_min_size_set(sd-image_object, sd-iw, sd-ih);
}
static void
@@ -473,19 +489,21 @@
sd-thumb_object = e_thumb_evas_object_get(sd-file-path,
sd-evas,
sd-iw,
- sd-ih);
+ sd-ih,
+ 1);
evas_object_smart_member_add(sd-thumb_object, sd-obj);
sd-image_object = edje_object_add(sd-evas);
- edje_extern_object_min_size_set(sd-image_object, sd-iw, sd-ih);
e_theme_edje_object_set(sd-image_object, base/theme/fileman,
fileman/icon_thumb);
edje_object_part_swallow(sd-image_object, icon_swallow,
sd-thumb_object);
+ edje_extern_object_min_size_set(sd-image_object, sd-iw, sd-ih);
+ edje_extern_object_max_size_set(sd-image_object, sd-iw, sd-ih);
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- being icon overhaul
- icons look bad for now, until everthing is fixed.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- default_fileman.edc 3 Nov 2005 15:26:46 - 1.19
+++ default_fileman.edc 4 Nov 2005 03:33:22 - 1.20
@@ -918,135 +918,133 @@
group {
name: fileman/icon_normal;
- min: 48 48;
- max: 128 ;
- parts {
- part {
-/* this is used for debugging */
-name: ghost;
-type: RECT;
-description {
- state: default 0.0;
- visible: 0;
- color: 128 128 128 128;
-}
- }
- part {
-name: icon_swallow;
-type: SWALLOW;
-mouse_events: 0;
-description {
- min: 48 48;
- max: 48 48;
- align: 0.5 0.0;
- state: default 0.0;
-}
- }
- part {
-name: icon_overlay;
-mouse_events: 1;
-description {
- state: default 0.0;
- visible: 0;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -1 -1;
- }
- image {
- normal: e17_button.png;
+ parts {
+part {
+ name: icon_box;
+ type: RECT;
+ mouse_events: 0;
+ description {
+ state: default 0.0;
+ visible: 1;
+ color: 128 128 128 128;
+ aspect: 1.0 1.0;
+ color: 0 0 0 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ to_y: icon_title;
+ relative: 1.0 0.0;
+ offset: -1 -1;
+ }
}
- color: 255 255 255 128;
}
-description {
- state: clicked 0.0;
-inherit: default 0.0;
- visible: 1;
-}
- }
- part {
-name: icon_title;
-type: SWALLOW;
-description {
- fixed: 1 1;
- align: 0.5 0.0;
- state: default 0.0;
- rel1 {
- to: icon_swallow;
- relative: 0.0 1.0;
- offset: 1 -1;
+part {
+ name: icon_swallow;
+ type: SWALLOW;
+ mouse_events: 0;
+ description {
+ state: default 0.0;
+ fixed: 1 1;
+ rel1 {
+ to: icon_box;
+ relative: 0.0 0.0;
+ offset: 2 2;
+ }
+ rel2 {
+ to: icon_box;
+ relative: 1.0 1.0;
+ offset: -3 -3;
+ }
}
- rel2 {
- to: icon_swallow;
- relative: 1.0 1.0;
- offset: -1 -1;
- }
-}
-description {
- state: clicked 0.0;
- inherit: default 0.0;
}
- }
- part {
-name: icon_event;
-type: RECT;
-mouse_events: 1;
-description {
- state: default 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -1 -1;
+part {
+ name: icon_title;
+ type: TEXT;
+ effect:SHADOW;
+ description {
+ state: default 0.0;
+ align: 0.5 1.0;
+ fixed: 0 1;
+ rel1 {
+ relative: 0.0 1.0;
+ offset: 0 -1;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+
+ color: 0 0 0 255;
+ color3: 255 255 255 128;
+ text {
+ text: No Title;
+ align:0.0 0.0;
+ size: 10;
+ font: Vera;
+ min: 0 1;
+ }
}
- color: 0 0 0 0;
-}
- }
-/*
- part {
-name: icon_title;
-type: TEXTBLOCK;
-effect:NONE;
-description {
- rel1 {
- relative: 0.0 1.0;
- offset: 5 -20;
- }
- rel2 {
- relative: 1.0 1.0;
-
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- show selections
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- default_fileman.edc 2 Nov 2005 01:37:11 - 1.17
+++ default_fileman.edc 2 Nov 2005 11:10:37 - 1.18
@@ -150,6 +150,8 @@
image: e17_fileman_rubberband.png COMP;
image: e17_menu_bg_border.png COMP;
image: e17_logo.png COMP;
+
+ image: e17_button.png COMP;
}
styles
@@ -939,6 +941,31 @@
}
}
part {
+name: icon_overlay;
+mouse_events: 1;
+description {
+ state: default 0.0;
+ visible: 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ image {
+ normal: e17_button.png;
+ }
+ color: 255 255 255 128;
+}
+description {
+ state: clicked 0.0;
+inherit: default 0.0;
+ visible: 1;
+}
+ }
+ part {
name: icon_title;
type: SWALLOW;
description {
@@ -948,7 +975,7 @@
rel1 {
to: icon_swallow;
relative: 0.0 1.0;
- offset: -1 -1;
+ offset: 1 -1;
}
rel2 {
to: icon_swallow;
@@ -960,7 +987,7 @@
state: clicked 0.0;
inherit: default 0.0;
}
- }
+ }
part {
name: icon_event;
type: RECT;
@@ -977,7 +1004,7 @@
}
color: 0 0 0 0;
}
- }
+ }
/*
part {
name: icon_title;
@@ -1025,6 +1052,7 @@
source: ;
action: STATE_SET clicked 0.0;
target: icon_title;
+target: icon_overlay;
}
program {
name: unclicked;
@@ -1032,6 +1060,7 @@
source: ;
action: STATE_SET default 0.0;
target: icon_title;
+ target: icon_overlay;
}
}
}
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman_smart.c Log Message: - dont fiddle with the keyboard if we dont have a win assigned === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -3 -r1.73 -r1.74 --- e_fileman_smart.c 2 Nov 2005 16:08:21 - 1.73 +++ e_fileman_smart.c 2 Nov 2005 16:18:18 - 1.74 @@ -2420,6 +2420,8 @@ sd = data; // make this call generic + if(!sd-win) + return; if (ev-win != ecore_evas_software_x11_subwindow_get(sd-win-ecore_evas)) return 1; --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- being keyboard navigation for efm
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_fileman_smart.c 2 Nov 2005 06:28:52 - 1.72
+++ e_fileman_smart.c 2 Nov 2005 16:08:21 - 1.73
@@ -21,8 +21,6 @@
* - is the offset code working properly? i have a feeling we're displayin
* more icons that the visible space can take and they are being hidden.
*
- * - emit all sorts of signals on double click, right click, single click...
- *
* - add typebuffer like in evidence.
*
* - keyboard shortcuts for directory and file navigation.
@@ -35,8 +33,6 @@
* - double check dir monitoring. note: when we are in a dir that is constantly
* changing, we cant keep calling redraw_new as it will kill us.
*
- * - we need to fix the icon edc to allow us to have icon labels what will
- * wrap on wrap=char
*/
/* BUGS:
@@ -161,16 +157,20 @@
} child;
struct {
- Evas_List *files;
- E_Fm_Icon *current_file;
-
- struct {
-unsigned char enabled : 1;
-Evas_Coord x, y;
-Evas_Object *obj;
-Evas_List *files;
- } band;
-
+ Evas_List *files;
+
+ struct {
+E_Fm_Icon *file;
+Evas_List *ptr;
+ } current;
+
+ struct {
+unsigned char enabled : 1;
+Evas_Coord x, y;
+Evas_Object *obj;
+Evas_List *files;
+ } band;
+
} selection;
struct {
@@ -207,15 +207,16 @@
static void_e_fm_file_rename (E_Fm_Icon *icon, const
char *name);
static void_e_fm_file_delete (E_Fm_Icon *icon);
-static void_e_fm_dir_set (E_Fm_Smart_Data *sd,
const char *dir);
-static Evas_List *_e_fm_dir_files_get (E_Fm_Smart_Data *sd, int
type);
-static char *_e_fm_dir_pop (const char *path);
-static void_e_fm_file_free (E_Fm_Icon *icon);
-static void_e_fm_dir_monitor_cb (void *data,
Ecore_File_Monitor *ecore_file_monitor, Ecore_File_Event event, const char
*path);
-static void_e_fm_selections_clear(E_Fm_Smart_Data *sd);
-static void_e_fm_selections_add (E_Fm_Icon *icon);
-static void_e_fm_selections_rect_add (E_Fm_Smart_Data *sd,
Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-static void_e_fm_selections_del (E_Fm_Icon *icon);
+static void_e_fm_dir_set(E_Fm_Smart_Data *sd,
const char *dir);
+static Evas_List *_e_fm_dir_files_get (E_Fm_Smart_Data *sd,
int type);
+static char *_e_fm_dir_pop(const char *path);
+static void_e_fm_file_free (E_Fm_Icon *icon);
+static void_e_fm_dir_monitor_cb (void *data,
Ecore_File_Monitor *ecore_file_monitor, Ecore_File_Event event, const char
*path);
+static void_e_fm_selections_clear (E_Fm_Smart_Data *sd);
+static void_e_fm_selections_add (E_Fm_Icon *icon,
Evas_List *icon_ptr);
+static void_e_fm_selections_current_set (E_Fm_Icon *icon,
Evas_List *icon_ptr);
+static void_e_fm_selections_rect_add(E_Fm_Smart_Data *sd,
Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+static void_e_fm_selections_del (E_Fm_Icon *icon);
static void_e_fm_fake_mouse_up_later (Evas *evas, int
button);
static void_e_fm_fake_mouse_up_all_later (Evas *evas);
@@ -230,6 +231,7 @@
static void_e_fm_icon_mouse_out_cb (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static int _e_fm_win_mouse_move_cb (void *data, int type,
void *event);
static int _e_fm_win_mouse_up_cb(void *data, int type,
void *event);
+static int _e_fm_win_key_down_cb(void *data, int type,
void *event);
static int _e_fm_drop_enter_cb (void *data, int type, void
*event);
static int _e_fm_drop_leave_cb (void *data, int type, void
*event);
@@ -562,6 +564,11 @@
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
_e_fm_win_mouse_move_cb,
sd));
+ sd-event_handlers = evas_list_append(sd-event_handlers,
+
ecore_event_handler_add(ECORE_X_EVENT_KEY_DOWN,
+
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c
Log Message:
- enter changes dirs or launches file
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- e_fileman_smart.c 2 Nov 2005 16:18:18 - 1.74
+++ e_fileman_smart.c 2 Nov 2005 16:31:18 - 1.75
@@ -2406,10 +2406,47 @@
static void
_e_fm_icon_run(E_Fm_Smart_Data *sd)
{
-
+ E_Fm_Icon *icon;
+ if(sd-selection.current.ptr)
+ {
+ icon = sd-selection.current.file;
+ if (icon-file-type == E_FM_FILE_TYPE_DIRECTORY)
+ {
+char *fullname;
+
+printf(dir!\n);
+
+if (!strcmp(icon-file-name, ..))
+ {
+ fullname = _e_fm_dir_pop(icon-sd-dir);
+ }
+else
+ {
+ fullname = strdup(icon-file-path);
+ }
+if (fullname)
+ {
+ if (icon-sd-win)
+ e_win_title_set(icon-sd-win, fullname);
+ _e_fm_dir_set(icon-sd, fullname);
+ free(fullname);
+ }
+ }
+ else if (icon-file-type == E_FM_FILE_TYPE_FILE)
+ {
+if(icon-sd-is_selector)
+ {
+ _e_fm_selector_send_file(icon);
+ return;
+ }
+
+if ((!e_fm_file_assoc_exec(icon-file))
+(e_fm_file_can_exec(icon-file)))
+ e_fm_file_exec(icon-file);
+ }
+ }
}
-
static int
_e_fm_win_key_down_cb(void *data, int type, void *event)
{
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman_smart.c Log Message: -add more spacing to icons === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -3 -r1.67 -r1.68 --- e_fileman_smart.c 31 Oct 2005 09:31:04 - 1.67 +++ e_fileman_smart.c 1 Nov 2005 22:08:07 - 1.68 @@ -513,8 +513,8 @@ sd-icon_info.w = 48; sd-icon_info.h = 48; - sd-icon_info.x_space = 15; - sd-icon_info.y_space = 15; + sd-icon_info.x_space = 25; + sd-icon_info.y_space = 25; sd-evas = evas_object_evas_get(object); sd-frozen = 0; --- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42 plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_icon.h e_fileman_smart.c
e_icon_layout.c
Log Message:
- fix icon file names
- fix spacing
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_fileman_icon.c31 Oct 2005 09:31:04 - 1.11
+++ e_fileman_icon.c2 Nov 2005 01:37:11 - 1.12
@@ -7,7 +7,7 @@
struct _E_Smart_Data
{
- Evas_Coord x, y, w, h;
+ Evas_Coord x, y, w, h, iw, ih;
Evas*evas;
Evas_Object *obj;
@@ -19,6 +19,7 @@
Evas_Object *icon_object;
Evas_Object *image_object;
Evas_Object *entry_object;
+ Evas_Object *title_object;
E_Fm_File *file;
@@ -132,8 +133,8 @@
if (e_thumb_exists(sd-file-path))
sd-image_object = e_thumb_evas_object_get(sd-file-path,
sd-evas,
-sd-w,
-sd-h);
+sd-iw,
+sd-ih);
else
{
thumb_files = evas_list_append(thumb_files, sd);
@@ -148,23 +149,47 @@
_e_fm_icon_type_set(sd);
- edje_object_size_min_calc(sd-icon_object, icon_w, icon_h);
- evas_object_resize(sd-icon_object, icon_w, icon_h);
- evas_object_resize(sd-event_object, icon_w, icon_h);
- evas_object_resize(sd-obj, icon_w, icon_h);
+ //edje_object_size_min_calc(sd-icon_object, icon_w, icon_h);
+ //evas_object_resize(sd-icon_object, icon_w, icon_h);
+ //evas_object_resize(sd-event_object, icon_w, icon_h);
+ //evas_object_resize(sd-obj, icon_w, icon_h);
}
void
e_fm_icon_title_set(Evas_Object *obj, const char *title)
{
- E_Smart_Data *sd;
-
+ E_Smart_Data *sd;
+
sd = evas_object_smart_data_get(obj);
if (!sd) return;
E_FREE(sd-saved_title);
sd-saved_title = E_NEW(char, strlen(title) + 1);
snprintf(sd-saved_title, strlen(title) + 1, %s, title);
- if (sd-icon_object) edje_object_part_text_set(sd-icon_object,
icon_title, title);
+ //if (sd-icon_object) edje_object_part_text_set(sd-icon_object,
icon_title, title);
+ if(sd-icon_object)
+ {
+ Evas_Textblock_Style *e_editable_text_style;
+ Evas_Coord fw, fh, il, ir, it, ib;
+
+ e_editable_text_style = evas_textblock_style_new();
+ evas_textblock_style_set(e_editable_text_style, DEFAULT='font=Vera
font_size=10 style=shadow shadow_color=#ff80 align=center color=#00
wrap=char');
+
+
+ evas_object_textblock_style_set(sd-title_object,
e_editable_text_style);
+ evas_object_textblock_text_markup_set(sd-title_object, sd-file-name);
+
+ evas_object_resize(sd-title_object, sd-w, 1);
+ evas_object_textblock_size_formatted_get(sd-title_object, fw, fh);
+ evas_object_textblock_style_insets_get(sd-title_object, il, ir, it,
ib);
+
+ sd-h = sd-ih + fh + it + ib;
+
+ evas_object_resize(sd-title_object, sd-w, fh + it + ib);
+ edje_extern_object_min_size_set(sd-title_object, sd-w, fh + it + ib);
+ evas_object_resize(sd-icon_object, sd-w, sd-h);
+evas_object_resize(sd-obj, sd-w, sd-h);
+ edje_object_part_swallow(sd-icon_object, icon_title,
sd-title_object);
+ }
}
void
@@ -206,6 +231,19 @@
return 0;
}
+void
+e_fm_icon_image_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+ E_Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+ sd-iw = w;
+ sd-ih = h;
+ evas_object_resize(sd-image_object, w, h);
+}
+
+
/* local subsystem functions */
static void
_e_fm_icon_smart_add(Evas_Object *obj)
@@ -219,12 +257,19 @@
sd-obj = obj;
sd-saved_title = NULL;
sd-type = E_FM_ICON_NORMAL;
+ sd-w = 64;
+ sd-h = 64;
+ sd-iw = 48;
+ sd-ih = 48;
sd-event_object = evas_object_rectangle_add(sd-evas);
evas_object_color_set(sd-event_object, 0, 0, 0, 0);
evas_object_smart_member_add(sd-event_object, obj);
evas_object_show(sd-event_object);
evas_object_smart_data_set(obj, sd);
-
+
+ sd-title_object = evas_object_textblock_add(sd-evas);
+ evas_object_smart_member_add(sd-title_object, obj);
+
sd-visible = 1;
sd-icon_object = edje_object_add(sd-evas);
evas_object_smart_member_add(sd-icon_object, obj);
@@ -257,6 +302,11 @@
evas_object_smart_member_del(sd-image_object);
evas_object_del(sd-image_object);
}
+ if (sd-title_object)
+ {
+ evas_object_smart_member_del(sd-title_object);
+ evas_object_del(sd-title_object);
+ }
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- fix icon file names
- fix spacing
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- default_fileman.edc 31 Oct 2005 10:08:41 - 1.16
+++ default_fileman.edc 2 Nov 2005 01:37:11 - 1.17
@@ -25,15 +25,16 @@
#define FILEMAN_ICON(TYPE) \
group { \
name: icons/fileman/TYPE; \
- max: 64 64; \
+ max: 48 48; \
parts { \
part { \
name: icon; \
mouse_events: 0; \
-description { \
+description { \
state:default 0.0; \
aspect: 1.0 1.0; \
- max: 64 64; \
+align: 0.5 0.0; \
+ max: 48 48; \
image { \
normal: e17_icon_fileman_TYPE.png; \
} \
@@ -45,23 +46,25 @@
#define FILEMAN_ICON_CLICKABLE(TYPE) \
group { \
name: icons/fileman/TYPE; \
- max: 64 64; \
+ max: 48 48; \
parts { \
part { \
name: icon; \
mouse_events: 0; \
description { \
state:default 0.0; \
+ align: 0.5 0.0; \
aspect: 1.0 1.0; \
- max: 64 64; \
+ max: 48 48; \
image { \
normal: e17_icon_fileman_TYPE.png; \
} \
} \
description { \
state:clicked 0.0; \
+ align: 0.5 0.0; \
aspect: 1.0 1.0; \
- max: 64 64; \
+ max: 48 48; \
image { \
normal: e17_icon_fileman_TYPE_clicked.png; \
} \
@@ -153,7 +156,7 @@
{
style {
name: fileman_icon_style;
-base: font=Edje-Vera color=#000 style=shadow shadow_color=#cc
font_size=10 align=center wrap=char;
+base: font=Edje-Vera color=#000 style=shadow shadow_color=#cc
font_size=10 align=center wrap=char;
tag: br \n;
tag: hilight + font=Edje-Vera-Bold;
tag: invisible + font=Edje-Vera font_size=7 style=none
color=#0002;
@@ -912,57 +915,50 @@
group {
name: fileman/icon_normal;
min: 48 48;
- max: 128 128;
+ max: 128 ;
parts {
part {
+/* this is used for debugging */
+name: ghost;
+type: RECT;
+description {
+ state: default 0.0;
+ visible: 0;
+ color: 128 128 128 128;
+}
+ }
+ part {
name: icon_swallow;
type: SWALLOW;
mouse_events: 0;
description {
min: 48 48;
- max: 128 128;
+ max: 48 48;
+ align: 0.5 0.0;
state: default 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 5 5;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -6 -20;
- }
- color: 0 0 0 255;
}
}
part {
name: icon_title;
-type: TEXT;
-effect:SHADOW;
+type: SWALLOW;
description {
+ fixed: 1 1;
+ align: 0.5 0.0;
state: default 0.0;
rel1 {
+ to: icon_swallow;
relative: 0.0 1.0;
- offset: 5 -6;
+ offset: -1 -1;
}
rel2 {
+ to: icon_swallow;
relative: 1.0 1.0;
- offset: -6 -6;
- }
- color: 0 0 0 255;
- color3: 255 255 255 128;
- text {
- text: No Title;
- align:0.0 0.0;
- font: Edje-Vera;
- size: 10;
- // min: 1 1;
- }
+ offset: -1 -1;
+ }
}
description {
state: clicked 0.0;
inherit: default 0.0;
- text {
- font: Edje-Vera-Bold;
- }
}
}
part {
@@ -974,12 +970,10 @@
rel1 {
relative: 0.0 0.0;
offset: 0 0;
- //to: icon_swallow;
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
- //to: icon_swallow;
}
color: 0 0 0 0;
}
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_eap_editor.c e_entry.c e_file_dialog.c
e_fileman_file.c e_fileman_icon.c e_fileman_smart.c e_thumb.c
e_widget_entry.c e_widget_iconsel.c
Log Message:
- fix warnings
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- e_apps.c31 Oct 2005 00:01:54 - 1.99
+++ e_apps.c31 Oct 2005 09:31:04 - 1.100
@@ -1077,7 +1077,7 @@
Evas *evasbuf;
Evas_Coord iw, ih;
Evas_Object *im;
- int *data;
+ const int *data;
buf = ecore_evas_buffer_new(1, 1);
evasbuf = ecore_evas_get(buf);
@@ -1095,7 +1095,7 @@
evas_object_move(im, 0, 0);
evas_object_show(im);
data = ecore_evas_buffer_pixels_get(buf);
-eet_data_image_write(ef, images/0, data, 48, 48, alpha, 1, 0, 0);
+eet_data_image_write(ef, images/0, (void *)data, 48, 48, alpha,
1, 0, 0);
}
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_eap_editor.c 31 Oct 2005 00:01:54 - 1.9
+++ e_eap_editor.c 31 Oct 2005 09:31:04 - 1.10
@@ -227,7 +227,7 @@
}
editor-img_widget = e_widget_iconsel_add(evas, editor-img, 48, 48,
-cfdata-image);
+(cfdata-image));
e_widget_iconsel_select_callback_add(editor-img_widget,
_e_eap_edit_select_cb, editor);
e_widget_frametable_object_append(o, editor-img_widget,
0, 0, 1, 1,
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_entry.c 28 Oct 2005 02:56:26 - 1.11
+++ e_entry.c 31 Oct 2005 09:31:04 - 1.12
@@ -769,7 +769,7 @@
if(key_event-string strcmp(key_event-keyname, Escape))
{
if(*(key_event-string) = 32 *(key_event-string) = 126)
- e_entry_sd-change_func(e_entry_sd-change_data, obj,
key_event-string);
+ e_entry_sd-change_func(e_entry_sd-change_data, obj, (char
*)key_event-string);
}
}
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_file_dialog.c 31 Oct 2005 00:01:54 - 1.3
+++ e_file_dialog.c 31 Oct 2005 09:31:04 - 1.4
@@ -65,7 +65,7 @@
table = e_widget_table_add(evas, Select File, 0);
- fm = e_widget_fileman_add(evas, dia-file);
+ fm = e_widget_fileman_add(evas, (dia-file));
e_widget_table_object_append(table, fm, 0, 0, 4, 4, 1, 1, 1, 1);
e_widget_fileman_select_callback_add(fm, _e_file_dialog_file_select_cb,
dia);
@@ -90,7 +90,7 @@
void
e_file_dialog_title_set(E_File_Dialog *dia, const char *title)
{
- e_dialog_title_set(dia-dia, title);
+ e_dialog_title_set(dia-dia, (char *)title);
}
void
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_file.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_fileman_file.c29 Oct 2005 14:19:23 - 1.10
+++ e_fileman_file.c31 Oct 2005 09:31:04 - 1.11
@@ -62,7 +62,7 @@
if (!file) return NULL;
file-path = strdup(filename);
if (!file-path) goto error;
- file-name = strdup(ecore_file_get_file(filename));
+ file-name = strdup(ecore_file_get_file((char *)filename));
if (!file-name) goto error;
/* Get attributes */
file-device = st.st_dev;
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_fileman_icon.c29 Oct 2005 11:48:18 - 1.10
+++ e_fileman_icon.c31 Oct 2005 09:31:04 - 1.11
@@ -162,7 +162,7 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
E_FREE(sd-saved_title);
- sd-saved_title = E_NEW(char *, strlen(title) + 1);
+ sd-saved_title = E_NEW(char, strlen(title) + 1);
snprintf(sd-saved_title, strlen(title) + 1, %s, title);
if (sd-icon_object) edje_object_part_text_set(sd-icon_object,
icon_title, title);
}
===
RCS file:
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_widget_iconsel.c
Log Message:
-bug fixes
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_eap_editor.c 31 Oct 2005 09:31:04 - 1.10
+++ e_eap_editor.c 31 Oct 2005 09:46:27 - 1.11
@@ -108,6 +108,7 @@
cfdata = E_NEW(E_App_Edit_CFData, 1);
if (!cfdata) return NULL;
cfdata-editor = cfd-data;
+ cfdata-image = NULL;
_e_eap_edit_fill_data(cfdata);
return cfdata;
}
@@ -214,17 +215,12 @@
o = e_widget_frametable_add(evas, _(Icon), 0);
+ editor-img = e_icon_add(evas);
if(eap-path)
{
- editor-img = e_icon_add(evas);
e_icon_file_key_set(editor-img, eap-path, images/0);
e_icon_fill_inside_set(editor-img, 1);
}
- else
- {
- editor-img = edje_object_add(evas);
- e_theme_edje_object_set(editor-img,
base/theme/icons/enlightenment/e, icons/enlightenment/e);
- }
editor-img_widget = e_widget_iconsel_add(evas, editor-img, 48, 48,
(cfdata-image));
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_iconsel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_widget_iconsel.c 31 Oct 2005 09:31:05 - 1.4
+++ e_widget_iconsel.c 31 Oct 2005 09:46:27 - 1.5
@@ -3,6 +3,13 @@
*/
#include e.h
+/*- DESCRIPTION -*/
+/* Adds a pushable button with an icon preview which serves as an icon
+ * selector (could be extended to select certain file tyes.
+ * NOTE: The Evas_Object *icon object in the *_add functions is expected to
+ * be an e_icon.
+ */
+
typedef struct _E_Widget_Data E_Widget_Data;
struct _E_Widget_Data
{
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- change font when something is selected
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- default_fileman.edc 30 Oct 2005 08:48:07 - 1.15
+++ default_fileman.edc 31 Oct 2005 10:08:41 - 1.16
@@ -938,6 +938,7 @@
type: TEXT;
effect:SHADOW;
description {
+ state: default 0.0;
rel1 {
relative: 0.0 1.0;
offset: 5 -6;
@@ -956,6 +957,13 @@
// min: 1 1;
}
}
+description {
+ state: clicked 0.0;
+ inherit: default 0.0;
+ text {
+ font: Edje-Vera-Bold;
+ }
+}
}
part {
name: icon_event;
@@ -1018,11 +1026,19 @@
}
programs {
program {
-name: button_click;
-signal: mouse,down,1;
-source: ;
-action: SIGNAL_EMIT clicked ;
- }
+name: clicked;
+signal: clicked;
+source: ;
+action: STATE_SET clicked 0.0;
+target: icon_title;
+ }
+ program {
+name: unclicked;
+signal: unclicked;
+source: ;
+action: STATE_SET default 0.0;
+target: icon_title;
+ }
}
}
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am Removed Files: e_scrollbar.c e_scrollbar.h Log Message: - remove old scrollbar stuff === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.73 retrieving revision 1.74 diff -u -3 -r1.73 -r1.74 --- Makefile.am 30 Oct 2005 08:40:37 - 1.73 +++ Makefile.am 30 Oct 2005 09:40:34 - 1.74 @@ -82,7 +82,6 @@ e_apps_cache.h \ e_entry.h \ e_fileman.h \ -e_scrollbar.h \ e_fileman_smart.h \ e_fileman_file.h \ e_fileman_icon.h \ @@ -171,7 +170,6 @@ e_apps_cache.c \ e_entry.c \ e_fileman.c \ -e_scrollbar.c \ e_fileman_smart.c \ e_fileman_file.c \ e_fileman_icon.c \ --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Removed Files: e17_hscrollbar_trough.png e17_scrollbar_button_shadow1.png e17_scrollbar_arrow_down.png e17_scrollbar_button_shadow2.png e17_scrollbar_arrow_left.png e17_scrollbar_arrow_right.png e17_scrollbar_arrow_up.png e17_vscrollbar_trough.png e17_scrollbar_button.png Log Message: - remove old scrollbar stuff --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Removed Files: default_scrollbar.edc Log Message: - remove old scrollbar stuff --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_file_selector.c e_fileman.c e_fileman_smart.c
e_fileman_smart.h
Log Message:
- fix scrolling
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- Makefile.am 29 Oct 2005 11:51:19 - 1.72
+++ Makefile.am 30 Oct 2005 08:40:37 - 1.73
@@ -108,7 +108,7 @@
e_widget_fileman.h \
e_scrollframe.h \
e_file_selector.h \
-e_file_dialog.h
+e_file_dialog.h
enlightenment_src = \
e_user.c \
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_selector.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_file_selector.c 28 Oct 2005 13:44:41 - 1.1
+++ e_file_selector.c 30 Oct 2005 08:40:37 - 1.2
@@ -102,15 +102,17 @@
sd-view = E_FILE_SELECTOR_ICONVIEW;
evas = evas_object_evas_get(obj);
- sd-theme = edje_object_add(evas);
+// sd-theme = edje_object_add(evas);
+ sd-theme = e_scrollframe_add(evas);
evas_object_smart_member_add(sd-theme, obj);
- THEME_SET(sd-theme, main);
+// THEME_SET(sd-theme, main);
sd-files = e_fm_add(evas);
e_fm_selector_enable(sd-files, _e_file_selector_selected_cb, sd);
evas_object_smart_member_add(sd-files, obj);
- edje_object_part_swallow(sd-theme, items, sd-files);
+ //edje_object_part_swallow(sd-theme, items, sd-files);
+e_scrollframe_child_set(sd-theme, sd-files);
evas_object_smart_data_set(obj, sd);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_fileman.c 27 Oct 2005 13:21:38 - 1.17
+++ e_fileman.c 30 Oct 2005 08:40:37 - 1.18
@@ -18,17 +18,16 @@
# define D(x) ((void) 0)
#endif
-static void _e_fileman_vscrollbar_drag_cb(Evas_Object *object, double value,
void *data);
-static int _e_fileman_reconf_cb(void *data, int type, void *event);
-static int _e_fileman_dir_change_cb(void *data, int type, void *event);
-static int _e_fileman_mouse_wheel_cb(void *data, int type, void *event);
static void _e_fileman_resize_cb(E_Win *win);
static void _e_fileman_delete_cb(E_Win *win);
static void _e_fileman_selector_cb(Evas_Object *object, char *file, void
*data);
-static void _e_fileman_vscrollbar_show_cb(void *data, Evas *e, Evas_Object
*obj, void *ev);
-static void _e_fileman_vscrollbar_hide_cb(void *data, Evas *e, Evas_Object
*obj, void *ev);
static void _e_fileman_free(E_Fileman *fileman);
-
+static void _e_fileman_scroll_set(Evas_Object *obj, Evas_Coord x, Evas_Coord
y);
+static void _e_fileman_scroll_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord
*y);
+static void _e_fileman_scroll_max_get(Evas_Object *obj, Evas_Coord *x,
Evas_Coord *y);
+static void _e_fileman_scroll_child_size_get(Evas_Object *obj, Evas_Coord *x,
Evas_Coord *y);
+
+
E_Fileman *
e_fileman_new(E_Container *con)
{
@@ -71,41 +70,23 @@
e_win_name_class_set(fileman-win, Efm , _fileman);
e_win_title_set(fileman-win, dir);
- fileman-main = edje_object_add(fileman-evas);
- e_theme_edje_object_set(fileman-main, base/theme/fileman/main,
- fileman/main);
-
- fileman-vscrollbar = e_scrollbar_add(fileman-evas);
- e_scrollbar_direction_set(fileman-vscrollbar, E_SCROLLBAR_VERTICAL);
- e_scrollbar_callback_drag_add(fileman-vscrollbar,
_e_fileman_vscrollbar_drag_cb, fileman);
- evas_object_event_callback_add(fileman-vscrollbar, EVAS_CALLBACK_SHOW,
_e_fileman_vscrollbar_show_cb, fileman);
- evas_object_event_callback_add(fileman-vscrollbar, EVAS_CALLBACK_HIDE,
_e_fileman_vscrollbar_hide_cb, fileman);
-
- e_win_resize_callback_set(fileman-win, _e_fileman_resize_cb);
- e_win_resize(fileman-win, 640, 480);
-
evas_event_freeze(fileman-evas);
-
fileman-smart = e_fm_add(fileman-evas);
e_fm_e_win_set(fileman-smart, fileman-win);
- edje_object_part_swallow(fileman-main, icon_area, fileman-smart);
-
- ecore_x_dnd_aware_set(fileman-win-evas_win, 1);
-
- fileman-event_handlers = evas_list_append(fileman-event_handlers,
-
ecore_event_handler_add(E_EVENT_FM_RECONFIGURE,
-
_e_fileman_reconf_cb,
- fileman));
- fileman-event_handlers = evas_list_append(fileman-event_handlers,
-
ecore_event_handler_add(E_EVENT_FM_DIRECTORY_CHANGE,
-
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- redo scrollbar
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- default_fileman.edc 29 Oct 2005 11:44:17 - 1.14
+++ default_fileman.edc 30 Oct 2005 08:48:07 - 1.15
@@ -247,7 +247,7 @@
}
}
part {
- name: icon_area;
+ name: item;
type: SWALLOW;
mouse_events: 1;
description {
@@ -263,26 +263,650 @@
}
}
part {
-name: vscrollbar;
-type: SWALLOW;
+name: sb_vbar;
+type: RECT;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ min: 16 16;
+ align: 1.0 0.0;
+ rel1 {
+ to: background;
+ relative: 1.0 0.0;
+ offset: -5 4;
+ }
+ rel2 {
+ to: background;
+ relative: 1.0 0.0;
+ offset: -5 -1;
+ to_y: sb_hbar;
+ }
+}
+description {
+ state: hidden 0.0;
+ visible: 0;
+ max: 0 9;
+ rel1 {
+ to: background;
+ relative: 1.0 0.0;
+ offset: -4 4;
+ }
+ rel2 {
+ to: background;
+ relative: 1.0 0.0;
+ offset: -4 -1;
+ to_y: sb_hbar;
+ }
+}
+ }
+ part {
+name: sb_vbar_base;
+type: RECT;
+clip_to: sb_vbar;
mouse_events: 1;
description {
- min: 16 40;
- state: default 0.0;
+ state: default 0.0;
+ color: 0 0 0 0;
rel1 {
+ relative: 0.0 1.0;
+ offset: 00;
+ to: sb_vbar_a1;
+ }
+ rel2 {
+ relative: 1.0 0.0;
+ offset: -1 -1;
+ to: sb_vbar_a2;
+ }
+}
+ }
+ part {
+name: sb_vbar_runner;
+clip_to: sb_vbar;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ max: 2 9;
+ rel1 {
+ to: sb_vbar_base;
+ }
+ rel2 {
+ to: sb_vbar_base;
+ }
+ image {
+ normal: e17_sb_runnerv.png;
+ border: 0 0 4 4;
+ }
+ fill {
+ smooth: 0;
+ }
+}
+ }
+ part {
+name: sb_vbar_p1;
+type: RECT;
+clip_to: sb_vbar;
+mouse_events: 1;
+description {
+ state: default 0.0;
+ color: 0 0 0 0;
+ rel1 {
+ relative: 0.0 1.0;
+ offset: 0 0;
+ to: sb_vbar_a1;
+ }
+ rel2 {
relative: 1.0 0.0;
- offset: -16 0;
+ offset: -1 -1;
+ to: vbar_bar;
+ }
+}
+ }
+ part {
+name: sb_vbar_p2;
+type: RECT;
+clip_to: sb_vbar;
+mouse_events: 1;
+description {
+ state: default 0.0;
+ color: 0 0 0 0;
+ rel1 {
+ relative: 0.0 1.0;
+ offset: 0 0;
+ to: vbar_bar;
}
rel2 {
- relative: 1.0 1.0;
- offset: 0 -1;
+ relative: 1.0 0.0;
+ offset: -1 -1;
+ to: sb_vbar_a2;
}
- color: 0 0 0 255;
}
- }
- }
- programs {
+ }
+ part {
+name: vbar_bar;
+clip_to: sb_vbar;
+mouse_events: 1;
+dragable {
+ x: 0 0 0;
+ y: 1 1 0;
+ confine: sb_vbar_base;
+}
+description {
+ state: default 0.0;
+ min: 16 16;
+ rel1 {
+ relative: 0.5 0.5;
+ offset: 00;
+ to: sb_vbar_base;
+ }
+ rel2 {
+ relative: 0.5 0.5;
+ offset: 00;
+ to: sb_vbar_base;
+ }
+ image {
+ normal: e17_sb_barv1.png;
+ border: 5 5 5 5;
+ }
+}
+description {
+ state: clicked 0.0;
+ inherit: default 0.0;
+ image {
+ normal: e17_sb_barv2.png;
+ }
+}
+ }
+ part {
+name: vbar_bar_thumb;
+clip_to: sb_vbar;
+mouse_events: 0;
+description {
+ state: default 0.0;
+ max: 8 8;
+
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fileman.c Log Message: oops, testing value === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_fileman.c 30 Oct 2005 08:40:37 - 1.18 +++ e_fileman.c 30 Oct 2005 09:00:01 - 1.19 @@ -84,7 +84,7 @@ _e_fileman_scroll_child_size_get); e_win_resize_callback_set(fileman-win, _e_fileman_resize_cb); - e_win_resize(fileman-win, 400, 400 ); + e_win_resize(fileman-win, 640, 480); ecore_x_dnd_aware_set(fileman-win-evas_win, 1); --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
