archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* Fix for [#19941] File Browser : inability to select multiple files

Browse Source 
Added border select on LMB tweak by default, and added shift-lmb to select multiple
This commit is contained in:
Matt Ebb
2009-11-22 22:23:58 +00:00
parent b351d7804b
commit 042f52b162
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/blender/editors/space_file/file_ops.c
View File

@@ -124,7 +124,7 @@ static void clamp_to_filelist(int numfiles, int *first_file, int *last_file)
} }
} }
static FileSelect file_select(SpaceFile* sfile, ARegion* ar, const rcti* rect, short selecting) static FileSelect file_select(SpaceFile* sfile, ARegion* ar, const rcti* rect, short selecting, short toggle_one)
{ {
int first_file = -1; int first_file = -1;
int last_file = -1; int last_file = -1;
@@ -146,7 +146,14 @@ static FileSelect file_select(SpaceFile* sfile, ARegion* ar, const rcti* rect, s
if ( (first_file >= 0) && (first_file < numfiles) && (last_file >= 0) && (last_file < numfiles) ) { if ( (first_file >= 0) && (first_file < numfiles) && (last_file >= 0) && (last_file < numfiles) ) {
for (act_file = first_file; act_file <= last_file; act_file++) { for (act_file = first_file; act_file <= last_file; act_file++) {
struct direntry* file = filelist_file(sfile->files, act_file); struct direntry* file = filelist_file(sfile->files, act_file);
if (selecting)
if (toggle_one) {
if (file->flags & ACTIVE) {
file->flags &= ~ACTIVE;
selecting=0;
} else
file->flags |= ACTIVE;
} else if (selecting)
file->flags |= ACTIVE; file->flags |= ACTIVE;
else else
file->flags &= ~ACTIVE; file->flags &= ~ACTIVE;
@@ -208,7 +215,7 @@ static int file_border_select_exec(bContext *C, wmOperator *op)
BLI_isect_rcti(&(ar->v2d.mask), &rect, &rect); BLI_isect_rcti(&(ar->v2d.mask), &rect, &rect);
if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, selecting)) { if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, selecting, 0)) {
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL); WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
} else { } else {
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL); WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
@@ -239,6 +246,7 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
SpaceFile *sfile= CTX_wm_space_file(C); SpaceFile *sfile= CTX_wm_space_file(C);
short val; short val;
rcti rect; rcti rect;
int extend = RNA_boolean_get(op->ptr, "extend");
if(ar->regiontype != RGN_TYPE_WINDOW) if(ar->regiontype != RGN_TYPE_WINDOW)
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
@@ -251,9 +259,9 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
/* single select, deselect all selected first */ /* single select, deselect all selected first */
file_deselect_all(sfile); if (!extend) file_deselect_all(sfile);
if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, val==LEFTMOUSE )) //LEFTMOUSE XXX, fixme if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, 1, extend ))
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL); WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
else else
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL); WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
@@ -273,13 +281,13 @@ void FILE_OT_select(wmOperatorType *ot)
/* api callbacks */ /* api callbacks */
ot->invoke= file_select_invoke; ot->invoke= file_select_invoke;
ot->poll= ED_operator_file_active;
/* rna */ /* rna */
RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first.");
ot->poll= ED_operator_file_active;
} }
static int file_select_all_invoke(bContext *C, wmOperator *op, wmEvent *event) static int file_select_all_exec(bContext *C, wmOperator *op)
{ {
ScrArea *sa= CTX_wm_area(C); ScrArea *sa= CTX_wm_area(C);
SpaceFile *sfile= CTX_wm_space_file(C); SpaceFile *sfile= CTX_wm_space_file(C);
@@ -317,7 +325,7 @@ void FILE_OT_select_all_toggle(wmOperatorType *ot)
ot->idname= "FILE_OT_select_all_toggle"; ot->idname= "FILE_OT_select_all_toggle";
/* api callbacks */ /* api callbacks */
ot->invoke= file_select_all_invoke; ot->exec= file_select_all_exec;
/* rna */ /* rna */
@@ -326,7 +334,7 @@ void FILE_OT_select_all_toggle(wmOperatorType *ot)
/* ---------- BOOKMARKS ----------- */ /* ---------- BOOKMARKS ----------- */
static int bookmark_select_invoke(bContext *C, wmOperator *op, wmEvent *event) static int bookmark_select_exec(bContext *C, wmOperator *op)
{ {
SpaceFile *sfile= CTX_wm_space_file(C); SpaceFile *sfile= CTX_wm_space_file(C);
@@ -353,13 +361,13 @@ void FILE_OT_select_bookmark(wmOperatorType *ot)
ot->idname= "FILE_OT_select_bookmark"; ot->idname= "FILE_OT_select_bookmark";
/* api callbacks */ /* api callbacks */
ot->invoke= bookmark_select_invoke; ot->exec= bookmark_select_exec;
ot->poll= ED_operator_file_active; ot->poll= ED_operator_file_active;
RNA_def_string(ot->srna, "dir", "", 256, "Dir", ""); RNA_def_string(ot->srna, "dir", "", 256, "Dir", "");
} }
static int bookmark_add_invoke(bContext *C, wmOperator *op, wmEvent *event) static int bookmark_add_exec(bContext *C, wmOperator *op)
{ {
ScrArea *sa= CTX_wm_area(C); ScrArea *sa= CTX_wm_area(C);
SpaceFile *sfile= CTX_wm_space_file(C); SpaceFile *sfile= CTX_wm_space_file(C);
@@ -386,11 +394,11 @@ void FILE_OT_add_bookmark(wmOperatorType *ot)
ot->idname= "FILE_OT_add_bookmark"; ot->idname= "FILE_OT_add_bookmark";
/* api callbacks */ /* api callbacks */
ot->invoke= bookmark_add_invoke; ot->exec= bookmark_add_exec;
ot->poll= ED_operator_file_active; ot->poll= ED_operator_file_active;
} }
static int bookmark_delete_invoke(bContext *C, wmOperator *op, wmEvent *event) static int bookmark_delete_exec(bContext *C, wmOperator *op)
{ {
ScrArea *sa= CTX_wm_area(C); ScrArea *sa= CTX_wm_area(C);
struct FSMenu* fsmenu = fsmenu_get(); struct FSMenu* fsmenu = fsmenu_get();
@@ -419,14 +427,14 @@ void FILE_OT_delete_bookmark(wmOperatorType *ot)
ot->idname= "FILE_OT_delete_bookmark"; ot->idname= "FILE_OT_delete_bookmark";
/* api callbacks */ /* api callbacks */
ot->invoke= bookmark_delete_invoke; ot->exec= bookmark_delete_exec;
ot->poll= ED_operator_file_active; ot->poll= ED_operator_file_active;
RNA_def_int(ot->srna, "index", -1, -1, 20000, "Index", "", -1, 20000); RNA_def_int(ot->srna, "index", -1, -1, 20000, "Index", "", -1, 20000);
} }
static int loadimages_invoke(bContext *C, wmOperator *op, wmEvent *event) static int loadimages_exec(bContext *C, wmOperator *op)
{ {
ScrArea *sa= CTX_wm_area(C); ScrArea *sa= CTX_wm_area(C);
SpaceFile *sfile= CTX_wm_space_file(C); SpaceFile *sfile= CTX_wm_space_file(C);
@@ -449,7 +457,7 @@ void FILE_OT_loadimages(wmOperatorType *ot)
ot->idname= "FILE_OT_loadimages"; ot->idname= "FILE_OT_loadimages";
/* api callbacks */ /* api callbacks */
ot->invoke= loadimages_invoke; ot->exec= loadimages_exec;
ot->poll= ED_operator_file_active; ot->poll= ED_operator_file_active;
} }

5
source/blender/editors/space_file/space_file.c
View File

@@ -382,10 +382,13 @@ void file_keymap(struct wmKeyConfig *keyconf)
/* keys for main area */ /* keys for main area */
keymap= WM_keymap_find(keyconf, "FileMain", SPACE_FILE, 0); keymap= WM_keymap_find(keyconf, "FileMain", SPACE_FILE, 0);
WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_PRESS, 0, 0);
kmi = WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
RNA_boolean_set(kmi->ptr, "extend", 1);
WM_keymap_add_item(keymap, "FILE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "FILE_OT_select_border", BKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_select_border", BKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "FILE_OT_select_border", EVT_TWEAK_L, KM_ANY, 0, 0);
WM_keymap_add_item(keymap, "FILE_OT_rename", LEFTMOUSE, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "FILE_OT_rename", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "FILE_OT_highlight", MOUSEMOVE, KM_ANY, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_highlight", MOUSEMOVE, KM_ANY, KM_ANY, 0);
WM_keymap_add_item(keymap, "FILE_OT_loadimages", TIMER1, KM_ANY, KM_ANY, 0); WM_keymap_add_item(keymap, "FILE_OT_loadimages", TIMER1, KM_ANY, KM_ANY, 0);
kmi = WM_keymap_add_item(keymap, "FILE_OT_filenum", PADPLUSKEY, KM_PRESS, 0, 0); kmi = WM_keymap_add_item(keymap, "FILE_OT_filenum", PADPLUSKEY, KM_PRESS, 0, 0);
RNA_int_set(kmi->ptr, "increment", 1); RNA_int_set(kmi->ptr, "increment", 1);