blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

WIP: Splash Screen Preferences Warning #110978

Closed
Harley Acheson wants to merge 7 commits from Harley/blender:SplashPrefs into main
pull from: Harley/blender:SplashPrefs
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 10 Commits 7 Files Changed 1 +62 -9
1 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
source/blender/windowmanager/intern/wm_splash_screen.cc
View File

@ -46,6 +46,8 @@
#include "UI_interface_icons.hh"
#include "UI_resources.hh"
#include "RNA_access.hh"
#include "WM_api.hh"
#include "WM_types.hh"
@ -169,6 +171,19 @@ static ImBuf *wm_block_splash_image(int width, int *r_height)
return ibuf;
}
static void new_manual_load_settings_fn(struct bContext *C, void * /*arg1*/, void * /*arg2*/)
{
WM_cursor_wait(true);
PointerRNA ptr_props;
char buf[512] = "wiki.blender.org/wiki/Reference/Release_Notes/4.0/Keymap";
WM_operator_properties_create(&ptr_props, "WM_OT_url_open");
RNA_string_set(&ptr_props, "url", buf);
WM_operator_name_call_ptr(
C, WM_operatortype_find("WM_OT_url_open", false), WM_OP_EXEC_DEFAULT, &ptr_props, nullptr);
WM_operator_properties_free(&ptr_props);
WM_cursor_wait(false);
}
static uiBlock *wm_block_create_splash(bContext *C, ARegion *region, void * /*arg*/)
{
const uiStyle *style = UI_style_get_dpi();
@ -186,6 +201,14 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *region, void * /*ar
CLAMP_MAX(splash_width, CTX_wm_window(C)->sizex * 0.7f);
int splash_height;
MenuType *mt;
char userpref[FILE_MAX];
const char *const cfgdir = BKE_appdir_folder_id(BLENDER_USER_CONFIG, nullptr);
if (cfgdir) {
BLI_path_join(userpref, sizeof(userpref), cfgdir, BLENDER_USERPREF_FILE);
}
/* Would be nice to support caching this, so it only has to be re-read (and likely resized) on
* first draw or if the image changed. */
ImBuf *ibuf = wm_block_splash_image(splash_width, &splash_height);
@ -194,7 +217,9 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *region, void * /*ar
uiBut *but = uiDefButImage(
block, ibuf, 0, 0.5f * U.widget_unit, splash_width, splash_height, nullptr);
UI_but_func_set(but, wm_block_close, block, nullptr);
if (BLI_exists(userpref)) {
UI_but_func_set(but, wm_block_close, block, nullptr);
}
wm_block_splash_add_label(block,
BKE_blender_version_string(),
@ -213,16 +238,44 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *region, void * /*ar
0,
style);
MenuType *mt;
char userpref[FILE_MAX];
const char *const cfgdir = BKE_appdir_folder_id(BLENDER_USER_CONFIG, nullptr);
if (cfgdir) {
BLI_path_join(userpref, sizeof(userpref), cfgdir, BLENDER_USERPREF_FILE);
}
/* Draw setup screen if no preferences have been saved yet. */
if (!BLI_exists(userpref)) {
const uiStyle *style = UI_style_get_dpi();
const short icon_size = 36 * UI_SCALE_FAC;
const float icon_padding = 5.0f * UI_SCALE_FAC;
/* Calculate the factor of the fixed icon column depending on the block width. */
const float split_factor = (float(icon_size) + icon_padding) /
float(splash_width - style->columnspace);
uiLayout *box = uiLayoutBox(layout);
uiLayout *split_block = uiLayoutSplit(box, split_factor, false);
uiLayoutSetAlignment(split_block, UI_LAYOUT_ALIGN_LEFT);
uiBut *icon = uiDefButAlert(block, ALERT_ICON_INFO, 0, 0, icon_size, icon_size);
UI_but_func_set(icon, new_manual_load_settings_fn, nullptr, nullptr);
/* The rest of the content on the right. */
uiLayout *right = uiLayoutColumn(split_block, false);
uiLayoutSetScaleY(right, 1.8f);
uiBut *link = uiDefBut(block,
UI_BTYPE_BUT_MENU,
1,
IFACE_("Learn more about the Blender 4.0 shortcut changes..."),
0,
0,
0,
UI_UNIT_Y,
nullptr,
0,
0,
0,
0,
TIP_("Open browser with information about this topic"));
UI_but_func_set(link, new_manual_load_settings_fn, nullptr, nullptr);
mt = WM_menutype_find("WM_MT_splash_quick_setup", true);
/* The #UI_BLOCK_QUICK_SETUP flag prevents the button text from being left-aligned,