Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am layout_etk_simple.c
Log Message:
* Added start of etk location add dialog. This does not quite work yet, but
the core logic is there.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Makefile.am 22 Feb 2006 13:09:47 -0000 1.20
+++ Makefile.am 23 Feb 2006 23:29:49 -0000 1.21
@@ -73,7 +73,8 @@
layout_ewl_simple_la_LIBADD = @EWL_LIBS@
if HAVE_ETK
-layout_etk_simple_la_SOURCES = layout_etk_simple.c
$(top_srcdir)/src/entropy_debug.c
+layout_etk_simple_la_SOURCES = layout_etk_simple.c
$(top_srcdir)/src/entropy_debug.c \
+
$(top_srcdir)/src/dialogs/etk_location_add_dialog.c
layout_etk_simple_la_CFLAGS = @ETK_CFLAGS@
layout_etk_simple_la_LDFLAGS = -module -avoid-version
layout_etk_simple_la_LIBADD = @ETK_LIBS@
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- layout_etk_simple.c 22 Feb 2006 14:25:54 -0000 1.13
+++ layout_etk_simple.c 23 Feb 2006 23:29:49 -0000 1.14
@@ -106,22 +106,21 @@
etk_main ();
}
+
+void _location_add_cb(Etk_Object *obj, void *data)
+{
+ printf("Add location\n");
+ etk_location_add_dialog_create((entropy_gui_component_instance*)data);
+}
+
void layout_etk_simple_add_header(entropy_gui_component_instance* instance,
char* name, char* uri)
{
- void *(*entropy_plugin_init) (entropy_core * core,
- entropy_gui_component_instance *);
void *(*structure_plugin_init) (entropy_core * core,
entropy_gui_component_instance *,
void* parent_visual,
void *data);
- void *(*local_plugin_init) (entropy_core * core,
- entropy_gui_component_instance *,
- void *data);
-
- entropy_plugin *plugin;
entropy_plugin *structure;
- entropy_plugin *local;
entropy_generic_file* file;
Etk_Tree_Row* row;
Etk_Tree_Col* col;
@@ -161,33 +160,17 @@
entropy_layout_gui *gui;
entropy_gui_component_instance *layout;
entropy_gui_component_instance* instance;
- Etk_Widget* test;
-
-
- void *(*entropy_plugin_init) (entropy_core * core,
- entropy_gui_component_instance *);
- void *(*structure_plugin_init) (entropy_core * core,
- entropy_gui_component_instance *,
- void* parent_visual,
- void *data);
void *(*local_plugin_init) (entropy_core * core,
entropy_gui_component_instance *,
void *data);
- entropy_plugin *plugin;
- entropy_plugin *structure;
entropy_plugin *local;
Etk_Tree_Col* col;
- Etk_Tree_Row* row;
Etk_Widget* vbox;
Etk_Widget* menubar;
Etk_Widget* menu_item;
Etk_Widget* menu;
- char* home = strdup(getenv("HOME"));
- char* pos;
- char* md5;
- entropy_file_listener* listener;
Ecore_Hash* config_hash;
Ecore_List* config_hash_keys;
@@ -234,7 +217,10 @@
menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Tools"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), NULL);
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Add Location"),
ETK_STOCK_ADDRESS_BOOK_NEW, ETK_MENU_SHELL(menu), NULL);
+
+ menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Add
Location"), ETK_STOCK_ADDRESS_BOOK_NEW, ETK_MENU_SHELL(menu), NULL);
+ etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(_location_add_cb), layout);
+
_entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Program
Associations.."), ETK_STOCK_SYSTEM_SHUTDOWN, ETK_MENU_SHELL(menu), NULL);
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
