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 e_int_config_apps.c
e_int_config_desklock.c e_int_config_icon_themes.c
e_int_config_startup.c e_int_config_theme.c
e_int_config_wallpaper.c
Log Message:
make use of flags.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- e_fm.c 31 Oct 2006 14:37:31 -0000 1.99
+++ e_fm.c 31 Oct 2006 14:56:28 -0000 1.100
@@ -617,6 +617,30 @@
}
EAPI void
+e_fm2_icon_menu_flags_set(Evas_Object *obj, E_Fm2_Menu_Flags flags)
+{
+ 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
+ sd->icon_menu.flags = flags;
+}
+
+EAPI E_Fm2_Menu_Flags
+e_fm2_icon_menu_flags_get(Evas_Object *obj)
+{
+ E_Fm2_Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return 0; // safety
+ if (!evas_object_type_get(obj)) return 0; // safety
+ if (strcmp(evas_object_type_get(obj), "e_fm")) return 0; // safety
+ return sd->icon_menu.flags;
+}
+
+EAPI void
e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj)
{
E_Fm2_Smart_Data *sd;
@@ -4265,7 +4289,7 @@
E_Container *con;
E_Zone *zone;
Evas_List *sel;
- int x, y, can_w, can_w2, protected;
+ int x, y, can_w, can_w2, protect;
char buf[4096];
sd = ic->sd;
@@ -4382,12 +4406,12 @@
if ((!sel) || evas_list_count(sel) == 1)
{
snprintf(buf, sizeof(buf), "%s/%s", sd->realpath, ic->info.file);
- protected = e_filereg_file_protected(buf);
+ protect = e_filereg_file_protected(buf);
}
else
- protected = 0;
+ protect = 0;
- if ((can_w) && (can_w2) && !(protected))
+ if ((can_w) && (can_w2) && !(protect))
{
mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_fm.h 31 Oct 2006 14:37:31 -0000 1.26
+++ e_fm.h 31 Oct 2006 14:56:28 -0000 1.27
@@ -129,6 +129,8 @@
EAPI void e_fm2_icon_menu_replace_callback_set(Evas_Object
*obj, void (*func) (void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info
*info), void *data);
EAPI void
e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, void (*func) (void
*data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info), void *data);
EAPI void e_fm2_icon_menu_end_extend_callback_set(Evas_Object
*obj, void (*func) (void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info
*info), void *data);
+EAPI void e_fm2_icon_menu_flags_set(Evas_Object *obj,
E_Fm2_Menu_Flags flags);
+EAPI E_Fm2_Menu_Flags e_fm2_icon_menu_flags_get(Evas_Object *obj);
EAPI void e_fm2_window_object_set(Evas_Object *obj, E_Object
*eobj);
EAPI void e_fm2_pan_set(Evas_Object *obj, Evas_Coord x,
Evas_Coord y);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_fwin.c 29 Oct 2006 10:51:12 -0000 1.20
+++ e_fwin.c 31 Oct 2006 14:56:28 -0000 1.21
@@ -831,6 +831,7 @@
fmc.selection.single = 1;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(mt, &fmc);
+ e_fm2_icon_menu_flags_set(mt, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(mt, "selection_change",
_e_fwin_cb_fm_selection_change, fad);
evas_object_smart_callback_add(mt, "selected",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_int_config_apps.c 19 Oct 2006 12:36:48 -0000 1.33
+++ e_int_config_apps.c 31 Oct 2006 14:56:28 -0000 1.34
@@ -533,6 +533,7 @@
fmc_all.selection.single = 1;
fmc_all.selection.windows_modifiers = 0;
e_fm2_config_set(mt, &fmc_all);
+ e_fm2_icon_menu_flags_set(mt, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(mt, "dir_changed",
_cb_files_dir_changed_all, cfdata);
evas_object_smart_callback_add(mt, "selected",
@@ -620,6 +621,7 @@
fmc.selection.single = 1;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(mt, &fmc);
+ e_fm2_icon_menu_flags_set(mt, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(mt, "dir_changed",
_cb_files_dir_changed, cfdata);
evas_object_smart_callback_add(mt, "selection_change",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_int_config_desklock.c 29 Oct 2006 04:44:50 -0000 1.40
+++ e_int_config_desklock.c 31 Oct 2006 14:56:28 -0000 1.41
@@ -602,6 +602,7 @@
fmc.selection.single = 1;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(o, &fmc);
+ e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(o, "dir_changed",
_cb_files_changed, cfdata);
evas_object_smart_callback_add(o, "selection_change",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_icon_themes.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_config_icon_themes.c 8 Oct 2006 08:04:17 -0000 1.13
+++ e_int_config_icon_themes.c 31 Oct 2006 14:56:28 -0000 1.14
@@ -244,6 +244,7 @@
fmc.selection.single = 1;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(mt, &fmc);
+ e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(mt, "dir_changed",
_cb_files_changed, cfdata);
// e_fm2_path_set(cfdata->gui.o_fm, "/opt/kde3/share/icons/crystalsvg", "/");
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_int_config_startup.c 8 Oct 2006 08:04:17 -0000 1.21
+++ e_int_config_startup.c 31 Oct 2006 14:56:28 -0000 1.22
@@ -310,6 +310,7 @@
fmc.selection.single = 1;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(o, &fmc);
+ e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(o, "dir_changed",
_cb_files_changed, cfdata);
evas_object_smart_callback_add(o, "selection_change",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_int_config_theme.c 8 Oct 2006 08:04:17 -0000 1.40
+++ e_int_config_theme.c 31 Oct 2006 14:56:28 -0000 1.41
@@ -398,6 +398,7 @@
fmc.selection.single = 1;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(o, &fmc);
+ e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(o, "dir_changed",
_cb_files_changed, cfdata);
evas_object_smart_callback_add(o, "selection_change",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_int_config_wallpaper.c 20 Oct 2006 03:23:46 -0000 1.21
+++ e_int_config_wallpaper.c 31 Oct 2006 14:56:28 -0000 1.22
@@ -494,6 +494,7 @@
fmc.selection.single = 1;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(o, &fmc);
+ e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(o, "dir_changed",
_cb_files_changed, cfdata);
evas_object_smart_callback_add(o, "selection_change",
@@ -649,6 +650,7 @@
fmc.selection.single = 1;
fmc.selection.windows_modifiers = 0;
e_fm2_config_set(o, &fmc);
+ e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(o, "dir_changed",
_cb_files_changed, cfdata);
evas_object_smart_callback_add(o, "selection_change",
-------------------------------------------------------------------------
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
