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

in theory handle custom themes for everything now (fm2-wise) 

SVN revision: 29584
This commit is contained in:
Carsten Haitzler 2007-04-17 15:46:51 +00:00
parent 257e46227e
commit c9ad93d57c
3 changed files with 77 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/bin/e_fm.c
View File

@ -74,6 +74,7 @@ struct _E_Fm2_Smart_Data
unsigned char listing : 1; unsigned char listing : 1;
E_Fm2_Config *config; E_Fm2_Config *config;
const char *custom_theme;
struct { struct {
Evas_Object *obj, *obj2; Evas_Object *obj, *obj2;
@ -293,6 +294,8 @@ static void _e_fm2_cb_dbus_method_name_has_owner(void *data, Ecore_DBus_Method_R
static void _e_fm2_cb_dbus_method_add_match(void *data, Ecore_DBus_Method_Return *reply); static void _e_fm2_cb_dbus_method_add_match(void *data, Ecore_DBus_Method_Return *reply);
static void _e_fm2_cb_dbus_method_error(void *data, const char *error); static void _e_fm2_cb_dbus_method_error(void *data, const char *error);
static int _e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group);
static void _e_fm2_client_spawn(void); static void _e_fm2_client_spawn(void);
static E_Fm2_Client *_e_fm2_client_get(void); static E_Fm2_Client *_e_fm2_client_get(void);
static void _e_fm2_client_monitor_add(int id, const char *path); static void _e_fm2_client_monitor_add(int id, const char *path);
@ -497,6 +500,22 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
sd->tmp.iter = 0; sd->tmp.iter = 0;
} }
EAPI void
e_fm2_custom_theme_set(Evas_Object *obj, const char *path)
{
E_Fm2_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
if (!sd) return; // safety
if (!evas_object_type_get(obj)) return; // safety
if (strcmp(evas_object_type_get(obj), "e_fm")) return; // safety
if (sd->custom_theme) evas_stringshare_del(sd->custom_theme);
if (path)
sd->custom_theme = evas_stringshare_add(path);
else
sd->custom_theme = NULL;
}
EAPI void EAPI void
e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path) e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path)
{ {
@ -907,7 +926,7 @@ e_fm2_icon_get(Evas *evas, const char *realpath,
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
if (!edje_object_file_set(oic, ici->icon, "icon")) if (!edje_object_file_set(oic, ici->icon, "icon"))
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
} }
else else
@ -930,7 +949,7 @@ e_fm2_icon_get(Evas *evas, const char *realpath,
if (S_ISDIR(ici->statinfo.st_mode)) if (S_ISDIR(ici->statinfo.st_mode))
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/folder"); "e/icons/fileman/folder");
} }
else else
@ -959,7 +978,7 @@ e_fm2_icon_get(Evas *evas, const char *realpath,
if (!icon) if (!icon)
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "FILE_TYPE"; if (type_ret) *type_ret = "FILE_TYPE";
} }
@ -992,10 +1011,10 @@ e_fm2_icon_get(Evas *evas, const char *realpath,
else if (!strncmp(icon, "e/icons/fileman/mime/", 21)) else if (!strncmp(icon, "e/icons/fileman/mime/", 21))
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
if (!e_theme_edje_object_set(oic, if (!_e_fm2_theme_edje_object_set(ic->sd, oic,
"base/theme/fileman", "base/theme/fileman",
icon)) icon))
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "THEME"; if (type_ret) *type_ret = "THEME";
} }
@ -1006,7 +1025,7 @@ e_fm2_icon_get(Evas *evas, const char *realpath,
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
if (!edje_object_file_set(oic, icon, "icon")) if (!edje_object_file_set(oic, icon, "icon"))
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
} }
else else
@ -1083,7 +1102,7 @@ e_fm2_icon_get(Evas *evas, const char *realpath,
if (oic == NULL) if (oic == NULL)
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "FILE_TYPE"; if (type_ret) *type_ret = "FILE_TYPE";
} }
@ -1095,42 +1114,42 @@ e_fm2_icon_get(Evas *evas, const char *realpath,
else if (S_ISCHR(ici->statinfo.st_mode)) else if (S_ISCHR(ici->statinfo.st_mode))
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "FILE_TYPE"; if (type_ret) *type_ret = "FILE_TYPE";
} }
else if (S_ISBLK(ici->statinfo.st_mode)) else if (S_ISBLK(ici->statinfo.st_mode))
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "FILE_TYPE"; if (type_ret) *type_ret = "FILE_TYPE";
} }
else if (S_ISFIFO(ici->statinfo.st_mode)) else if (S_ISFIFO(ici->statinfo.st_mode))
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "FILE_TYPE"; if (type_ret) *type_ret = "FILE_TYPE";
} }
else if (S_ISSOCK(ici->statinfo.st_mode)) else if (S_ISSOCK(ici->statinfo.st_mode))
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "FILE_TYPE"; if (type_ret) *type_ret = "FILE_TYPE";
} }
else if (ecore_file_can_exec(buf)) else if (ecore_file_can_exec(buf))
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "FILE_TYPE"; if (type_ret) *type_ret = "FILE_TYPE";
} }
else else
{ {
oic = edje_object_add(evas); oic = edje_object_add(evas);
e_theme_edje_object_set(oic, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
"e/icons/fileman/file"); "e/icons/fileman/file");
if (type_ret) *type_ret = "FILE_TYPE"; if (type_ret) *type_ret = "FILE_TYPE";
} }
@ -2349,7 +2368,7 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
if (!obj) if (!obj)
{ {
obj = edje_object_add(evas_object_evas_get(ic->sd->obj)); obj = edje_object_add(evas_object_evas_get(ic->sd->obj));
e_theme_edje_object_set(obj, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
"e/fileman/icon/variable"); "e/fileman/icon/variable");
ic->sd->tmp.obj = obj; ic->sd->tmp.obj = obj;
} }
@ -2370,10 +2389,10 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
{ {
obj = edje_object_add(evas_object_evas_get(ic->sd->obj)); obj = edje_object_add(evas_object_evas_get(ic->sd->obj));
if (ic->sd->config->icon.fixed.w) if (ic->sd->config->icon.fixed.w)
e_theme_edje_object_set(obj, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
"e/fileman/list/fixed"); "e/fileman/list/fixed");
else else
e_theme_edje_object_set(obj, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
"e/fileman/list/variable"); "e/fileman/list/variable");
ic->sd->tmp.obj = obj; ic->sd->tmp.obj = obj;
} }
@ -2456,29 +2475,29 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
if (ic->sd->config->icon.fixed.w) if (ic->sd->config->icon.fixed.w)
{ {
if (ic->odd) if (ic->odd)
e_theme_edje_object_set(ic->obj, "base/theme/widgets", _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
"e/fileman/list_odd/fixed"); "e/fileman/list_odd/fixed");
else else
e_theme_edje_object_set(ic->obj, "base/theme/widgets", _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
"e/fileman/list/fixed"); "e/fileman/list/fixed");
} }
else else
{ {
if (ic->odd) if (ic->odd)
e_theme_edje_object_set(ic->obj, "base/theme/widgets", _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
"e/fileman/list_odd/variable"); "e/fileman/list_odd/variable");
else else
e_theme_edje_object_set(ic->obj, "base/theme/widgets", _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
"e/fileman/list/variable"); "e/fileman/list/variable");
} }
} }
else else
{ {
if (ic->sd->config->icon.fixed.w) if (ic->sd->config->icon.fixed.w)
e_theme_edje_object_set(ic->obj, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/fileman",
"e/fileman/icon/fixed"); "e/fileman/icon/fixed");
else else
e_theme_edje_object_set(ic->obj, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/fileman",
"e/fileman/icon/variable"); "e/fileman/icon/variable");
} }
_e_fm2_icon_label_set(ic, ic->obj); _e_fm2_icon_label_set(ic, ic->obj);
@ -3820,29 +3839,29 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
if (ic->sd->config->icon.fixed.w) if (ic->sd->config->icon.fixed.w)
{ {
if (ic->odd) if (ic->odd)
e_theme_edje_object_set(o, "base/theme/widgets", _e_fm2_theme_edje_object_set(ic->sd, o, "base/theme/widgets",
"e/fileman/list_odd/fixed"); "e/fileman/list_odd/fixed");
else else
e_theme_edje_object_set(o, "base/theme/widgets", _e_fm2_theme_edje_object_set(ic->sd, o, "base/theme/widgets",
"e/fileman/list/fixed"); "e/fileman/list/fixed");
} }
else else
{ {
if (ic->odd) if (ic->odd)
e_theme_edje_object_set(o, "base/theme/widgets", _e_fm2_theme_edje_object_set(ic->sd, o, "base/theme/widgets",
"e/fileman/list_odd/variable"); "e/fileman/list_odd/variable");
else else
e_theme_edje_object_set(o, "base/theme/widgets", _e_fm2_theme_edje_object_set(ic->sd, o, "base/theme/widgets",
"e/fileman/list/variable"); "e/fileman/list/variable");
} }
} }
else else
{ {
if (ic->sd->config->icon.fixed.w) if (ic->sd->config->icon.fixed.w)
e_theme_edje_object_set(o, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, o, "base/theme/fileman",
"e/fileman/icon/fixed"); "e/fileman/icon/fixed");
else else
e_theme_edje_object_set(o, "base/theme/fileman", _e_fm2_theme_edje_object_set(ic->sd, o, "base/theme/fileman",
"e/fileman/icon/variable"); "e/fileman/icon/variable");
} }
_e_fm2_icon_label_set(ic, o); _e_fm2_icon_label_set(ic, o);
@ -4347,21 +4366,21 @@ _e_fm2_smart_add(Evas_Object *obj)
sd->drop = edje_object_add(evas_object_evas_get(obj)); sd->drop = edje_object_add(evas_object_evas_get(obj));
evas_object_clip_set(sd->drop, sd->clip); evas_object_clip_set(sd->drop, sd->clip);
e_theme_edje_object_set(sd->drop, "base/theme/fileman", _e_fm2_theme_edje_object_set(sd, sd->drop, "base/theme/fileman",
"e/fileman/list/drop_between"); "e/fileman/list/drop_between");
evas_object_smart_member_add(sd->drop, obj); evas_object_smart_member_add(sd->drop, obj);
evas_object_show(sd->drop); evas_object_show(sd->drop);
sd->drop_in = edje_object_add(evas_object_evas_get(obj)); sd->drop_in = edje_object_add(evas_object_evas_get(obj));
evas_object_clip_set(sd->drop_in, sd->clip); evas_object_clip_set(sd->drop_in, sd->clip);
e_theme_edje_object_set(sd->drop_in, "base/theme/fileman", _e_fm2_theme_edje_object_set(sd, sd->drop_in, "base/theme/fileman",
"e/fileman/list/drop_in"); "e/fileman/list/drop_in");
evas_object_smart_member_add(sd->drop_in, obj); evas_object_smart_member_add(sd->drop_in, obj);
evas_object_show(sd->drop_in); evas_object_show(sd->drop_in);
sd->overlay = edje_object_add(evas_object_evas_get(obj)); sd->overlay = edje_object_add(evas_object_evas_get(obj));
evas_object_clip_set(sd->overlay, sd->clip); evas_object_clip_set(sd->overlay, sd->clip);
e_theme_edje_object_set(sd->overlay, "base/theme/fileman", _e_fm2_theme_edje_object_set(sd, sd->overlay, "base/theme/fileman",
"e/fileman/overlay"); "e/fileman/overlay");
evas_object_smart_member_add(sd->overlay, obj); evas_object_smart_member_add(sd->overlay, obj);
evas_object_show(sd->overlay); evas_object_show(sd->overlay);
@ -4399,6 +4418,7 @@ _e_fm2_smart_del(Evas_Object *obj)
if (sd->scroll_job) ecore_job_del(sd->scroll_job); if (sd->scroll_job) ecore_job_del(sd->scroll_job);
if (sd->resize_job) ecore_job_del(sd->resize_job); if (sd->resize_job) ecore_job_del(sd->resize_job);
if (sd->refresh_job) ecore_job_del(sd->refresh_job); if (sd->refresh_job) ecore_job_del(sd->refresh_job);
if (sd->custom_theme) evas_stringshare_del(sd->custom_theme);
if (sd->dev) evas_stringshare_del(sd->dev); if (sd->dev) evas_stringshare_del(sd->dev);
if (sd->path) evas_stringshare_del(sd->path); if (sd->path) evas_stringshare_del(sd->path);
if (sd->realpath) if (sd->realpath)
@ -5852,3 +5872,22 @@ _e_fm2_cb_dbus_method_error(void *data, const char *error)
{ {
printf("E FM: DBus Error: %s\n", error); printf("E FM: DBus Error: %s\n", error);
} }
static int
_e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group)
{
if (sd->custom_theme)
{
/* FIXME: need a way of caching what elements are and are not in the custom theme */
if (edje_object_file_set(o, sd->custom_theme, group)) return 1;
}
if (sd->custom_theme)
{
if (!ecore_file_exists(sd->custom_theme))
{
evas_stringshare_del(sd->custom_theme);
sd->custom_theme = NULL;
}
}
return e_theme_edje_object_set(o, category, group);
}

