[Bf-blender-cvs] [91e0dc0b8e8] userpref_redesign: Move File section into system group

[Julian Eisel]

Commit: 91e0dc0b8e891b24a19ab823f98a4d5caba91d0c
Author: Julian Eisel
Date:   Sat Nov 24 02:32:27 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB91e0dc0b8e891b24a19ab823f98a4d5caba91d0c

Move File section into system group

And rename from "File" to "Files".

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

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 10e29afa591..22fb5af5c58 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -884,7 +884,7 @@ class USERPREF_PT_file(Panel):
     @classmethod
     def poll(cls, context):
         userpref = context.user_preferences
-        return (userpref.active_section == 'FILES')
+        return (userpref.active_section == 'SYSTEM_FILES')
 
     def draw(self, context):
         layout = self.layout
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index a31f914af5a..0eed17cf1ff 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -685,7 +685,7 @@ extern UserDef U; /* from blenkernel blender.c */
 typedef enum eUserPref_Section {
 	USER_SECTION_INTERFACE         = 0,
 	USER_SECTION_EDIT              = 1,
-	USER_SECTION_FILE              = 2,
+	USER_SECTION_SYSTEM_FILES      = 2,
 	USER_SECTION_SYSTEM_GENERAL    = 3,
 	USER_SECTION_THEME             = 4,
 	USER_SECTION_INPUT             = 5,
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 8a49a7a3ea9..6ba0d4d3a7c 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4932,7 +4932,6 @@ void RNA_def_userdef(BlenderRNA *brna)
 		{USER_SECTION_ADDONS, "ADDONS", 0, "Add-ons", ""},
 		{USER_SECTION_THEME, "THEMES", 0, "Themes", ""},
 		{USER_SECTION_LIGHT, "LIGHTS", 0, "Lights", ""},
-		{USER_SECTION_FILE, "FILES", 0, "File", ""},
 #ifdef WITH_USERDEF_WORKSPACES
 		{0, "", ICON_WORKSPACE, "Workspaces", ""},
 		{USER_SECTION_WORKSPACE_CONFIG, "WORKSPACE_CONFIG", 0, "Configuration File", ""},
@@ -4941,6 +4940,7 @@ void RNA_def_userdef(BlenderRNA *brna)
 #endif
 		{0, "", ICON_SYSTEM, "System", ""},
 		{USER_SECTION_SYSTEM_GENERAL, "SYSTEM_GENERAL", 0, "General", ""},
+		{USER_SECTION_SYSTEM_FILES,   "SYSTEM_FILES",   0, "Files",   ""},
 #ifdef WITH_USERDEF_SYSTEM_SPLIT
 		{USER_SECTION_SYSTEM_DISPLAY, "SYSTEM_DISPLAY", 0, "Display", ""},
 		{USER_SECTION_SYSTEM_DEVICES, "SYSTEM_DEVICES", 0, "Devices", ""},