Differential D6522 Diff 27927 source/blender/windowmanager/intern/wm_files.c

Changeset View

Standalone View

source/blender/windowmanager/intern/wm_files.c

Context not available.
	userdef_curr->runtime.is_dirty = is_dirty;	userdef_curr->runtime.is_dirty = is_dirty;
	}	}

		/**
		* Load Factory Preferences/Settings warning dialog box.
		*/

		static bool load_factory_startup_file = false;
		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…

		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 *UNUSED(arg))
		{
		wmWindow *win = CTX_wm_window(C);
		UI_popup_block_close(C, win, arg_block);

		WM_operator_name_call(C,
		load_factory_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)
		{
		uiBut *but = uiDefIconTextBut(block,
		UI_BTYPE_BUT,
		0,
		ICON_NONE,
		load_factory_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, NULL);
		UI_but_drawflag_disable(but, UI_BUT_TEXT_LEFT);
		UI_but_flag_enable(but, UI_BUT_ACTIVE_DEFAULT);
		}

		static uiBlock block_create_load_factory_dialog(struct bContext C,
		struct ARegion *region,
		void *UNUSED(arg))
		{
		const uiStyle *style = UI_style_get_dpi();
		const int dialog_width = U.widget_unit * 26;
		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…
		const short icon_size = 64 * U.dpi_fac;
		/* Fixed size for icon column. */
		const float split_factor =
		(float)(icon_size + 6.0f * U.dpi_fac) / (float)(dialog_width - style->columnspace);

		uiBlock *block = UI_block_begin(C, region, "load_factory_dialog", UI_EMBOSS);

		UI_block_flag_enable(
		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.
		block, UI_BLOCK_KEEP_OPEN \| UI_BLOCK_LOOP \| UI_BLOCK_NO_WIN_CLIP \| UI_BLOCK_NUMSELECT);
		UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_POPUP);
		UI_block_emboss_set(block, UI_EMBOSS);

		uiLayout *block_layout = UI_block_layout(
		block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, dialog_width, 0, 0, style);

		/* Split layout to put alert icon on left side. */
		uiLayout *split_block = uiLayoutSplit(block_layout, split_factor, false);

		/* Alert icon. */
		uiLayout *layout = uiLayoutRow(split_block, false);
		uiLayoutSetAlignment(layout, UI_LAYOUT_ALIGN_LEFT);
		uiDefButAlert(block, ALERT_ICON_QUESTION, 0, 0, icon_size, icon_size);

		/* The rest of the content on the right. */
		layout = uiLayoutColumn(split_block, false);

		/* Title. */
		uiItemL_ex(layout,
		load_factory_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_("Loading factory settings won't automatically save your preferences on quit."),
		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…
		ICON_NONE);
		uiItemL(
		col,
		load_factory_startup_file ?
		TIP_("To make changes permanent, use \"Save Startup File\" and \"Save Preferences\".") :
		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…
		TIP_("To make changes to preferences permanent, use \"Save Preferences\"."),
		ICON_NONE);

		/* The current file will not be saved before loading the factory startup file. */
		if (load_factory_startup_file) {
		if (U.uiflag & USER_SAVE_PROMPT &&
		wm_file_or_image_is_modified(CTX_data_main(C), CTX_wm_manager(C))) {
		uiItemL_ex(
		layout,TIP_("WARNING: The current file will not be saved."), ICON_NONE, false, true);
		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"…
		}
		}

		/* The space before the buttons. */
		uiItemS_ex(layout, 3.0f);

		uiLayout *split = uiLayoutSplit(layout, 0.2f, false);
		uiLayoutSetScaleY(split, 1.2f);

		/* Empty space. */
		uiLayoutColumn(split, false);

		#ifdef _WIN32
		/* "Load" button (Windows standard layout). */
		uiLayoutColumn(split, false);
		wm_block_load_factory_load_button(block);
		#endif

		/* "Cancel" button. */
		uiLayoutColumn(split, false);
		wm_block_load_factory_cancel_button(block);

		#ifndef _WIN32
		/* "Load" button (Non-Windows layout, macOS and Linux). */
		uiLayoutColumn(split, false);
		wm_block_load_factory_load_button(block);
		#endif

		UI_block_bounds_set_centered(block, 14 * U.dpi_fac);

		return block;
		}

		static int wm_load_factory_invoke(bContext C, wmOperator op, const wmEvent *UNUSED(event))
		{
		load_factory_startup_file = STREQ(op->type->idname, "WM_OT_read_factory_settings");
		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.

		UI_popup_block_invoke(C, block_create_load_factory_dialog, NULL, 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;
Context not available.
	{	{
	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_load_factory_invoke;
	ot->exec = wm_userpref_read_exec;	ot->exec = wm_userpref_read_exec;
	}	}

Context not available.
	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;
Context not available.
	{	{
	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_load_factory_invoke;
	ot->exec = wm_homefile_read_exec;	ot->exec = wm_homefile_read_exec;

	read_homefile_props(ot);	read_homefile_props(ot);
Context not available.