[Bf-blender-cvs] [cbe7ecb8bdd] userpref_redesign: Address review inline comments

[Julian Eisel]

Commit: cbe7ecb8bdd37f3ea187ae227a958f38eb7df2b7
Author: Julian Eisel
Date:   Sat Nov 24 01:08:49 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rBcbe7ecb8bdd37f3ea187ae227a958f38eb7df2b7

Address review inline comments

===================================================================

M	source/blender/blenkernel/intern/screen.c
M	source/blender/editors/interface/interface_layout.c
M	source/blender/editors/screen/screen_ops.c
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c
M	source/blender/windowmanager/WM_api.h
M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index b25506f2368..e23291d42d4 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -671,7 +671,7 @@ void BKE_screen_remove_unused_scrverts(bScreen *sc)
 /**
  * Find a region of type \a region_type in the currently active space of \a sa.
  *
- * \note This does __not__ work if the region to look up is not in the active
+ * \note This does _not_ work if the region to look up is not in the active
  *       space. Use #BKE_spacedata_find_region_type if that may be the case.
  */
 ARegion *BKE_area_find_region_type(const ScrArea *sa, int region_type)
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 6b884726e25..e5a301e2d02 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -655,6 +655,7 @@ static void ui_item_enum_expand_exec(
 	uiLayout *layout_radial = NULL;
 	const EnumPropertyItem *item, *item_array;
 	const char *name;
+	char group_name[UI_MAX_NAME_STR];
 	int itemw, icon, value;
 	bool free;
 	bool radial = (layout->root->type == UI_LAYOUT_PIEMENU);
@@ -691,13 +692,10 @@ static void ui_item_enum_expand_exec(
 
 		if (!item->identifier[0]) {
 			if (item->name) {
-				size_t group_name_len = strlen(item->name) + 2;
-				char *group_name = alloca(group_name_len);
-
 				if (!is_first) {
 					uiItemS(block->curlayout);
 				}
-				BLI_snprintf(group_name, group_name_len, "%s:", item->name);
+				BLI_snprintf(group_name, sizeof(group_name), "%s:", item->name);
 				uiItemL(block->curlayout, group_name, item->icon);
 			}
 			else {
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index d839924ba4f..2305ce8f5fe 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4338,7 +4338,7 @@ static int settings_show_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	int sizey = 500 * UI_DPI_FAC;
 
 	/* changes context! */
-	if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_SETTINGS) != NULL) {
+	if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_USERPREFS) != NULL) {
 		return OPERATOR_FINISHED;
 	}
 	else {
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index ebc77629036..a31f914af5a 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -697,7 +697,7 @@ typedef enum eUserPref_Section {
 	USER_SECTION_WORKSPACE_KEYMAPS = 10,
 #endif
 #ifdef WITH_USERDEF_SYSTEM_SPLIT
-	USER_SECTION_SYSTEM_DRAWING    = 11,
+	USER_SECTION_SYSTEM_DISPLAY    = 11,
 	USER_SECTION_SYSTEM_DEVICES    = 12,
 #endif
 } eUserPref_Section;
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index a62d2f6d934..914c109eea9 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4942,7 +4942,7 @@ void RNA_def_userdef(BlenderRNA *brna)
 		{0, "", ICON_SYSTEM, "System", ""},
 		{USER_SECTION_SYSTEM_GENERAL, "SYSTEM_GENERAL", 0, "General", ""},
 #ifdef WITH_USERDEF_SYSTEM_SPLIT
-		{USER_SECTION_SYSTEM_DRAWING, "SYSTEM_DRAWING", 0, "Drawing", ""},
+		{USER_SECTION_SYSTEM_DISPLAY, "SYSTEM_DISPLAY", 0, "Display", ""},
 		{USER_SECTION_SYSTEM_DEVICES, "SYSTEM_DEVICES", 0, "Devices", ""},
 #endif
 		{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 8cc0c494a61..adf082982b7 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -140,7 +140,7 @@ void WM_opengl_context_release(void *context);
 /* defines for 'type' WM_window_open_temp */
 enum {
 	WM_WINDOW_RENDER = 1,
-	WM_WINDOW_SETTINGS,
+	WM_WINDOW_USERPREFS,
 	WM_WINDOW_DRIVERS,
 	// WM_WINDOW_FILESEL // UNUSED
 };
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 7f5aea9a840..a3ce85b5d8e 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -843,7 +843,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_SETTINGS...
+ * \param type: WM_WINDOW_RENDER, WM_WINDOW_USERPREFS...
  * \return the window or NULL.
  */
 wmWindow *WM_window_open_temp(bContext *C, int x, int y, int sizex, int sizey, int type)