Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e.h e_int_menus.c e_main.c e_menu.c
Log Message:
fix some png's.. that seem to get screwed if loading into gimp. also move to
making some of the menu icons int he left click menu edjes... and emit
signals to them... play with it :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e.h 21 Dec 2004 03:01:19 -0000 1.6
+++ e.h 24 Dec 2004 04:30:58 -0000 1.7
@@ -79,6 +79,7 @@
extern EAPI E_Path *path_images;
extern EAPI E_Path *path_fonts;
extern EAPI E_Path *path_themes;
+extern EAPI E_Path *path_icons;
extern EAPI E_Path *path_init;
extern EAPI int restart;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_menus.c 23 Dec 2004 15:31:47 -0000 1.8
+++ e_int_menus.c 24 Dec 2004 04:30:58 -0000 1.9
@@ -65,8 +65,8 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "About Enlightenment");
- e_menu_item_icon_file_set(mi,
- e_path_find(path_images, "e.png"));
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ "e");
e_menu_item_callback_set(mi, _e_int_menus_main_about, NULL);
mi = e_menu_item_new(m);
@@ -74,10 +74,14 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Restart Enlightement");
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ "reset");
e_menu_item_callback_set(mi, _e_int_menus_main_restart, NULL);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Exit Enlightement");
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ "power");
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
return m;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_main.c 23 Dec 2004 06:38:27 -0000 1.14
+++ e_main.c 24 Dec 2004 04:30:58 -0000 1.15
@@ -38,6 +38,7 @@
E_Path *path_fonts = NULL;
E_Path *path_themes = NULL;
E_Path *path_init = NULL;
+E_Path *path_icons = NULL;
int restart = 0;
/* local subsystem globals */
@@ -398,6 +399,7 @@
"%s/.e/e/fonts",
"%s/.e/e/themes",
"%s/.e/e/init",
+ "%s/.e/e/icons",
"%s/.e/e/backgrounds",
"%s/.e/e/applications",
"%s/.e/e/applications/all",
@@ -559,6 +561,14 @@
}
e_path_path_append(path_themes, "~/.e/e/themes");
e_path_path_append(path_themes, PACKAGE_DATA_DIR"/data/themes");
+ path_icons = e_path_new();
+ if (!path_icons)
+ {
+ e_error_message_show("Cannot allocate path for path_icons\n");
+ return 0;
+ }
+ e_path_path_append(path_icons, "~/.e/e/icons");
+ e_path_path_append(path_icons, PACKAGE_DATA_DIR"/data/icons");
path_init = e_path_new();
if (!path_init)
{
@@ -593,6 +603,11 @@
e_object_unref(E_OBJECT(path_themes));
path_themes = NULL;
}
+ if (path_icons)
+ {
+ e_object_unref(E_OBJECT(path_icons));
+ path_icons = NULL;
+ }
if (path_init)
{
e_object_unref(E_OBJECT(path_init));
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_menu.c 23 Dec 2004 06:38:27 -0000 1.5
+++ e_menu.c 24 Dec 2004 04:30:58 -0000 1.6
@@ -485,6 +485,8 @@
edje_object_signal_emit(mi->submenu_object, "active", "");
if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "active", "");
+ if (mi->icon_key)
+ edje_object_signal_emit(mi->icon_object, "active", "");
edje_object_signal_emit(mi->menu->bg_object, "active", "");
_e_menu_submenu_activate(mi);
}
@@ -501,6 +503,8 @@
edje_object_signal_emit(mi->submenu_object, "passive", "");
if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "passive", "");
+ if (mi->icon_key)
+ edje_object_signal_emit(mi->icon_object, "passive", "");
edje_object_signal_emit(mi->menu->bg_object, "passive", "");
}
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
