blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Cleanup: Move project operators closer together

This commit is contained in:
Julian Eisel 2022-10-06 17:39:53 +02:00
parent 2578c0ba92
commit 3ad6715265
2 changed files with 78 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
source/blender/windowmanager/intern/wm_files.c
View File

@ -2348,6 +2348,82 @@ void WM_OT_save_project_settings(wmOperatorType *ot)
/** \} */
/* -------------------------------------------------------------------- */
/** \name New project operator
* \{ */
static int wm_new_project_exec(bContext *C, wmOperator *op)
{
const Main *bmain = CTX_data_main(C);
const char *blendfile_path = BKE_main_blendfile_path(bmain);
if (!RNA_struct_property_is_set(op->ptr, "directory")) {
BKE_report(op->reports, RPT_ERROR, "No path defined for creating a new project in");
return OPERATOR_CANCELLED;
}
char project_root_dir[FILE_MAXDIR];
RNA_string_get(op->ptr, "directory", project_root_dir);
if (!BKE_project_create_settings_directory(project_root_dir)) {
BKE_reportf(op->reports,
RPT_ERROR,
"Failed to create project with unknown error. Is the directory read-only?");
return OPERATOR_CANCELLED;
}
BKE_reportf(op->reports, RPT_INFO, "Project created and loaded successfully");
if (blendfile_path[0] && BLI_path_contains(project_root_dir, blendfile_path)) {
BKE_project_active_load_from_path(blendfile_path);
WM_main_add_notifier(NC_PROJECT, NULL);
/* Update the window title. */
WM_event_add_notifier_ex(CTX_wm_manager(C), CTX_wm_window(C), NC_WM | ND_DATACHANGED, NULL);
}
else {
BKE_reportf(op->reports,
RPT_INFO,
"The current file is not located inside of the new project. This means the new "
"project is not active");
}
return OPERATOR_FINISHED;
}
static int wm_new_project_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
const Main *bmain = CTX_data_main(C);
const char *blendfile_path = BKE_main_blendfile_path(bmain);
if (blendfile_path[0]) {
/* Open at the .blend file location if any. */
RNA_string_set(op->ptr, "filepath", blendfile_path);
}
WM_event_add_fileselect(C, op);
return OPERATOR_RUNNING_MODAL;
}
void WM_OT_new_project(wmOperatorType *ot)
{
ot->name = "New Project";
ot->idname = "WM_OT_new_project";
ot->description = "Choose a directory to use as the root of a project";
ot->invoke = wm_new_project_invoke;
ot->exec = wm_new_project_exec;
/* omit window poll so this can work in background mode */
WM_operator_properties_filesel(ot,
FILE_TYPE_FOLDER,
FILE_BLENDER,
FILE_OPENFILE,
WM_FILESEL_DIRECTORY,
FILE_DEFAULTDISPLAY,
FILE_SORT_DEFAULT);
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Read File History Operator
* \{ */
@ -3330,82 +3406,6 @@ void WM_OT_save_mainfile(wmOperatorType *ot)
/** \} */
/* -------------------------------------------------------------------- */
/** \name New project operator
* \{ */
static int wm_new_project_exec(bContext *C, wmOperator *op)
{
const Main *bmain = CTX_data_main(C);
const char *blendfile_path = BKE_main_blendfile_path(bmain);
if (!RNA_struct_property_is_set(op->ptr, "directory")) {
BKE_report(op->reports, RPT_ERROR, "No path defined for creating a new project in");
return OPERATOR_CANCELLED;
}
char project_root_dir[FILE_MAXDIR];
RNA_string_get(op->ptr, "directory", project_root_dir);
if (!BKE_project_create_settings_directory(project_root_dir)) {
BKE_reportf(op->reports,
RPT_ERROR,
"Failed to create project with unknown error. Is the directory read-only?");
return OPERATOR_CANCELLED;
}
BKE_reportf(op->reports, RPT_INFO, "Project created and loaded successfully");
if (blendfile_path[0] && BLI_path_contains(project_root_dir, blendfile_path)) {
BKE_project_active_load_from_path(blendfile_path);
WM_main_add_notifier(NC_PROJECT, NULL);
/* Update the window title. */
WM_event_add_notifier_ex(CTX_wm_manager(C), CTX_wm_window(C), NC_WM | ND_DATACHANGED, NULL);
}
else {
BKE_reportf(op->reports,
RPT_INFO,
"The current file is not located inside of the new project. This means the new "
"project is not active");
}
return OPERATOR_FINISHED;
}
static int wm_new_project_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
const Main *bmain = CTX_data_main(C);
const char *blendfile_path = BKE_main_blendfile_path(bmain);
if (blendfile_path[0]) {
/* Open at the .blend file location if any. */
RNA_string_set(op->ptr, "filepath", blendfile_path);
}
WM_event_add_fileselect(C, op);
return OPERATOR_RUNNING_MODAL;
}
void WM_OT_new_project(wmOperatorType *ot)
{
ot->name = "New Project";
ot->idname = "WM_OT_new_project";
ot->description = "Choose a directory to use as the root of a project";
ot->invoke = wm_new_project_invoke;
ot->exec = wm_new_project_exec;
/* omit window poll so this can work in background mode */
WM_operator_properties_filesel(ot,
FILE_TYPE_FOLDER,
FILE_BLENDER,
FILE_OPENFILE,
WM_FILESEL_DIRECTORY,
FILE_DEFAULTDISPLAY,
FILE_SORT_DEFAULT);
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Auto Script Execution Warning Dialog
* \{ */

5
source/blender/windowmanager/wm_files.h
View File

@ -90,8 +90,9 @@ bool wm_file_or_session_data_has_unsaved_changes(const Main *bmain, const wmWind
void WM_OT_save_homefile(struct wmOperatorType *ot);
void WM_OT_save_userpref(struct wmOperatorType *ot);
void WM_OT_read_userpref(struct wmOperatorType *ot);
void WM_OT_save_project_settings(struct wmOperatorType *ot);
void WM_OT_read_factory_userpref(struct wmOperatorType *ot);
void WM_OT_save_project_settings(struct wmOperatorType *ot);
void WM_OT_new_project(struct wmOperatorType *ot);
void WM_OT_read_history(struct wmOperatorType *ot);
void WM_OT_read_homefile(struct wmOperatorType *ot);
void WM_OT_read_factory_settings(struct wmOperatorType *ot);
@ -105,8 +106,6 @@ void WM_OT_recover_auto_save(struct wmOperatorType *ot);
void WM_OT_save_as_mainfile(struct wmOperatorType *ot);
void WM_OT_save_mainfile(struct wmOperatorType *ot);
void WM_OT_new_project(struct wmOperatorType *ot);
/* wm_files_link.c */
void WM_OT_link(struct wmOperatorType *ot);