[Bf-blender-cvs] [822aae0ff24] userpref_redesign: Merge branch 'master' into userpref_redesign

[Julian Eisel]

Commit: 822aae0ff242d3d47612ddbcd3fbc4bf3590513c
Author: Julian Eisel
Date:   Sat Dec 29 13:36:10 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB822aae0ff242d3d47612ddbcd3fbc4bf3590513c

Merge branch 'master' into userpref_redesign

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



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

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index e0a383b9b64,73d34fdb380..4d2fdd151ad
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -190,119 -123,99 +190,119 @@@ class USERPREF_PT_interface_viewports_3
          sub.prop(view, "mini_axis_size", text="Size")
          sub.prop(view, "mini_axis_brightness", text="Brightness")
  
 -        col.separator()
 +        layout.separator()
  
 -        # Toolbox doesn't exist yet
 -        # col.label(text="Toolbox:")
 -        #col.prop(view, "show_column_layout")
 -        #col.label(text="Open Toolbox Delay:")
 -        #col.prop(view, "open_left_mouse_delay", text="Hold LMB")
 -        #col.prop(view, "open_right_mouse_delay", text="Hold RMB")
 -        col.prop(view, "show_gizmo", text="Gizmos")
 -        sub = col.column()
 -        sub.active = view.show_gizmo
 -        sub.prop(view, "gizmo_size", text="Size")
 +        layout.prop(view, "gizmo_size", text="Gizmo Size")
  
 -        col.separator()
  
 -        col.label(text="Development:")
 -        col.prop(view, "show_tooltips_python")
 -        col.prop(view, "show_developer_ui")
 +class USERPREF_PT_interface_viewports_3d_weight_paint(PreferencePanel):
 +    bl_label = "Custom Weight Paint Range"
 +    bl_options = {'DEFAULT_CLOSED'}
 +    bl_parent_id = "USERPREF_PT_interface_viewports_3d"
  
 -        row = split.row()
 -        row.separator()
 -        col = row.column()
 +    def draw_header(self, context):
 +        prefs = context.preferences
 +        system = prefs.system
 +
 +        self.layout.prop(system, "use_weight_color_range", text="")
 +
 +    def draw_props(self, context, layout):
 +        prefs = context.preferences
 +        system = prefs.system
  
 -        col.label(text="View Gizmos:")
 -        col.prop(view, "use_mouse_depth_cursor")
 -        col.prop(view, "use_cursor_lock_adjust")
 -        col.prop(view, "use_mouse_depth_navigate")
 -        col.prop(view, "use_zoom_to_mouse")
 -        col.prop(view, "use_rotate_around_active")
 -        col.prop(view, "use_camera_lock_parent")
 +        layout.active = system.use_weight_color_range
 +        layout.template_color_ramp(system, "weight_color_range", expand=True)
  
 -        col.separator()
  
 -        col.prop(view, "use_auto_perspective")
 -        col.prop(view, "smooth_view")
 -        col.prop(view, "rotation_angle")
 +class USERPREF_PT_interface_viewports_2d(PreferencePanel):
 +    bl_label = "2D Viewports"
 +    bl_parent_id = "USERPREF_PT_interface_viewports"
  
 -        col.separator()
 -        col.separator()
 +    def draw_props(self, context, layout):
 +        prefs = context.preferences
 +        view = prefs.view
  
 -        col.label(text="2D Viewports:")
 -        col.prop(view, "view2d_grid_spacing_min", text="Minimum Grid Spacing")
 -        col.prop(view, "timecode_style")
 -        col.prop(view, "view_frame_type")
 +        layout.prop(view, "view2d_grid_spacing_min", text="Minimum Grid Spacing")
 +        layout.prop(view, "timecode_style")
 +        layout.prop(view, "view_frame_type")
          if view.view_frame_type == 'SECONDS':
 -            col.prop(view, "view_frame_seconds")
 +            layout.prop(view, "view_frame_seconds")
          elif view.view_frame_type == 'KEYFRAMES':
 -            col.prop(view, "view_frame_keyframes")
 +            layout.prop(view, "view_frame_keyframes")
  
 -        row = split.row()
 -        row.separator()
 -        col = row.column()
  
 -        col.label(text="Menus:")
 -        col.prop(view, "use_mouse_over_open")
 -        sub = col.column()
 -        sub.active = view.use_mouse_over_open
 +class USERPREF_PT_interface_menus(PreferencePanel):
 +    bl_label = "Menus"
 +    bl_options = {'DEFAULT_CLOSED'}
  
 -        sub.prop(view, "open_toplevel_delay", text="Top Level")
 -        sub.prop(view, "open_sublevel_delay", text="Sub Level")
 +    @classmethod
 +    def poll(cls, context):
 +        prefs = context.preferences
 +        return (prefs.active_section == 'INTERFACE')
  
 -        col.separator()
 -        col.label(text="Pie Menus:")
 -        sub = col.column(align=True)
 -        sub.prop(view, "pie_animation_timeout")
 -        sub.prop(view, "pie_initial_timeout")
 -        sub.prop(view, "pie_menu_radius")
 -        sub.prop(view, "pie_menu_threshold")
 -        sub.prop(view, "pie_menu_confirm")
 -        col.separator()
 +    def draw_props(self, context, layout):
 +        prefs = context.preferences
 +        view = prefs.view
  
 -        col.label(text="Header:")
 -        sub = col.split()
 -        sub.label(text="Default Position")
 -        sub.row().prop(view, "header_align_default", expand=True)
 +        layout.prop(view, "show_splash")
 +        layout.prop(view, "use_quit_dialog")
  
 -        col.prop(view, "show_splash")
  
 -        col.label(text="Warnings:")
 -        col.prop(view, "use_quit_dialog")
 +class USERPREF_PT_interface_menus_mouse_over(PreferencePanel):
 +    bl_label = "Open on Mouse Over"
 +    bl_parent_id = "USERPREF_PT_interface_menus"
 +    bl_options = {'DEFAULT_CLOSED'}
  
 -        col.separator()
 +    def draw_header(self, context):
 +        prefs = context.preferences
 +        view = prefs.view
  
 -        col.label(text="App Template:")
 -        col.label(text="Options intended for use with app-templates only")
 -        col.prop(view, "show_layout_ui")
 +        self.layout.prop(view, "use_mouse_over_open", text="")
  
 +    def draw_props(self, context, layout):
 +        prefs = context.preferences
 +        view = prefs.view
  
 -class USERPREF_PT_edit(Panel):
 -    bl_space_type = 'PREFERENCES'
 -    bl_label = "Edit"
 -    bl_region_type = 'WINDOW'
 -    bl_options = {'HIDE_HEADER'}
 +        layout.active = view.use_mouse_over_open
 +
 +        layout.prop(view, "open_toplevel_delay", text="Top Level")
 +        layout.prop(view, "open_sublevel_delay", text="Sub Level")
 +
 +class USERPREF_PT_interface_menus_pie(PreferencePanel):
 +    bl_label = "Pie Menus"
 +    bl_parent_id = "USERPREF_PT_interface_menus"
 +    bl_options = {'DEFAULT_CLOSED'}
 +
 +    def draw_props(self, context, layout):
 +        prefs = context.preferences
 +        view = prefs.view
 +
 +        layout.prop(view, "pie_animation_timeout")
 +        layout.prop(view, "pie_initial_timeout")
 +        layout.prop(view, "pie_menu_radius")
 +        layout.prop(view, "pie_menu_threshold")
 +        layout.prop(view, "pie_menu_confirm")
 +
 +
 +class USERPREF_PT_interface_templates(PreferencePanel):
 +    bl_label = "Templates"
 +    bl_options = {'DEFAULT_CLOSED'}
 +
 +    @classmethod
 +    def poll(cls, context):
 +        prefs = context.preferences
 +        return (prefs.active_section == 'INTERFACE')
 +
 +    def draw_props(self, context, layout):
 +        prefs = context.preferences
 +        view = prefs.view
 +
-         layout.label(text="Options intended for use with app-templates only.")
++        layout.label(text="Options intended for use with app-templates only")
 +        layout.prop(view, "show_layout_ui")
 +
 +
 +class USERPREF_PT_edit_undo(PreferencePanel):
 +    bl_label = "Undo"
  
      @classmethod
      def poll(cls, context):