From: <enl...@li...> - 2005-09-19 15:25:38
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_int_menus.c Added Files: e_configure.c e_configure.h Log Message: Move config menu to config panel as planned frees need more work :( icon texts are getting cropped, not knowledgable enough to fix I think =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- Makefile.am 18 Aug 2005 06:15:27 -0000 1.43 +++ Makefile.am 19 Sep 2005 15:25:23 -0000 1.44 @@ -69,7 +69,8 @@ e_remember.h \ e_win.h \ e_pan.h \ -e_dialog.h +e_dialog.h \ +e_configure.h enlightenment_SOURCES = \ e_main.c \ @@ -127,6 +128,7 @@ e_win.c \ e_pan.c \ e_dialog.c \ +e_configure.c \ $(ENLIGHTENMENTHEADERS) enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -3 -r1.91 -r1.92 --- e_int_menus.c 19 Sep 2005 10:52:45 -0000 1.91 +++ e_int_menus.c 19 Sep 2005 15:25:23 -0000 1.92 @@ -34,6 +34,7 @@ static void _e_int_menus_apps_run (void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_config_pre_cb (void *data, E_Menu *m); static void _e_int_menus_config_free_hook (void *obj); +static void _e_int_menus_config_item_cb (void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_clients_pre_cb (void *data, E_Menu *m); static void _e_int_menus_clients_free_hook (void *obj); static void _e_int_menus_clients_item_cb (void *data, E_Menu *m, E_Menu_Item *mi); @@ -573,19 +574,14 @@ static void _e_int_menus_config_pre_cb(void *data, E_Menu *m) { - E_Menu *subm; E_Menu_Item *mi; Evas_List *l; - char buf[4096]; e_menu_pre_activate_callback_set(m, NULL, NULL); - snprintf(buf, sizeof(buf), "%s/config-apps", e_prefix_data_get()); - subm = e_int_menus_apps_new(buf); - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Applications")); - e_menu_item_submenu_set(mi, subm); + e_menu_item_label_set(mi, _("Configuration Panel")); + e_menu_item_callback_set(mi, _e_int_menus_config_item_cb, NULL); l = evas_hash_find(_e_int_menus_augmentation, "config"); if (l) @@ -597,23 +593,25 @@ } e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_config_free_hook); - e_object_data_set(E_OBJECT(m), subm); } static void _e_int_menus_config_free_hook(void *obj) { - E_Menu *m, *subm; + E_Menu *m; m = obj; - subm = e_object_data_get(E_OBJECT(obj)); - if (subm) - e_object_del(E_OBJECT(subm)); _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "config")); } static void +_e_int_menus_config_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) +{ + e_configure_show(m->zone->container); +} + +static void _e_int_menus_clients_pre_cb(void *data, E_Menu *m) { E_Menu_Item *mi; |