Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_config.c e_container.c e_menu.c e_menu.h
Log Message:
a temperature monitor module for acpi... it's simple... and really only
handles 1 temperature guage - but it's useful. fixed stuff in battery
modules, added config menus... ibar size change menu only works after a
restart for now.. need to fix that.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_border.c 30 Dec 2004 09:11:29 -0000 1.38
+++ e_border.c 2 Jan 2005 02:39:43 -0000 1.39
@@ -2300,6 +2300,7 @@
E_Menu_Item *mi;
E_App *a;
+ if (e_menu_grab_window_get()) return;
if (!_e_border_menu)
_e_border_menu = e_menu_new();
else
@@ -2440,4 +2441,3 @@
please install e_util_eapp_edit\n \
or make sure it is in your PATH\n");
}
-
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_config.c 27 Dec 2004 13:22:03 -0000 1.11
+++ e_config.c 2 Jan 2005 02:39:43 -0000 1.12
@@ -88,6 +88,10 @@
em->name = strdup("battery");
e_config->modules = evas_list_append(e_config->modules, em);
em->enabled = 1;
+ em = E_NEW(E_Config_Module, 1);
+ em->name = strdup("temperature");
+ e_config->modules = evas_list_append(e_config->modules, em);
+ em->enabled = 1;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_container.c 25 Dec 2004 15:53:48 -0000 1.8
+++ e_container.c 2 Jan 2005 02:39:43 -0000 1.9
@@ -335,6 +335,8 @@
ev = (Evas_Event_Mouse_Down *)event_info;
con = data;
+ if (e_menu_grab_window_get()) return;
+
if (ev->button == 1)
{
E_Menu *m;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_menu.c 24 Dec 2004 04:30:58 -0000 1.6
+++ e_menu.c 2 Jan 2005 02:39:43 -0000 1.7
@@ -617,6 +617,12 @@
}
}
+Ecore_X_Window
+e_menu_grab_window_get(void)
+{
+ return _e_menu_win;
+}
+
/* local subsystem functions */
static void
_e_menu_free(E_Menu *m)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_menu.h 22 Dec 2004 10:41:03 -0000 1.3
+++ e_menu.h 2 Jan 2005 02:39:43 -0000 1.4
@@ -138,5 +138,6 @@
EAPI void e_menu_item_active_set(E_Menu_Item *mi, int active);
EAPI void e_menu_idler_before(void);
-
+
+EAPI Ecore_X_Window e_menu_grab_window_get(void);
#endif
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
