2.5

FileWindow:

It appeared all load/save went via 1 call, so the 'OK save over' menu
popped up on loading files too.
Added check in the function for saving... bit weak, could become an
argument for ED_fileselect.

Also renamed file operators to conform to others.

1 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h
index d4cb80c1b39..e47387a2d22 100644
--- a/source/blender/editors/space_file/file_intern.h
+++ b/source/blender/editors/space_file/file_intern.h
@@ -49,17 +49,17 @@ void file_draw_fsmenu(const bContext *C, ARegion *ar);
 struct wmOperatorType;
 struct wmOperator;
 struct wmEvent;
-void ED_FILE_OT_highlight(struct wmOperatorType *ot);
-void ED_FILE_OT_select(struct wmOperatorType *ot);
-void ED_FILE_OT_select_all(struct wmOperatorType *ot);
-void ED_FILE_OT_border_select(struct wmOperatorType *ot);
-void ED_FILE_OT_select_bookmark(struct wmOperatorType *ot);
-void ED_FILE_OT_loadimages(struct wmOperatorType *ot);
-void ED_FILE_OT_load(struct wmOperatorType *ot);
-void ED_FILE_OT_cancel(struct wmOperatorType *ot);
-void ED_FILE_OT_parent(struct wmOperatorType *ot);
+void FILE_OT_highlight(struct wmOperatorType *ot);
+void FILE_OT_select(struct wmOperatorType *ot);
+void FILE_OT_select_all(struct wmOperatorType *ot);
+void FILE_OT_border_select(struct wmOperatorType *ot);
+void FILE_OT_select_bookmark(struct wmOperatorType *ot);
+void FILE_OT_loadimages(struct wmOperatorType *ot);
+void FILE_OT_exec(struct wmOperatorType *ot);
+void FILE_OT_cancel(struct wmOperatorType *ot);
+void FILE_OT_parent(struct wmOperatorType *ot);
 
-int file_load_exec(bContext *C, struct wmOperator *unused);
+int file_exec(bContext *C, struct wmOperator *unused);
 int file_cancel_exec(bContext *C, struct wmOperator *unused);
 int file_parent_exec(bContext *C, struct wmOperator *unused);
 int file_hilight_set(SpaceFile *sfile, ARegion *ar, int mx, int my);