have an "always order stuff" config option for fm2

SVN revision: 27027

src/bin/e_fm.c

@@ -4256,6 +4256,7 @@ _e_fm2_order_file_rewrite(Evas_Object *obj)
 	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 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
 	
 	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 @@ _e_fm2_cb_live_idler(void *data)
    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;
 }

src/bin/e_fm.h

@@ -36,12 +36,13 @@ struct _E_Fm2_Config
    /* 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 @@ struct _E_Fm2_Config
       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

src/bin/e_fwin.c

@@ -101,6 +101,7 @@ e_fwin_new(E_Container *con, const char *dev, const char *path)
    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;

src/bin/e_int_config_apps.c

@@ -597,6 +597,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
          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;