[Bf-blender-cvs] [3cfb9e0ec56] userpref_redesign: Merge branch 'blender2.8' into userpref_redesign

[Julian Eisel]

Commit: 3cfb9e0ec5623b66371f76377060faf63252a208
Author: Julian Eisel
Date:   Wed Dec 19 12:23:32 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB3cfb9e0ec5623b66371f76377060faf63252a208

Merge branch 'blender2.8' into userpref_redesign

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



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

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index e8173931813,88bfa8a2e24..97c092853d5
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -37,13 -37,27 +37,13 @@@ class USERPREF_HT_header(Header)
  
          userpref = context.user_preferences
  
 -        if userpref.active_section == 'INPUT':
 -            layout.operator("wm.keyconfig_import", icon='IMPORT')
 -            layout.operator("wm.keyconfig_export", icon='EXPORT')
 -        elif userpref.active_section == 'ADDONS':
 -            layout.operator("wm.addon_install", icon='FILEBROWSER')
 -            layout.operator("wm.addon_refresh", icon='FILE_REFRESH')
 -            layout.menu("USERPREF_MT_addons_online_resources")
 -        elif userpref.active_section == 'LIGHTS':
 +
 +        if userpref.active_section == 'LIGHTS':
-             layout.operator('wm.studiolight_install', text="Add MatCap").type = 'MATCAP'
-             layout.operator('wm.studiolight_install', text="Add LookDev HDRI").type = 'WORLD'
-             op = layout.operator('wm.studiolight_install', text="Add Studio Light")
+             layout.operator("wm.studiolight_install", text="Add MatCap").type = 'MATCAP'
+             layout.operator("wm.studiolight_install", text="Add LookDev HDRI").type = 'WORLD'
+             op = layout.operator("wm.studiolight_install", text="Add Studio Light")
              op.type = 'STUDIO'
              op.filter_glob = ".sl"
 -        elif userpref.active_section == 'THEMES':
 -            layout.operator("wm.theme_install", icon='FILEBROWSER')
 -            layout.operator("ui.reset_default_theme", icon='LOOP_BACK')
 -
 -        layout.separator_spacer()
 -
 -        layout.operator_context = 'EXEC_AREA'
 -        layout.operator("wm.save_userpref")
  
  
  class USERPREF_PT_navigation(Panel):
@@@ -502,33 -349,32 +502,32 @@@ class USERPREF_PT_edit_misc(PreferenceP
      @classmethod
      def poll(cls, context):
          userpref = context.user_preferences
 -        return (userpref.active_section == 'SYSTEM_GENERAL')
 -
 -    def draw(self, context):
 -        import sys
 -        layout = self.layout
 +        return (userpref.active_section == 'EDITING')
  
 +    def draw_props(self, context, layout):
          userpref = context.user_preferences
 -        system = userpref.system
 +        edit = userpref.edit
  
 -        split = layout.split()
 +        layout.prop(edit, "sculpt_paint_overlay_color", text="Sculpt Overlay Color")
 +        layout.prop(edit, "node_margin", text="Node Editor Auto-offset Margin")
  
 -        # 1. Column
 -        column = split.column()
 -        colsplit = column.split(factor=0.85)
  
 -        col = colsplit.column()
 -        col.label(text="General:")
 +class USERPREF_PT_interface_system_sound(PreferencePanel):
 +    bl_label = "Sound"
 +    bl_options = {'DEFAULT_CLOSED'}
  
 -        col.prop(system, "scrollback", text="Console Scrollback")
 +    @classmethod
 +    def poll(cls, context):
 +        userpref = context.user_preferences
 +        return (userpref.active_section == 'SYSTEM_GENERAL')
  
 -        col.separator()
 +    def draw_props(self, context, layout):
 +        userpref = context.user_preferences
 +        system = userpref.system
  
 -        col.label(text="Sound:")
 -        col.row().prop(system, "audio_device", expand=False)
 -        sub = col.column()
 +        layout.prop(system, "audio_device", expand=False)
 +        sub = layout.column()
          sub.active = system.audio_device not in {'NONE', 'Null'}
-         #sub.prop(system, "use_preview_images")
          sub.prop(system, "audio_channels", text="Channels")
          sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer")
          sub.prop(system, "audio_sample_rate", text="Sample Rate")
@@@ -1396,38 -1062,44 +1395,38 @@@ class USERPREF_PT_input_mouse(Preferenc
          userpref = context.user_preferences
          return (userpref.active_section == 'INPUT')
  
 -    @staticmethod
 -    def draw_input_prefs(inputs, layout):
 -        import sys
 -
 -        # General settings
 -        sub = layout.column()
 -
 -        sub.label(text="Mouse:")
 -        sub.prop(inputs, "use_mouse_emulate_3_button")
 -        sub.prop(inputs, "use_mouse_continuous")
 -        sub.prop(inputs, "drag_threshold")
 -        sub.prop(inputs, "tweak_threshold")
 +    def draw_props(self, context, layout):
 +        userpref = context.user_preferences
 +        inputs = userpref.inputs
  
 -        sub = layout.column()
 -        sub.label(text="Double Click:")
 -        sub.prop(inputs, "mouse_double_click_time", text="Speed")
 +        layout.prop(inputs, "drag_threshold")
 +        layout.prop(inputs, "tweak_threshold")
 +        layout.prop(inputs, "mouse_double_click_time", text="Double Click Speed")
 +        layout.prop(inputs, "use_mouse_emulate_3_button")
 +        layout.prop(inputs, "use_mouse_continuous")
  
 -        sub.separator()
  
 -        sub.prop(inputs, "use_emulate_numpad")
 +class USERPREF_PT_input_view(PreferencePanel):
 +    bl_label = "View"
  
 -        sub.separator()
 +    @classmethod
 +    def poll(cls, context):
 +        userpref = context.user_preferences
 +        return (userpref.active_section == 'INPUT')
  
 -        sub.label(text="Orbit Style:")
 -        sub.row().prop(inputs, "view_rotate_method", expand=True)
 +    def draw_props(self, context, layout):
 +        import sys
 +        userpref = context.user_preferences
 +        inputs = userpref.inputs
  
 -        sub.separator()
 +        layout.row().prop(inputs, "view_rotate_method", expand=True)
  
 -        sub.label(text="Zoom Style:")
 -        sub.row().prop(inputs, "view_zoom_method", text="")
 +        layout.row().prop(inputs, "view_zoom_method", text="Zoom Method")
          if inputs.view_zoom_method in {'DOLLY', 'CONTINUE'}:
-             layout.row().prop(inputs, "view_zoom_axis", expand=True)
-             layout.prop(inputs, "invert_mouse_zoom", text="Invert Mouse Zoom Direction")
+             sub.row().prop(inputs, "view_zoom_axis", expand=True)
+             sub.prop(inputs, "invert_mouse_zoom", text="Invert Mouse Zoom Direction")
  
 -        # layout.separator()
 -
 -        sub = layout.column()
 -        sub.prop(inputs, "invert_zoom_wheel", text="Invert Wheel Zoom Direction")
 +        layout.prop(inputs, "invert_zoom_wheel", text="Invert Wheel Zoom Direction")
          #sub.prop(view, "wheel_scroll_lines", text="Scroll Lines")
  
          if sys.platform == "darwin":