2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2008-12-14 12:16:55 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2008-12-14 12:16:55 +00:00
|
|
|
*
|
|
|
|
|
* The Original Code is Copyright (C) 2008 Blender Foundation.
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* Contributor(s): Blender Foundation
|
|
|
|
|
*
|
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
|
*/
|
|
|
|
|
|
2011-02-27 20:29:51 +00:00
|
|
|
/** \file blender/editors/space_file/filesel.c
|
|
|
|
|
* \ingroup spfile
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2008-12-14 12:16:55 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
2010-05-07 23:34:03 +00:00
|
|
|
/* path/file handeling stuff */
|
2012-04-15 07:54:07 +00:00
|
|
|
#ifdef WIN32
|
|
|
|
|
# include <io.h>
|
|
|
|
|
# include <direct.h>
|
|
|
|
|
# include "BLI_winstuff.h"
|
2010-05-07 23:34:03 +00:00
|
|
|
#else
|
2012-04-15 07:54:07 +00:00
|
|
|
# include <unistd.h>
|
|
|
|
|
# include <sys/times.h>
|
|
|
|
|
# include <dirent.h>
|
2010-05-07 23:34:03 +00:00
|
|
|
#endif
|
|
|
|
|
|
2008-12-14 12:16:55 +00:00
|
|
|
#include "DNA_space_types.h"
|
|
|
|
|
#include "DNA_screen_types.h"
|
2009-05-14 18:08:14 +00:00
|
|
|
#include "DNA_userdef_types.h"
|
2008-12-14 12:16:55 +00:00
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
|
|
#include "BLI_blenlib.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2013-03-05 03:44:47 +00:00
|
|
|
#include "BLI_fileops_types.h"
|
2013-08-27 18:29:30 +00:00
|
|
|
#include "BLI_fnmatch.h"
|
2008-12-14 12:16:55 +00:00
|
|
|
|
2014-11-23 14:37:13 +01:00
|
|
|
#include "BKE_appdir.h"
|
2008-12-18 02:56:48 +00:00
|
|
|
#include "BKE_context.h"
|
2009-01-06 14:42:54 +00:00
|
|
|
#include "BKE_global.h"
|
2010-10-18 06:41:16 +00:00
|
|
|
#include "BKE_main.h"
|
2008-12-14 12:16:55 +00:00
|
|
|
|
2009-05-14 18:54:41 +00:00
|
|
|
#include "BLF_api.h"
|
2009-05-14 18:08:14 +00:00
|
|
|
|
2009-03-08 13:14:12 +00:00
|
|
|
|
2009-01-06 14:42:54 +00:00
|
|
|
#include "ED_fileselect.h"
|
2008-12-14 12:16:55 +00:00
|
|
|
|
|
|
|
|
#include "WM_api.h"
|
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
|
|
|
|
|
|
2009-07-27 19:06:33 +00:00
|
|
|
#include "RNA_access.h"
|
|
|
|
|
|
2008-12-14 12:16:55 +00:00
|
|
|
#include "UI_interface.h"
|
2010-11-14 10:48:36 +00:00
|
|
|
#include "UI_interface_icons.h"
|
2008-12-14 12:16:55 +00:00
|
|
|
|
|
|
|
|
#include "file_intern.h"
|
2009-01-06 14:42:54 +00:00
|
|
|
#include "filelist.h"
|
2008-12-14 12:16:55 +00:00
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
FileSelectParams *ED_fileselect_get_params(struct SpaceFile *sfile)
|
2009-01-08 18:47:16 +00:00
|
|
|
{
|
|
|
|
|
if (!sfile->params) {
|
2009-07-27 19:06:33 +00:00
|
|
|
ED_fileselect_set_params(sfile);
|
2009-01-08 18:47:16 +00:00
|
|
|
}
|
|
|
|
|
return sfile->params;
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-24 04:29:35 +00:00
|
|
|
/**
|
2013-02-06 14:02:19 +00:00
|
|
|
* \note RNA_struct_property_is_set_ex is used here because we want
|
2012-10-24 04:29:35 +00:00
|
|
|
* the previously used settings to be used here rather then overriding them */
|
2009-07-27 19:06:33 +00:00
|
|
|
short ED_fileselect_set_params(SpaceFile *sfile)
|
2009-01-06 14:42:54 +00:00
|
|
|
{
|
2009-01-08 18:47:16 +00:00
|
|
|
FileSelectParams *params;
|
2009-07-27 19:06:33 +00:00
|
|
|
wmOperator *op = sfile->op;
|
2009-01-06 14:42:54 +00:00
|
|
|
|
2009-07-27 19:06:33 +00:00
|
|
|
/* create new parameters if necessary */
|
2009-01-08 18:47:16 +00:00
|
|
|
if (!sfile->params) {
|
2012-06-18 13:01:24 +00:00
|
|
|
sfile->params = MEM_callocN(sizeof(FileSelectParams), "fileselparams");
|
2009-07-27 19:06:33 +00:00
|
|
|
/* set path to most recently opened .blend */
|
2011-10-15 03:56:05 +00:00
|
|
|
BLI_split_dirfile(G.main->name, sfile->params->dir, sfile->params->file, sizeof(sfile->params->dir), sizeof(sfile->params->file));
|
2010-09-24 07:05:43 +00:00
|
|
|
sfile->params->filter_glob[0] = '\0';
|
2015-04-29 21:25:34 +02:00
|
|
|
/* set the default thumbnails size */
|
2015-05-01 01:49:58 +10:00
|
|
|
sfile->params->thumbnail_size = 128;
|
2009-01-06 14:42:54 +00:00
|
|
|
}
|
|
|
|
|
|
2009-01-08 18:47:16 +00:00
|
|
|
params = sfile->params;
|
|
|
|
|
|
2009-07-27 19:06:33 +00:00
|
|
|
/* set the parameters from the operator, if it exists */
|
|
|
|
|
if (op) {
|
2013-08-26 06:54:05 +00:00
|
|
|
PropertyRNA *prop;
|
2014-01-28 03:52:21 +11:00
|
|
|
const bool is_files = (RNA_struct_find_property(op->ptr, "files") != NULL);
|
|
|
|
|
const bool is_filepath = (RNA_struct_find_property(op->ptr, "filepath") != NULL);
|
|
|
|
|
const bool is_filename = (RNA_struct_find_property(op->ptr, "filename") != NULL);
|
|
|
|
|
const bool is_directory = (RNA_struct_find_property(op->ptr, "directory") != NULL);
|
|
|
|
|
const bool is_relative_path = (RNA_struct_find_property(op->ptr, "relative_path") != NULL);
|
2011-06-24 03:30:50 +00:00
|
|
|
|
2012-07-07 14:58:40 +00:00
|
|
|
BLI_strncpy_utf8(params->title, RNA_struct_ui_name(op->type->srna), sizeof(params->title));
|
2009-09-12 19:54:39 +00:00
|
|
|
|
2015-02-17 13:09:21 +11:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filemode"))) {
|
|
|
|
|
params->type = RNA_property_int_get(op->ptr, prop);
|
|
|
|
|
}
|
|
|
|
|
else {
|
Key Configuration
Keymaps are now saveable and configurable from the user preferences, note
that editing one item in a keymap means the whole keymap is now defined by
the user and will not be updated by Blender, an option for syncing might be
added later. The outliner interface is still there, but I will probably
remove it.
There's actually 3 levels now:
* Default builtin key configuration.
* Key configuration loaded from .py file, for configs like Blender 2.4x
or other 3D applications.
* Keymaps edited by the user and saved in .B.blend. These can be saved
to .py files as well to make creating distributable configurations
easier.
Also, user preferences sections were reorganized a bit, now there is:
Interface, Editing, Input, Files and System.
Implementation notes:
* wmKeyConfig was added which represents a key configuration containing
keymaps.
* wmKeymapItem was renamed to wmKeyMapItem for consistency with wmKeyMap.
* Modal maps are not wrapped yet.
* User preferences DNA file reading did not support newdataadr() yet,
added this now for reading keymaps.
* Key configuration related settings are now RNA wrapped.
* is_property_set and is_property_hidden python methods were added.
2009-10-08 18:40:03 +00:00
|
|
|
params->type = FILE_SPECIAL;
|
2015-02-17 13:09:21 +11:00
|
|
|
}
|
2009-09-12 19:54:39 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
if (is_filepath && RNA_struct_property_is_set_ex(op->ptr, "filepath", false)) {
|
2010-07-02 17:44:57 +00:00
|
|
|
char name[FILE_MAX];
|
2010-06-14 03:52:10 +00:00
|
|
|
RNA_string_get(op->ptr, "filepath", name);
|
2009-09-12 19:54:39 +00:00
|
|
|
if (params->type == FILE_LOADLIB) {
|
|
|
|
|
BLI_strncpy(params->dir, name, sizeof(params->dir));
|
2012-06-18 13:01:24 +00:00
|
|
|
sfile->params->file[0] = '\0';
|
2009-09-12 19:54:39 +00:00
|
|
|
}
|
2010-07-02 17:44:57 +00:00
|
|
|
else {
|
2011-10-15 03:56:05 +00:00
|
|
|
BLI_split_dirfile(name, sfile->params->dir, sfile->params->file, sizeof(sfile->params->dir), sizeof(sfile->params->file));
|
2010-07-02 17:44:57 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2014-04-01 11:34:00 +11:00
|
|
|
if (is_directory && RNA_struct_property_is_set_ex(op->ptr, "directory", false)) {
|
2010-07-02 17:44:57 +00:00
|
|
|
RNA_string_get(op->ptr, "directory", params->dir);
|
2012-06-18 13:01:24 +00:00
|
|
|
sfile->params->file[0] = '\0';
|
2010-07-02 17:44:57 +00:00
|
|
|
}
|
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
if (is_filename && RNA_struct_property_is_set_ex(op->ptr, "filename", false)) {
|
2010-07-02 17:44:57 +00:00
|
|
|
RNA_string_get(op->ptr, "filename", params->file);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (params->dir[0]) {
|
2010-10-18 06:41:16 +00:00
|
|
|
BLI_cleanup_dir(G.main->name, params->dir);
|
|
|
|
|
BLI_path_abs(params->dir, G.main->name);
|
2009-09-12 19:54:39 +00:00
|
|
|
}
|
2010-07-02 17:44:57 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
if (is_directory == true && is_filename == false && is_filepath == false && is_files == false) {
|
2011-06-24 03:30:50 +00:00
|
|
|
params->flag |= FILE_DIRSEL_ONLY;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
params->flag &= ~FILE_DIRSEL_ONLY;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-27 19:06:33 +00:00
|
|
|
params->filter = 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_blender")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_BLENDER : 0;
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_blenlib")))
|
|
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_BLENDERLIB : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_backup")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_BLENDER_BACKUP : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_image")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_IMAGE : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_movie")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_MOVIE : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_python")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_PYSCRIPT : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_font")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_FTFONT : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_sound")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_SOUND : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_text")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_TEXT : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_folder")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_FOLDER : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_btx")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_BTX : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_collada")))
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_COLLADA : 0;
|
Basic Alembic support
All in all, this patch adds an Alembic importer, an Alembic exporter,
and a new CacheFile data block which, for now, wraps around an Alembic
archive. This data block is made available through a new modifier ("Mesh
Sequence Cache") as well as a new constraint ("Transform Cache") to
somewhat properly support respectively geometric and transformation data
streaming from alembic caches.
A more in-depth documentation is to be found on the wiki, as well as a
guide to compile alembic: https://wiki.blender.org/index.php/
User:Kevindietrich/AlembicBasicIo.
Many thanks to everyone involved in this little project, and huge shout
out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini
and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the
custom builds and compile fixes.
Reviewers: sergey, campbellbarton, mont29
Reviewed By: sergey, campbellbarton, mont29
Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_alembic")))
|
|
|
|
|
params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_ALEMBIC : 0;
|
2013-08-26 06:54:05 +00:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "filter_glob"))) {
|
2016-01-27 18:04:50 +01:00
|
|
|
/* Protection against pyscripts not setting proper size limit... */
|
|
|
|
|
char *tmp = RNA_property_string_get_alloc(
|
|
|
|
|
op->ptr, prop, params->filter_glob, sizeof(params->filter_glob), NULL);
|
|
|
|
|
if (tmp != params->filter_glob) {
|
|
|
|
|
BLI_strncpy(params->filter_glob, tmp, sizeof(params->filter_glob));
|
|
|
|
|
MEM_freeN(tmp);
|
|
|
|
|
}
|
2015-01-04 12:03:47 +01:00
|
|
|
params->filter |= (FILE_TYPE_OPERATOR | FILE_TYPE_FOLDER);
|
2010-09-24 07:05:43 +00:00
|
|
|
}
|
2010-09-25 08:29:25 +00:00
|
|
|
else {
|
|
|
|
|
params->filter_glob[0] = '\0';
|
|
|
|
|
}
|
2010-09-24 07:05:43 +00:00
|
|
|
|
2010-04-15 20:37:47 +00:00
|
|
|
if (params->filter != 0) {
|
|
|
|
|
if (U.uiflag & USER_FILTERFILEEXTS) {
|
|
|
|
|
params->flag |= FILE_FILTER;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2010-04-15 20:37:47 +00:00
|
|
|
params->flag &= ~FILE_FILTER;
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-07-28 16:46:14 +00:00
|
|
|
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
/* For now, always init filterid to 'all true' */
|
|
|
|
|
params->filter_id = FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR | FILTER_ID_CA | FILTER_ID_CU | FILTER_ID_GD |
|
|
|
|
|
FILTER_ID_GR | FILTER_ID_IM | FILTER_ID_LA | FILTER_ID_LS | FILTER_ID_LT | FILTER_ID_MA |
|
|
|
|
|
FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME | FILTER_ID_MSK | FILTER_ID_NT | FILTER_ID_OB |
|
2016-12-28 17:30:58 +01:00
|
|
|
FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO | FILTER_ID_CF | FILTER_ID_WS;
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
|
2009-11-22 20:24:36 +00:00
|
|
|
if (U.uiflag & USER_HIDE_DOT) {
|
|
|
|
|
params->flag |= FILE_HIDE_DOT;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2009-11-22 20:24:36 +00:00
|
|
|
params->flag &= ~FILE_HIDE_DOT;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-13 09:41:00 +00:00
|
|
|
|
2009-09-12 19:54:39 +00:00
|
|
|
if (params->type == FILE_LOADLIB) {
|
|
|
|
|
params->flag |= RNA_boolean_get(op->ptr, "link") ? FILE_LINK : 0;
|
|
|
|
|
params->flag |= RNA_boolean_get(op->ptr, "autoselect") ? FILE_AUTOSELECT : 0;
|
2017-05-26 17:41:50 +02:00
|
|
|
params->flag |= RNA_boolean_get(op->ptr, "active_collection") ? FILE_ACTIVE_COLLECTION : 0;
|
2009-09-12 19:54:39 +00:00
|
|
|
}
|
2012-01-24 18:18:51 +00:00
|
|
|
|
2015-02-17 13:09:21 +11:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "display_type"))) {
|
|
|
|
|
params->display = RNA_property_enum_get(op->ptr, prop);
|
|
|
|
|
}
|
2012-01-24 18:18:51 +00:00
|
|
|
|
2015-08-23 12:40:21 +02:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "sort_method"))) {
|
|
|
|
|
params->sort = RNA_property_enum_get(op->ptr, prop);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
params->sort = FILE_SORT_ALPHA;
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
if (params->display == FILE_DEFAULTDISPLAY) {
|
2012-01-24 18:18:51 +00:00
|
|
|
if (U.uiflag & USER_SHOW_THUMBNAILS) {
|
2016-04-26 17:17:01 +02:00
|
|
|
if (params->filter & (FILE_TYPE_IMAGE | FILE_TYPE_MOVIE | FILE_TYPE_FTFONT))
|
2012-06-18 13:01:24 +00:00
|
|
|
params->display = FILE_IMGDISPLAY;
|
2012-01-24 18:18:51 +00:00
|
|
|
else
|
2012-06-18 13:01:24 +00:00
|
|
|
params->display = FILE_SHORTDISPLAY;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2012-06-18 13:01:24 +00:00
|
|
|
params->display = FILE_SHORTDISPLAY;
|
2012-01-24 18:18:51 +00:00
|
|
|
}
|
2010-11-06 18:54:15 +00:00
|
|
|
}
|
|
|
|
|
|
2011-10-12 00:15:19 +00:00
|
|
|
if (is_relative_path) {
|
2015-02-17 13:09:21 +11:00
|
|
|
if ((prop = RNA_struct_find_property(op->ptr, "relative_path"))) {
|
|
|
|
|
if (!RNA_property_is_set_ex(op->ptr, prop, false)) {
|
2015-02-19 12:33:14 +11:00
|
|
|
RNA_property_boolean_set(op->ptr, prop, (U.flag & USER_RELPATHS) != 0);
|
2015-02-17 13:09:21 +11:00
|
|
|
}
|
2011-10-12 00:15:19 +00:00
|
|
|
}
|
|
|
|
|
}
|
2011-06-24 03:30:50 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2009-07-27 19:06:33 +00:00
|
|
|
/* default values, if no operator */
|
2009-09-15 20:47:34 +00:00
|
|
|
params->type = FILE_UNIX;
|
2009-07-28 16:46:14 +00:00
|
|
|
params->flag |= FILE_HIDE_DOT;
|
2011-06-24 03:30:50 +00:00
|
|
|
params->flag &= ~FILE_DIRSEL_ONLY;
|
2009-07-27 19:06:33 +00:00
|
|
|
params->display = FILE_SHORTDISPLAY;
|
2015-09-26 13:37:46 +02:00
|
|
|
params->sort = FILE_SORT_ALPHA;
|
2009-07-27 19:06:33 +00:00
|
|
|
params->filter = 0;
|
2010-09-25 08:29:25 +00:00
|
|
|
params->filter_glob[0] = '\0';
|
2009-07-07 07:25:44 +00:00
|
|
|
}
|
2010-08-09 22:54:40 +00:00
|
|
|
|
2013-02-07 00:46:53 +00:00
|
|
|
/* operator has no setting for this */
|
2015-06-12 06:25:43 +02:00
|
|
|
params->active_file = -1;
|
2013-02-07 00:46:53 +00:00
|
|
|
|
2010-08-09 22:54:40 +00:00
|
|
|
|
|
|
|
|
/* initialize the list with previous folders */
|
|
|
|
|
if (!sfile->folders_prev)
|
|
|
|
|
sfile->folders_prev = folderlist_new();
|
2013-06-06 23:58:30 +00:00
|
|
|
|
|
|
|
|
if (!sfile->params->dir[0]) {
|
|
|
|
|
if (G.main->name[0]) {
|
|
|
|
|
BLI_split_dir_part(G.main->name, sfile->params->dir, sizeof(sfile->params->dir));
|
|
|
|
|
}
|
|
|
|
|
else {
|
2014-11-23 15:54:29 +01:00
|
|
|
const char *doc_path = BKE_appdir_folder_default();
|
2013-06-06 23:58:30 +00:00
|
|
|
if (doc_path) {
|
|
|
|
|
BLI_strncpy(sfile->params->dir, doc_path, sizeof(sfile->params->dir));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-08-09 22:54:40 +00:00
|
|
|
folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
|
|
|
|
|
|
2011-10-05 07:57:33 +00:00
|
|
|
/* switching thumbnails needs to recalc layout [#28809] */
|
|
|
|
|
if (sfile->layout) {
|
2014-04-01 11:34:00 +11:00
|
|
|
sfile->layout->dirty = true;
|
2011-10-05 07:57:33 +00:00
|
|
|
}
|
|
|
|
|
|
2009-01-06 14:42:54 +00:00
|
|
|
return 1;
|
2008-12-14 12:16:55 +00:00
|
|
|
}
|
|
|
|
|
|
2009-01-08 18:47:16 +00:00
|
|
|
void ED_fileselect_reset_params(SpaceFile *sfile)
|
|
|
|
|
{
|
2009-09-13 08:08:50 +00:00
|
|
|
sfile->params->type = FILE_UNIX;
|
2009-01-08 18:47:16 +00:00
|
|
|
sfile->params->flag = 0;
|
|
|
|
|
sfile->params->title[0] = '\0';
|
2015-06-12 06:25:43 +02:00
|
|
|
sfile->params->active_file = -1;
|
2009-01-08 18:47:16 +00:00
|
|
|
}
|
2009-03-08 13:14:12 +00:00
|
|
|
|
2015-07-09 18:40:34 +02:00
|
|
|
/**
|
|
|
|
|
* Sets FileSelectParams->file (name of selected file)
|
|
|
|
|
*/
|
|
|
|
|
void fileselect_file_set(SpaceFile *sfile, const int index)
|
|
|
|
|
{
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
const struct FileDirEntry *file = filelist_file(sfile->files, index);
|
|
|
|
|
if (file && file->relpath && file->relpath[0] && !(file->typeflag & FILE_TYPE_FOLDER)) {
|
|
|
|
|
BLI_strncpy(sfile->params->file, file->relpath, FILE_MAXFILE);
|
2015-07-09 18:40:34 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-07-26 22:47:05 +00:00
|
|
|
int ED_fileselect_layout_numfiles(FileLayout *layout, ARegion *ar)
|
2009-07-26 12:40:44 +00:00
|
|
|
{
|
|
|
|
|
int numfiles;
|
|
|
|
|
|
2014-09-03 16:00:44 +10:00
|
|
|
/* Values in pixels.
|
|
|
|
|
*
|
|
|
|
|
* - *_item: size of each (row|col), (including padding)
|
|
|
|
|
* - *_view: (x|y) size of the view.
|
|
|
|
|
* - *_over: extra pixels, to take into account, when the fit isnt exact
|
|
|
|
|
* (needed since you may see the end of the previous column and the beginning of the next).
|
|
|
|
|
*
|
2014-09-05 10:16:11 +10:00
|
|
|
* Could be more clever and take scrolling into account,
|
2014-09-03 16:00:44 +10:00
|
|
|
* but for now don't bother.
|
|
|
|
|
*/
|
2009-07-26 12:40:44 +00:00
|
|
|
if (layout->flag & FILE_LAYOUT_HOR) {
|
2014-09-03 16:00:44 +10:00
|
|
|
const int x_item = layout->tile_w + (2 * layout->tile_border_x);
|
|
|
|
|
const int x_view = (int)(BLI_rctf_size_x(&ar->v2d.cur));
|
|
|
|
|
const int x_over = x_item - (x_view % x_item);
|
|
|
|
|
numfiles = (int)((float)(x_view + x_over) / (float)(x_item));
|
2012-06-18 13:01:24 +00:00
|
|
|
return numfiles * layout->rows;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2014-09-03 16:00:44 +10:00
|
|
|
const int y_item = layout->tile_h + (2 * layout->tile_border_y);
|
|
|
|
|
const int y_view = (int)(BLI_rctf_size_y(&ar->v2d.cur));
|
|
|
|
|
const int y_over = y_item - (y_view % y_item);
|
|
|
|
|
numfiles = (int)((float)(y_view + y_over) / (float)(y_item));
|
2012-06-18 13:01:24 +00:00
|
|
|
return numfiles * layout->columns;
|
2009-07-26 12:40:44 +00:00
|
|
|
}
|
|
|
|
|
}
|
2009-03-08 13:14:12 +00:00
|
|
|
|
2014-01-28 03:52:21 +11:00
|
|
|
static bool is_inside(int x, int y, int cols, int rows)
|
2011-03-14 19:56:13 +00:00
|
|
|
{
|
2014-01-28 03:52:21 +11:00
|
|
|
return ((x >= 0) && (x < cols) && (y >= 0) && (y < rows));
|
2011-03-14 19:56:13 +00:00
|
|
|
}
|
|
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
FileSelection ED_fileselect_layout_offset_rect(FileLayout *layout, const rcti *rect)
|
2011-03-14 19:56:13 +00:00
|
|
|
{
|
|
|
|
|
int colmin, colmax, rowmin, rowmax;
|
|
|
|
|
FileSelection sel;
|
|
|
|
|
sel.first = sel.last = -1;
|
|
|
|
|
|
|
|
|
|
if (layout == NULL)
|
|
|
|
|
return sel;
|
|
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
colmin = (rect->xmin) / (layout->tile_w + 2 * layout->tile_border_x);
|
|
|
|
|
rowmin = (rect->ymin) / (layout->tile_h + 2 * layout->tile_border_y);
|
|
|
|
|
colmax = (rect->xmax) / (layout->tile_w + 2 * layout->tile_border_x);
|
|
|
|
|
rowmax = (rect->ymax) / (layout->tile_h + 2 * layout->tile_border_y);
|
2011-03-14 19:56:13 +00:00
|
|
|
|
2012-05-20 19:49:27 +00:00
|
|
|
if (is_inside(colmin, rowmin, layout->columns, layout->rows) ||
|
|
|
|
|
is_inside(colmax, rowmax, layout->columns, layout->rows) )
|
|
|
|
|
{
|
2012-06-18 13:01:24 +00:00
|
|
|
CLAMP(colmin, 0, layout->columns - 1);
|
|
|
|
|
CLAMP(rowmin, 0, layout->rows - 1);
|
|
|
|
|
CLAMP(colmax, 0, layout->columns - 1);
|
|
|
|
|
CLAMP(rowmax, 0, layout->rows - 1);
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2011-03-14 19:56:13 +00:00
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
if ((colmin > layout->columns - 1) || (rowmin > layout->rows - 1)) {
|
2011-03-14 19:56:13 +00:00
|
|
|
sel.first = -1;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2011-03-14 19:56:13 +00:00
|
|
|
if (layout->flag & FILE_LAYOUT_HOR)
|
2012-06-18 13:01:24 +00:00
|
|
|
sel.first = layout->rows * colmin + rowmin;
|
2011-03-14 19:56:13 +00:00
|
|
|
else
|
2012-06-18 13:01:24 +00:00
|
|
|
sel.first = colmin + layout->columns * rowmin;
|
2011-03-14 19:56:13 +00:00
|
|
|
}
|
2012-06-18 13:01:24 +00:00
|
|
|
if ((colmax > layout->columns - 1) || (rowmax > layout->rows - 1)) {
|
2011-03-14 19:56:13 +00:00
|
|
|
sel.last = -1;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2011-03-14 19:56:13 +00:00
|
|
|
if (layout->flag & FILE_LAYOUT_HOR)
|
2012-06-18 13:01:24 +00:00
|
|
|
sel.last = layout->rows * colmax + rowmax;
|
2011-03-14 19:56:13 +00:00
|
|
|
else
|
2012-06-18 13:01:24 +00:00
|
|
|
sel.last = colmax + layout->columns * rowmax;
|
2011-03-14 19:56:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return sel;
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
int ED_fileselect_layout_offset(FileLayout *layout, int x, int y)
|
2009-03-08 13:14:12 +00:00
|
|
|
{
|
|
|
|
|
int offsetx, offsety;
|
|
|
|
|
int active_file;
|
|
|
|
|
|
2009-05-31 04:52:20 +00:00
|
|
|
if (layout == NULL)
|
2011-03-14 19:56:13 +00:00
|
|
|
return -1;
|
2009-05-31 04:52:20 +00:00
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
offsetx = (x) / (layout->tile_w + 2 * layout->tile_border_x);
|
|
|
|
|
offsety = (y) / (layout->tile_h + 2 * layout->tile_border_y);
|
2009-03-08 13:14:12 +00:00
|
|
|
|
2012-02-27 10:35:39 +00:00
|
|
|
if (offsetx > layout->columns - 1) return -1;
|
|
|
|
|
if (offsety > layout->rows - 1) return -1;
|
2010-03-18 04:09:59 +00:00
|
|
|
|
2009-03-08 13:14:12 +00:00
|
|
|
if (layout->flag & FILE_LAYOUT_HOR)
|
2012-06-18 13:01:24 +00:00
|
|
|
active_file = layout->rows * offsetx + offsety;
|
2009-03-08 13:14:12 +00:00
|
|
|
else
|
2012-06-18 13:01:24 +00:00
|
|
|
active_file = offsetx + layout->columns * offsety;
|
2009-03-08 13:14:12 +00:00
|
|
|
return active_file;
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
void ED_fileselect_layout_tilepos(FileLayout *layout, int tile, int *x, int *y)
|
2009-03-08 13:14:12 +00:00
|
|
|
{
|
|
|
|
|
if (layout->flag == FILE_LAYOUT_HOR) {
|
2012-06-18 13:01:24 +00:00
|
|
|
*x = layout->tile_border_x + (tile / layout->rows) * (layout->tile_w + 2 * layout->tile_border_x);
|
|
|
|
|
*y = layout->tile_border_y + (tile % layout->rows) * (layout->tile_h + 2 * layout->tile_border_y);
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2012-06-18 13:01:24 +00:00
|
|
|
*x = layout->tile_border_x + ((tile) % layout->columns) * (layout->tile_w + 2 * layout->tile_border_x);
|
|
|
|
|
*y = layout->tile_border_y + ((tile) / layout->columns) * (layout->tile_h + 2 * layout->tile_border_y);
|
2009-03-08 13:14:12 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
float file_string_width(const char *str)
|
2009-05-14 18:08:14 +00:00
|
|
|
{
|
2014-11-09 21:20:40 +01:00
|
|
|
uiStyle *style = UI_style_get();
|
2015-05-27 17:15:48 +02:00
|
|
|
float width;
|
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_fontstyle_set(&style->widget);
|
2015-05-27 17:15:48 +02:00
|
|
|
if (style->widget.kerning == 1) { /* for BLF_width */
|
|
|
|
|
BLF_enable(style->widget.uifont_id, BLF_KERNING_DEFAULT);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
width = BLF_width(style->widget.uifont_id, str, BLF_DRAW_STR_DUMMY_MAX);
|
|
|
|
|
|
|
|
|
|
if (style->widget.kerning == 1) {
|
|
|
|
|
BLF_disable(style->widget.uifont_id, BLF_KERNING_DEFAULT);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return width;
|
2009-05-14 18:08:14 +00:00
|
|
|
}
|
|
|
|
|
|
2011-02-13 15:02:21 +00:00
|
|
|
float file_font_pointsize(void)
|
2009-05-14 18:08:14 +00:00
|
|
|
{
|
2011-01-13 04:53:55 +00:00
|
|
|
#if 0
|
2009-05-14 18:08:14 +00:00
|
|
|
float s;
|
|
|
|
|
char tmp[2] = "X";
|
2014-11-09 21:20:40 +01:00
|
|
|
uiStyle *style = UI_style_get();
|
|
|
|
|
UI_fontstyle_set(&style->widget);
|
BugFix:
[#20854] PROPERTIES STAMP: Rendering stamp flickers in output renders
Blenfont was not thread safe, that is why one thread can change
the font properties (size, dpi, color, etc) at the same time
that the stamp draw on the image, and then the problem.
To make blenfont thread safe I have to change two important things:
1) Every BLF_* function take one argument, the font id.
2) We have two new function to make font "thread safe":
BLF_load_unique
BLF_load_mem_unique
This two function are for case like stamp, that need and own font
that don't share the glyph cache, so can draw without problem
in a different thread.
Why the BLF_*_unique function ?
Because blenfont keep only one copy of a font and keep a list of
"glyph cache". Every glyph cache have size and dpi, so if two
different thread access the same font at the same time, they can
change value and finish with something like the stamp problem.
Why don't remove the glyph cache ?
Because if we do that, we finish with a font object for every size
and dpi, and the stamp is really a special case that happen in
the rendering process, so I really thing is better keep the
glyph cache and make this two new function to handle this
special case.
(When I say "font object" I mean have the same freetype font multiple
times just to have differents size and dpi)
As Matt point we still can have one case that two thread access
the BLF_*_unique function at the same time, but I am looking to
fix this with some class of thread lock.
For now I test and work fine, so if some one found problem, please
let me know.
Campbell I have to change the python api (python/generic/blf_api.c)
to the new syntax, so maybe you can take a look at this.
2010-04-22 10:56:45 +00:00
|
|
|
s = BLF_height(style->widget.uifont_id, tmp);
|
2009-05-14 18:08:14 +00:00
|
|
|
return style->widget.points;
|
2011-06-07 15:33:01 +00:00
|
|
|
#else
|
2014-11-09 21:20:40 +01:00
|
|
|
uiStyle *style = UI_style_get();
|
|
|
|
|
UI_fontstyle_set(&style->widget);
|
2011-06-07 15:33:01 +00:00
|
|
|
return style->widget.points * UI_DPI_FAC;
|
2011-01-13 04:53:55 +00:00
|
|
|
#endif
|
2009-05-14 18:08:14 +00:00
|
|
|
}
|
|
|
|
|
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
static void column_widths(FileSelectParams *params, struct FileLayout *layout)
|
2009-05-14 18:08:14 +00:00
|
|
|
{
|
|
|
|
|
int i;
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
const bool small_size = SMALL_SIZE_CHECK(params->thumbnail_size);
|
2009-05-14 18:08:14 +00:00
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
for (i = 0; i < MAX_FILE_COLUMN; ++i) {
|
2009-05-14 18:08:14 +00:00
|
|
|
layout->column_widths[i] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-09 01:16:58 +10:00
|
|
|
layout->column_widths[COLUMN_NAME] = ((float)params->thumbnail_size / 8.0f) * UI_UNIT_X;
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
/* Biggest possible reasonable values... */
|
|
|
|
|
layout->column_widths[COLUMN_DATE] = file_string_width(small_size ? "23/08/89" : "23-Dec-89");
|
|
|
|
|
layout->column_widths[COLUMN_TIME] = file_string_width("23:59");
|
|
|
|
|
layout->column_widths[COLUMN_SIZE] = file_string_width(small_size ? "98.7 M" : "98.7 MiB");
|
2009-05-14 18:08:14 +00:00
|
|
|
}
|
2009-03-08 13:14:12 +00:00
|
|
|
|
2012-07-26 22:47:05 +00:00
|
|
|
void ED_fileselect_init_layout(struct SpaceFile *sfile, ARegion *ar)
|
2009-03-08 13:14:12 +00:00
|
|
|
{
|
2009-07-26 12:40:44 +00:00
|
|
|
FileSelectParams *params = ED_fileselect_get_params(sfile);
|
2012-06-18 13:01:24 +00:00
|
|
|
FileLayout *layout = NULL;
|
|
|
|
|
View2D *v2d = &ar->v2d;
|
2009-03-08 13:14:12 +00:00
|
|
|
int maxlen = 0;
|
2009-07-26 12:40:44 +00:00
|
|
|
int numfiles;
|
|
|
|
|
int textheight;
|
2011-10-05 12:20:38 +00:00
|
|
|
|
2011-03-05 10:29:10 +00:00
|
|
|
if (sfile->layout == NULL) {
|
2009-03-08 13:14:12 +00:00
|
|
|
sfile->layout = MEM_callocN(sizeof(struct FileLayout), "file_layout");
|
2014-04-01 11:34:00 +11:00
|
|
|
sfile->layout->dirty = true;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
2014-04-01 11:34:00 +11:00
|
|
|
else if (sfile->layout->dirty == false) {
|
2011-10-05 12:20:38 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2009-07-26 12:40:44 +00:00
|
|
|
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
numfiles = filelist_files_ensure(sfile->files);
|
2011-04-10 09:37:04 +00:00
|
|
|
textheight = (int)file_font_pointsize();
|
2009-07-26 12:40:44 +00:00
|
|
|
layout = sfile->layout;
|
2009-08-20 18:39:25 +00:00
|
|
|
layout->textheight = textheight;
|
2009-07-26 12:40:44 +00:00
|
|
|
|
2009-03-08 13:14:12 +00:00
|
|
|
if (params->display == FILE_IMGDISPLAY) {
|
2015-05-01 01:49:58 +10:00
|
|
|
layout->prv_w = ((float)params->thumbnail_size / 20.0f) * UI_UNIT_X;
|
|
|
|
|
layout->prv_h = ((float)params->thumbnail_size / 20.0f) * UI_UNIT_Y;
|
2013-02-13 05:10:38 +00:00
|
|
|
layout->tile_border_x = 0.3f * UI_UNIT_X;
|
|
|
|
|
layout->tile_border_y = 0.3f * UI_UNIT_X;
|
|
|
|
|
layout->prv_border_x = 0.3f * UI_UNIT_X;
|
|
|
|
|
layout->prv_border_y = 0.3f * UI_UNIT_Y;
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->tile_w = layout->prv_w + 2 * layout->prv_border_x;
|
|
|
|
|
layout->tile_h = layout->prv_h + 2 * layout->prv_border_y + textheight;
|
2012-09-15 11:48:20 +00:00
|
|
|
layout->width = (int)(BLI_rctf_size_x(&v2d->cur) - 2 * layout->tile_border_x);
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->columns = layout->width / (layout->tile_w + 2 * layout->tile_border_x);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (layout->columns > 0)
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->rows = numfiles / layout->columns + 1; // XXX dirty, modulo is zero
|
2009-03-09 21:17:19 +00:00
|
|
|
else {
|
2009-07-26 12:40:44 +00:00
|
|
|
layout->columns = 1;
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->rows = numfiles + 1; // XXX dirty, modulo is zero
|
2009-03-09 21:17:19 +00:00
|
|
|
}
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->height = sfile->layout->rows * (layout->tile_h + 2 * layout->tile_border_y) + layout->tile_border_y * 2;
|
2009-07-26 12:40:44 +00:00
|
|
|
layout->flag = FILE_LAYOUT_VER;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2013-02-13 05:10:38 +00:00
|
|
|
int column_space = 0.6f * UI_UNIT_X;
|
|
|
|
|
int column_icon_space = 0.2f * UI_UNIT_X;
|
2013-02-12 17:09:02 +00:00
|
|
|
|
2009-07-26 12:40:44 +00:00
|
|
|
layout->prv_w = 0;
|
|
|
|
|
layout->prv_h = 0;
|
2013-02-13 05:10:38 +00:00
|
|
|
layout->tile_border_x = 0.4f * UI_UNIT_X;
|
|
|
|
|
layout->tile_border_y = 0.1f * UI_UNIT_Y;
|
2009-07-26 12:40:44 +00:00
|
|
|
layout->prv_border_x = 0;
|
|
|
|
|
layout->prv_border_y = 0;
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->tile_h = textheight * 3 / 2;
|
2012-09-15 11:48:20 +00:00
|
|
|
layout->height = (int)(BLI_rctf_size_y(&v2d->cur) - 2 * layout->tile_border_y);
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->rows = layout->height / (layout->tile_h + 2 * layout->tile_border_y);
|
2011-04-21 13:11:51 +00:00
|
|
|
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
column_widths(params, layout);
|
2009-05-14 18:08:14 +00:00
|
|
|
|
2009-03-14 18:15:28 +00:00
|
|
|
if (params->display == FILE_SHORTDISPLAY) {
|
2013-02-12 17:09:02 +00:00
|
|
|
maxlen = ICON_DEFAULT_WIDTH_SCALE + column_icon_space +
|
|
|
|
|
(int)layout->column_widths[COLUMN_NAME] + column_space +
|
|
|
|
|
(int)layout->column_widths[COLUMN_SIZE] + column_space;
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2013-02-12 17:09:02 +00:00
|
|
|
maxlen = ICON_DEFAULT_WIDTH_SCALE + column_icon_space +
|
|
|
|
|
(int)layout->column_widths[COLUMN_NAME] + column_space +
|
|
|
|
|
(int)layout->column_widths[COLUMN_DATE] + column_space +
|
|
|
|
|
(int)layout->column_widths[COLUMN_TIME] + column_space +
|
|
|
|
|
(int)layout->column_widths[COLUMN_SIZE] + column_space;
|
2010-11-14 10:48:36 +00:00
|
|
|
|
2009-03-14 18:15:28 +00:00
|
|
|
}
|
2009-09-28 12:10:23 +00:00
|
|
|
layout->tile_w = maxlen;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (layout->rows > 0)
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->columns = numfiles / layout->rows + 1; // XXX dirty, modulo is zero
|
2009-03-09 21:17:19 +00:00
|
|
|
else {
|
2009-07-26 12:40:44 +00:00
|
|
|
layout->rows = 1;
|
|
|
|
|
layout->columns = numfiles + 1; // XXX dirty, modulo is zero
|
2009-03-09 21:17:19 +00:00
|
|
|
}
|
2012-06-18 13:01:24 +00:00
|
|
|
layout->width = sfile->layout->columns * (layout->tile_w + 2 * layout->tile_border_x) + layout->tile_border_x * 2;
|
2009-07-26 12:40:44 +00:00
|
|
|
layout->flag = FILE_LAYOUT_HOR;
|
|
|
|
|
}
|
2014-04-01 11:34:00 +11:00
|
|
|
layout->dirty = false;
|
2009-03-08 13:14:12 +00:00
|
|
|
}
|
|
|
|
|
|
2012-07-26 22:47:05 +00:00
|
|
|
FileLayout *ED_fileselect_get_layout(struct SpaceFile *sfile, ARegion *ar)
|
2009-03-08 13:14:12 +00:00
|
|
|
{
|
|
|
|
|
if (!sfile->layout) {
|
|
|
|
|
ED_fileselect_init_layout(sfile, ar);
|
|
|
|
|
}
|
|
|
|
|
return sfile->layout;
|
2009-03-11 23:22:07 +00:00
|
|
|
}
|
2009-07-07 07:25:44 +00:00
|
|
|
|
2016-06-27 10:54:17 +02:00
|
|
|
void ED_file_change_dir(bContext *C)
|
2009-07-07 07:25:44 +00:00
|
|
|
{
|
2013-03-15 19:56:29 +00:00
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
2012-06-18 13:01:24 +00:00
|
|
|
SpaceFile *sfile = CTX_wm_space_file(C);
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
2010-03-10 19:30:20 +00:00
|
|
|
|
2009-10-15 11:11:52 +00:00
|
|
|
if (sfile->params) {
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
ED_fileselect_clear(wm, sa, sfile);
|
2010-03-10 19:30:20 +00:00
|
|
|
|
2015-01-05 12:23:41 +01:00
|
|
|
/* Clear search string, it is very rare to want to keep that filter while changing dir,
|
|
|
|
|
* and usually very annoying to keep it actually! */
|
|
|
|
|
sfile->params->filter_search[0] = '\0';
|
2015-07-11 05:20:35 +02:00
|
|
|
sfile->params->active_file = -1;
|
2015-01-05 12:23:41 +01:00
|
|
|
|
2016-08-29 16:42:49 +02:00
|
|
|
if (!filelist_is_dir(sfile->files, sfile->params->dir)) {
|
2009-10-15 11:11:52 +00:00
|
|
|
BLI_strncpy(sfile->params->dir, filelist_dir(sfile->files), sizeof(sfile->params->dir));
|
|
|
|
|
/* could return but just refresh the current dir */
|
|
|
|
|
}
|
2009-09-12 19:54:39 +00:00
|
|
|
filelist_setdir(sfile->files, sfile->params->dir);
|
2015-07-11 05:20:35 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (folderlist_clear_next(sfile))
|
2009-09-12 19:54:39 +00:00
|
|
|
folderlist_free(sfile->folders_next);
|
2009-07-07 07:25:44 +00:00
|
|
|
|
2009-09-12 19:54:39 +00:00
|
|
|
folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
|
2009-07-07 07:25:44 +00:00
|
|
|
|
2015-02-17 08:52:19 +11:00
|
|
|
file_draw_check(C);
|
2009-07-07 07:25:44 +00:00
|
|
|
}
|
|
|
|
|
}
|
2009-07-10 17:05:04 +00:00
|
|
|
|
2012-06-17 14:16:26 +00:00
|
|
|
int file_select_match(struct SpaceFile *sfile, const char *pattern, char *matched_file)
|
2009-07-10 17:05:04 +00:00
|
|
|
{
|
|
|
|
|
int match = 0;
|
2012-06-17 14:16:26 +00:00
|
|
|
|
|
|
|
|
int i;
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
FileDirEntry *file;
|
|
|
|
|
int n = filelist_files_ensure(sfile->files);
|
2012-06-17 14:16:26 +00:00
|
|
|
|
|
|
|
|
/* select any file that matches the pattern, this includes exact match
|
|
|
|
|
* if the user selects a single file by entering the filename
|
|
|
|
|
*/
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
|
file = filelist_file(sfile->files, i);
|
2016-07-08 09:46:12 +10:00
|
|
|
/* Do not check whether file is a file or dir here! Causes T44243 (we do accept dirs at this stage). */
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
if (fnmatch(pattern, file->relpath, 0) == 0) {
|
|
|
|
|
filelist_entry_select_set(sfile->files, file, FILE_SEL_ADD, FILE_SEL_SELECTED, CHECK_ALL);
|
2012-06-17 14:16:26 +00:00
|
|
|
if (!match) {
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
BLI_strncpy(matched_file, file->relpath, FILE_MAX);
|
2009-07-10 17:05:04 +00:00
|
|
|
}
|
2013-11-22 14:35:34 +01:00
|
|
|
match++;
|
2009-07-10 17:05:04 +00:00
|
|
|
}
|
|
|
|
|
}
|
2012-06-17 14:16:26 +00:00
|
|
|
|
2009-07-10 17:05:04 +00:00
|
|
|
return match;
|
|
|
|
|
}
|
2009-07-10 19:19:54 +00:00
|
|
|
|
2013-11-22 01:35:38 +01:00
|
|
|
int autocomplete_directory(struct bContext *C, char *str, void *UNUSED(arg_v))
|
2009-07-10 19:19:54 +00:00
|
|
|
{
|
2012-06-18 13:01:24 +00:00
|
|
|
SpaceFile *sfile = CTX_wm_space_file(C);
|
2013-11-19 16:31:48 +01:00
|
|
|
int match = AUTOCOMPLETE_NO_MATCH;
|
2010-05-07 23:34:03 +00:00
|
|
|
|
|
|
|
|
/* search if str matches the beginning of name */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (str[0] && sfile->files) {
|
2010-05-07 23:34:03 +00:00
|
|
|
char dirname[FILE_MAX];
|
|
|
|
|
|
|
|
|
|
DIR *dir;
|
|
|
|
|
struct dirent *de;
|
|
|
|
|
|
2011-10-21 02:13:36 +00:00
|
|
|
BLI_split_dir_part(str, dirname, sizeof(dirname));
|
2010-05-07 23:34:03 +00:00
|
|
|
|
|
|
|
|
dir = opendir(dirname);
|
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dir) {
|
2014-11-09 21:20:40 +01:00
|
|
|
AutoComplete *autocpl = UI_autocomplete_begin(str, FILE_MAX);
|
2010-05-07 23:34:03 +00:00
|
|
|
|
|
|
|
|
while ((de = readdir(dir)) != NULL) {
|
2015-01-26 16:58:02 +01:00
|
|
|
if (FILENAME_IS_CURRPAR(de->d_name)) {
|
2010-05-07 23:34:03 +00:00
|
|
|
/* pass */
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
char path[FILE_MAX];
|
2014-05-28 22:50:40 +06:00
|
|
|
BLI_stat_t status;
|
2010-05-07 23:34:03 +00:00
|
|
|
|
2011-02-13 03:21:27 +00:00
|
|
|
BLI_join_dirfile(path, sizeof(path), dirname, de->d_name);
|
2010-05-07 23:34:03 +00:00
|
|
|
|
2013-06-25 14:48:30 +00:00
|
|
|
if (BLI_stat(path, &status) == 0) {
|
2010-05-07 23:34:03 +00:00
|
|
|
if (S_ISDIR(status.st_mode)) { /* is subdir */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_autocomplete_update_name(autocpl, path);
|
2010-05-07 23:34:03 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
closedir(dir);
|
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
match = UI_autocomplete_end(autocpl, str);
|
2015-04-03 16:17:17 +02:00
|
|
|
if (match == AUTOCOMPLETE_FULL_MATCH) {
|
|
|
|
|
BLI_add_slash(str);
|
2010-05-07 23:34:03 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-06-19 11:53:48 +00:00
|
|
|
|
2013-11-22 01:35:38 +01:00
|
|
|
return match;
|
2010-05-07 23:34:03 +00:00
|
|
|
}
|
|
|
|
|
|
2013-11-22 01:35:38 +01:00
|
|
|
int autocomplete_file(struct bContext *C, char *str, void *UNUSED(arg_v))
|
2010-05-07 23:34:03 +00:00
|
|
|
{
|
2012-06-18 13:01:24 +00:00
|
|
|
SpaceFile *sfile = CTX_wm_space_file(C);
|
2013-11-19 16:31:48 +01:00
|
|
|
int match = AUTOCOMPLETE_NO_MATCH;
|
2009-07-10 19:19:54 +00:00
|
|
|
|
|
|
|
|
/* search if str matches the beginning of name */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (str[0] && sfile->files) {
|
2014-11-09 21:20:40 +01:00
|
|
|
AutoComplete *autocpl = UI_autocomplete_begin(str, FILE_MAX);
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
int nentries = filelist_files_ensure(sfile->files);
|
2009-07-10 19:19:54 +00:00
|
|
|
int i;
|
|
|
|
|
|
2012-06-18 13:01:24 +00:00
|
|
|
for (i = 0; i < nentries; ++i) {
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
FileDirEntry *file = filelist_file(sfile->files, i);
|
|
|
|
|
UI_autocomplete_update_name(autocpl, file->relpath);
|
2009-07-10 19:19:54 +00:00
|
|
|
}
|
2014-11-09 21:20:40 +01:00
|
|
|
match = UI_autocomplete_end(autocpl, str);
|
2009-07-10 19:19:54 +00:00
|
|
|
}
|
2013-11-22 01:35:38 +01:00
|
|
|
|
|
|
|
|
return match;
|
2009-07-16 04:45:52 +00:00
|
|
|
}
|
2010-03-10 19:30:20 +00:00
|
|
|
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
void ED_fileselect_clear(wmWindowManager *wm, ScrArea *sa, SpaceFile *sfile)
|
2010-03-10 19:30:20 +00:00
|
|
|
{
|
2011-12-31 03:52:07 +00:00
|
|
|
/* only NULL in rare cases - [#29734] */
|
|
|
|
|
if (sfile->files) {
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
filelist_readjob_stop(wm, sa);
|
2011-12-31 03:52:07 +00:00
|
|
|
filelist_freelib(sfile->files);
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
filelist_clear(sfile->files);
|
2011-12-31 03:52:07 +00:00
|
|
|
}
|
|
|
|
|
|
File Browser Arrow Keys Navigation
Adds support for selecting/deselecting files in File Browser using the
arrow keys. All directions (up, down, left, right) are possible.
When to Select, When to Deselect?
Standard behaviour is selecting, however if we move into a block of
already selected files (meaning 2+ files are selected) we start
deselecting
Possible Selection Methods
Simple selection (arrow-key): All other files are deselected
Expand selection (Shift+arrow key): Add to/remove from existing
selection
ill-Expand selection (Ctrl+Shift+arrow key): Add to/remove from existing
selection and fill everything in-between
From which file do we start navigating?
From each available selection method (Mouse-, Walk-, All-, Border
Select), we use the last selected file. If there's no selection at all
we use the first (down/right arrow) or last (up/left arrow) file.
(Ideally, the view would automatically be set to the new selection, but
this behaviour overlaps with an other patch I've been working on, so
prefer to do that separately)
(Also tweaks color for highlighted file for better feedback)
D1297, Review done by @campbellbarton, thx a lot :)
2015-06-11 17:20:29 +02:00
|
|
|
sfile->params->highlight_file = -1;
|
2013-03-15 19:56:29 +00:00
|
|
|
WM_main_add_notifier(NC_SPACE | ND_SPACE_FILE_LIST, NULL);
|
2010-03-10 19:30:20 +00:00
|
|
|
}
|
|
|
|
|
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
void ED_fileselect_exit(wmWindowManager *wm, ScrArea *sa, SpaceFile *sfile)
|
2010-03-10 19:30:20 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!sfile) return;
|
|
|
|
|
if (sfile->op) {
|
2013-03-15 19:56:29 +00:00
|
|
|
WM_event_fileselect_event(wm, sfile->op, EVT_FILESELECT_EXTERNAL_CANCEL);
|
2011-04-25 09:28:52 +00:00
|
|
|
sfile->op = NULL;
|
|
|
|
|
}
|
2010-09-17 22:12:23 +00:00
|
|
|
|
|
|
|
|
folderlist_free(sfile->folders_prev);
|
|
|
|
|
folderlist_free(sfile->folders_next);
|
|
|
|
|
|
|
|
|
|
if (sfile->files) {
|
Final 'FileBrowser First Stage' merge.
It basically rewrites most of filelist.c, with some more limited changes in other areas of filebrowser.
From user perspective, it:
* Removes some info in 'long' drawing mode (owner, permissions) - OS-specific data that do not really matter in Blender!
* Makes short/long display 'fixed' size (among four choices, like thumbnails mode).
* Allows to list several layers of dirtree at once, in a flat way (inside .blend files and/or real directories).
* Consequently, adds datablocks types filtering.
* Uses way less RAM when listing big directories, especially in thumbnail mode (we are talking of several hundred of MiB spared).
* Generates thumbnails way faster.
From code perspective, it:
* Is ready for asset engine needs (on data structure level in filebrowser's listing).
* Simplifies and makes 'generic' file listing much lighter.
* Separates file listing in three different aspects:
** 'generic' filelisting (in BLI), which becomes a shallow wrapper around stat struct.
** 'filebrowser drawing' filelisting, which only contains current visible subset of the whole list (sliding window), with extra drawing data (strings for size, date/time, preview, etc.).
** 'asset-ready' filelisting, which is used for operations common to 'basic' filehandling and future asset-related one.
* Uses uuid's to handle file selection/state in the browser, instead of using flags in filelisting items.
* Uses much lighter BLI_task handling for previews, instead of heavy 'job' system (using the new 'notifier' timer to handle UI refresh, in similar way to jobs).
* Moves .blend datablocks preview handling to IMB_thumbnail (necessary to avoid storing all datablock previews at once, and gives better consistency and performances too).
Revision: https://developer.blender.org/D1316
Thanks to Campbell & Sergey for the reviews. :)
2015-08-19 22:41:39 +02:00
|
|
|
ED_fileselect_clear(wm, sa, sfile);
|
|
|
|
|
filelist_free(sfile->files);
|
2010-09-17 22:12:23 +00:00
|
|
|
MEM_freeN(sfile->files);
|
2012-06-18 13:01:24 +00:00
|
|
|
sfile->files = NULL;
|
2010-09-17 22:12:23 +00:00
|
|
|
}
|
|
|
|
|
|
2010-03-10 19:30:20 +00:00
|
|
|
}
|