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 -0000 1.17
+++ e_eap_editor.c 6 Dec 2005 22:50:41 -0000 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.h 4 Dec 2005 12:03:58 -0000 1.113
+++ e_ipc_handlers.h 6 Dec 2005 22:50:41 -0000 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 -0000 1.39
+++ e_ipc_handlers_list.h 6 Dec 2005 22:50:41 -0000 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 -0000 1.7
+++ e_widget_iconsel.c 6 Dec 2005 22:50:41 -0000 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!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
