Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_fm.h e_fwin.c
Log Message:
shuffling around of fm theme - now desktop can use a different theme entirely
to fm windows - easy to turn on and select. desktp;p theme items are slightly
modified as an example. fm theme still sucks tho
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -3 -r1.175 -r1.176
--- e_fm.c 2 Jun 2007 16:35:10 -0000 1.175
+++ e_fm.c 3 Jun 2007 04:50:54 -0000 1.176
@@ -73,6 +73,7 @@
E_Fm2_Config *config;
const char *custom_theme;
+ const char *custom_theme_content;
struct {
Evas_Object *obj, *obj2;
@@ -300,6 +301,7 @@
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 int _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object
*o, const char *category, const char *group);
static void _e_fm2_client_spawn(void);
static E_Fm2_Client *_e_fm2_client_get(void);
@@ -527,11 +529,33 @@
else
sd->custom_theme = NULL;
_e_fm2_theme_edje_object_set(sd, sd->drop, "base/theme/fileman",
- "e/fileman/list/drop_between");
+ "list/drop_between");
_e_fm2_theme_edje_object_set(sd, sd->drop_in, "base/theme/fileman",
- "e/fileman/list/drop_in");
+ "list/drop_in");
_e_fm2_theme_edje_object_set(sd, sd->overlay, "base/theme/fileman",
- "e/fileman/overlay");
+ "overlay");
+}
+
+EAPI void
+e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content)
+{
+ 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 (content)
+ sd->custom_theme_content = evas_stringshare_add(content);
+ else
+ sd->custom_theme_content = NULL;
+ _e_fm2_theme_edje_object_set(sd, sd->drop, "base/theme/fileman",
+ "list/drop_between");
+ _e_fm2_theme_edje_object_set(sd, sd->drop_in, "base/theme/fileman",
+ "list/drop_in");
+ _e_fm2_theme_edje_object_set(sd, sd->overlay, "base/theme/fileman",
+ "overlay");
}
EAPI void
@@ -969,9 +993,9 @@
{
oic = edje_object_add(evas);
if (!edje_object_file_set(oic, ic->info.icon, "icon"))
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
}
else
{
@@ -1014,9 +1038,9 @@
if (S_ISDIR(ic->info.statinfo.st_mode))
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/folder");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "folder");
}
else
{
@@ -1044,9 +1068,9 @@
if (!icon)
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "FILE_TYPE";
}
else if (!strcmp(icon, "THUMB"))
@@ -1081,12 +1105,12 @@
else if (!strncmp(icon, "e/icons/fileman/mime/", 21))
{
oic = edje_object_add(evas);
- if (!_e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- icon))
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ if (!_e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ icon + 21 - 5))
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "THEME";
}
else
@@ -1096,9 +1120,9 @@
{
oic = edje_object_add(evas);
if (!edje_object_file_set(oic, icon, "icon"))
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
}
else
{
@@ -1178,9 +1202,9 @@
if (oic == NULL)
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "FILE_TYPE";
}
else
@@ -1191,49 +1215,49 @@
else if (S_ISCHR(ic->info.statinfo.st_mode))
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "FILE_TYPE";
}
else if (S_ISBLK(ic->info.statinfo.st_mode))
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "FILE_TYPE";
}
else if (S_ISFIFO(ic->info.statinfo.st_mode))
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "FILE_TYPE";
}
else if (S_ISSOCK(ic->info.statinfo.st_mode))
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "FILE_TYPE";
}
else if (ecore_file_can_exec(buf))
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "FILE_TYPE";
}
else
{
oic = edje_object_add(evas);
- _e_fm2_theme_edje_object_set(ic->sd, oic,
- "base/theme/fileman",
- "e/icons/fileman/file");
+ _e_fm2_theme_edje_icon_object_set(ic->sd, oic,
+ "base/theme/fileman",
+ "file");
if (type_ret) *type_ret = "FILE_TYPE";
}
}
@@ -2819,7 +2843,7 @@
/* FIXME: end go away chunk */
}
- if(S_ISDIR(ic->info.statinfo.st_mode))
+ if (S_ISDIR(ic->info.statinfo.st_mode))
{
ic->info.mime = evas_stringshare_add("x-directory/normal");
}
@@ -2885,11 +2909,11 @@
if ((ic->sd->config->icon.fixed.w) &&
(ic->sd->config->icon.fixed.h))
_e_fm2_theme_edje_object_set(ic->sd, obj,
"base/theme/fileman",
- "e/fileman/icon/fixed");
+ "icon/fixed");
else
_e_fm2_theme_edje_object_set(ic->sd, obj,
"base/theme/fileman",
- "e/fileman/icon/variable");
+ "icon/variable");
ic->sd->tmp.obj = obj;
// printf("CALC OBJ %p\n", ic->sd->tmp.obj);
}
@@ -2924,10 +2948,10 @@
// if (ic->sd->config->icon.fixed.w)
_e_fm2_theme_edje_object_set(ic->sd, obj,
"base/theme/fileman",
- "e/fileman/list/fixed");
+ "list/fixed");
// else
// _e_fm2_theme_edje_object_set(ic->sd, obj,
"base/theme/fileman",
-// "e/fileman/list/variable");
+// "list/variable");
ic->sd->tmp.obj = obj;
}
_e_fm2_icon_label_set(ic, obj);
@@ -3016,20 +3040,20 @@
if (ic->odd)
_e_fm2_theme_edje_object_set(ic->sd, ic->obj,
"base/theme/widgets",
- "e/fileman/list_odd/fixed");
+ "list_odd/fixed");
else
_e_fm2_theme_edje_object_set(ic->sd, ic->obj,
"base/theme/widgets",
- "e/fileman/list/fixed");
+ "list/fixed");
// }
// else
// {
// if (ic->odd)
// _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
"base/theme/widgets",
-// "e/fileman/list_odd/variable");
+// "list_odd/variable");
// else
// _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
"base/theme/widgets",
-// "e/fileman/list/variable");
+// "list/variable");
// }
}
else
@@ -3037,11 +3061,11 @@
if (ic->sd->config->icon.fixed.w)
_e_fm2_theme_edje_object_set(ic->sd, ic->obj,
"base/theme/fileman",
- "e/fileman/icon/fixed");
+ "icon/fixed");
else
_e_fm2_theme_edje_object_set(ic->sd, ic->obj,
"base/theme/fileman",
- "e/fileman/icon/variable");
+ "icon/variable");
}
_e_fm2_icon_label_set(ic, ic->obj);
evas_object_clip_set(ic->obj, ic->sd->clip);
@@ -4489,22 +4513,22 @@
if (ic->odd)
_e_fm2_theme_edje_object_set(ic->sd, o,
"base/theme/widgets",
-
"e/fileman/list_odd/fixed");
+ "list_odd/fixed");
else
_e_fm2_theme_edje_object_set(ic->sd, o,
"base/theme/widgets",
- "e/fileman/list/fixed");
+ "list/fixed");
}
else
{
if (ic->odd)
_e_fm2_theme_edje_object_set(ic->sd, o,
"base/theme/widgets",
-
"e/fileman/list_odd/variable");
+ "list_odd/variable");
else
_e_fm2_theme_edje_object_set(ic->sd, o,
"base/theme/widgets",
-
"e/fileman/list/variable");
+ "list/variable");
}
}
else
@@ -4512,11 +4536,11 @@
if (ic->sd->config->icon.fixed.w)
_e_fm2_theme_edje_object_set(ic->sd, o,
"base/theme/fileman",
- "e/fileman/icon/fixed");
+ "icon/fixed");
else
_e_fm2_theme_edje_object_set(ic->sd, o,
"base/theme/fileman",
- "e/fileman/icon/variable");
+ "icon/variable");
}
_e_fm2_icon_label_set(ic, o);
o2 = _e_fm2_icon_icon_direct_set(ic, o,
@@ -5083,7 +5107,7 @@
evas_object_clip_set(sd->drop, sd->clip);
_e_fm2_theme_edje_object_set(sd, sd->drop,
"base/theme/fileman",
- "e/fileman/list/drop_between");
+ "list/drop_between");
evas_object_smart_member_add(sd->drop, obj);
evas_object_show(sd->drop);
@@ -5091,7 +5115,7 @@
evas_object_clip_set(sd->drop_in, sd->clip);
_e_fm2_theme_edje_object_set(sd, sd->drop_in,
"base/theme/fileman",
- "e/fileman/list/drop_in");
+ "list/drop_in");
evas_object_smart_member_add(sd->drop_in, obj);
evas_object_show(sd->drop_in);
@@ -5099,7 +5123,7 @@
evas_object_clip_set(sd->overlay, sd->clip);
_e_fm2_theme_edje_object_set(sd, sd->overlay,
"base/theme/fileman",
- "e/fileman/overlay");
+ "overlay");
evas_object_smart_member_add(sd->overlay, obj);
evas_object_show(sd->overlay);
@@ -5137,6 +5161,7 @@
if (sd->resize_job) ecore_job_del(sd->resize_job);
if (sd->refresh_job) ecore_job_del(sd->refresh_job);
if (sd->custom_theme) evas_stringshare_del(sd->custom_theme);
+ if (sd->custom_theme_content)
evas_stringshare_del(sd->custom_theme_content);
if (sd->dev) evas_stringshare_del(sd->dev);
if (sd->path) evas_stringshare_del(sd->path);
if (sd->realpath)
@@ -5315,8 +5340,8 @@
e_menu_item_label_set(mi, _("Refresh View"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/refresh"),
- "e/fileman/button/refresh");
+
"e/fileman/default/button/refresh"),
+ "e/fileman/default/button/refresh");
e_menu_item_callback_set(mi, _e_fm2_refresh, sd);
}
@@ -5326,8 +5351,8 @@
e_menu_item_label_set(mi, _("Show Hidden Files"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/hidden_files"),
- "e/fileman/button/hidden_files");
+
"e/fileman/default/button/hidden_files"),
+ "e/fileman/default/button/hidden_files");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->show_hidden_files);
e_menu_item_callback_set(mi, _e_fm2_toggle_hidden_files, sd);
@@ -5341,8 +5366,8 @@
e_menu_item_label_set(mi, _("Remember Ordering"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/ordering"),
- "e/fileman/button/ordering");
+
"e/fileman/default/button/ordering"),
+
"e/fileman/default/button/ordering");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->order_file);
e_menu_item_callback_set(mi, _e_fm2_toggle_ordering, sd);
@@ -5353,8 +5378,8 @@
e_menu_item_label_set(mi, _("Sort Now"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/ordering"),
- "e/fileman/button/sort");
+
"e/fileman/default/button/ordering"),
+ "e/fileman/default/button/sort");
e_menu_item_callback_set(mi, _e_fm2_sort, sd);
}
}
@@ -5371,8 +5396,8 @@
e_menu_item_label_set(mi, _("New Directory"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/new_dir"),
- "e/fileman/button/new_dir");
+
"e/fileman/default/button/new_dir"),
+ "e/fileman/default/button/new_dir");
e_menu_item_callback_set(mi, _e_fm2_new_directory, sd);
}
}
@@ -5457,8 +5482,8 @@
e_menu_item_label_set(mi, _("Refresh View"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/refresh"),
- "e/fileman/button/refresh");
+
"e/fileman/default/button/refresh"),
+ "e/fileman/default/button/refresh");
e_menu_item_callback_set(mi, _e_fm2_refresh, sd);
}
@@ -5468,8 +5493,8 @@
e_menu_item_label_set(mi, _("Show Hidden Files"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/hidden_files"),
- "e/fileman/button/hidden_files");
+
"e/fileman/default/button/hidden_files"),
+ "e/fileman/default/button/hidden_files");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->show_hidden_files);
e_menu_item_callback_set(mi, _e_fm2_toggle_hidden_files, sd);
@@ -5483,8 +5508,8 @@
e_menu_item_label_set(mi, _("Remember Ordering"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/ordering"),
- "e/fileman/button/ordering");
+
"e/fileman/default/button/ordering"),
+
"e/fileman/default/button/ordering");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->order_file);
e_menu_item_callback_set(mi, _e_fm2_toggle_ordering, sd);
@@ -5495,8 +5520,8 @@
e_menu_item_label_set(mi, _("Sort Now"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/ordering"),
- "e/fileman/button/sort");
+
"e/fileman/default/button/ordering"),
+ "e/fileman/default/button/sort");
e_menu_item_callback_set(mi, _e_fm2_sort, sd);
}
}
@@ -5513,8 +5538,8 @@
e_menu_item_label_set(mi, _("New Directory"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/new_dir"),
- "e/fileman/button/new_dir");
+
"e/fileman/default/button/new_dir"),
+ "e/fileman/default/button/new_dir");
e_menu_item_callback_set(mi, _e_fm2_new_directory, sd);
}
}
@@ -5572,8 +5597,8 @@
e_menu_item_label_set(mi, _("Delete"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/delete"),
- "e/fileman/button/delete");
+
"e/fileman/default/button/delete"),
+ "e/fileman/default/button/delete");
e_menu_item_callback_set(mi, _e_fm2_file_delete, ic);
}
@@ -5583,8 +5608,8 @@
e_menu_item_label_set(mi, _("Rename"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/rename"),
- "e/fileman/button/rename");
+
"e/fileman/default/button/rename"),
+ "e/fileman/default/button/rename");
e_menu_item_callback_set(mi, _e_fm2_file_rename, ic);
}
}
@@ -5593,8 +5618,8 @@
e_menu_item_label_set(mi, _("Properties"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/properties"),
- "e/fileman/button/properties");
+
"e/fileman/default/button/properties"),
+ "e/fileman/default/button/properties");
e_menu_item_callback_set(mi, _e_fm2_file_properties, ic);
if (sd->icon_menu.end.func)
@@ -6678,9 +6703,44 @@
static int
_e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char
*category, const char *group)
{
+ char buf[1024];
+ int ret;
+
+ if (sd->custom_theme_content)
+ snprintf(buf, sizeof(buf), "e/fileman/%s/%s", sd->custom_theme_content,
group);
+ else
+ snprintf(buf, sizeof(buf), "e/fileman/default/%s", group);
+
+ if (sd->custom_theme)
+ {
+ if (edje_object_file_set(o, sd->custom_theme, buf)) return 1;
+ }
+ if (sd->custom_theme)
+ {
+ if (!ecore_file_exists(sd->custom_theme))
+ {
+ evas_stringshare_del(sd->custom_theme);
+ sd->custom_theme = NULL;
+ }
+ }
+ ret = e_theme_edje_object_set(o, category, buf);
+ return ret;
+}
+
+static int
+_e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const
char *category, const char *group)
+{
+ char buf[1024];
+ int ret;
+
+// if (sd->custom_theme_content)
+// snprintf(buf, sizeof(buf), "e/icons/fileman/%s/%s",
sd->custom_theme_content, group);
+// else
+ snprintf(buf, sizeof(buf), "e/icons/fileman/%s", group);
+
if (sd->custom_theme)
{
- if (edje_object_file_set(o, sd->custom_theme, group)) return 1;
+ if (edje_object_file_set(o, sd->custom_theme, buf)) return 1;
}
if (sd->custom_theme)
{
@@ -6690,5 +6750,6 @@
sd->custom_theme = NULL;
}
}
- return e_theme_edje_object_set(o, category, group);
+ ret = e_theme_edje_object_set(o, category, buf);
+ return ret;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_fm.h 29 May 2007 11:25:54 -0000 1.48
+++ e_fm.h 3 Jun 2007 04:50:54 -0000 1.49
@@ -135,6 +135,7 @@
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_custom_theme_set(Evas_Object *obj, const char
*path);
+EAPI void e_fm2_custom_theme_content_set(Evas_Object *obj,
const char *content);
EAPI void e_fm2_underlay_show(Evas_Object *obj);
EAPI void e_fm2_underlay_hide(Evas_Object *obj);
EAPI void e_fm2_all_unsel(Evas_Object *obj);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_fwin.c 30 May 2007 14:35:26 -0000 1.48
+++ e_fwin.c 3 Jun 2007 04:50:54 -0000 1.49
@@ -108,7 +108,7 @@
o = edje_object_add(e_win_evas_get(fwin->win));
e_theme_edje_object_set(o, "base/theme/fileman",
- "e/fileman/window/main");
+ "e/fileman/default/window/main");
evas_object_show(o);
fwin->bg_obj = o;
@@ -169,7 +169,7 @@
* to specify the .edj files to get the list and icon theme stuff from
*/
e_scrollframe_custom_theme_set(o, "base/theme/fileman",
- "e/fileman/scrollframe/default");
+ "e/fileman/default/scrollframe");
evas_object_data_set(fwin->fm_obj, "fwin", fwin);
e_scrollframe_extern_pan_set(o, fwin->fm_obj,
_e_fwin_pan_set,
@@ -255,6 +255,7 @@
fmc.selection.single = 0;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(o, &fmc);
+ e_fm2_custom_theme_content_set(o, "desktop");
evas_object_smart_callback_add(o, "dir_changed",
_e_fwin_changed, fwin);
evas_object_smart_callback_add(o, "dir_deleted",
@@ -270,7 +271,7 @@
o = e_scrollframe_add(zone->container->bg_evas);
e_scrollframe_custom_theme_set(o, "base/theme/fileman",
- "e/fileman/scrollframe/desktop");
+ "e/fileman/desktop/scrollframe");
/* FIXME: this theme object will have more versions and options later
* for things like swallowing widgets/buttons ot providing them - a
* gadcon for starters for fm widgets. need to register the owning
@@ -442,20 +443,20 @@
if (fwin->scrollframe_obj)
{
if ((fwin->scrollframe_file) &&
- (e_util_edje_collection_exists(fwin->scrollframe_file,
"e/fileman/scrollframe/default")))
+ (e_util_edje_collection_exists(fwin->scrollframe_file,
"e/fileman/default/scrollframe")))
e_scrollframe_custom_edje_file_set(fwin->scrollframe_obj,
(char *)fwin->scrollframe_file,
- "e/fileman/scrollframe/default");
+ "e/fileman/default/scrollframe");
else
{
if (fwin->zone)
e_scrollframe_custom_theme_set(fwin->scrollframe_obj,
"base/theme/fileman",
- "e/fileman/scrollframe/desktop");
+ "e/fileman/desktop/scrollframe");
else
e_scrollframe_custom_theme_set(fwin->scrollframe_obj,
"base/theme/fileman",
- "e/fileman/scrollframe/default");
+ "e/fileman/default/scrollframe");
}
e_scrollframe_child_pos_set(fwin->scrollframe_obj, 0, 0);
}
@@ -505,8 +506,8 @@
e_menu_item_label_set(mi, _("Go to Parent Directory"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
-
"e/fileman/button/parent"),
- "e/fileman/button/parent");
+
"e/fileman/default/button/parent"),
+ "e/fileman/default/button/parent");
e_menu_item_callback_set(mi, _e_fwin_parent, obj);
}
/* FIXME: if info != null then check mime type and offer options based
@@ -531,15 +532,15 @@
e_menu_item_label_set(mi, _("Open"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
- "e/fileman/button/open"),
- "e/fileman/button/open");
+
"e/fileman/default/button/open"),
+ "e/fileman/default/button/open");
e_menu_item_callback_set(mi, _e_fwin_cb_menu_open, fwin);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Open with..."));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
- "e/fileman/button/open"),
- "e/fileman/button/open");
+
"e/fileman/default/button/open"),
+ "e/fileman/default/button/open");
e_menu_item_callback_set(mi, _e_fwin_cb_menu_open_with, fwin);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
