Page MenuHome
Differential D6522 Diff 30816 source/blender/windowmanager/intern/wm_files.c

Changeset View

Standalone View

View Options

source/blender/windowmanager/intern/wm_files.c

Show First 20 Lines • Show All 87 Lines • ▼ Show 20 Lines
PointerRNA ptr_a, ptr_b; PointerRNA ptr_a, ptr_b;
RNA_pointer_create(NULL, &RNA_Preferences, userdef_prev, &ptr_a); RNA_pointer_create(NULL, &RNA_Preferences, userdef_prev, &ptr_a);
RNA_pointer_create(NULL, &RNA_Preferences, userdef_curr, &ptr_b); RNA_pointer_create(NULL, &RNA_Preferences, userdef_curr, &ptr_b);
const bool is_dirty = userdef_curr->runtime.is_dirty; const bool is_dirty = userdef_curr->runtime.is_dirty;
rna_struct_update_when_changed(C, bmain, &ptr_a, &ptr_b); rna_struct_update_when_changed(C, bmain, &ptr_a, &ptr_b);
WM_reinit_gizmomap_all(bmain); WM_reinit_gizmomap_all(bmain);
WM_keyconfig_reload(C); WM_keyconfig_reload(C);
SeverinUnsubmitted
Done
Inline Actions

This static variable is easy to avoid I think. Just pass it as arg to UI_popup_block_invoke(), to the functions that need it, and via arg2 in UI_but_func_set() to the buttons that need it. You should use POINTER_FROM_INT()/POINTER_AS_INT() for that.

