Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
sort now menu item to make kai happy :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- e_fm.c 12 Nov 2006 03:22:36 -0000 1.111
+++ e_fm.c 14 Nov 2006 14:55:21 -0000 1.112
@@ -273,6 +273,7 @@
static void _e_fm2_refresh(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_toggle_hidden_files(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_toggle_ordering(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_fm2_sort(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_new_directory(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_new_directory_delete_cb(void *obj);
static void _e_fm2_new_directory_yes_cb(char *text, void *data);
@@ -1033,7 +1034,7 @@
if (sd->monitor.monitor) ecore_file_monitor_del(sd->monitor.monitor);
sd->monitor.monitor = ecore_file_monitor_add(sd->realpath,
_e_fm2_cb_file_monitor, obj);
sd->scan_idler = ecore_idler_add(_e_fm2_cb_scan_idler, obj);
- sd->scan_timer = ecore_timer_add(0.2, _e_fm2_cb_scan_timer, obj);
+ sd->scan_timer = ecore_timer_add(0.5, _e_fm2_cb_scan_timer, obj);
sd->busy_count++;
if (sd->busy_count == 1)
edje_object_signal_emit(sd->overlay, "e,state,busy,start", "e");
@@ -4323,6 +4324,16 @@
e_menu_item_toggle_set(mi, sd->order_file);
e_menu_item_callback_set(mi, _e_fm2_toggle_ordering, sd);
}
+ if ((sd->order_file) || (sd->config->view.always_order))
+ {
+ mi = e_menu_item_new(mn);
+ 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_menu_item_callback_set(mi, _e_fm2_sort, sd);
+ }
}
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_NEW_DIRECTORY))
@@ -4454,6 +4465,16 @@
e_menu_item_toggle_set(mi, sd->order_file);
e_menu_item_callback_set(mi, _e_fm2_toggle_ordering, sd);
}
+ if ((sd->order_file) || (sd->config->view.always_order))
+ {
+ mi = e_menu_item_new(mn);
+ 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_menu_item_callback_set(mi, _e_fm2_sort, sd);
+ }
}
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_NEW_DIRECTORY))
@@ -4629,6 +4650,18 @@
}
else
_e_fm2_order_file_rewrite(sd->obj);
+ _e_fm2_refresh(data, m, mi);
+}
+
+static void
+_e_fm2_sort(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ E_Fm2_Smart_Data *sd;
+
+ sd = data;
+ sd->icons = evas_list_sort(sd->icons, evas_list_count(sd->icons),
+ _e_fm2_cb_icon_sort);
+ _e_fm2_order_file_rewrite(sd->obj);
_e_fm2_refresh(data, m, mi);
}
-------------------------------------------------------------------------
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