1
src/bin/e_fm.h
View File

@ -151,6 +151,7 @@ EAPI int e_fm2_init(void);
EAPI int e_fm2_shutdown(void); EAPI int e_fm2_shutdown(void);
EAPI Evas_Object *e_fm2_add(Evas *evas); EAPI Evas_Object *e_fm2_add(Evas *evas);
EAPI void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path); EAPI void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path);
EAPI void e_fm2_custom_theme_set(Evas_Object *obj, const char *path);
EAPI void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path); EAPI void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path);
EAPI void e_fm2_refresh(Evas_Object *obj); EAPI void e_fm2_refresh(Evas_Object *obj);
EAPI const char *e_fm2_real_path_get(Evas_Object *obj); EAPI const char *e_fm2_real_path_get(Evas_Object *obj);

6
src/bin/e_fwin.c
View File

@ -280,6 +280,12 @@ _e_fwin_changed(void *data, Evas_Object *obj, void *event_info)
"e/fileman/scrollframe/default"); "e/fileman/scrollframe/default");
e_scrollframe_child_pos_set(fwin->scrollframe_obj, 0, 0); e_scrollframe_child_pos_set(fwin->scrollframe_obj, 0, 0);
} }
snprintf(buf, sizeof(buf), "%s/.directory-theme.edj",
e_fm2_real_path_get(fwin->fm_obj));
if (ecore_file_exists(buf))
e_fm2_custom_theme_set(obj, buf);
else
e_fm2_custom_theme_set(obj, NULL);
} }
static void static void