[Bf-blender-cvs] [33dc1214b19] userpref_redesign: Rename "Editing" section to "General"

[Julian Eisel]

Commit: 33dc1214b197f4bdc82baf3e54107a2f223d2f68
Author: Julian Eisel
Date:   Mon Feb 26 23:37:27 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB33dc1214b197f4bdc82baf3e54107a2f223d2f68

Rename "Editing" section to "General"

Also moved to be first item.

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

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 c1f3329129f..f8fef4b0186 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -332,16 +332,16 @@ class USERPREF_PT_interface(Panel):
 
 
 
-class USERPREF_PT_edit(Panel):
+class USERPREF_PT_general(Panel):
     bl_space_type = 'USER_PREFERENCES'
-    bl_label = "Edit"
+    bl_label = "General"
     bl_region_type = 'WINDOW'
     bl_options = {'HIDE_HEADER'}
 
     @classmethod
     def poll(cls, context):
         userpref = context.user_preferences
-        return (userpref.active_section == 'EDITING')
+        return (userpref.active_section == 'GENERAL')
 
     def draw(self, context):
         layout = self.layout
@@ -1592,7 +1592,7 @@ classes = (
     USERPREF_MT_splash,
     USERPREF_MT_splash_footer,
     USERPREF_PT_interface,
-    USERPREF_PT_edit,
+    USERPREF_PT_general,
     USERPREF_PT_system,
     USERPREF_MT_interface_theme_presets,
     USERPREF_PT_theme,
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 3da0bdb6ca2..bc9dc8e95f4 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -604,7 +604,7 @@ extern UserDef U; /* from blenkernel blender.c */
 /* UserDef.userpref (UI active_section) */
 typedef enum eUserPref_Section {
 	USER_SECTION_INTERFACE	= 0,
-	USER_SECTION_EDIT		= 1,
+	USER_SECTION_GENERAL		= 1,
 	USER_SECTION_FILE		= 2,
 	USER_SECTION_SYSTEM		= 3,
 	USER_SECTION_THEME		= 4,
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 27a9f971ee6..74bb16d7e03 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4697,8 +4697,8 @@ void RNA_def_userdef(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static const EnumPropertyItem user_pref_sections[] = {
+		{USER_SECTION_GENERAL, "GENERAL", 0, "General", ""},
 		{USER_SECTION_INTERFACE, "INTERFACE", 0, "Interface", ""},
-		{USER_SECTION_EDIT, "EDITING", 0, "Editing", ""},
 		{USER_SECTION_INPUT, "INPUT", 0, "Input", ""},
 		{USER_SECTION_ADDONS, "ADDONS", 0, "Add-ons", ""},
 		{USER_SECTION_THEME, "THEMES", 0, "Themes", ""},