styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

inti splash conforms to theme standards now 

SVN revision: 25124
This commit is contained in:
Carsten Haitzler 2006-08-26 11:14:16 +00:00
parent ab996003d6
commit d28f9901cd
2 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
data/init/default.edc
View File

@ -539,7 +539,7 @@ collections {
} }
} }
part { part {
name: "title"; name: "e.text.title";
type: TEXT; type: TEXT;
effect: SOFT_SHADOW; effect: SOFT_SHADOW;
mouse_events: 0; mouse_events: 0;
@ -569,7 +569,7 @@ collections {
} }
} }
part { part {
name: "version"; name: "e.text.version";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
description { description {
@ -596,7 +596,7 @@ collections {
} }
} }
part { part {
name: "status"; name: "e.text.status";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -606,12 +606,12 @@ collections {
rel1 { rel1 {
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 0 5; offset: 0 5;
to: "title"; to: "e.text.title";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -1 5; offset: -1 5;
to: "title"; to: "e.text.title";
} }
color: 0 0 0 128; color: 0 0 0 128;
color3: 255 255 255 128; color3: 255 255 255 128;
@ -626,7 +626,7 @@ collections {
} }
} }
part { part {
name: "disable_text"; name: "e.text.disable_text";
type: TEXT; type: TEXT;
effect: SHADOW; effect: SHADOW;
mouse_events: 0; mouse_events: 0;
@ -664,12 +664,12 @@ collections {
rel1 { rel1 {
relative: 1.0 0.0; relative: 1.0 0.0;
offset: 5 0; offset: 5 0;
to: "disable_text"; to: "e.text.disable_text";
} }
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: 5 -1; offset: 5 -1;
to: "disable_text"; to: "e.text.disable_text";
} }
image { image {
normal: "check1.png"; normal: "check1.png";
@ -691,7 +691,7 @@ collections {
visible: 0; visible: 0;
color: 0 0 0 0; color: 0 0 0 0;
rel1 { rel1 {
to: "disable_text"; to: "e.text.disable_text";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -5 -5; offset: -5 -5;
} }
@ -715,7 +715,7 @@ collections {
visible: 1; visible: 1;
color: 0 0 0 0; color: 0 0 0 0;
rel1 { rel1 {
to: "disable_text"; to: "e.text.disable_text";
relative: 0.0 0.0; relative: 0.0 0.0;
offset: -5 -5; offset: -5 -5;
} }
@ -732,7 +732,7 @@ collections {
} }
} }
part { part {
name: "icons"; name: "e.swallow.icons";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
description { description {
@ -741,12 +741,12 @@ collections {
min: 128 32; min: 128 32;
max: 1280 32; max: 1280 32;
rel1 { rel1 {
to_y: "status"; to_y: "e.text.status";
relative: 0.0 1.0; relative: 0.0 1.0;
offset: 16 8; offset: 16 8;
} }
rel2 { rel2 {
to_y: "status"; to_y: "e.text.status";
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -17 8; offset: -17 8;
} }
@ -1336,7 +1336,7 @@ collections {
program { program {
name: "done1"; name: "done1";
signal: "done"; signal: "e.state.done";
source: ""; source: "";
script { script {
new val; new val;
@ -1357,7 +1357,7 @@ collections {
} }
program { program {
name: "done3"; name: "done3";
action: SIGNAL_EMIT "done_ok" ""; action: SIGNAL_EMIT "e,state,done_ok" "";
} }
program { program {
@ -1382,11 +1382,11 @@ collections {
} }
program { program {
name: "disable_on"; name: "disable_on";
action: SIGNAL_EMIT "disable_state" "disable"; action: SIGNAL_EMIT "e,action,init,disable" "e";
} }
program { program {
name: "disable_off"; name: "disable_off";
action: SIGNAL_EMIT "disable_state" "enable"; action: SIGNAL_EMIT "e,action,init,enable" "e";
} }
} }
} }

29
src/bin/e_init.c
View File

@ -5,6 +5,7 @@
static void _e_init_icons_del(void); 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_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); static void _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char *emission, const char *source);
/* local subsystem globals */ /* local subsystem globals */
@ -97,11 +98,13 @@ e_init_init(void)
} }
if (s) evas_stringshare_del(s); 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?")); _("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); _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); _e_init_cb_signal_done_ok, NULL);
free(roots); free(roots);
return 1; return 1;
@ -152,21 +155,21 @@ EAPI void
e_init_title_set(const char *str) e_init_title_set(const char *str)
{ {
if (!_e_init_object) return; 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 EAPI void
e_init_version_set(const char *str) e_init_version_set(const char *str)
{ {
if (!_e_init_object) return; 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 EAPI void
e_init_status_set(const char *str) e_init_status_set(const char *str)
{ {
if (!_e_init_object) return; 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 EAPI Ecore_X_Window
@ -179,7 +182,7 @@ EAPI void
e_init_done(void) e_init_done(void)
{ {
if (!_e_init_object) return; 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 EAPI void
@ -200,7 +203,7 @@ e_init_icons_app_add(E_App *app)
_e_init_icon_box = o; _e_init_icon_box = o;
e_box_homogenous_set(o, 1); e_box_homogenous_set(o, 1);
e_box_align_set(o, 0.5, 0.5); 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); evas_object_geometry_get(o, NULL, NULL, &w, &h);
if (w > h) if (w > h)
{ {
@ -247,8 +250,14 @@ _e_init_icons_del(void)
static void static void
_e_init_cb_signal_disable(void *data, Evas_Object *obj, const char *emission, const char *source) _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; e_config->show_splash = 0;
else e_config->show_splash = 1; 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(); e_config_save_queue();
} }