Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_init.c
Log Message:
inti splash conforms to theme standards now
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_init.c 26 Aug 2006 11:06:05 -0000 1.37
+++ e_init.c 26 Aug 2006 11:14:16 -0000 1.38
@@ -5,6 +5,7 @@
static void _e_init_icons_del(void);
static void _e_init_cb_signal_disable(void *data, Evas_Object *obj, const char
*emission, const char *source);
+static void _e_init_cb_signal_enable(void *data, Evas_Object *obj, const char
*emission, const char *source);
static void _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char
*emission, const char *source);
/* local subsystem globals */
@@ -97,11 +98,13 @@
}
if (s) evas_stringshare_del(s);
- edje_object_part_text_set(_e_init_object, "disable_text",
+ edje_object_part_text_set(_e_init_object, "e.text.disable_text",
_("Disable this splash screen in the future?"));
- edje_object_signal_callback_add(_e_init_object, "disable_state", "*",
+ edje_object_signal_callback_add(_e_init_object, "e,action,init,disable",
"e",
_e_init_cb_signal_disable, NULL);
- edje_object_signal_callback_add(_e_init_object, "done_ok", "*",
+ edje_object_signal_callback_add(_e_init_object, "e,action,init,enable", "e",
+ _e_init_cb_signal_enable, NULL);
+ edje_object_signal_callback_add(_e_init_object, "e,state,done_ok", "e",
_e_init_cb_signal_done_ok, NULL);
free(roots);
return 1;
@@ -152,21 +155,21 @@
e_init_title_set(const char *str)
{
if (!_e_init_object) return;
- edje_object_part_text_set(_e_init_object, "title", str);
+ edje_object_part_text_set(_e_init_object, "e.text.title", str);
}
EAPI void
e_init_version_set(const char *str)
{
if (!_e_init_object) return;
- edje_object_part_text_set(_e_init_object, "version", str);
+ edje_object_part_text_set(_e_init_object, "e.text.version", str);
}
EAPI void
e_init_status_set(const char *str)
{
if (!_e_init_object) return;
- edje_object_part_text_set(_e_init_object, "status", str);
+ edje_object_part_text_set(_e_init_object, "e.text.status", str);
}
EAPI Ecore_X_Window
@@ -179,7 +182,7 @@
e_init_done(void)
{
if (!_e_init_object) return;
- edje_object_signal_emit(_e_init_object, "done", "");
+ edje_object_signal_emit(_e_init_object, "e.state.done", "");
}
EAPI void
@@ -200,7 +203,7 @@
_e_init_icon_box = o;
e_box_homogenous_set(o, 1);
e_box_align_set(o, 0.5, 0.5);
- edje_object_part_swallow(_e_init_object, "icons", o);
+ edje_object_part_swallow(_e_init_object, "e.swallow.icons", o);
evas_object_geometry_get(o, NULL, NULL, &w, &h);
if (w > h)
{
@@ -247,8 +250,14 @@
static void
_e_init_cb_signal_disable(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
- if (!strcmp(source, "disable")) e_config->show_splash = 0;
- else e_config->show_splash = 1;
+ e_config->show_splash = 0;
+ e_config_save_queue();
+}
+
+static void
+_e_init_cb_signal_enable(void *data, Evas_Object *obj, const char *emission,
const char *source)
+{
+ e_config->show_splash = 1;
e_config_save_queue();
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
