Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_includes.h Makefile.am e_gadcon.c e_gadcon.h Added Files: e_toolbar.h e_toolbar.c e_int_toolbar_config.h e_int_toolbar_config.c Log Message: Initial check-in of upcoming toolbar. Ignore this code for now as it's still a work in progress (ie: do not use right now). =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.172 retrieving revision 1.173 diff -u -3 -r1.172 -r1.173 --- e_includes.h 25 Sep 2007 14:26:36 -0000 1.172 +++ e_includes.h 31 Oct 2007 10:09:51 -0000 1.173 @@ -119,7 +119,6 @@ #include "e_color_dialog.h" #include "e_sys.h" #include "e_obj_dialog.h" -//#include "e_fwin.h" #include "e_filereg.h" #include "e_widget_aspect.h" #include "e_widget_desk_preview.h" @@ -130,3 +129,5 @@ #include "e_widget_font_preview.h" #include "e_fm_custom.h" #include "e_msgbus.h" +#include "e_toolbar.h" +#include "e_int_toolbar_config.h" =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.204 retrieving revision 1.205 diff -u -3 -r1.204 -r1.205 --- Makefile.am 22 Oct 2007 07:38:24 -0000 1.204 +++ Makefile.am 31 Oct 2007 10:09:51 -0000 1.205 @@ -156,7 +156,9 @@ e_fm_custom.h \ e_fm_shared.h \ e_config_data.h \ -e_intl_data.h +e_intl_data.h \ +e_toolbar.h \ +e_int_toolbar_config.h enlightenment_src = \ e_user.c \ @@ -286,6 +288,8 @@ e_exec.c \ e_widget_font_preview.c \ e_fm_custom.c \ +e_toolbar.c \ +e_int_toolbar_config.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -3 -r1.83 -r1.84 --- e_gadcon.c 5 Oct 2007 06:05:16 -0000 1.83 +++ e_gadcon.c 31 Oct 2007 10:09:51 -0000 1.84 @@ -672,6 +672,22 @@ return gc->shelf; } +EAPI void +e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar) +{ + E_OBJECT_CHECK(gc); + E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); + gc->toolbar = toolbar; +} + +EAPI E_Toolbar * +e_gadcon_toolbar_get(E_Gadcon *gc) +{ + E_OBJECT_CHECK_RETURN(gc, NULL); + E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); + return gc->toolbar; +} + EAPI E_Config_Gadcon_Client * e_gadcon_client_config_new(E_Gadcon *gc, const char *name) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- e_gadcon.h 5 Oct 2007 06:05:16 -0000 1.41 +++ e_gadcon.h 31 Oct 2007 10:09:51 -0000 1.42 @@ -84,6 +84,7 @@ unsigned char editing : 1; Ecore_X_Window dnd_win; E_Shelf *shelf; + E_Toolbar *toolbar; E_Drop_Handler *drop_handler; @@ -194,7 +195,8 @@ EAPI Ecore_X_Window e_gadcon_dnd_window_get(E_Gadcon *gc); EAPI void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf); EAPI E_Shelf *e_gadcon_shelf_get(E_Gadcon *gc); - +EAPI void e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar); +EAPI E_Toolbar *e_gadcon_toolbar_get(E_Gadcon *gc); EAPI E_Config_Gadcon_Client *e_gadcon_client_config_new(E_Gadcon *gc, const char *name); EAPI void e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc); EAPI E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *style, Evas_Object *base_obj); ------------------------------------------------------------------------- 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