Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_menus.c
Log Message:
clean up menu - remove themes menu - there's a dialog now.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- e_int_menus.c 2 Feb 2006 04:31:28 -0000 1.128
+++ e_int_menus.c 2 Feb 2006 06:06:21 -0000 1.129
@@ -13,7 +13,7 @@
E_Menu *clients;
// E_Menu *modules;
E_Menu *gadgets;
- E_Menu *themes;
+// E_Menu *themes;
E_Menu *config;
E_Menu *lost_clients;
};
@@ -130,27 +130,32 @@
e_menu_item_label_set(mi, _("Gadgets"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
e_menu_item_submenu_set(mi, subm);
-
+
+/* We have a config dialog for this - this menu was a hack nayway to start
+ * with
+ */
+/*
subm = e_int_menus_themes_new();
dat->themes = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Themes"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/themes");
e_menu_item_submenu_set(mi, subm);
-
+ */
+
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
-
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("About Enlightenment"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/e");
e_menu_item_callback_set(mi, _e_int_menus_main_about, NULL);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Files"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/fileman");
- e_menu_item_callback_set(mi, _e_int_menus_main_fm, NULL);
-
+ e_menu_item_label_set(mi, _("About This Theme"));
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/theme");
+ e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
+
subm = e_int_menus_config_new();
dat->config = subm;
mi = e_menu_item_new(m);
@@ -247,6 +252,7 @@
return m;
}
+/*
EAPI E_Menu *
e_int_menus_themes_new(void)
{
@@ -256,6 +262,7 @@
e_menu_pre_activate_callback_set(m, _e_int_menus_themes_pre_cb, NULL);
return m;
}
+*/
EAPI E_Menu *
e_int_menus_lost_clients_new(void)
@@ -351,7 +358,7 @@
e_object_del(E_OBJECT(dat->desktops));
e_object_del(E_OBJECT(dat->clients));
e_object_del(E_OBJECT(dat->gadgets));
- e_object_del(E_OBJECT(dat->themes));
+// e_object_del(E_OBJECT(dat->themes));
e_object_del(E_OBJECT(dat->config));
e_object_del(E_OBJECT(dat->lost_clients));
free(dat);
@@ -597,6 +604,14 @@
e_menu_item_label_set(mi, _("Eap Editor"));
e_menu_item_callback_set(mi, _e_int_menus_eapedit_item_cb, NULL);
+ mi = e_menu_item_new(m);
+ e_menu_item_separator_set(mi, 1);
+
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Test Filemanager"));
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/fileman");
+ e_menu_item_callback_set(mi, _e_int_menus_main_fm, NULL);
+
l = evas_hash_find(_e_int_menus_augmentation, "config");
if (l)
{
@@ -797,6 +812,7 @@
*
* Remove this later, keep for fast theme switching now.
*/
+/*
static void
_e_int_menus_themes_pre_cb(void *data, E_Menu *m)
{
@@ -866,7 +882,6 @@
snprintf(fulltheme, sizeof(fulltheme), "%s/%s", buf,
theme);
if (ecore_file_is_dir(fulltheme)) continue;
- /* minimum theme requirements */
if(edje_object_file_set(o, fulltheme,
"widgets/border/default/border"))
{
mi = e_menu_item_new(m);
@@ -920,7 +935,8 @@
a = e_action_find("restart");
if ((a) && (a->func.go)) a->func.go(NULL, NULL);
}
-
+*/
+
static void
_e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
{
-------------------------------------------------------
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=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
