diff options
Diffstat (limited to 'source/blender/editors/space_file/file_ops.c')
| -rw-r--r-- | source/blender/editors/space_file/file_ops.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 429b643a807..ea73026020d 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -37,10 +37,10 @@ #include "BKE_appdir.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_global.h" -#include "BKE_report.h" #include "BKE_main.h" +#include "BKE_report.h" +#include "BKE_screen.h" #ifdef WIN32 # include "BLI_winstuff.h" @@ -113,7 +113,7 @@ typedef enum FileSelect { static void clamp_to_filelist(int numfiles, FileSelection *sel) { - /* border select before the first file */ + /* box select before the first file */ if ( (sel->first < 0) && (sel->last >= 0) ) { sel->first = 0; } @@ -338,7 +338,7 @@ static FileSelect file_select(bContext *C, const rcti *rect, FileSelType select, return retval; } -static int file_border_select_find_last_selected( +static int file_box_select_find_last_selected( SpaceFile *sfile, ARegion *ar, const FileSelection *sel, const int mouse_xy[2]) { @@ -371,7 +371,7 @@ static int file_border_select_find_last_selected( return (dist_first < dist_last) ? sel->first : sel->last; } -static int file_border_select_modal(bContext *C, wmOperator *op, const wmEvent *event) +static int file_box_select_modal(bContext *C, wmOperator *op, const wmEvent *event) { ARegion *ar = CTX_wm_region(C); SpaceFile *sfile = CTX_wm_space_file(C); @@ -381,7 +381,7 @@ static int file_border_select_modal(bContext *C, wmOperator *op, const wmEvent * int result; - result = WM_gesture_border_modal(C, op, event); + result = WM_gesture_box_modal(C, op, event); if (result == OPERATOR_RUNNING_MODAL) { WM_operator_properties_border_to_rcti(op, &rect); @@ -399,7 +399,7 @@ static int file_border_select_modal(bContext *C, wmOperator *op, const wmEvent * for (idx = sel.last; idx >= 0; idx--) { const FileDirEntry *file = filelist_file(sfile->files, idx); - /* dont highlight readonly file (".." or ".") on border select */ + /* dont highlight readonly file (".." or ".") on box select */ if (FILENAME_IS_CURRPAR(file->relpath)) { filelist_entry_select_set(sfile->files, file, FILE_SEL_REMOVE, FILE_SEL_HIGHLIGHTED, CHECK_ALL); } @@ -411,7 +411,7 @@ static int file_border_select_modal(bContext *C, wmOperator *op, const wmEvent * } } params->sel_first = sel.first; params->sel_last = sel.last; - params->active_file = file_border_select_find_last_selected(sfile, ar, &sel, event->mval); + params->active_file = file_box_select_find_last_selected(sfile, ar, &sel, event->mval); } else { params->highlight_file = -1; @@ -424,7 +424,7 @@ static int file_border_select_modal(bContext *C, wmOperator *op, const wmEvent * return result; } -static int file_border_select_exec(bContext *C, wmOperator *op) +static int file_box_select_exec(bContext *C, wmOperator *op) { ARegion *ar = CTX_wm_region(C); SpaceFile *sfile = CTX_wm_space_file(C); @@ -455,22 +455,22 @@ static int file_border_select_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void FILE_OT_select_border(wmOperatorType *ot) +void FILE_OT_select_box(wmOperatorType *ot) { /* identifiers */ - ot->name = "Activate/Select File"; + ot->name = "Box Select"; ot->description = "Activate/select the file(s) contained in the border"; - ot->idname = "FILE_OT_select_border"; + ot->idname = "FILE_OT_select_box"; /* api callbacks */ - ot->invoke = WM_gesture_border_invoke; - ot->exec = file_border_select_exec; - ot->modal = file_border_select_modal; + ot->invoke = WM_gesture_box_invoke; + ot->exec = file_box_select_exec; + ot->modal = file_box_select_modal; ot->poll = ED_operator_file_active; - ot->cancel = WM_gesture_border_cancel; + ot->cancel = WM_gesture_box_cancel; /* properties */ - WM_operator_properties_gesture_border_select(ot); + WM_operator_properties_gesture_box_select(ot); } static int file_select_invoke(bContext *C, wmOperator *op, const wmEvent *event) @@ -527,7 +527,7 @@ void FILE_OT_select(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name = "Activate/Select File"; + ot->name = "Select"; ot->description = "Activate/select file"; ot->idname = "FILE_OT_select"; @@ -808,12 +808,12 @@ static int file_select_all_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -void FILE_OT_select_all_toggle(wmOperatorType *ot) +void FILE_OT_select_all(wmOperatorType *ot) { /* identifiers */ ot->name = "(De)select All Files"; ot->description = "Select or deselect all files"; - ot->idname = "FILE_OT_select_all_toggle"; + ot->idname = "FILE_OT_select_all"; /* api callbacks */ ot->exec = file_select_all_exec; @@ -1147,11 +1147,11 @@ static int file_highlight_invoke(bContext *C, wmOperator *UNUSED(op), const wmEv SpaceFile *sfile = CTX_wm_space_file(C); if (!file_highlight_set(sfile, ar, event->x, event->y)) - return OPERATOR_CANCELLED; + return OPERATOR_PASS_THROUGH; ED_area_tag_redraw(CTX_wm_area(C)); - return OPERATOR_FINISHED; + return OPERATOR_PASS_THROUGH; } void FILE_OT_highlight(struct wmOperatorType *ot) |