diff options
5 files changed, 13 insertions, 13 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 904e38098e6..f076b9db706 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -425,7 +425,7 @@ def km_screen(params): ("screen.region_flip", {"type": 'F5', "value": 'PRESS'}, None), ("screen.redo_last", {"type": 'F6', "value": 'PRESS'}, None), ("script.reload", {"type": 'F8', "value": 'PRESS'}, None), - ("screen.settings_show", {"type": 'U', "value": 'PRESS', "ctrl": True, "alt": True}, None), + ("screen.userpref_show", {"type": 'U', "value": 'PRESS', "ctrl": True, "alt": True}, None), ]) if params.apple: @@ -434,7 +434,7 @@ def km_screen(params): ("ed.undo", {"type": 'Z', "value": 'PRESS', "oskey": True}, None), ("ed.redo", {"type": 'Z', "value": 'PRESS', "shift": True, "oskey": True}, None), ("ed.undo_history", {"type": 'Z', "value": 'PRESS', "alt": True, "oskey": True}, None), - ("screen.settings_show", {"type": 'COMMA', "value": 'PRESS', "oskey": True}, None), + ("screen.userpref_show", {"type": 'COMMA', "value": 'PRESS', "oskey": True}, None), ]) return keymap diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index a769268bb22..f1a91d08040 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -834,7 +834,7 @@ class TOPBAR_MT_edit(Menu): layout.separator() - layout.operator("screen.settings_show", text="Settings...", icon='PREFERENCES') + layout.operator("screen.userpref_show", text="Preferences...", icon='PREFERENCES') class TOPBAR_MT_window(Menu): @@ -987,7 +987,7 @@ class TOPBAR_MT_window_specials(Menu): layout.separator() - layout.operator("screen.settings_show", text="Settings...", icon='PREFERENCES') + layout.operator("screen.userpref_show", text="Preferences...", icon='PREFERENCES') class TOPBAR_MT_workspace_menu(Menu): diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 812455333e9..b2a86be2c3c 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -4336,7 +4336,7 @@ static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot) /** \name Show User Preferences Operator * \{ */ -static int settings_show_invoke(bContext *C, wmOperator *op, const wmEvent *event) +static int userpref_show_invoke(bContext *C, wmOperator *op, const wmEvent *event) { int sizex = (800 + UI_NAVIGATION_REGION_WIDTH) * UI_DPI_FAC; int sizey = 500 * UI_DPI_FAC; @@ -4352,15 +4352,15 @@ static int settings_show_invoke(bContext *C, wmOperator *op, const wmEvent *even } -static void SCREEN_OT_settings_show(struct wmOperatorType *ot) +static void SCREEN_OT_userpref_show(struct wmOperatorType *ot) { /* identifiers */ - ot->name = "Show Blender Settings"; - ot->description = "Edit user preferences, workspaces and system settings"; - ot->idname = "SCREEN_OT_settings_show"; + ot->name = "Show Preferences"; + ot->description = "Edit user preferences and system settings"; + ot->idname = "SCREEN_OT_userpref_show"; /* api callbacks */ - ot->invoke = settings_show_invoke; + ot->invoke = userpref_show_invoke; ot->poll = ED_operator_screenactive; } @@ -4818,7 +4818,7 @@ void ED_operatortypes_screen(void) WM_operatortype_append(SCREEN_OT_back_to_previous); WM_operatortype_append(SCREEN_OT_spacedata_cleanup); WM_operatortype_append(SCREEN_OT_screenshot); - WM_operatortype_append(SCREEN_OT_settings_show); + WM_operatortype_append(SCREEN_OT_userpref_show); WM_operatortype_append(SCREEN_OT_drivers_editor_show); WM_operatortype_append(SCREEN_OT_region_blend); WM_operatortype_append(SCREEN_OT_space_context_cycle); diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 808804b7c21..1e714f1dfb4 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1662,7 +1662,7 @@ static int wm_userpref_write_exec(bContext *C, wmOperator *op) void WM_OT_save_userpref(wmOperatorType *ot) { - ot->name = "Save Settings"; + ot->name = "Save Preferences"; ot->idname = "WM_OT_save_userpref"; ot->description = "Save user preferences separately, overrides startup file preferences"; diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 53394aa927f..53db8f931a5 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -954,7 +954,7 @@ wmWindow *WM_window_open_temp(bContext *C, int x, int y, int sizex, int sizey, i if (sa->spacetype == SPACE_IMAGE) title = IFACE_("Blender Render"); else if (ELEM(sa->spacetype, SPACE_OUTLINER, SPACE_USERPREF)) - title = IFACE_("Blender Settings"); + title = IFACE_("Blender Preferences"); else if (sa->spacetype == SPACE_FILE) title = IFACE_("Blender File View"); else if (sa->spacetype == SPACE_IPO) |