[Bf-blender-cvs] [104af87614b] userpref_redesign: Rename "User Preferences" to "Settings" in the UI
Julian Eisel
noreply at git.blender.org
Mon Feb 26 23:20:28 CET 2018
Commit: 104af87614b1a06a2c3436bf1dfb951cc5ac0f30
Author: Julian Eisel
Date: Mon Feb 26 23:18:03 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB104af87614b1a06a2c3436bf1dfb951cc5ac0f30
Rename "User Preferences" to "Settings" in the UI
===================================================================
M release/scripts/presets/keyconfig/3dsmax.py
M release/scripts/presets/keyconfig/maya.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/space_info.py
M source/blender/editors/screen/screen_ops.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py
index a4288377b82..b9ca1a2af65 100644
--- a/release/scripts/presets/keyconfig/3dsmax.py
+++ b/release/scripts/presets/keyconfig/3dsmax.py
@@ -110,7 +110,7 @@ kmi.properties.animation = True
kmi = km.keymap_items.new('render.view_cancel', 'ESC', 'PRESS')
kmi = km.keymap_items.new('render.view_show', 'F11', 'PRESS')
kmi = km.keymap_items.new('render.play_rendered_anim', 'F11', 'PRESS', ctrl=True)
-kmi = km.keymap_items.new('screen.userpref_show', 'U', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('screen.settings_show', 'U', 'PRESS', ctrl=True, alt=True)
# Map Markers
km = kc.keymaps.new('Markers', space_type='EMPTY', region_type='WINDOW', modal=False)
diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py
index 3075e0bd009..6840a63cf22 100644
--- a/release/scripts/presets/keyconfig/maya.py
+++ b/release/scripts/presets/keyconfig/maya.py
@@ -108,7 +108,7 @@ kmi.properties.animation = True
kmi = km.keymap_items.new('render.view_cancel', 'ESC', 'PRESS')
kmi = km.keymap_items.new('render.view_show', 'F11', 'PRESS')
kmi = km.keymap_items.new('render.play_rendered_anim', 'F11', 'PRESS', ctrl=True)
-kmi = km.keymap_items.new('screen.userpref_show', 'U', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('screen.settings_show', 'U', 'PRESS', ctrl=True, alt=True)
# Map View2D
km = kc.keymaps.new('View2D', space_type='EMPTY', region_type='WINDOW', modal=False)
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 022ee1576d8..d30edb4bfb7 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -2226,7 +2226,7 @@ class WM_OT_addon_userpref_show(Operator):
context.user_preferences.active_section = 'ADDONS'
context.window_manager.addon_filter = 'All'
context.window_manager.addon_search = info["name"]
- bpy.ops.screen.userpref_show('INVOKE_DEFAULT')
+ bpy.ops.screen.settings_show('INVOKE_DEFAULT')
return {'FINISHED'}
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index 8c69e733a2d..49fe4ddcd0e 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -135,7 +135,7 @@ class INFO_MT_file(Menu):
layout.separator()
- layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
+ layout.operator("screen.settings_show", text="Settings", icon='PREFERENCES')
layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.save_homefile", icon='SAVE_PREFS')
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index bfe1754adec..56593486c08 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4016,16 +4016,16 @@ static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot)
/** \} */
/* -------------------------------------------------------------------- */
-/** \name Show User Preferences Operator
+/** \name Show Blender Settings Operator
* \{ */
-static int userpref_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+static int settings_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
const int sizex = 1024 * UI_DPI_FAC;
const int sizey = 614 * UI_DPI_FAC;
/* changes context! */
- if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_USERPREFS) != NULL) {
+ if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_SETTINGS) != NULL) {
return OPERATOR_FINISHED;
}
else {
@@ -4035,15 +4035,16 @@ static int userpref_show_invoke(bContext *C, wmOperator *op, const wmEvent *even
}
-static void SCREEN_OT_userpref_show(struct wmOperatorType *ot)
+static void SCREEN_OT_settings_show(struct wmOperatorType *ot)
{
/* identifiers */
- ot->name = "Show User Preferences";
- ot->description = "Show user preferences";
- ot->idname = "SCREEN_OT_userpref_show";
+ ot->name = "Show Blender Settings";
+ ot->description = "Show window for global Blender settings (user preferences, "
+ "workspace configurations, system settings)";
+ ot->idname = "SCREEN_OT_settings_show";
/* api callbacks */
- ot->invoke = userpref_show_invoke;
+ ot->invoke = settings_show_invoke;
ot->poll = ED_operator_screenactive;
}
@@ -4373,7 +4374,7 @@ void ED_operatortypes_screen(void)
WM_operatortype_append(SCREEN_OT_spacedata_cleanup);
WM_operatortype_append(SCREEN_OT_screenshot);
WM_operatortype_append(SCREEN_OT_screencast);
- WM_operatortype_append(SCREEN_OT_userpref_show);
+ WM_operatortype_append(SCREEN_OT_settings_show);
WM_operatortype_append(SCREEN_OT_region_blend);
WM_operatortype_append(SCREEN_OT_space_context_cycle);
@@ -4545,9 +4546,9 @@ void ED_keymap_screen(wmKeyConfig *keyconf)
/* user prefs */
#ifdef __APPLE__
- WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_OSKEY, 0);
+ WM_keymap_add_item(keymap, "SCREEN_OT_settings_show", COMMAKEY, KM_PRESS, KM_OSKEY, 0);
#endif
- WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", UKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
+ WM_keymap_add_item(keymap, "SCREEN_OT_settings_show", UKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
/* Anim Playback ------------------------------------------------ */
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 4449736d2a5..db7f526e9bb 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -122,7 +122,7 @@ bool WM_window_is_temp_screen(const struct wmWindow *win) ATTR_WARN_UNUSED_RESUL
/* defines for 'type' WM_window_open_temp */
enum {
WM_WINDOW_RENDER = 1,
- WM_WINDOW_USERPREFS,
+ WM_WINDOW_SETTINGS,
// WM_WINDOW_FILESEL // UNUSED
};
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 103f8d580c1..f7bda316e46 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -697,7 +697,7 @@ wmWindow *WM_window_open(bContext *C, const rcti *rect)
* Uses `screen->temp` tag to define what to do, currently it limits
* to only one "temp" window for render out, preferences, filewindow, etc...
*
- * \param type: WM_WINDOW_RENDER, WM_WINDOW_USERPREFS...
+ * \param type: WM_WINDOW_RENDER, WM_WINDOW_SETTINGS...
* \return the window or NULL.
*/
wmWindow *WM_window_open_temp(bContext *C, int x, int y, int sizex, int sizey, int type)
@@ -797,7 +797,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 User Preferences");
+ title = IFACE_("Blender Settings");
else if (sa->spacetype == SPACE_FILE)
title = IFACE_("Blender File View");
else
More information about the Bf-blender-cvs
mailing list