Severin: This static variable is easy to avoid I think. Just pass it as `arg` to `UI_popup_block_invoke…
userdef_curr->runtime.is_dirty = is_dirty; userdef_curr->runtime.is_dirty = is_dirty;
} }
/* Warning dialog box for the "loading factory settings" operator. */
static void wm_block_load_factory_cancel(bContext *C, void *arg_block, void *UNUSED(arg))
{
wmWindow *win = CTX_wm_window(C);
UI_popup_block_close(C, win, arg_block);
}
static void wm_block_load_factory_load(bContext *C, void *arg_block, void *arg)
{
wmWindow *win = CTX_wm_window(C);
UI_popup_block_close(C, win, arg_block);
const bool load_startup_file = POINTER_AS_INT(arg);
WM_operator_name_call(C,
load_startup_file ?
"WM_OT_read_factory_settings" :
"WM_OT_read_factory_userpref",
WM_OP_EXEC_DEFAULT, NULL);
}
static void wm_block_load_factory_cancel_button(uiBlock *block)
{
uiBut *but = uiDefIconTextBut(
block, UI_BTYPE_BUT, 0, ICON_NONE, IFACE_("Cancel"), 0, 0, 0, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
UI_but_func_set(but, wm_block_load_factory_cancel, block, NULL);
UI_but_drawflag_disable(but, UI_BUT_TEXT_LEFT);
}
static void wm_block_load_factory_load_button(uiBlock *block, const bool load_startup_file)
{
uiBut *but = uiDefIconTextBut(block,
UI_BTYPE_BUT,
0,
ICON_NONE,
load_startup_file ?
IFACE_("Load Factory Settings") :
IFACE_("Load Factory Preferences"),
0,
0,
0,
UI_UNIT_Y,
NULL,
0,
0,
0,
0,
"");
UI_but_func_set(but, wm_block_load_factory_load, block, POINTER_FROM_INT(load_startup_file));
UI_but_drawflag_disable(but, UI_BUT_TEXT_LEFT);
UI_but_flag_enable(but, UI_BUT_ACTIVE_DEFAULT);
}
HooglyBooglyUnsubmitted
Done
Inline Actions

This should take into account rBbdad412fa76e6f so the dialog is wide enough with any text size setting.

HooglyBoogly: This should take into account rBbdad412fa76e6f so the dialog is wide enough with any text size…
static uiBlock *block_create_load_factory_dialog(struct bContext *C,
struct ARegion *region,
void *arg)
{
const bool load_startup_file = POINTER_AS_INT(arg);
uiBlock *block = UI_block_begin(C, region, "load_factory_dialog", UI_EMBOSS);
uiLayout *layout = uiLayoutAlertIconSplitWrapperCreate(block, 42, ALERT_ICON_WARNING);
SeverinUnsubmitted
Not Done
Inline Actions

Where is this function coming from? I can't find it in master.

Severin: Where is this function coming from? I can't find it in master.
/* Title. */
uiItemL_ex(layout,
load_startup_file ?
TIP_("Load Factory Startup File and Preferences?") :
TIP_("Load Factory Preferences?"),
ICON_NONE,
true,
false);
/* Explanation text. */
uiLayout *col = uiLayoutColumn(layout, true);
uiItemL(
col,
TIP_("Preferences will not be saved when quitting after loading factory settings."),
ICON_NONE);
uiItemL(
col,
load_startup_file ?
TIP_("Use \"Save Startup File\" and \"Save Preferences\" to make permanent changes.") :
TIP_("Use \"Save Preferences\" to make permanent changes to preferences."),
ICON_NONE);
/* The current file will not be saved before loading the factory startup file. */
if (load_startup_file) {
if (U.uiflag & USER_SAVE_PROMPT &&
wm_file_or_image_is_modified(CTX_data_main(C), CTX_wm_manager(C))) {
col = uiLayoutColumn(layout, false); /* As a separator. */
uiItemL_ex(
col, TIP_("The current file will not be saved."), ICON_NONE, false, true);
}
}
HooglyBooglyUnsubmitted
Done
Inline Actions

I would suggest something more like: "Preferences will not be saved when quitting after loading factory settings."

HooglyBoogly: I would suggest something more like: "Preferences will not be saved when quitting after loading…
/* The space before the buttons. */
uiItemS_ex(layout, 3.0f);
uiLayout *split = uiLayoutSplit(layout, 0.2f, false);
HooglyBooglyUnsubmitted
Done
Inline Actions

Here I would suggest "Use \"Save Startup File\" and \"Save Preferences\" to make permanent changes to preferences."

HooglyBoogly: Here I would suggest "Use \"Save Startup File\" and \"Save Preferences\" to make permanent…
uiLayoutSetScaleY(split, 1.2f);
/* Empty space on left. */
uiLayoutColumn(split, false);
#ifdef _WIN32
const bool windows_layout = true;
#else
const bool windows_layout = false;
HooglyBooglyUnsubmitted
Done
Inline Actions

What about using the warning icon here? I think that's more common, I've never seen "WARNING" in Blender before.

HooglyBoogly: What about using the warning icon here? I think that's more common, I've never seen "WARNING"…
#endif
/* Create buttons of different widths. */
uiLayout *split_right = uiLayoutSplit(split, windows_layout ? 0.6f : 0.4f, false);
/* "Load" button (Windows standard layout). */
if (windows_layout) {
uiLayoutColumn(split_right, false);
wm_block_load_factory_load_button(block, load_startup_file);
}
/* "Cancel" button. */
uiLayoutColumn(split_right, false);
wm_block_load_factory_cancel_button(block);
/* "Load" button (Non-Windows layout, macOS and Linux). */
if (!windows_layout) {
uiLayoutColumn(split_right, false);
wm_block_load_factory_load_button(block, load_startup_file);
}
UI_block_bounds_set_centered(block, 14 * U.dpi_fac);
return block;
}
static int wm_read_factory_settings_invoke(
bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
{
const bool load_startup_file = true;
UI_popup_block_invoke(
C, block_create_load_factory_dialog, POINTER_FROM_INT(load_startup_file), NULL);
return OPERATOR_INTERFACE;
}
static int wm_read_factory_userpref_invoke(
SeverinUnsubmitted
Done
Inline Actions

I know this follows existing code, but I'd prefer logic to not depend on operator names.
Instead you could have different invoke functions for the different operators.

Severin: I know this follows existing code, but I'd prefer logic to not depend on operator names.
bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
{
const bool load_startup_file = false;
UI_popup_block_invoke(
C, block_create_load_factory_dialog, POINTER_FROM_INT(load_startup_file), NULL);
return OPERATOR_INTERFACE;
}
static int wm_userpref_read_exec(bContext *C, wmOperator *op) static int wm_userpref_read_exec(bContext *C, wmOperator *op)
{ {
const bool use_data = false; const bool use_data = false;
const bool use_userdef = true; const bool use_userdef = true;
const bool use_factory_settings = STREQ(op->type->idname, "WM_OT_read_factory_userpref"); const bool use_factory_settings = STREQ(op->type->idname, "WM_OT_read_factory_userpref");
UserDef U_backup = U; UserDef U_backup = U;
Show All 35 Lines
ot->invoke = WM_operator_confirm; ot->invoke = WM_operator_confirm;
ot->exec = wm_userpref_read_exec; ot->exec = wm_userpref_read_exec;
} }
void WM_OT_read_factory_userpref(wmOperatorType *ot) void WM_OT_read_factory_userpref(wmOperatorType *ot)
{ {
ot->name = "Load Factory Preferences"; ot->name = "Load Factory Preferences";
ot->idname = "WM_OT_read_factory_userpref"; ot->idname = "WM_OT_read_factory_userpref";
ot->description = ot->description = "Load factory default preferences";
"Load factory default preferences. "
"To make changes to preferences permanent, use \"Save Preferences\"";
ot->invoke = WM_operator_confirm; ot->invoke = wm_read_factory_userpref_invoke;
ot->exec = wm_userpref_read_exec; ot->exec = wm_userpref_read_exec;
} }
/** \} */ /** \} */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Read File History Operator /** \name Read File History Operator
* \{ */ * \{ */
▲ Show 20 Lines • Show All 155 Lines • ▼ Show 20 Lines
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
} }
void WM_OT_read_homefile(wmOperatorType *ot) void WM_OT_read_homefile(wmOperatorType *ot)
{ {
PropertyRNA *prop; PropertyRNA *prop;
ot->name = "Reload Start-Up File"; ot->name = "Reload Start-Up File";
ot->idname = "WM_OT_read_homefile"; ot->idname = "WM_OT_read_homefile";
ot->description = "Open the default file (doesn't save the current file)"; ot->description = "Open the default file";
ot->invoke = wm_homefile_read_invoke; ot->invoke = wm_homefile_read_invoke;
ot->exec = wm_homefile_read_exec; ot->exec = wm_homefile_read_exec;
prop = RNA_def_string_file_path( prop = RNA_def_string_file_path(
ot->srna, "filepath", NULL, FILE_MAX, "File Path", "Path to an alternative start-up file"); ot->srna, "filepath", NULL, FILE_MAX, "File Path", "Path to an alternative start-up file");
RNA_def_property_flag(prop, PROP_HIDDEN); RNA_def_property_flag(prop, PROP_HIDDEN);
Show All 16 Lines
/* omit poll to run in background mode */ /* omit poll to run in background mode */
} }
void WM_OT_read_factory_settings(wmOperatorType *ot) void WM_OT_read_factory_settings(wmOperatorType *ot)
{ {
ot->name = "Load Factory Settings"; ot->name = "Load Factory Settings";
ot->idname = "WM_OT_read_factory_settings"; ot->idname = "WM_OT_read_factory_settings";
ot->description = ot->description = "Load factory default startup file and preferences";
"Load factory default startup file and preferences. "
"To make changes permanent, use \"Save Startup File\" and \"Save Preferences\"";
ot->invoke = WM_operator_confirm; ot->invoke = wm_read_factory_settings_invoke;
ot->exec = wm_homefile_read_exec; ot->exec = wm_homefile_read_exec;
read_homefile_props(ot); read_homefile_props(ot);
/* omit poll to run in background mode */ /* omit poll to run in background mode */
} }
/** \} */ /** \} */
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines