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
Log Message:
have an "always order stuff" config option for fm2
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- e_fm.c 5 Nov 2006 03:31:45 -0000 1.108
+++ e_fm.c 9 Nov 2006 12:05:56 -0000 1.109
@@ -4256,6 +4256,7 @@
if (!ic->info.deleted)
fprintf(f, "%s\n", ic->info.file);
}
+ if (!sd->order_file) sd->order_file = 1;
fclose(f);
}
@@ -4315,15 +4316,18 @@
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REMEMBER_ORDERING))
{
- mi = e_menu_item_new(mn);
- 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_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);
+ if (!sd->config->view.always_order)
+ {
+ mi = e_menu_item_new(mn);
+ 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_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);
+ }
}
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_NEW_DIRECTORY))
@@ -5186,8 +5190,9 @@
if (sd->live.actions) return 1;
_e_fm2_live_process_end(data);
_e_fm2_cb_live_timer(data);
- printf("write changes %i\n", sd->order_file);
- if (sd->order_file) _e_fm2_order_file_rewrite(data);
+ printf("write changes %i | %i\n", sd->order_file,
sd->config->view.always_order);
+ if ((sd->order_file) || (sd->config->view.always_order))
+ _e_fm2_order_file_rewrite(data);
sd->live.idler = NULL;
return 0;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_fm.h 4 Nov 2006 04:49:36 -0000 1.30
+++ e_fm.h 9 Nov 2006 12:05:57 -0000 1.31
@@ -36,12 +36,13 @@
/* general view mode */
struct {
E_Fm2_View_Mode mode;
+ const char *extra_file_source;
unsigned char open_dirs_in_place;
unsigned char selector;
unsigned char single_click;
unsigned char no_subdir_jump;
unsigned char no_subdir_drop;
- const char *extra_file_source;
+ unsigned char always_order;
} view;
/* display of icons */
struct {
@@ -83,15 +84,6 @@
const char *icons;
unsigned char fixed;
} theme;
- /* used internally only - used to save to disk only and laod from disk */
- /* FIXME: not implemented yet */
- struct {
- int x, y, w, h;
- struct {
- int w, h;
- } res;
- int screen;
- } geometry;
};
struct _E_Fm2_Icon_Info
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_fwin.c 31 Oct 2006 15:02:47 -0000 1.22
+++ e_fwin.c 9 Nov 2006 12:05:57 -0000 1.23
@@ -101,6 +101,7 @@
fmc.view.selector = 0;
fmc.view.single_click = 0;
fmc.view.no_subdir_jump = 0;
+ fmc.view.always_order = 1;
fmc.icon.list.w = 24;
fmc.icon.list.h = 24;
fmc.icon.fixed.w = 1;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_int_config_apps.c 6 Nov 2006 19:39:10 -0000 1.38
+++ e_int_config_apps.c 9 Nov 2006 12:05:57 -0000 1.39
@@ -597,6 +597,7 @@
fmc_all.view.single_click = 0;
fmc_all.view.no_subdir_jump = 0;
fmc_all.view.extra_file_source = cfdata->path_everything;
+ fmc_all.view.always_order = 1;
fmc_all.icon.list.w = 24;
fmc_all.icon.list.h = 24;
fmc_all.icon.fixed.w = 1;
@@ -683,6 +684,7 @@
fmc.view.single_click = 0;
fmc.view.no_subdir_jump = 0;
fmc.view.extra_file_source = cfdata->path_everything;
+ fmc.view.always_order = 1;
fmc.icon.list.w = 24;
fmc.icon.list.h = 24;
fmc.icon.fixed.w = 1;
-------------------------------------------------------------------------
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
