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

splash config works now... 

SVN revision: 23847
This commit is contained in:
Carsten Haitzler 2006-07-11 18:57:13 +00:00
parent 51fa371dbb
commit c7a02b017b
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_config.c
View File

@ -513,7 +513,7 @@ e_config_init(void)
#define IFCFGEND } #define IFCFGEND }
IFCFG(0x008d); IFCFG(0x008d);
e_config->show_splash = 1; e_config->show_splash = 1;
e_config->init_default_theme = NULL; e_config->init_default_theme = evas_stringshare_add("init.edj");
e_config->desktop_default_background = NULL; e_config->desktop_default_background = NULL;
e_config->desktop_default_name = evas_stringshare_add(_("Desktop %i, %i")); e_config->desktop_default_name = evas_stringshare_add(_("Desktop %i, %i"));
e_config->menus_scroll_speed = 1000.0; e_config->menus_scroll_speed = 1000.0;

17
src/bin/e_int_config_startup.c
View File

@ -77,12 +77,17 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (e_config->init_default_theme) if (e_config->init_default_theme)
evas_stringshare_del(e_config->init_default_theme); evas_stringshare_del(e_config->init_default_theme);
if (!cfdata->init_default_theme[0]) if (cfdata->init_default_theme)
e_config->init_default_theme = NULL;
else
{ {
const char *f = ecore_file_get_file(cfdata->init_default_theme); if (!cfdata->init_default_theme[0])
e_config->init_default_theme = evas_stringshare_add(f); e_config->init_default_theme = NULL;
else
{
const char *f;
f = ecore_file_get_file(cfdata->init_default_theme);
e_config->init_default_theme = evas_stringshare_add(f);
}
} }
e_config_save_queue(); e_config_save_queue();
@ -196,7 +201,7 @@ _load_inits(E_Config_Dialog *cfd, Evas_Object *il)
if (!e_util_edje_collection_exists(full_path, "init/splash")) continue; if (!e_util_edje_collection_exists(full_path, "init/splash")) continue;
ic = e_thumb_icon_add(cfd->dia->win->evas); ic = e_thumb_icon_add(cfd->dia->win->evas);
e_thumb_icon_file_set(ic, full_path, "desktop/background"); e_thumb_icon_file_set(ic, full_path, "init/splash");
e_thumb_icon_size_set(ic, 64, e_thumb_icon_size_set(ic, 64,
(64 * e_zone_current_get(cfd->dia->win->container)->h) / (64 * e_zone_current_get(cfd->dia->win->container)->h) /
e_zone_current_get(cfd->dia->win->container)->w); e_zone_current_get(cfd->dia->win->container)->w);