UI: Improve running jobs labels
Use the form "Processing something..." (gerund, sentence case, ellipsis) for running jobs progress label, according to Blender's Human Interface Guidelines. Pull Request: https://projects.blender.org/blender/blender/pulls/141573
This commit is contained in:
committed by
Pablo Vazquez
parent
4a9fced257
commit
f6771d8e21
@@ -314,7 +314,7 @@ wmJob *EEVEE_lightbake_job_create(wmWindowManager *wm,
|
||||
wmJob *wm_job = WM_jobs_get(wm,
|
||||
win,
|
||||
scene,
|
||||
"Bake Lighting",
|
||||
"Baking lighting...",
|
||||
WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_LIGHT_BAKE);
|
||||
|
||||
|
||||
@@ -392,7 +392,7 @@ static wmOperatorStatus lineart_bake_common(bContext *C,
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Line Art",
|
||||
"Baking Line Art...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_LINEART);
|
||||
|
||||
|
||||
@@ -1277,7 +1277,7 @@ void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool bi
|
||||
wmJob *wm_job = WM_jobs_get(wm,
|
||||
CTX_wm_window(C),
|
||||
icon,
|
||||
"StudioLight Icon",
|
||||
"Generating StudioLight icon...",
|
||||
eWM_JobFlag(0),
|
||||
WM_JOB_TYPE_STUDIOLIGHT);
|
||||
Icon **tmp = MEM_callocN<Icon *>(__func__);
|
||||
|
||||
@@ -569,7 +569,7 @@ static wmOperatorStatus multiresbake_image_exec(bContext *C, wmOperator *op)
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Multires Bake",
|
||||
"Baking Multires...",
|
||||
WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_OBJECT_BAKE_TEXTURE);
|
||||
WM_jobs_customdata_set(wm_job, bkr, multiresbake_freejob);
|
||||
|
||||
@@ -2190,7 +2190,7 @@ static wmOperatorStatus bake_invoke(bContext *C, wmOperator *op, const wmEvent *
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Texture Bake",
|
||||
"Baking texture...",
|
||||
WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_OBJECT_BAKE);
|
||||
WM_jobs_customdata_set(wm_job, bkr, bake_freejob);
|
||||
|
||||
@@ -170,7 +170,7 @@ static wmOperatorStatus simulate_to_frame_invoke(bContext *C,
|
||||
wmJob *wm_job = WM_jobs_get(wm,
|
||||
CTX_wm_window(C),
|
||||
CTX_data_scene(C),
|
||||
"Calculate Simulation",
|
||||
"Calculating simulation...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_CALCULATE_SIMULATION_NODES);
|
||||
|
||||
@@ -578,7 +578,7 @@ static wmOperatorStatus start_bake_job(bContext *C,
|
||||
wmJob *wm_job = WM_jobs_get(job->wm,
|
||||
CTX_wm_window(C),
|
||||
job->scene,
|
||||
"Bake Nodes",
|
||||
"Baking nodes...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_BAKE_GEOMETRY_NODES);
|
||||
|
||||
|
||||
@@ -3283,7 +3283,7 @@ static wmOperatorStatus ocean_bake_exec(bContext *C, wmOperator *op)
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Ocean Simulation",
|
||||
"Simulating ocean...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_OBJECT_SIM_OCEAN);
|
||||
OceanBakeJob *oj = MEM_callocN<OceanBakeJob>("ocean bake job");
|
||||
|
||||
@@ -1013,7 +1013,7 @@ static wmOperatorStatus quadriflow_remesh_exec(bContext *C, wmOperator *op)
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
CTX_data_scene(C),
|
||||
"QuadriFlow Remesh",
|
||||
"Remeshing with QuadriFlow...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_QUADRIFLOW_REMESH);
|
||||
|
||||
|
||||
@@ -497,7 +497,7 @@ static wmOperatorStatus dynamicpaint_bake_exec(bContext *C, wmOperator *op)
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
CTX_data_scene(C),
|
||||
"Dynamic Paint Bake",
|
||||
"Baking Dynamic Paint...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_DPAINT_BAKE);
|
||||
|
||||
|
||||
@@ -562,7 +562,7 @@ static wmOperatorStatus fluid_bake_invoke(bContext *C, wmOperator *op, const wmE
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Fluid Bake",
|
||||
"Baking fluid...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_OBJECT_SIM_FLUID);
|
||||
|
||||
@@ -644,7 +644,7 @@ static wmOperatorStatus fluid_free_exec(bContext *C, wmOperator *op)
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Fluid Free",
|
||||
"Freeing fluid...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_OBJECT_SIM_FLUID);
|
||||
|
||||
|
||||
@@ -222,7 +222,7 @@ static wmOperatorStatus ptcache_bake_invoke(bContext *C, wmOperator *op, const w
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
CTX_data_scene(C),
|
||||
"Point Cache",
|
||||
"Baking point cache...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_POINTCACHE);
|
||||
|
||||
|
||||
@@ -1083,7 +1083,7 @@ static wmOperatorStatus screen_render_invoke(bContext *C, wmOperator *op, const
|
||||
name = RPT_("Rendering sequence...");
|
||||
}
|
||||
else {
|
||||
name = RPT_("Render...");
|
||||
name = RPT_("Rendering...");
|
||||
}
|
||||
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
|
||||
@@ -1334,7 +1334,7 @@ static wmOperatorStatus screen_opengl_render_invoke(bContext *C,
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
oglrender->scene,
|
||||
"Viewport Render",
|
||||
"Rendering viewport...",
|
||||
WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_RENDER);
|
||||
WM_jobs_customdata_set(wm_job, oglrender, opengl_render_freejob);
|
||||
|
||||
@@ -1832,7 +1832,7 @@ PreviewLoadJob::~PreviewLoadJob()
|
||||
PreviewLoadJob &PreviewLoadJob::ensure_job(wmWindowManager *wm, wmWindow *win)
|
||||
{
|
||||
wmJob *wm_job = WM_jobs_get(
|
||||
wm, win, nullptr, "Load Previews", eWM_JobFlag(0), WM_JOB_TYPE_LOAD_PREVIEW);
|
||||
wm, win, nullptr, "Loading previews...", eWM_JobFlag(0), WM_JOB_TYPE_LOAD_PREVIEW);
|
||||
|
||||
if (!WM_jobs_is_running(wm_job)) {
|
||||
PreviewLoadJob *job_data = MEM_new<PreviewLoadJob>("PreviewLoadJobData");
|
||||
@@ -2114,7 +2114,7 @@ void ED_preview_icon_job(
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
prv_img,
|
||||
"Icon Preview",
|
||||
"Generating icon preview...",
|
||||
WM_JOB_EXCL_RENDER,
|
||||
WM_JOB_TYPE_RENDER_PREVIEW);
|
||||
|
||||
@@ -2191,7 +2191,7 @@ void ED_preview_shader_job(const bContext *C,
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
owner,
|
||||
"Shader Preview",
|
||||
"Generating shader preview...",
|
||||
WM_JOB_EXCL_RENDER,
|
||||
WM_JOB_TYPE_RENDER_PREVIEW);
|
||||
sp = MEM_callocN<ShaderPreview>("shader preview");
|
||||
|
||||
@@ -443,7 +443,7 @@ static wmOperatorStatus grease_pencil_trace_image_exec(bContext *C, wmOperator *
|
||||
wmJob *wm_job = WM_jobs_get(job->wm,
|
||||
CTX_wm_window(C),
|
||||
job->scene,
|
||||
"Trace Image",
|
||||
"Tracing image...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_TRACE_IMAGE);
|
||||
|
||||
|
||||
@@ -1117,7 +1117,7 @@ void clip_start_prefetch_job(const bContext *C)
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
CTX_data_scene(C),
|
||||
"Prefetching",
|
||||
"Prefetching...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_CLIP_PREFETCH);
|
||||
|
||||
|
||||
@@ -1537,7 +1537,7 @@ static wmOperatorStatus clip_rebuild_proxy_exec(bContext *C, wmOperator * /*op*/
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Building Proxies",
|
||||
"Building proxies...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_CLIP_BUILD_PROXY);
|
||||
|
||||
|
||||
@@ -229,7 +229,7 @@ static wmOperatorStatus solve_camera_invoke(bContext *C, wmOperator *op, const w
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
CTX_data_scene(C),
|
||||
"Solve Camera",
|
||||
"Solving camera...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_CLIP_SOLVE_CAMERA);
|
||||
WM_jobs_customdata_set(wm_job, scj, solve_camera_freejob);
|
||||
|
||||
@@ -317,7 +317,7 @@ static wmOperatorStatus track_markers(bContext *C, wmOperator *op, bool use_job)
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
CTX_data_scene(C),
|
||||
"Track Markers",
|
||||
"Tracking markers...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_CLIP_TRACK_MARKERS);
|
||||
WM_jobs_customdata_set(wm_job, tmj, track_markers_freejob);
|
||||
|
||||
@@ -3323,7 +3323,7 @@ static void filelist_readjob_start_ex(FileList *filelist,
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
filelist,
|
||||
"Listing Dirs...",
|
||||
"Listing directories...",
|
||||
WM_JOB_PROGRESS,
|
||||
filelist_jobtype_get(filelist));
|
||||
WM_jobs_customdata_set(wm_job, flrj, filelist_readjob_free);
|
||||
|
||||
@@ -663,7 +663,7 @@ static void fsmenu_bookmark_validate_job_start(wmWindowManager *wm)
|
||||
wm_job = WM_jobs_get(wm,
|
||||
wm->winactive,
|
||||
wm,
|
||||
"Validating Bookmarks...",
|
||||
"Validating bookmarks...",
|
||||
eWM_JobFlag(0),
|
||||
WM_JOB_TYPE_FSMENU_BOOKMARK_VALIDATE);
|
||||
WM_jobs_customdata_set(wm_job, fsmenu_job, fsmenu_bookmark_validate_job_free);
|
||||
|
||||
@@ -410,7 +410,7 @@ void ED_node_composite_job(const bContext *C, bNodeTree *nodetree, Scene *scene_
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene_owner,
|
||||
"Compositing",
|
||||
"Compositing...",
|
||||
WM_JOB_EXCL_RENDER | WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_COMPOSITE);
|
||||
CompoJob *cj = MEM_new<CompoJob>("compo job");
|
||||
|
||||
@@ -793,7 +793,7 @@ static void ensure_nodetree_previews(const bContext &C,
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(&C),
|
||||
CTX_wm_window(&C),
|
||||
CTX_wm_space_node(&C),
|
||||
"Shader Previews",
|
||||
"Generating shader previews...",
|
||||
WM_JOB_EXCL_RENDER,
|
||||
WM_JOB_TYPE_RENDER_PREVIEW);
|
||||
ShaderNodesPreviewJob *job_data = MEM_new<ShaderNodesPreviewJob>(__func__);
|
||||
|
||||
@@ -590,7 +590,7 @@ static void start_audio_video_job(bContext *C, wmDrag *drag, bool only_audio)
|
||||
Scene *scene = CTX_data_sequencer_scene(C);
|
||||
|
||||
wmJob *wm_job = WM_jobs_get(
|
||||
wm, win, nullptr, "Load Previews", eWM_JobFlag(0), WM_JOB_TYPE_SEQ_DRAG_DROP_PREVIEW);
|
||||
wm, win, nullptr, "Loading previews...", eWM_JobFlag(0), WM_JOB_TYPE_SEQ_DRAG_DROP_PREVIEW);
|
||||
|
||||
DropJobData *job_data = MEM_mallocN<DropJobData>("SeqDragDropPreviewData");
|
||||
get_drag_path(C, drag, job_data->path);
|
||||
|
||||
@@ -185,7 +185,7 @@ void sequencer_preview_add_sound(const bContext *C, const Strip *strip)
|
||||
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
CTX_data_sequencer_scene(C),
|
||||
"Strip Previews",
|
||||
"Generating strip previews...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_SEQ_BUILD_PREVIEW);
|
||||
|
||||
|
||||
@@ -1798,7 +1798,7 @@ static wmOperatorStatus pack_islands_exec(bContext *C, wmOperator *op)
|
||||
}
|
||||
|
||||
wmJob *wm_job = WM_jobs_get(
|
||||
pid->wm, CTX_wm_window(C), scene, "Packing UVs", WM_JOB_PROGRESS, WM_JOB_TYPE_UV_PACK);
|
||||
pid->wm, CTX_wm_window(C), scene, "Packing UVs...", WM_JOB_PROGRESS, WM_JOB_TYPE_UV_PACK);
|
||||
WM_jobs_customdata_set(wm_job, pid, pack_islands_freejob);
|
||||
WM_jobs_timer(wm_job, 0.1, 0, 0);
|
||||
WM_locked_interface_set_with_flags(pid->wm, REGION_DRAW_LOCK_RENDER);
|
||||
|
||||
@@ -232,7 +232,7 @@ bool ABC_export(Scene *scene,
|
||||
wmJob *wm_job = WM_jobs_get(job->wm,
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Alembic Export",
|
||||
"Exporting Alembic...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_ALEMBIC_EXPORT);
|
||||
|
||||
|
||||
@@ -767,7 +767,7 @@ bool ABC_import(bContext *C, const AlembicImportParams *params, bool as_backgrou
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
job->scene,
|
||||
"Alembic Import",
|
||||
"Importing Alembic...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_ALEMBIC_IMPORT);
|
||||
|
||||
|
||||
@@ -813,8 +813,12 @@ bool USD_export(const bContext *C,
|
||||
|
||||
bool export_ok = false;
|
||||
if (as_background_job) {
|
||||
wmJob *wm_job = WM_jobs_get(
|
||||
job->wm, CTX_wm_window(C), scene, "USD Export", WM_JOB_PROGRESS, WM_JOB_TYPE_USD_EXPORT);
|
||||
wmJob *wm_job = WM_jobs_get(job->wm,
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Exporting USD...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_USD_EXPORT);
|
||||
|
||||
/* setup job */
|
||||
WM_jobs_customdata_set(wm_job, job, [](void *j) {
|
||||
|
||||
@@ -449,7 +449,7 @@ bool USD_import(const bContext *C,
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
job->scene,
|
||||
"USD Import",
|
||||
"Importing USD...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_USD_IMPORT);
|
||||
|
||||
|
||||
@@ -257,8 +257,12 @@ void ThumbGenerationJob::ensure_job(const bContext *C, ThumbnailCache *cache)
|
||||
wmWindowManager *wm = CTX_wm_manager(C);
|
||||
wmWindow *win = CTX_wm_window(C);
|
||||
Scene *scene = CTX_data_sequencer_scene(C);
|
||||
wmJob *wm_job = WM_jobs_get(
|
||||
wm, win, scene, "Strip Thumbnails", eWM_JobFlag(0), WM_JOB_TYPE_SEQ_DRAW_THUMBNAIL);
|
||||
wmJob *wm_job = WM_jobs_get(wm,
|
||||
win,
|
||||
scene,
|
||||
"Generating strip thumbnails...",
|
||||
eWM_JobFlag(0),
|
||||
WM_JOB_TYPE_SEQ_DRAW_THUMBNAIL);
|
||||
if (!WM_jobs_is_running(wm_job)) {
|
||||
ThumbGenerationJob *tj = MEM_new<ThumbGenerationJob>("ThumbGenerationJob", scene, cache);
|
||||
WM_jobs_customdata_set(wm_job, tj, free_fn);
|
||||
|
||||
@@ -90,7 +90,7 @@ wmJob *ED_seq_proxy_wm_job_get(const bContext *C)
|
||||
wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
|
||||
CTX_wm_window(C),
|
||||
scene,
|
||||
"Building Proxies",
|
||||
"Building proxies...",
|
||||
WM_JOB_PROGRESS,
|
||||
WM_JOB_TYPE_SEQ_BUILD_PROXY);
|
||||
return wm_job;
|
||||
|
||||
Reference in New Issue
Block a user